@dashx/react-native 0.1.18 → 0.1.21

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,51 +1,51 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
 	package
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:2:11-37
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:2:11-37
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	android:versionName
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	android:versionCode
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:11-69
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:11-69
 application
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:4:3-10:17
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:4:3-10:17
 service#com.dashx.rn.sdk.DashXMessagingService
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:5-9:15
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:5-9:15
 	android:exported
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:52-76
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:52-76
 	android:name
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:14-51
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:14-51
 intent-filter#action:name:com.google.firebase.MESSAGING_EVENT
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:6:7-8:23
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:6:7-8:23
 action#com.google.firebase.MESSAGING_EVENT
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:7:9-70
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:7:9-70
 	android:name
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:7:17-67
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:7:17-67
 uses-sdk
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml

package/android/build/outputs/logs/manifest-merger-release-report.txt

@@ -1,51 +1,51 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
 	package
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:2:11-37
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:2:11-37
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	android:versionName
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	android:versionCode
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:1-11:12
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:11-69
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:1:11-69
 application
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:4:3-10:17
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:4:3-10:17
 service#com.dashx.rn.sdk.DashXMessagingService
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:5-9:15
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:5-9:15
 	android:exported
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:52-76
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:52-76
 	android:name
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:14-51
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:5:14-51
 intent-filter#action:name:com.google.firebase.MESSAGING_EVENT
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:6:7-8:23
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:6:7-8:23
 action#com.google.firebase.MESSAGING_EVENT
-ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:7:9-70
+ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:7:9-70
 	android:name
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:7:17-67
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml:7:17-67
 uses-sdk
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		ADDED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
-		INJECTED from /home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/AndroidManifest.xml

package/android/build/reports/lint-results.html

@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
       <span class="mdl-layout-title">Lint Report: 1 error and 1 warning</span>
       <div class="mdl-layout-spacer"></div>
       <nav class="mdl-navigation mdl-layout--large-screen-only">
-Check performed at Thu Apr 28 08:53:55 IST 2022      </nav>
+Check performed at Thu May 12 12:18:17 IST 2022      </nav>
     </div>
   </header>
   <div class="mdl-layout__drawer">

package/android/build/reports/lint-results.xml

@@ -12,7 +12,7 @@
         errorLine1="        val pendingIntentFlags = PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE"
         errorLine2="                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
-            file="/home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/java/com/dashx/rn/sdk/DashXMessagingService.kt"
+            file="/Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/java/com/dashx/rn/sdk/DashXMessagingService.kt"
             line="107"
             column="71"/>
     </issue>
@@ -28,7 +28,7 @@
         errorLine1="                content.forEach {"
         errorLine2="                        ~~~~~~~">
         <location
-            file="/home/dgulshan/Projects/dashx-js/packages/react-native/android/src/main/java/com/dashx/rn/sdk/DashXModule.kt"
+            file="/Users/amandeepghai/PROJECTS/dashx/dashx-js/packages/react-native/android/src/main/java/com/dashx/rn/sdk/DashXModule.kt"
             line="138"
             column="25"/>
     </issue>

package/ios/DashX.swift

@@ -1,5 +1,5 @@
 import Foundation
