Notifications for a few merge-related scenarios

2022-12-05 14:46:54 -08:00
parent 78ce34b9d3
commit a49a6f2057
40 changed files with 2764 additions and 553 deletions
--- a/ts/state/ducks/accounts.ts
+++ b/ts/state/ducks/accounts.ts
@@ -90,12 +90,14 @@ function checkForAccount(
      const maybePair = uuidLookup.get(phoneNumber);

      if (maybePair) {
-        uuid = window.ConversationController.maybeMergeContacts({
-          aci: maybePair.aci,
-          pni: maybePair.pni,
-          e164: phoneNumber,
-          reason: 'checkForAccount',
-        })?.get('uuid');
+        const { conversation: maybeMerged } =
+          window.ConversationController.maybeMergeContacts({
+            aci: maybePair.aci,
+            pni: maybePair.pni,
+            e164: phoneNumber,
+            reason: 'checkForAccount',
+          });
+        uuid = maybeMerged?.get('uuid');
      }
    } catch (error) {
      log.error('checkForAccount:', Errors.toLogFormat(error));