@loyalytics/swan-react-native-sdk 2.5.1-beta.1 → 2.5.1-beta.3

package/android/src/main/kotlin/com/loyalytics/swan/templates/carousel/CarouselTemplate.kt

@@ -84,7 +84,8 @@ class CarouselTemplate : SwanNotificationTemplate {
             notificationId: Int,
             messageId: String,
             itemIndex: Int,
-            itemRoute: String
+            itemRoute: String,
+            isContentIntent: Boolean = false
         ): PendingIntent {
             val launchIntent = context.packageManager.getLaunchIntentForPackage(context.packageName)
                 ?: Intent(Intent.ACTION_MAIN).apply {
@@ -107,8 +108,15 @@ class CarouselTemplate : SwanNotificationTemplate {
                 PendingIntent.FLAG_UPDATE_CURRENT
             }
 
+            // Use different request codes for image click vs content intent to prevent collision
+            val requestCode = if (isContentIntent) {
+                "${notificationId}CONTENT_CLICK".hashCode()
+            } else {
+                "$notificationId${ACTION_CLICK}$itemIndex".hashCode()
+            }
+
             return PendingIntent.getActivity(
-                context, "$notificationId${ACTION_CLICK}$itemIndex".hashCode(), launchIntent, flags
+                context, requestCode, launchIntent, flags
             )
         }
     }
@@ -447,13 +455,16 @@ class CarouselTemplate : SwanNotificationTemplate {
         extras: Bundle
     ): PendingIntent {
         // For CLICK, use PendingIntent.getActivity() to avoid Android 12+ trampoline restriction
+        // This is always the content intent (notification body tap) — image clicks go through
+        // createClickActivityPendingIntent() directly from RemoteViews builders
         if (action == ACTION_CLICK) {
             return createClickActivityPendingIntent(
                 context,
                 notificationId,
                 extras.getString(EXTRA_MESSAGE_ID, ""),
                 extras.getInt(EXTRA_ITEM_INDEX, 0),
-                extras.getString(EXTRA_ITEM_ROUTE, "")
+                extras.getString(EXTRA_ITEM_ROUTE, ""),
+                isContentIntent = true
             )
         }
 

package/lib/commonjs/index.js

@@ -160,6 +160,7 @@ function _resetClickDedup() {
 
 class SwanSDK {
   listeners = {};
+  coldStartCheckDone = false;
   SDK_VERSION = _version.SDK_VERSION;
   isProduction = 'STAGE';
   appId = '';
@@ -628,6 +629,16 @@ class SwanSDK {
     }
     this.listeners[event].push(callback);
 
+    // On first NOTIFICATION_OPENED listener, check for pending cold-start notifications.
+    // The native side holds click data until consumed — we just need to ask when ready.
+    if (event === SwanSDK.EVENTS.NOTIFICATION_OPENED && !this.coldStartCheckDone) {
+      this.coldStartCheckDone = true;
+      // Defer to next microtask so the listener is fully registered before events emit
+      Promise.resolve().then(() => {
+        this.checkPendingCarouselClick();
+      });
+    }
+
     // Return a subscription object for easy cleanup
     return {
       remove: () => {
@@ -958,9 +969,6 @@ class SwanSDK {
       _Logger.default.log('[SwanSDK] Tracking initial app launch event...');
       this.appLaunched();
 
-      // Check for pending carousel click (covers killed/quit → fresh launch)
-      this.checkPendingCarouselClick();
-
       // AppState listener setup (always runs)
       _Logger.default.log('[SwanSDK] Setting up AppState listener...');
       this.setupAppStateListener();
@@ -1826,11 +1834,12 @@ class SwanSDK {
         // Read click data from App Group (written by Content Extension)
         clickData = await _SharedCredentialsManager.SharedCredentialsManager.readTemplateClickData();
 
-        // If no data yet, retry after a short delay.
-        // The Content Extension may still be writing when the app foregrounds.
+        // Exponential backoff: Content Extension may still be writing to App Group
         if (!clickData) {
-          await new Promise(r => setTimeout(r, 500));
-          clickData = await _SharedCredentialsManager.SharedCredentialsManager.readTemplateClickData();
+          for (let attempt = 0; attempt < 4 && !clickData; attempt++) {
+            await new Promise(r => setTimeout(r, 100 * Math.pow(2, attempt)));
+            clickData = await _SharedCredentialsManager.SharedCredentialsManager.readTemplateClickData();
+          }
         }
       }
       if (!clickData) return;