react-native-nami-sdk 3.1.21 → 3.1.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'
-    compileOnly "com.namiml:sdk-amazon:3.1.21"
+    compileOnly "com.namiml:sdk-amazon:3.1.23"
 
     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

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

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

@@ -129,10 +129,12 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
     }
 
     @ReactMethod
-    fun dismiss(animated: Boolean) {
+    fun dismiss(promise: Promise) {
         if (latestPaywallActivity != null) {
             val paywallActivity = latestPaywallActivity as Activity
-            NamiPaywallManager.dismiss(paywallActivity)
+            NamiPaywallManager.dismiss(paywallActivity, completionHandler = {
+                promise.resolve(it)
+            })
         }
     }
 
@@ -207,7 +209,15 @@ class NamiPaywallManagerBridgeModule(reactContext: ReactApplicationContext) :
 
     @ReactMethod
     fun buySkuCancel() {
-        NamiPaywallManager.buySkuCancel()
+        reactApplicationContext.runOnUiQueueThread {
+            if (latestPaywallActivity != null) {
+                NamiPaywallManager.buySkuCancel(latestPaywallActivity!!)
+            } else if (currentActivity != null) {
+                NamiPaywallManager.buySkuCancel(currentActivity!!)
+            } else {
+                NamiPaywallManager.buySkuCancel()
+            }
+        }
     }
 
     @ReactMethod

package/index.ts

@@ -6,4 +6,5 @@ export { NamiEntitlementManager } from './src/NamiEntitlementManager';
 export { NamiManager } from './src/NamiManager';
 export { NamiPurchaseManager } from './src/NamiPurchaseManager';
 export { NamiPaywallManager } from './src/NamiPaywallManager';
+export { NamiSKU } from './src/types';
 export * from './src/types';

package/ios/Nami.m

@@ -50,7 +50,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.1.21"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.1.23"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];

package/ios/NamiPaywallManagerBridge.m

@@ -27,7 +27,7 @@ RCT_EXTERN_METHOD(registerRestoreHandler)
 
 RCT_EXTERN_METHOD(registerDeeplinkActionHandler)
 
-RCT_EXTERN_METHOD(dismiss:(BOOL)animated)
+RCT_EXTERN_METHOD(dismiss:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(show)
 

package/ios/NamiPaywallManagerBridge.swift

@@ -107,9 +107,13 @@ class RNNamiPaywallManager: RCTEventEmitter {
         }
     }
 
-    @objc(dismiss:)
-    func dismiss(animated: Bool) {
-        NamiPaywallManager.dismiss(animated: animated) {}
+    @objc(dismiss:rejecter:)
+    func dismiss(resolve: @escaping RCTPromiseResolveBlock, reject _: @escaping RCTPromiseRejectBlock) {
+        DispatchQueue.main.async {
+            NamiPaywallManager.dismiss(animated: true) {
+                resolve(true)
+            }
+        }
     }
 
     @objc(show)

package/package.json

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

package/src/NamiPaywallManager.d.ts

@@ -7,7 +7,7 @@ export const NamiPaywallManager: {
   buySkuCompleteGooglePlay: (
     purchaseSuccess: NamiPurchaseSuccessGooglePlay,
   ) => void;
-  dismiss: (animated?: boolean) => void;
+  dismiss: () => Promise<boolean>;
   registerBuySkuHandler: (
     callback: (sku: NamiSKU) => void,
   ) => EmitterSubscription['remove'];

package/src/NamiPaywallManager.ts

@@ -44,7 +44,7 @@ export interface INamiPaywallManager {
   registerDeeplinkActionHandler: (
     callback: (url: string) => void,
   ) => EmitterSubscription['remove'];
-  dismiss: (animated?: boolean) => void;
+  dismiss: () => Promise<boolean>;
   show: () => void;
   hide: () => void;
   isHidden: () => Promise<boolean>;
@@ -145,8 +145,8 @@ export const NamiPaywallManager: INamiPaywallManager = {
       }
     };
   },
-  dismiss: (animated?: boolean) => {
-    RNNamiPaywallManager.dismiss(animated ?? true);
+  dismiss: () => {
+    return RNNamiPaywallManager.dismiss();
   },
   show: () => {
     RNNamiPaywallManager.show();