fix: Clear Notifications when in app (#1444)

Clear notifications once they load
ephemeraHQ · Dec 31, 2024 · 0bd5d13 · 0bd5d13
1 parent 089d602
commit 0bd5d13
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 46 deletions.
diff --git a/features/notifications/utils/accountTopicSubscription.ts b/features/notifications/utils/accountTopicSubscription.ts
@@ -1,6 +1,7 @@
 import { createConversationListQueryObserver } from "@/queries/useConversationListQuery";
 import { subscribeToNotifications } from "./subscribeToNotifications";
 import logger from "@/utils/logger";
+import { resetNotifications } from "./resetNotifications";
 
 const accountTopicUnsubscribeMap: Record<string, () => void> = {};
 
@@ -26,6 +27,12 @@ export const setupAccountTopicSubscription = (account: string) => {
         conversations: conversationList.data,
         account,
       });
+      // For now just reset notifications when we get a new conversation list
+      /*
+        TODO: We can probably do better here
+        - Counter by account (Only clear the counter for the account we are subscribing to so users know they have new messages on other accounts)
+      */
+      resetNotifications();
     }
   });
   accountTopicUnsubscribeMap[account] = unsubscribe;

diff --git a/ios/ConverseNotificationExtension/Xmtp/Messages.swift b/ios/ConverseNotificationExtension/Xmtp/Messages.swift
@@ -127,52 +127,6 @@ func handleV3Message(xmtpClient: XMTP.Client, envelope: XMTP.Xmtp_MessageApi_V1_
   return (shouldShowNotification, messageId, messageIntent)
 }
 
-
-func handleOngoingConversationMessage(xmtpClient: XMTP.Client, envelope: XMTP.Xmtp_MessageApi_V1_Envelope, bestAttemptContent: inout UNMutableNotificationContent, body: [String: Any]) async -> (shouldShowNotification: Bool, messageId: String?, messageIntent: INSendMessageIntent?) {
-  var shouldShowNotification = false
-  let contentTopic = envelope.contentTopic
-  var conversationTitle: String? = nil
-  var messageId: String? = nil
-  var messageIntent: INSendMessageIntent? = nil
-
-  let decodedMessage = try? await decodeMessage(xmtpClient: xmtpClient, envelope: envelope)
-  // If couldn't decode the message, not showing
-  if let message = decodedMessage {
-    let decodedMessageResult = handleMessageByContentType(decodedMessage: message, xmtpClient: xmtpClient);
-
-    if decodedMessageResult.senderAddress == xmtpClient.address || decodedMessageResult.forceIgnore {
-      // Message is from me or a reaction removal, let's drop it
-      print("[NotificationExtension] Not showing a notification")
-    } else if let content = decodedMessageResult.content {
-      bestAttemptContent.body = content
-
-      var senderAvatar: String? = nil
-      if let senderAddress = decodedMessageResult.senderAddress, let senderProfileSocials = await getProfile(account: xmtpClient.address, address: senderAddress) {
-        conversationTitle = getPreferredName(address: senderAddress, socials: senderProfileSocials)
-        senderAvatar = getPreferredAvatar(socials: senderProfileSocials)
-      }
-
-      if (conversationTitle == nil), let senderAddress = decodedMessageResult.senderAddress {
-        conversationTitle = shortAddress(address: senderAddress)
-      }
-      if let convoTitle = conversationTitle {
-        bestAttemptContent.title = convoTitle
-      }
-
-      shouldShowNotification = true
-      messageId = decodedMessageResult.id
-      messageIntent = getIncoming1v1MessageIntent(topic: envelope.contentTopic, senderId: decodedMessage?.senderInboxId ?? "", senderName: bestAttemptContent.title, senderAvatar: senderAvatar, content: bestAttemptContent.body)
-    }
-  } else {
-    print("[NotificationExtension] Not showing a notification because could not decode message")
-    sentryTrackMessage(message: "Could not decode envelope", extras: ["envelope": envelope, "account": xmtpClient.address])
-  }
-  if (isDebugAccount(account: xmtpClient.address)) {
-    sentryTrackMessage(message: "DEBUG_NOTIFICATION", extras: ["shouldShowNotification": shouldShowNotification, "messageId": messageId ?? "EMPTY", "bestAttemptContentBody": bestAttemptContent.body, "bestAttemptContentTitle": bestAttemptContent.title])
-  }
-  return (shouldShowNotification, messageId, messageIntent)
-}
-
 func loadSavedMessages() -> [SavedNotificationMessage] {
   let mmkv = getMmkv()
   let savedMessagesString = mmkv?.string(forKey: "saved-notifications-messages")