add registerRestoreHandler (#222)

namiml · Jul 20, 2023 · a5efae7 · a5efae7
1 parent f4f9af8
commit a5efae7
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 6 deletions.
diff --git a/android/src/main/java/com/nami/reactlibrary/NamiBridgeModule.kt b/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.22")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.23")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

diff --git a/android/src/main/java/com/nami/reactlibrary/NamiPaywallManagerBridgeModule.kt b/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

diff --git a/examples/Basic/containers/CampaignScreen.tsx b/examples/Basic/containers/CampaignScreen.tsx
@@ -73,9 +73,16 @@ const CampaignScreen: FC<CampaignScreenProps> = ({navigation}) => {
     const subscriptionSignInRemover = NamiPaywallManager.registerSignInHandler(
       () => {
         console.log('sign in');
-        NamiPaywallManager.hide();
+        NamiPaywallManager.dismiss();
       },
     );
+
+    const subscriptionRestoreRemover =
+      NamiPaywallManager.registerRestoreHandler(() => {
+        console.log('restore');
+        NamiPaywallManager.dismiss();
+      });
+
     const subscriptionRemover =
       NamiCampaignManager.registerAvailableCampaignsHandler(
         (availableCampaigns) => {
@@ -89,6 +96,7 @@ const CampaignScreen: FC<CampaignScreenProps> = ({navigation}) => {
     return () => {
       subscriptionRemover();
       subscriptionSignInRemover();
+      subscriptionRestoreRemover();
     };
     //Note: not needed in depts
     // eslint-disable-next-line react-hooks/exhaustive-deps

diff --git a/ios/Nami.m b/ios/Nami.m
@@ -52,7 +52,7 @@ @implementation NamiBridge (RCTExternModule)
         }
 
         // 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.22"]];
+        NSMutableArray *namiCommandStrings = [NSMutableArray arrayWithArray:@[@"extendedClientInfo:react-native:3.0.23"]];
 
         // Add additional namiCommands app may have sent in.
         NSObject *appCommandStrings = configDict[@"namiCommands"];

diff --git a/ios/NamiPaywallManagerBridge.m b/ios/NamiPaywallManagerBridge.m
@@ -23,6 +23,8 @@ @interface RCT_EXTERN_MODULE(RNNamiPaywallManager, NSObject)
 
 RCT_EXTERN_METHOD(registerSignInHandler)
 
+RCT_EXTERN_METHOD(registerRestoreHandler)
+
 RCT_EXTERN_METHOD(dismiss:(BOOL)animated)
 
 RCT_EXTERN_METHOD(show)

diff --git a/ios/NamiPaywallManagerBridge.swift b/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) {}
@@ -129,4 +137,4 @@ class RNNamiPaywallManager: RCTEventEmitter {
             resolve(isHidden)
         }
     }
-}
+}
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.0.22",
+  "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": {

diff --git a/src/NamiPaywallManager.d.ts b/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>;

diff --git a/src/NamiPaywallManager.js b/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);
   },