mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Reload conversation messages on merge

Browse source
This commit is contained in:
Fedor Indutny 2023-01-10 10:57:39 -08:00 • committed by GitHub
parent 801dea2969
commit f8978328a8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 118 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ts/ConversationController.ts
View file

@ -1120,13 +1120,19 @@ export class ConversationController {
this._conversations.resetLookups();
current.captureChange('combineConversations');
void current.updateLastMessage();
drop(current.updateLastMessage());
const state = window.reduxStore.getState();
if (state.conversations.selectedConversationId === current.id) {
// TODO: DESKTOP-4807
drop(current.loadNewestMessages(undefined, undefined));
}
const titleIsUseful = Boolean(
obsoleteTitleInfo && getTitleNoDefault(obsoleteTitleInfo)
);
if (!fromPniSignature && obsoleteTitleInfo && titleIsUseful) {
void current.addConversationMerge(obsoleteTitleInfo);
drop(current.addConversationMerge(obsoleteTitleInfo));
}
log.warn(`${logId}: Complete!`);