colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Notifications for a few merge-related scenarios

Browse Source
This commit is contained in:
Scott Nonnenberg
2022-12-05 14:46:54 -08:00
committed by GitHub
parent 78ce34b9d3
commit a49a6f2057
40 changed files with 2764 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ts/updateConversationsWithUuidLookup.ts
View File

@@ -40,7 +40,7 @@ export async function updateConversationsWithUuidLookup({
const pairFromServer = serverLookup.get(e164);
if (pairFromServer) {
const maybeFinalConversation =
const { conversation: maybeFinalConversation } =
conversationController.maybeMergeContacts({
aci: pairFromServer.aci,
pni: pairFromServer.pni,