Merge contacts when we discover split or duplicated contacts
This commit is contained in:
parent
68e432188b
commit
901179440f
32 changed files with 1199 additions and 824 deletions
|
@ -2058,7 +2058,7 @@
|
|||
await contact.setApproved();
|
||||
}
|
||||
|
||||
message.resend(contact.get('uuid') || contact.get('e164'));
|
||||
message.resend(contact.getSendTarget());
|
||||
},
|
||||
});
|
||||
|
||||
|
|
|
@ -84,6 +84,13 @@
|
|||
model: { window: options.window },
|
||||
});
|
||||
|
||||
Whisper.events.on('refreshConversation', ({ oldId, newId }) => {
|
||||
const convo = this.conversation_stack.lastConversation;
|
||||
if (convo && convo.get('id') === oldId) {
|
||||
this.conversation_stack.open(newId);
|
||||
}
|
||||
});
|
||||
|
||||
if (!options.initialLoadComplete) {
|
||||
this.appLoadingScreen = new Whisper.AppLoadingScreen();
|
||||
this.appLoadingScreen.render();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue