react-native-nami-sdk 3.0.22 → 3.0.24

package/.github/workflows/app_prod.yaml

@@ -254,7 +254,7 @@ jobs:
           pip3 install PyJWT
           echo "1.0" > $RUNNER_TEMP/.current_version
           export CURRENT_VERSION=`cat $RUNNER_TEMP/.current_version`
-          python3 get_next_build.py com.namiml.stg.testreactnative --prerelease --platform=TV_OS > $RUNNER_TEMP/.next_build_number
+          python3 get_next_build.py com.namiml.app.testreactnative --prerelease --platform=TV_OS > $RUNNER_TEMP/.next_build_number
         working-directory: appstoreconnect-build-tools
         env:
           APPSTORE_API_KEY_ID: "${{ secrets.APPSTORE_API_KEY_ID }}"

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.22")
+        val settingsList = mutableListOf("extendedClientInfo:react-native:3.0.24")
         namiCommandsReact?.toArrayList()?.filterIsInstance<String>()?.let { commandsFromReact ->
             settingsList.addAll(commandsFromReact)
         }

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

@@ -29,6 +29,8 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
         const val CAMPAIGN_TYPE = "campaignType"
         const val CAMPAIGN_URL = "campaignUrl"
         const val PAYWALL_NAME = "paywallName"
+        const val COMPONENT_CHANGE_ID = "componentChangeId"
+        const val COMPONENT_CHANGE_NAME = "componentChangeName"
         const val SEGMENT_ID = "segmentId"
         const val EXTERNAL_SEGMENT_ID = "externalSegmentId"
         const val DEEP_LINK_URL = "deeplinkUrl"
@@ -189,6 +191,8 @@ class NamiCampaignManagerBridgeModule(reactContext: ReactApplicationContext) :
             putString(CAMPAIGN_TYPE, campaignType ?: "")
             putString(CAMPAIGN_URL, campaignUrl ?: "")
             putString(PAYWALL_NAME, paywallName ?: "")
+            putString(COMPONENT_CHANGE_ID, "")
+            putString(COMPONENT_CHANGE_NAME, "")
             putString(SEGMENT_ID, segmentId ?: "")
             putString(EXTERNAL_SEGMENT_ID, externalSegmentId ?: "")
             putString(DEEP_LINK_URL, deeplinkUrl ?: "")

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/android/src/main/java/com/nami/reactlibrary/NamiUtil.kt

@@ -79,6 +79,8 @@ fun NamiSKU.toSkuDict(): WritableMap {
     productDict.putString("skuId", this.skuId)
     productDict.putString("id", this.id)
     productDict.putString("type", this.type.toString())
+    productDict.putString("promoId","")
+    productDict.putString("promoToken","")
 
     return productDict
 }

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

package/ios/NamiCampaignManagerBridge.swift

@@ -43,23 +43,10 @@ class RNNamiCampaignManager: RCTEventEmitter {
     }
 
     func handlePaywallAction(
-        campaignId: String?,
-        campaignName: String?,
-        campaignType: String?,
-        campaignLabel: String?,
-        campaignUrl: String?,
-        paywallId: String?,
-        paywallName: String?,
-        segmentId: String?,
-        externalSegmentId: String?,
-        action: NamiApple.NamiPaywallAction,
-        sku: NamiApple.NamiSKU?,
-        purchaseError: Error?,
-        purchases: [NamiApple.NamiPurchase],
-        deeplinkUrl: String?
+        paywallEvent: NamiPaywallEvent
     ) {
-        let actionString: String
-        switch action {
+        var actionString: String
+        switch paywallEvent.action {
         case .show_paywall:
             actionString = "SHOW_PAYWALL"
         case .close_paywall:
@@ -86,29 +73,36 @@ class RNNamiCampaignManager: RCTEventEmitter {
             actionString = "PURCHASE_UNKNOWN"
         case .deeplink:
             actionString = "DEEPLINK"
-        @unknown default:
-            actionString = "PURCHASE_UNKNOWN"
+        case .toggle_change:
+            actionString = "TOGGLE_CHANGE"
+        case .page_change:
+            actionString = "PAGE_CHANGE"
+        case .slide_change:
+            actionString = "SLIDE_CHANGE"
+        default:
+            actionString = "UNKNOWN"
         }
-        let skuId = sku?.skuId
-        let errorSting = purchaseError?.localizedDescription
+        let errorSting = paywallEvent.purchaseError?.localizedDescription
 
-        let dictionaries = purchases.map { purchase in RNNamiPurchaseManager.purchaseToPurchaseDict(purchase) }
+        let dictionaries = paywallEvent.purchases.map { purchase in RNNamiPurchaseManager.purchaseToPurchaseDict(purchase) }
 
         let payload: [String: Any?] = [
-            "campaignId": campaignId,
-            "campaignName": campaignName,
-            "campaignType": campaignType,
-            "campaignLabel": campaignLabel,
-            "campaignUrl": campaignUrl,
-            "paywallId": paywallId,
-            "paywallName": paywallName,
-            "segmentId": segmentId,
-            "externalSegmentId": externalSegmentId,
+            "campaignId": paywallEvent.campaignId,
+            "campaignName": paywallEvent.campaignName,
+            "campaignType": paywallEvent.campaignType,
+            "campaignLabel": paywallEvent.campaignLabel,
+            "campaignUrl": paywallEvent.campaignUrl,
+            "paywallId": paywallEvent.paywallId,
+            "paywallName": paywallEvent.paywallName,
+            "segmentId": paywallEvent.segmentId,
+            "externalSegmentId": paywallEvent.externalSegmentId,
             "action": actionString,
-            "skuId": skuId,
+            "skuId": paywallEvent.sku?.id,
             "purchaseError": errorSting,
             "purchases": dictionaries,
-            "deeplinkUrl": deeplinkUrl,
+            "deeplinkUrl": paywallEvent.deeplinkUrl,
+            "componentChangeId": paywallEvent.componentChange?.id,
+            "componentChangeName": paywallEvent.componentChange?.name,
         ]
 
         RNNamiCampaignManager.shared?.sendEvent(withName: "ResultCampaign", body: payload)
@@ -156,8 +150,8 @@ class RNNamiCampaignManager: RCTEventEmitter {
                                                    error: error
                                                )
                                            },
-                                           paywallActionHandler: { campaignId, campaignName, campaignType, campaignLabel, campaignUrl, paywallId, paywallName, segmentId, externalSegmentId, _, action, sku, purchaseError, purchases, deeplinkUrl in
-                                               self.handlePaywallAction(campaignId: campaignId, campaignName: campaignName, campaignType: campaignType, campaignLabel: campaignLabel, campaignUrl: campaignUrl, paywallId: paywallId, paywallName: paywallName, segmentId: segmentId, externalSegmentId: externalSegmentId, action: action, sku: sku, purchaseError: purchaseError, purchases: purchases, deeplinkUrl: deeplinkUrl)
+                                           paywallActionHandler: { paywallEvent in
+                                               self.handlePaywallAction(paywallEvent: paywallEvent)
                                            })
             }
         } else if let label = label {
@@ -170,8 +164,8 @@ class RNNamiCampaignManager: RCTEventEmitter {
                                                    error: error
                                                )
                                            },
-                                           paywallActionHandler: { campaignId, campaignName, campaignType, campaignLabel, campaignUrl, paywallId, paywallName, segmentId, externalSegmentId, _, action, sku, purchaseError, purchases, deeplinkUrl in
-                                               self.handlePaywallAction(campaignId: campaignId, campaignName: campaignName, campaignType: campaignType, campaignLabel: campaignLabel, campaignUrl: campaignUrl, paywallId: paywallId, paywallName: paywallName, segmentId: segmentId, externalSegmentId: externalSegmentId, action: action, sku: sku, purchaseError: purchaseError, purchases: purchases, deeplinkUrl: deeplinkUrl)
+                                           paywallActionHandler: { paywallEvent in
+                                               self.handlePaywallAction(paywallEvent: paywallEvent)
                                            })
             }
         } else {
@@ -185,8 +179,8 @@ class RNNamiCampaignManager: RCTEventEmitter {
                                                    error: error
                                                )
                                            },
-                                           paywallActionHandler: { campaignId, campaignName, campaignType, campaignLabel, campaignUrl, paywallId, paywallName, segmentId, externalSegmentId, _, action, sku, purchaseError, purchases, deeplinkUrl in
-                                               self.handlePaywallAction(campaignId: campaignId, campaignName: campaignName, campaignType: campaignType, campaignLabel: campaignLabel, campaignUrl: campaignUrl, paywallId: paywallId, paywallName: paywallName, segmentId: segmentId, externalSegmentId: externalSegmentId, action: action, sku: sku, purchaseError: purchaseError, purchases: purchases, deeplinkUrl: deeplinkUrl)
+                                           paywallActionHandler: { paywallEvent in
+                                               self.handlePaywallAction(paywallEvent: paywallEvent)
                                            })
             }
         }

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:)
@@ -41,7 +41,7 @@ class RNNamiPaywallManager: RCTEventEmitter {
                     namiSkuType = .unknown
                 }
 
-                let namiSku = NamiSKU(namiId: namiId, storeId: storeId, skuType: namiSkuType, product: nil)
+                let namiSku = NamiSKU(namiId: namiId, storeId: storeId, skuType: namiSkuType)
 
                 do {
                     let dateFormatter = DateFormatter()
@@ -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)
         }
     }
-}
+}

package/ios/NamiPurchaseManagerBridge.swift

