Reload conversation messages on merge
This commit is contained in:
parent
801dea2969
commit
f8978328a8
2 changed files with 118 additions and 63 deletions
|
@ -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!`);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue