diff --git a/lib/actions/thread-actions.js b/lib/actions/thread-actions.js --- a/lib/actions/thread-actions.js +++ b/lib/actions/thread-actions.js @@ -121,6 +121,7 @@ | { ...UpdateThreadRequest, +thick: false, + +threadInfo: ThreadInfo, } | { ...UpdateThickThreadRequest, @@ -142,7 +143,7 @@ return React.useCallback( async (input: UseChangeThreadSettingsInput) => { if (!input.thick) { - const { thick, ...rest } = input; + const { thick, threadInfo, ...rest } = input; return await keyserverCall({ ...rest }); } diff --git a/lib/components/base-edit-thread-avatar-provider.react.js b/lib/components/base-edit-thread-avatar-provider.react.js --- a/lib/components/base-edit-thread-avatar-provider.react.js +++ b/lib/components/base-edit-thread-avatar-provider.react.js @@ -88,7 +88,7 @@ } const updateThreadInput = threadTypeIsThick(threadInfo.type) ? { thick: true, threadInfo, ...updateThreadRequest } - : { thick: false, ...updateThreadRequest }; + : { thick: false, threadInfo, ...updateThreadRequest }; const promise = changeThreadSettingsCall(updateThreadInput); void dispatchActionPromise(changeThreadSettingsActionTypes, promise, { diff --git a/lib/hooks/promote-sidebar.react.js b/lib/hooks/promote-sidebar.react.js --- a/lib/hooks/promote-sidebar.react.js +++ b/lib/hooks/promote-sidebar.react.js @@ -71,6 +71,7 @@ return await callChangeThreadSettings({ thick: false, threadID: threadInfo.id, + threadInfo, changes: { type: threadTypes.COMMUNITY_OPEN_SUBTHREAD }, }); })(), @@ -79,7 +80,7 @@ onError?.(); throw e; } - }, [threadInfo.id, callChangeThreadSettings, dispatchActionPromise, onError]); + }, [threadInfo, callChangeThreadSettings, dispatchActionPromise, onError]); const returnValues = React.useMemo( () => ({ diff --git a/lib/shared/messages/text-message-spec.js b/lib/shared/messages/text-message-spec.js --- a/lib/shared/messages/text-message-spec.js +++ b/lib/shared/messages/text-message-spec.js @@ -331,6 +331,7 @@ const changeThreadSettingsInput = { thick: false, + threadInfo, ...changeThreadSettingsRequest, }; diff --git a/native/chat/settings/add-users-modal.react.js b/native/chat/settings/add-users-modal.react.js --- a/native/chat/settings/add-users-modal.react.js +++ b/native/chat/settings/add-users-modal.react.js @@ -75,13 +75,13 @@ const userInfoInputIDs = userInfoInputArray.map(userInfo => userInfo.id); const { route } = props; const { threadInfo } = route.params; - const threadID = threadInfo.id; const addUsersToThread = React.useCallback(async () => { try { const result = await callChangeThreadSettings({ thick: false, - threadID: threadID, + threadID: threadInfo.id, changes: { newMemberIDs: userInfoInputIDs }, + threadInfo, }); close(); return result; @@ -96,7 +96,7 @@ } }, [ callChangeThreadSettings, - threadID, + threadInfo, userInfoInputIDs, close, onUnknownErrorAlertAcknowledged, diff --git a/native/chat/settings/color-selector-modal.react.js b/native/chat/settings/color-selector-modal.react.js --- a/native/chat/settings/color-selector-modal.react.js +++ b/native/chat/settings/color-selector-modal.react.js @@ -111,7 +111,11 @@ threadInfo: props.route.params.threadInfo, ...changeThreadSettingRequest, } - : { thick: false, ...changeThreadSettingRequest }; + : { + thick: false, + threadInfo: props.route.params.threadInfo, + ...changeThreadSettingRequest, + }; return await updateThreadSettings(changeThreadSettingInput); } catch (e) { Alert.alert( diff --git a/native/chat/settings/thread-settings-description.react.js b/native/chat/settings/thread-settings-description.react.js --- a/native/chat/settings/thread-settings-description.react.js +++ b/native/chat/settings/thread-settings-description.react.js @@ -277,7 +277,11 @@ threadInfo: this.props.threadInfo, ...changeThreadSettingsRequest, } - : { thick: false, ...changeThreadSettingsRequest }; + : { + thick: false, + threadInfo: this.props.threadInfo, + ...changeThreadSettingsRequest, + }; return await this.props.changeThreadSettings(changeThreadSettingsInput); } catch (e) { diff --git a/native/chat/settings/thread-settings-name.react.js b/native/chat/settings/thread-settings-name.react.js --- a/native/chat/settings/thread-settings-name.react.js +++ b/native/chat/settings/thread-settings-name.react.js @@ -205,7 +205,11 @@ threadInfo: this.props.threadInfo, ...changeThreadSetingsRequest, } - : { thick: false, ...changeThreadSetingsRequest }; + : { + thick: false, + threadInfo: this.props.threadInfo, + ...changeThreadSetingsRequest, + }; return await this.props.changeThreadSettings(changeThreadSettingsInput); } catch (e) { diff --git a/web/modals/threads/members/add-members-modal.react.js b/web/modals/threads/members/add-members-modal.react.js --- a/web/modals/threads/members/add-members-modal.react.js +++ b/web/modals/threads/members/add-members-modal.react.js @@ -77,6 +77,7 @@ callChangeThreadSettings({ thick: false, threadID, + threadInfo, changes: { newMemberIDs }, }), ); diff --git a/web/modals/threads/settings/thread-settings-utils.js b/web/modals/threads/settings/thread-settings-utils.js --- a/web/modals/threads/settings/thread-settings-utils.js +++ b/web/modals/threads/settings/thread-settings-utils.js @@ -49,7 +49,7 @@ threadInfo, ...changeThreadSettingsRequest, } - : { thick: false, ...changeThreadSettingsRequest }; + : { thick: false, threadInfo, ...changeThreadSettingsRequest }; return await callChangeThreadSettings(changeThreadSettingsInput); } catch (e) { @@ -104,6 +104,7 @@ thick: false, threadID: threadInfo.id, changes: queuedChanges, + threadInfo, }); modalContext.popModal(); return response; @@ -118,7 +119,7 @@ queuedChanges, setErrorMessage, setQueuedChanges, - threadInfo.id, + threadInfo, ]); const onSubmit = React.useCallback(