fix(messaging, badge): use new iOS JSON location for FCM badge inform…

…ation (#4560) Co-authored-by: Yunarta Kartawahyudi <[email protected]>
invertase · Nov 23, 2020 · bda2d67 · bda2d67
1 parent f9935e7
commit bda2d67
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.m b/packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.m
@@ -113,6 +113,12 @@ + (NSDictionary *)remoteMessageUserInfoToDict:(NSDictionary *)userInfo {
       message[@"mutableContent"] = @([RCTConvert BOOL:apsDict[@"mutable-content"]]);
     }
 
+    // iOS only
+    // message.notification.ios.badge
+    if (apsDict[@"badge"] != nil) {
+      notificationIOS[@"badge"] = apsDict[@"badge"];
+    }
+
     // message.notification.*
     if (apsDict[@"alert"] != nil) {
       // can be a string or dictionary
@@ -169,15 +175,8 @@ + (NSDictionary *)remoteMessageUserInfoToDict:(NSDictionary *)userInfo {
         if (apsAlertDict[@"subtitle-loc-args"] != nil) {
           notificationIOS[@"subtitleLocArgs"] = apsAlertDict[@"subtitle-loc-args"];
         }
-
-        // iOS only
-        // message.notification.ios.badge
-        if (apsAlertDict[@"badge"] != nil) {
-          notificationIOS[@"badge"] = apsAlertDict[@"badge"];
-        }
       }
 
-
       notification[@"ios"] = notificationIOS;
       message[@"notification"] = notification;
     }