Fix double notification on Android

ava-labs · Dec 13, 2024 · c2d52cd · c2d52cd
1 parent 828c6f7
commit c2d52cd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/core-mobile/app/services/fcm/FCMService.ts b/packages/core-mobile/app/services/fcm/FCMService.ts
@@ -6,6 +6,7 @@ import {
   BalanceChangeEvents,
   NotificationsBalanceChangeSchema
 } from 'services/fcm/types'
+import { Platform } from 'react-native'
 
 type UnsubscribeFunc = () => void
 
@@ -59,6 +60,10 @@ class FCMService {
   listenForMessagesBackground = (): void => {
     messaging().setBackgroundMessageHandler(async remoteMessage => {
       Logger.info('A new FCM message arrived in background', remoteMessage)
+      if (Platform.OS === 'android') {
+        //skip for android, FCM sdk handles this already
+        return
+      }
       const result = NotificationsBalanceChangeSchema.safeParse(remoteMessage)
       if (!result.success) {
         Logger.error(

diff --git a/packages/core-mobile/app/services/notifications/NotificationsService.ts b/packages/core-mobile/app/services/notifications/NotificationsService.ts
@@ -321,16 +321,14 @@ class NotificationsService {
         pressAction: {
           id: PressActionId.OPEN_PORTFOLIO,
           launchActivity: LAUNCH_ACTIVITY
-        }
+        },
+        channelId: channelId ?? ''
       },
       data
     }
     if (sound) {
       notification.ios = { sound: sound }
     }
-    if (channelId && notification.android) {
-      notification.android.channelId = channelId
-    }
     await notifee.displayNotification(notification).catch(Logger.error)
   }
 }