react-native-nami-sdk 3.3.4 → 3.3.5-1

package/android/build.gradle

@@ -85,8 +85,8 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
-    playImplementation "com.namiml:sdk-android:3.3.4"
-    amazonImplementation "com.namiml:sdk-amazon:3.3.4"
+    playImplementation "com.namiml:sdk-android:3.3.5.1"
+    amazonImplementation "com.namiml:sdk-amazon:3.3.5.1"
 
     implementation "com.facebook.react:react-native:+"  // From node_modules
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.0.4"

package/android/src/main/java/com/namiml/reactnative/NamiCampaignManagerBridge.kt

@@ -354,14 +354,17 @@ class NamiCampaignManagerBridgeModule internal constructor(
         promise: Promise,
     ) {
         try {
-            val uri = if (!withUrl.isNullOrEmpty()) {
-                val parsedUri = Uri.parse(withUrl)
-                if (parsedUri.scheme.isNullOrEmpty()) {
-                    promise.reject("ISFLOW_ERROR", "Invalid URL format: missing scheme", null)
-                    return
+            val uri =
+                if (!withUrl.isNullOrEmpty()) {
+                    val parsedUri = Uri.parse(withUrl)
+                    if (parsedUri.scheme.isNullOrEmpty()) {
+                        promise.reject("ISFLOW_ERROR", "Invalid URL format: missing scheme", null)
+                        return
+                    }
+                    parsedUri
+                } else {
+                    null
                 }
-                parsedUri
-            } else null
             val result = NamiCampaignManager.isFlow(label = label, uri = uri)
             promise.resolve(result)
         } catch (e: Exception) {
@@ -400,4 +403,34 @@ class NamiCampaignManagerBridgeModule internal constructor(
     @ReactMethod
     fun removeListeners(count: Int?) {
     }
+
+    @ReactMethod
+    fun productGroups(
+        label: String?,
+        withUrl: String?,
+        promise: Promise,
+    ) {
+        try {
+            val uri =
+                if (!withUrl.isNullOrEmpty()) {
+                    val parsedUri = Uri.parse(withUrl)
+                    if (parsedUri.scheme.isNullOrEmpty()) {
+                        promise.reject("PRODUCTGROUPS_ERROR", "Invalid URL format: missing scheme", null)
+                        return
+                    }
+                    parsedUri
+                } else {
+                    null
+                }
+
+            val productGroups = NamiCampaignManager.getProductGroups(label = label, uri = uri)
+            val array = WritableNativeArray()
+            productGroups.forEach { group: String ->
+                array.pushString(group)
+            }
+            promise.resolve(array)
+        } catch (e: Exception) {
+            promise.reject("PRODUCTGROUPS_ERROR", "Failed to get product groups: ${e.message}", e)
+        }
+    }
 }

package/android/src/main/java/com/namiml/reactnative/NamiOverlayControlBridge.kt

@@ -18,12 +18,31 @@ class NamiOverlayControlBridgeModule(private val ctx: ReactApplicationContext)
     const val NAME = "RNNamiOverlayControl"
     var currentOverlayActivity: ReactOverlayActivity? = null
     var lastValidActivity: Activity? = null
+    private var isPresentingOverlay = false
+    private val pendingPromises = mutableListOf<Promise>()
+
+    // Internal method to clear the presenting flag (for use by ReactOverlayActivity)
+    internal fun clearPresentingFlag() {
+      isPresentingOverlay = false
+    }
+
+    // Internal method to check if an overlay is currently being presented
+    internal fun isOverlayActive(): Boolean {
+      return isPresentingOverlay || currentOverlayActivity != null
+    }
   }
 
   override fun getName() = NAME
 
   @ReactMethod
   fun presentOverlay(promise: Promise) {
+    // Check if we're already presenting an overlay
+    if (isPresentingOverlay || currentOverlayActivity != null) {
+      // If there's already an active overlay, reject the new call
+      promise.reject("OVERLAY_ALREADY_ACTIVE", "An overlay is already being presented or is currently active")
+      return
+    }
+
     var theActivity: Activity? = null
     if (reactApplicationContext.hasCurrentActivity()) {
       theActivity = reactApplicationContext.currentActivity
@@ -55,6 +74,8 @@ class NamiOverlayControlBridgeModule(private val ctx: ReactApplicationContext)
       return
     }
 
+    // Set flag to indicate we're presenting an overlay
+    isPresentingOverlay = true
     startOverlayActivity(theActivity, promise)
   }
 
@@ -88,11 +109,15 @@ class NamiOverlayControlBridgeModule(private val ctx: ReactApplicationContext)
           promise.resolve(null)
         } catch (uiError: Exception) {
           Log.e(NAME, "Error in UI thread: ${uiError.message}", uiError)
+          // Clear the presenting flag on error
+          isPresentingOverlay = false
           promise.reject("UI_THREAD_ERROR", "Failed in UI thread: ${uiError.message}", uiError)
         }
       }
     } catch (e: Exception) {
       Log.e(NAME, "Error presenting overlay: ${e.message}", e)
+      // Clear the presenting flag on error
+      isPresentingOverlay = false
       promise.reject("PRESENT_OVERLAY_ERROR", "Failed to present overlay: ${e.message}", e)
     }
   }
