fix(messaging): Refactor code to avoid bugs

When NotificationIOS only contains badge, it's not serialized... So I fixed it

Author: Titozzz

packages/messaging/ios/RNFBMessaging/RNFBMessagingSerializer.m

@@ -176,9 +176,6 @@ + (NSDictionary *)remoteMessageUserInfoToDict:(NSDictionary *)userInfo {
           notificationIOS[@"subtitleLocArgs"] = apsAlertDict[@"subtitle-loc-args"];
         }
       }
-
-      notification[@"ios"] = notificationIOS;
-      message[@"notification"] = notification;
     }
 
     // message.notification.ios.sound
@@ -208,11 +205,14 @@ + (NSDictionary *)remoteMessageUserInfoToDict:(NSDictionary *)userInfo {
         // message.notification.ios.sound
         notificationIOS[@"sound"] = notificationIOSSound;
       }
-
-      notification[@"ios"] = notificationIOS;
-      message[@"notification"] = notification;
     }
   }
+  if ([notificationIOS count] > 0) {
+    notification[@"ios"] = notificationIOS;
+  }
+  if ([notification count] > 0) {
+    message[@"notification"] = notification;
+  }
 
   return message;
 }