Combine two redux batches in send flow

This commit is contained in:
Fedor Indutny 2022-05-23 15:04:33 -07:00 committed by GitHub
parent 494287a570
commit 7afe3fcca2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 10 deletions

View File

@ -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;
}

View File

@ -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',