@@ -137,6 +162,8 @@ class NamiOverlayControlBridgeModule(private val ctx: ReactApplicationContext)
             overlay.overridePendingTransition(0, 0)
           }
           currentOverlayActivity = null
+          // Clear the presenting flag when overlay is finished
+          isPresentingOverlay = false
 
           // Wait for activity to actually finish before resolving promise
           android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
@@ -153,12 +180,16 @@ class NamiOverlayControlBridgeModule(private val ctx: ReactApplicationContext)
               @Suppress("DEPRECATION")
               overridePendingTransition(0, 0)
             }
+            // Clear the presenting flag when overlay is finished
+            isPresentingOverlay = false
 
             // Wait for activity to actually finish before resolving promise
             android.os.Handler(android.os.Looper.getMainLooper()).postDelayed({
               promise.resolve(null)
             }, 100)
           } ?: run {
+            // Clear the presenting flag even if no activity was found
+            isPresentingOverlay = false
             promise.resolve(null)
           }
         }

package/android/src/main/java/com/namiml/reactnative/NamiPaywallManagerBridgeModule.kt

@@ -68,7 +68,7 @@ class NamiPaywallManagerBridgeModule internal constructor(
             }
 
             if (purchaseSuccess != null) {
-                val activity = latestPaywallActivity ?: currentActivity
+                val activity = latestPaywallActivity ?: reactApplicationContext.getCurrentActivity()
                 if (activity != null) {
                     NamiPaywallManager.buySkuComplete(activity, purchaseSuccess)
                 } else {
@@ -166,7 +166,7 @@ class NamiPaywallManagerBridgeModule internal constructor(
         reactApplicationContext.runOnUiQueueThread {
             latestPaywallActivity?.let {
                 NamiPaywallManager.buySkuCancel(it)
-            } ?: currentActivity?.let {
+            } ?: reactApplicationContext.getCurrentActivity()?.let {
                 NamiPaywallManager.buySkuCancel(it)
             } ?: NamiPaywallManager.buySkuCancel()
         }

package/android/src/main/java/com/namiml/reactnative/ReactOverlayActivity.kt

@@ -24,6 +24,8 @@ class ReactOverlayActivity : ReactActivity() {
     // Clear the reference when activity is destroyed
     if (NamiOverlayControlBridgeModule.currentOverlayActivity == this) {
       NamiOverlayControlBridgeModule.currentOverlayActivity = null
+      // Also clear the presenting flag to prevent stuck states
+      NamiOverlayControlBridgeModule.clearPresentingFlag()
     }
   }
 }

package/dist/specs/NativeNamiCampaignManager.d.ts

@@ -81,6 +81,7 @@ export interface Spec extends TurboModule {
         value?: string;
     }[]>;
     registerAvailableCampaignsHandler(): void;
+    productGroups(label: string | null, withUrl: string | null): Promise<string[]>;
 }
 declare const _default: Spec;
 export default _default;

package/dist/src/NamiCampaignManager.d.ts

@@ -27,4 +27,5 @@ export declare const NamiCampaignManager: {
         value?: string;
     }[]>;
     registerAvailableCampaignsHandler: (callback: (campaigns: NamiCampaign[]) => void) => (() => void);
+    getProductGroups: (label?: string | null, withUrl?: string | null) => Promise<string[]>;
 };

