Notifications for a few merge-related scenarios

ts/models/messages.ts

@@ -122,6 +122,8 @@ import {
   isUnsupportedMessage,
   isVerifiedChange,
   processBodyRanges,
+  isConversationMerge,
+  isPhoneNumberDiscovery,
 } from '../state/selectors/message';
 import {
   isInCall,
@@ -181,6 +183,9 @@ import { parseBoostBadgeListFromServer } from '../badges/parseBadgesFromServer';
 import { GiftBadgeStates } from '../components/conversation/Message';
 import { downloadAttachment } from '../util/downloadAttachment';
 import type { StickerWithHydratedData } from '../types/Stickers';
+import { getStringForConversationMerge } from '../util/getStringForConversationMerge';
+import { getStringForPhoneNumberDiscovery } from '../util/getStringForPhoneNumberDiscovery';
+import { getTitle, renderNumber } from '../util/getTitle';
 import { DurationInSeconds } from '../util/durations';
 import dataInterface from '../sql/Client';
 
@@ -415,12 +420,14 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
     return (
       !isCallHistory(attributes) &&
       !isChatSessionRefreshed(attributes) &&
+      !isConversationMerge(attributes) &&
       !isEndSession(attributes) &&
       !isExpirationTimerUpdate(attributes) &&
       !isGroupUpdate(attributes) &&
-      !isGroupV2Change(attributes) &&
       !isGroupV1Migration(attributes) &&
+      !isGroupV2Change(attributes) &&
       !isKeyChange(attributes) &&
+      !isPhoneNumberDiscovery(attributes) &&
       !isProfileChange(attributes) &&
       !isUniversalTimerNotification(attributes) &&
       !isUnsupportedMessage(attributes) &&
@@ -622,7 +629,8 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
   }
 
   getNotificationData(): { emoji?: string; text: string } {
-    const { attributes } = this;
+    // eslint-disable-next-line prefer-destructuring
+    const attributes: MessageAttributesType = this.attributes;
 
     if (isDeliveryIssue(attributes)) {
       return {
@@ -631,6 +639,46 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
       };
     }
 
+    if (isConversationMerge(attributes)) {
+      const conversation = this.getConversation();
+      strictAssert(
+        conversation,
+        'getNotificationData/isConversationMerge/conversation'
+      );
+      strictAssert(
+        attributes.conversationMerge,
+        'getNotificationData/isConversationMerge/conversationMerge'
+      );
+
+      return {
+        text: getStringForConversationMerge({
+          obsoleteConversationTitle: getTitle(
+            attributes.conversationMerge.renderInfo
+          ),
+          conversationTitle: conversation.getTitle(),
+          i18n: window.i18n,
+        }),
+      };
+    }
+
+    if (isPhoneNumberDiscovery(attributes)) {
+      const conversation = this.getConversation();
+      strictAssert(conversation, 'getNotificationData/isPhoneNumberDiscovery');
+      strictAssert(
+        attributes.phoneNumberDiscovery,
+        'getNotificationData/isPhoneNumberDiscovery/phoneNumberDiscovery'
+      );
+
+      return {
+        text: getStringForPhoneNumberDiscovery({
+          phoneNumber: renderNumber(attributes.phoneNumberDiscovery.e164),
+          conversationTitle: conversation.getTitle(),
+          sharedGroup: conversation.get('sharedGroupNames')?.[0],
+          i18n: window.i18n,
+        }),
+      };
+    }
+
     if (isChatSessionRefreshed(attributes)) {
       return {
         emoji: '🔁',
@@ -1323,6 +1371,8 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
     const isProfileChangeValue = isProfileChange(attributes);
     const isUniversalTimerNotificationValue =
       isUniversalTimerNotification(attributes);
+    const isConversationMergeValue = isConversationMerge(attributes);
+    const isPhoneNumberDiscoveryValue = isPhoneNumberDiscovery(attributes);
 
     const isPayment = messageHasPaymentEvent(attributes);
 
@@ -1353,7 +1403,9 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
       // Locally-generated notifications
       isKeyChangeValue ||
       isProfileChangeValue ||
-      isUniversalTimerNotificationValue;
+      isUniversalTimerNotificationValue ||
+      isConversationMergeValue ||
+      isPhoneNumberDiscoveryValue;
 
     return !hasSomethingToDisplay;
   }
@@ -2320,7 +2372,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
                 return;
               }
 
-              const destinationConversation =
+              const { conversation: destinationConversation } =
                 window.ConversationController.maybeMergeContacts({
                   aci: destinationUuid,
                   e164: destination || undefined,