-import FirebaseInstanceID
+import FirebaseMessaging
 
 @objc(DashX)
 class DashX: RCTEventEmitter {
@@ -23,7 +23,7 @@ class DashX: RCTEventEmitter {
     func setup(_ options: NSDictionary?) {
         ConfigInterceptor.shared.publicKey = options?.value(forKey: "publicKey") as? String
 
-        DashXAppDelegate.swizzleDidReceiveRemoteNotification()
+        DashXAppDelegate.swizzleDidReceiveRemoteNotificationFetchCompletionHandler()
 
         if let baseUri = options?.value(forKey: "baseUri") {
             Network.shared.setBaseUri(to: baseUri as! String)
@@ -45,12 +45,13 @@ class DashX: RCTEventEmitter {
             UIViewController.swizzle()
         }
 
-        InstanceID.instanceID().instanceID { (result, error) in
+        // Based on https://firebase.google.com/docs/cloud-messaging/ios/client#access_the_registration_token
+        Messaging.messaging().token { token, error in
             if let error = error {
-                DashXLog.d(tag: #function, "Error fetching remote instance ID: \(error)")
-            } else if let result = result {
-                DashXLog.d(tag: #function, "Firebase initialised with: \(result.token)")
-                self.dashXClient.setDeviceToken(to: result.token)
+                DashXLog.d(tag: #function, "Error fetching FCM registration token: \(error)")
+            } else if let token = token {
+                DashXLog.d(tag: #function, "Firebase initialised with: \(token)")
+                self.dashXClient.setDeviceToken(to: token)
             }
         }
     }
@@ -145,5 +146,4 @@ class DashX: RCTEventEmitter {
     func subscribe() {
         dashXClient.subscribe()
     }
-
 }

package/ios/DashXAppDelegate.swift

@@ -2,23 +2,27 @@ import Foundation
 
 @objc(DashXAppDelegate)
 class DashXAppDelegate: NSObject {
-    static func swizzleDidReceiveRemoteNotification() {
-        let appDelegate = UIApplication.shared.delegate
-        let appDelegateClass = object_getClass(appDelegate)
+    static func swizzleDidReceiveRemoteNotificationFetchCompletionHandler() {
+        // To remove the warning -[UIApplication delegate] must be called from main thread only
+        // and to call the UI controlling method from the main thread, use `DispatchQueue.main.async`
+        DispatchQueue.main.async {
+            let appDelegate = UIApplication.shared.delegate
+            let appDelegateClass: AnyClass? = object_getClass(appDelegate)
 
-        let originalSelector = #selector(UIApplicationDelegate.application(_:didReceiveRemoteNotification:fetchCompletionHandler:))
-        let swizzledSelector = #selector(DashXAppDelegate.self.handleMessage(_:didReceiveRemoteNotification:fetchCompletionHandler:))
+            let originalSelector = #selector(UIApplicationDelegate.application(_:didReceiveRemoteNotification:fetchCompletionHandler:))
+            let swizzledSelector = #selector(DashXAppDelegate.self.handleMessage(_:didReceiveRemoteNotification:fetchCompletionHandler:))
 
-        guard let swizzledMethod = class_getInstanceMethod(DashXAppDelegate.self, swizzledSelector) else {
-            return
-        }
+            guard let swizzledMethod = class_getInstanceMethod(DashXAppDelegate.self, swizzledSelector) else {
+                return
+            }
 
-        if let originalMethod = class_getInstanceMethod(appDelegateClass, originalSelector)  {
-            // exchange implementation
-            method_exchangeImplementations(originalMethod, swizzledMethod)
-        } else {
-            // add implementation
-            class_addMethod(appDelegateClass, swizzledSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod))
+            if let originalMethod = class_getInstanceMethod(appDelegateClass, originalSelector)  {
+                // exchange implementation
+                method_exchangeImplementations(originalMethod, swizzledMethod)
+            } else {
+                // add implementation
+                class_addMethod(appDelegateClass, swizzledSelector, method_getImplementation(swizzledMethod), method_getTypeEncoding(swizzledMethod))
+            }
         }
     }
 
@@ -27,12 +31,43 @@ class DashXAppDelegate: NSObject {
     func handleMessage(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable: Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         DashXLog.d(tag: #function, "Received APN: \(userInfo)")
 
-        guard let remoteMessage = try? FirebaseRemoteMessage(decoding: userInfo) else {
-            DashXLog.d(tag: #function, "Non firebase notification received: \(userInfo)")
+        let state = UIApplication.shared.applicationState
+        // Do Nothing when app is in foreground
+        if state == .active {
+            completionHandler(.noData)
             return
         }
 
+        if let dashx = userInfo["dashx"] as? String {
+            let maybeDashxDictionary = dashx.convertToDictionary()
+
+            let notificationContent = UNMutableNotificationContent()
+            notificationContent.sound = UNNotificationSound.default
+
+            if let parsedDashxDictionary = maybeDashxDictionary {
+                guard let identifier = parsedDashxDictionary["id"] as? String else {
+                    completionHandler(.newData)
+                    // Do not handle non-DashX notifications
+                    return
+                }
+
+                if let parsedTitle = parsedDashxDictionary["title"] as? String {
+                    notificationContent.title = parsedTitle
+                }
+
+                if let parsedBody = parsedDashxDictionary["body"] as? String {
+                    notificationContent.body = parsedBody
+                }
+
+                let request = UNNotificationRequest(identifier: identifier, content: notificationContent, trigger: nil)
+                let notificationCenter = UNUserNotificationCenter.current()
+                notificationCenter.add(request)
+
+                let data = ["data": userInfo]
+                DashXEventEmitter.instance.dispatch(name: "messageReceived", body: data)
+            }
+        }
+
         completionHandler(.newData)
-        DashXEventEmitter.instance.dispatch(name: "messageReceived", body: userInfo)
     }
 }

package/ios/DashXData.swift

@@ -1,24 +1,6 @@
 import Foundation
 import Apollo
 
-struct FirebaseRemoteMessage: Decodable {
-    let aps: APS
-
-    struct APS: Decodable {
-        let alert: Alert
-
-        struct Alert: Decodable {
-            let title: String
-            let body: String
-        }
-    }
-
-    init(decoding userInfo: [AnyHashable: Any]) throws {
-        let data = try JSONSerialization.data(withJSONObject: userInfo, options: .prettyPrinted)
-        self = try JSONDecoder().decode(FirebaseRemoteMessage.self, from: data)
-    }
-}
-
 public extension DashXGql {
     typealias JSON = [String : Any?]
     typealias Json = [String : Any?]
@@ -27,11 +9,11 @@ public extension DashXGql {
     typealias Decimal = String
 }
 
-extension Dictionary: JSONDecodable {
-  public init(jsonValue value: JSONValue) throws {
-    guard let dictionary = value as? Dictionary else {
-      throw JSONDecodingError.couldNotConvert(value: value, to: Dictionary.self)
+extension String {
+    func convertToDictionary() -> [String: Any]? {
+        if let data = data(using: .utf8) {
+            return try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any]
+        }
+        return nil
     }
-    self = dictionary
-  }
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "0.1.18",
+  "version": "0.1.21",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [

package/android/build/kotlin/compileDebugKotlin/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +0,0 @@
-�D�G�<�6�6�.�*

package/android/build/kotlin/compileReleaseKotlin/caches-jvm/lookups/lookups.tab.values.s

@@ -1 +0,0 @@
-�D�G�<�6�6�.�*