package/dist/src/version.d.ts

@@ -2,4 +2,4 @@
  * Auto-generated file. Do not edit manually.
  * React Native Nami SDK version.
  */
-export declare const NAMI_REACT_NATIVE_VERSION = "3.3.4";
+export declare const NAMI_REACT_NATIVE_VERSION = "3.3.5-1";

package/ios/NamiCampaignManagerBridge.m

@@ -22,6 +22,8 @@ RCT_EXTERN_METHOD(refresh:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRe
 
 RCT_EXTERN_METHOD(registerAvailableCampaignsHandler)
 
+RCT_EXTERN_METHOD(productGroups:(nullable NSString *)label withUrl:(nullable NSString *)withUrl resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+
 + (BOOL)requiresMainQueueSetup {
   return YES;
 }

package/ios/NamiCampaignManagerBridge.swift

@@ -320,4 +320,20 @@ class RNNamiCampaignManager: RCTEventEmitter {
             self.safeSend(withName: "AvailableCampaignsChanged", body: dictionaries)
         }
     }
+
+    @objc(productGroups:withUrl:resolver:rejecter:)
+    func productGroups(
+        label: String?,
+        withUrl: String?,
+        resolve: @escaping RCTPromiseResolveBlock,
+        reject _: @escaping RCTPromiseRejectBlock
+    ) {
+        var url: URL?
+        if let withUrl = withUrl {
+            url = URL(string: withUrl)
+        }
+
+        let productGroups = NamiCampaignManager.productGroups(label: label, url: url)
+        resolve(productGroups)
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.3.4",
+  "version": "3.3.5-1",
   "description": "React Native SDK for Nami - No-code paywall and onboarding flows with A/B testing.",
   "main": "index.ts",
   "types": "dist/index.d.ts",

package/react-native-nami-sdk.podspec

@@ -21,7 +21,7 @@ Pod::Spec.new do |s|
   s.requires_arc  = true
   s.swift_version = '5.0'  # or your supported version
 
-  s.dependency 'Nami', '3.3.4.1'
+  s.dependency 'Nami', '3.3.5.1'
   s.dependency 'React'
 
   pod_target_xcconfig = {

package/specs/NativeNamiCampaignManager.ts

@@ -92,6 +92,11 @@ export interface Spec extends TurboModule {
   >;
 
   registerAvailableCampaignsHandler(): void;
+
+  productGroups(
+    label: string | null,
+    withUrl: string | null,
+  ): Promise<string[]>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('RNNamiCampaignManager');

package/src/NamiCampaignManager.ts

@@ -115,4 +115,11 @@ export const NamiCampaignManager = {
     RNNamiCampaignManager.registerAvailableCampaignsHandler?.();
     return () => sub.remove();
   },
+
+  getProductGroups: async (label?: string | null, withUrl?: string | null) => {
+    return await RNNamiCampaignManager.productGroups(
+      label ?? null,
+      withUrl ?? null,
+    );
+  },
 };

package/src/NamiOverlayControl.tsx

@@ -16,7 +16,18 @@ export const NamiOverlayControl = {
   emitter,
 
   presentOverlay(): Promise<void> {
-    return RNNamiOverlayControl.presentOverlay();
+    return RNNamiOverlayControl.presentOverlay().catch((error) => {
+      // Handle the case where an overlay is already active
+      if (error.code === 'OVERLAY_ALREADY_ACTIVE') {
+        console.warn(
+          'NamiOverlayControl: An overlay is already being presented. Ignoring duplicate call.',
+        );
+        // Return a resolved promise to maintain backward compatibility
+        return Promise.resolve();
+      }
+      // Re-throw other errors
+      throw error;
+    });
   },
 
   finishOverlay(result?: any): Promise<void> {

package/src/version.ts

@@ -2,4 +2,4 @@
  * Auto-generated file. Do not edit manually.
  * React Native Nami SDK version.
  */
-export const NAMI_REACT_NATIVE_VERSION = '3.3.4';
+export const NAMI_REACT_NATIVE_VERSION = '3.3.5-1';