react-native-nami-sdk 3.0.21 → 3.0.23

package/android/build.gradle

@@ -84,7 +84,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 
     implementation 'com.github.jeziellago:compose-markdown:0.3.0'
-    implementation "com.namiml:sdk-android:3.0.23"
+    implementation "com.namiml:sdk-android:3.0.24"
 
     implementation 'com.facebook.react:react-native:+'  // From node_modules
     coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"

package/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt

@@ -115,7 +115,7 @@ class NamiBridgeModule(reactContext: ReactApplicationContext) :
             } else {
                 Arguments.createArray()
             }
-        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.21")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.23")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

package/android/src/main/java/com/nami/reactlibrary/NamiCampaignManagerBridge.kt

@@ -57,7 +57,6 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
 
         var paywallLaunchContext: PaywallLaunchContext? = null
         if (context != null) {
-
             val productGroups: MutableList<String> = mutableListOf()
             val customAttributes: MutableMap<String, String> = mutableMapOf()
 
@@ -69,7 +68,6 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
                         if (groupString != null) {
                             productGroups.add(groupString)
                         }
-
                     }
                 }
                 Log.d(LOG_TAG, "productGroups $productGroups")
@@ -87,7 +85,12 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
                 }
             }
 
-            paywallLaunchContext = PaywallLaunchContext(productGroups.toList(), customAttributes)
+            if (context.hasKey("productGroups")) {
+                paywallLaunchContext = PaywallLaunchContext(productGroups.toList(), customAttributes)
+            } else {
+                paywallLaunchContext = PaywallLaunchContext(null, customAttributes)
+            }
+
         }
 
         if (theActivity != null) {

package/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt

@@ -222,6 +222,19 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    fun registerRestoreHandler() {
+        NamiPaywallManager.registerRestoreHandler { activity ->
+            latestPaywallActivity = activity
+            val map = Arguments.createMap().apply {
+                putBoolean("paywallRestoreRequested", true)
+            }
+            reactApplicationContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)
+                .emit("PaywallRestoreRequested", map)
+        }
+    }
+
     @ReactMethod
     fun show() {
         // Do nothing on Android side

package/ios/Nami.m

@@ -52,7 +52,7 @@ RCT_EXPORT_METHOD(configure: (NSDictionary *)configDict completion: (RCTResponse
         }
 
         // Start commands with header iformation for Nami to let them know this is a React client.
-        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.21"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.23"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];

package/ios/NamiPaywallManagerBridge.m

@@ -23,6 +23,8 @@ RCT_EXTERN_METHOD(registerCloseHandler)
 
 RCT_EXTERN_METHOD(registerSignInHandler)
 
+RCT_EXTERN_METHOD(registerRestoreHandler)
+
 RCT_EXTERN_METHOD(dismiss:(BOOL)animated)
 
 RCT_EXTERN_METHOD(show)

package/ios/NamiPaywallManagerBridge.swift

@@ -19,7 +19,7 @@ class RNNamiPaywallManager: RCTEventEmitter {
     }
 
     override func supportedEvents() -> [String]! {
-        return ["RegisterBuySKU", "PaywallCloseRequested", "PaywallSignInRequested"]
+        return ["RegisterBuySKU", "PaywallCloseRequested", "PaywallSignInRequested", "PaywallRestoreRequested"]
     }
 
     @objc(buySkuComplete:)
@@ -103,6 +103,14 @@ class RNNamiPaywallManager: RCTEventEmitter {
         }
     }
 
+    @objc(registerRestoreHandler)
+    func registerRestoreHandler() {
+        NamiPaywallManager.registerRestoreHandler {
+            let dictionary = NSDictionary(dictionary: ["PaywallRestoreRequested": true].compactMapValues { $0 })
+            RNNamiPaywallManager.shared?.sendEvent(withName: "PaywallRestoreRequested", body: dictionary)
+        }
+    }
+
     @objc(dismiss:)
     func dismiss(animated: Bool) {
         NamiPaywallManager.dismiss(animated: animated) {}
@@ -124,7 +132,9 @@ class RNNamiPaywallManager: RCTEventEmitter {
 
     @objc(isHidden:rejecter:)
     func isHidden(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
-        let isHidden = NamiPaywallManager.isHidden()
-        resolve(isHidden)
+        DispatchQueue.main.async {
+            let isHidden = NamiPaywallManager.isHidden()
+            resolve(isHidden)
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.0.21",
+  "version": "3.0.23",
   "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.",
   "main": "index.js",
   "scripts": {

package/src/NamiPaywallManager.d.ts

@@ -13,6 +13,7 @@ export const NamiPaywallManager: {
   ) => EmitterSubscription["remove"];
   registerCloseHandler: (callback: () => void) => EmitterSubscription["remove"];
   registerSignInHandler: (callback: () => void) => EmitterSubscription["remove"];
+  registerRestoreHandler: (callback: () => void) => EmitterSubscription["remove"];
   show: () => void;
   hide: () => void;
   isHidden: () => Promise<boolean>;

package/src/NamiPaywallManager.js

@@ -47,6 +47,17 @@ export const NamiPaywallManager = {
     RNNamiPaywallManager.registerSignInHandler();
     return subscription.remove;
   },
+  registerRestoreHandler(callback) {
+    var subscription;
+    subscription = this.paywallEmitter.addListener(
+      "PaywallRestoreRequested",
+      (body) => {
+        callback(body);
+      }
+    );
+    RNNamiPaywallManager.registerRestoreHandler();
+    return subscription.remove;
+  },
   dismiss(animated) {
     RNNamiPaywallManager.dismiss(animated ?? true);
   },