mirror of
https://github.com/signalapp/Signal-Desktop.git
synced 2025-12-24 20:26:24 +00:00
Combine two redux batches in send flow
This commit is contained in:
@@ -3944,11 +3944,13 @@ export class ConversationModel extends window.Backbone
|
||||
sendHQImages,
|
||||
storyId,
|
||||
timestamp,
|
||||
extraReduxActions,
|
||||
}: {
|
||||
dontClearDraft?: boolean;
|
||||
sendHQImages?: boolean;
|
||||
storyId?: string;
|
||||
timestamp?: number;
|
||||
extraReduxActions?: () => void;
|
||||
} = {}
|
||||
): Promise<MessageAttributesType | undefined> {
|
||||
if (this.isGroupV1AndDisabled()) {
|
||||
@@ -4118,6 +4120,8 @@ export class ConversationModel extends window.Backbone
|
||||
if (enableProfileSharing) {
|
||||
this.captureChange('mandatoryProfileSharing');
|
||||
}
|
||||
|
||||
extraReduxActions?.();
|
||||
} finally {
|
||||
this.isInReduxBatch = false;
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
|
||||
/* eslint-disable camelcase */
|
||||
|
||||
import { batch as batchDispatch } from 'react-redux';
|
||||
import { debounce, flatten, omit, throttle } from 'lodash';
|
||||
import { render } from 'mustache';
|
||||
|
||||
@@ -2969,17 +2968,16 @@ export class ConversationView extends window.Backbone.View<ConversationModel> {
|
||||
{
|
||||
sendHQImages,
|
||||
timestamp,
|
||||
extraReduxActions: () => {
|
||||
this.compositionApi.current?.reset();
|
||||
model.setMarkedUnread(false);
|
||||
this.setQuoteMessage(null);
|
||||
this.resetLinkPreview();
|
||||
this.clearAttachments();
|
||||
window.reduxActions.composer.resetComposer();
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
batchDispatch(() => {
|
||||
this.compositionApi.current?.reset();
|
||||
model.setMarkedUnread(false);
|
||||
this.setQuoteMessage(null);
|
||||
this.resetLinkPreview();
|
||||
this.clearAttachments();
|
||||
window.reduxActions.composer.resetComposer();
|
||||
});
|
||||
} catch (error) {
|
||||
log.error(
|
||||
'Error pulling attached files before send',
|
||||
|
||||
Reference in New Issue
Block a user