@@ -26,8 +26,8 @@ class RNNamiPurchaseManager: RCTEventEmitter {
         let productDict: [String: Any?] = [
             "localizedTitle": product.localizedTitle,
             "localizedDescription": product.localizedDescription,
-            "localizedPrice": product.localizedPrice,
-            "localizedMultipliedPrice": product.localizedMultipliedPrice,
+            "localizedPrice": product.price,
+            "localizedMultipliedPrice": "",
             "price": product.price.stringValue,
             "priceLanguage": product.priceLocale.languageCode,
             "priceCurrency": product.priceLocale.currencyCode,
@@ -37,7 +37,7 @@ class RNNamiPurchaseManager: RCTEventEmitter {
 
     static func skuToSKUDict(_ sku: NamiSKU) -> NSDictionary {
         var productDict: NSDictionary?
-        if let product = sku.product {
+        if let product = sku.product as? SKProduct {
             productDict = productToDict(product)
         }
 
@@ -58,6 +58,8 @@ class RNNamiPurchaseManager: RCTEventEmitter {
             "skuId": sku.skuId,
             "type": typeString,
             "appleProduct": productDict,
+            "promoId": sku.promoId,
+            "promoToken": "",
         ]
 
         return NSDictionary(dictionary: skuDict.compactMapValues { $0 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.0.22",
+  "version": "3.0.24",
   "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/react-native-nami-sdk.podspec

@@ -20,7 +20,7 @@ Pod::Spec.new do |s|
   s.source_files = "ios/**/*.{h,m,swift}"
   s.requires_arc = true
 
-  s.dependency 'Nami', '3.0.25'
+  s.dependency 'Nami', '3.1.1'
   s.dependency 'React'
 
 end

package/src/NamiCampaignManager.d.ts

@@ -1,6 +1,7 @@
 import { EmitterSubscription } from "react-native";
 import { NamiPurchase } from "./NamiPurchaseManager";
 import { NamiPaywallAction } from "./NamiPaywallManager";
+import { NamiSKU } from "./types";
 
 export const NamiCampaignManager: {
   allCampaigns: () => Promise<Array<NamiCampaign>>;
@@ -23,6 +24,8 @@ export const NamiCampaignManager: {
       externalSegmentId?: string,
       deeplinkUrl?: string,
       skuId?: string,
+      componentChangeId?: string,
+      componentChangeName?: string,
       purchaseError?: string,
       purchases?: NamiPurchase[]
     ) => void
@@ -72,3 +75,26 @@ export type PaywallLaunchContext = {
     [key: string]: string;
   };
 };
+
+export type NamiPaywallEvent = {
+  action: NamiPaywallAction;
+  campaignId?: string;
+  campaignName?: string;
+  campaignType?: string;
+  campaignLabel?: string;
+  campaignUrl?: string;
+  paywallId?: string;
+  paywallName?: string;
+  componentChange?: NamiPaywallComponentChange;
+  segmentId?: string;
+  externalSegmentId?: string;
+  deeplinkUrl?: string;
+  sku?: NamiSKU;
+  purchaseError?: string;
+  purchases?: NamiPurchase[];
+};
+
+export type NamiPaywallComponentChange = {
+  id?: string;
+  name?: string;
+};

package/src/NamiCampaignManager.js

@@ -19,15 +19,17 @@ export const NamiCampaignManager = {
           action,
           campaignId,
           paywallId,
-          campaignLabel,
           campaignName,
           campaignType,
+          campaignLabel,
           campaignUrl,
           paywallName,
           segmentId,
           externalSegmentId,
           deeplinkUrl,
           skuId,
+          componentChangeId,
+          componentChangeName,
           purchaseError,
           purchases
         } = body;
@@ -35,15 +37,17 @@ export const NamiCampaignManager = {
           action,
           campaignId,
           paywallId,
-          campaignLabel,
           campaignName,
           campaignType,
+          campaignLabel,
           campaignUrl,
           paywallName,
           segmentId,
           externalSegmentId,
           deeplinkUrl,
           skuId,
+          componentChangeId,
+          componentChangeName,
           purchaseError,
           purchases,
         );

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>;
@@ -65,4 +66,8 @@ export enum NamiPaywallAction {
   PURCHASE_UNKNOWN = "PURCHASE_UNKNOWN",
   PURCHASE_DEFERRED = "PURCHASE_DEFERRED",
   DEEPLINK = "DEEPLINK",
+  TOGGLE_CHANGE = "TOGGLE_CHANGE",
+  PAGE_CHANGE = "PAGE_CHANGE",
+  SLIDE_CHANGE = "SLIDE_CHANGE",
+  UNKNOWN = "UNKNOWN"
 }

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);
   },

package/src/types.ts

@@ -6,6 +6,8 @@ export type NamiSKU = {
   googleProduct?: GoogleProduct;
   amazonProduct?: AmazonProduct;
   type: NamiSKUType;
+  promoId?: string;
+  promoToken?: string;
 };
 
 export enum NamiPurchaseState {