react-native-nami-sdk 3.3.0-4 → 3.3.0-7

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.0.1"
-    amazonImplementation "com.namiml:sdk-amazon:3.3.0.1"
+    playImplementation "com.namiml:sdk-android:3.3.0.2"
+    amazonImplementation "com.namiml:sdk-amazon:3.3.0.2"
 
     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

@@ -158,8 +158,7 @@ class NamiCampaignManagerBridgeModule internal constructor(
         paywallEvent: NamiPaywallEvent,
         actionCallback: Callback,
     ) {
-        val actionString = paywallEvent.action.toString()
-
+        val actionString = paywallEvent.action.toRNActionString()
         val purchasesArray = createPurchaseArray(paywallEvent.purchases)
 
         val resultMap =

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

@@ -24,11 +24,12 @@ class NamiPaywallManagerBridgeModule internal constructor(
     private var latestPaywallActivity: Activity? = null
 
     @ReactMethod
-    fun buySkuComplete(dict: ReadableMap, storeType: String) {
+    fun buySkuComplete(dict: ReadableMap) {
         val product = dict.getMap("product")
         val productId = product?.getString("id")
         val skuRefId = product?.getString("skuId")
         val typeString = product?.getString("type")
+        val storeType = dict.getString("storeType") ?: "GooglePlay"
         var purchaseSuccess: NamiPurchaseSuccess? = null
 
         if (productId != null && skuRefId != null) {

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

@@ -15,6 +15,41 @@ import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
 import java.util.TimeZone
+import com.namiml.paywall.model.NamiPaywallAction
+
+fun NamiPaywallAction.toRNActionString(): String {
+    return when (this) {
+        NamiPaywallAction.NAMI_BUY_SKU -> "BUY_SKU"
+        NamiPaywallAction.NAMI_SELECT_SKU -> "SELECT_SKU"
+        NamiPaywallAction.NAMI_RESTORE_PURCHASES -> "RESTORE_PURCHASES"
+        NamiPaywallAction.NAMI_SHOW_PAYWALL -> "SHOW_PAYWALL"
+        NamiPaywallAction.NAMI_CLOSE_PAYWALL -> "CLOSE_PAYWALL"
+        NamiPaywallAction.NAMI_SIGN_IN -> "SIGN_IN"
+        NamiPaywallAction.NAMI_PURCHASE_SELECTED_SKU -> "PURCHASE_SELECTED_SKU"
+        NamiPaywallAction.NAMI_PURCHASE_SUCCESS -> "PURCHASE_SUCCESS"
+        NamiPaywallAction.NAMI_PURCHASE_FAILED -> "PURCHASE_FAILED"
+        NamiPaywallAction.NAMI_PURCHASE_CANCELLED -> "PURCHASE_CANCELLED"
+        NamiPaywallAction.NAMI_PURCHASE_PENDING -> "PURCHASE_PENDING"
+        NamiPaywallAction.NAMI_PURCHASE_UNKNOWN -> "PURCHASE_UNKNOWN"
+        NamiPaywallAction.NAMI_DEEP_LINK -> "DEEPLINK"
+        NamiPaywallAction.NAMI_TOGGLE_CHANGE -> "TOGGLE_CHANGE"
+        NamiPaywallAction.NAMI_PAGE_CHANGE -> "PAGE_CHANGE"
+        NamiPaywallAction.NAMI_SLIDE_CHANGE -> "SLIDE_CHANGE"
+        NamiPaywallAction.NAMI_COLLAPSIBLE_DRAWER_OPEN -> "COLLAPSIBLE_DRAWER_OPEN"
+        NamiPaywallAction.NAMI_COLLAPSIBLE_DRAWER_CLOSE -> "COLLAPSIBLE_DRAWER_CLOSE"
+        NamiPaywallAction.NAMI_VIDEO_STARTED -> "VIDEO_STARTED"
+        NamiPaywallAction.NAMI_VIDEO_PAUSED -> "VIDEO_PAUSED"
+        NamiPaywallAction.NAMI_VIDEO_RESUMED -> "VIDEO_RESUMED"
+        NamiPaywallAction.NAMI_VIDEO_ENDED -> "VIDEO_ENDED"
+        NamiPaywallAction.NAMI_VIDEO_CHANGED -> "VIDEO_CHANGED"
+        NamiPaywallAction.NAMI_VIDEO_MUTED -> "VIDEO_MUTED"
+        NamiPaywallAction.NAMI_VIDEO_UNMUTED -> "VIDEO_UNMUTED"
+        else -> {
+            Log.w("NamiUtil", "Unhandled NamiPaywallAction: $this. This might indicate a new enum value added in the SDK.")
+            "UNKNOWN"
+        }
+    }
+}
 
 fun List<*>.toWritableArray(): WritableArray {
     val convertedArray = Arguments.createArray()

package/dist/specs/NativeNamiPaywallManager.d.ts

@@ -17,6 +17,7 @@ export interface Spec extends TurboModule {
         marketplace?: string;
         price?: string;
         currencyCode?: string;
+        storeType?: string;
     }): void;
     buySkuCompleteApple(purchase: {
         product: {

package/dist/src/types.d.ts

@@ -123,6 +123,7 @@ export type NamiPurchaseDetails = {
     currencyCode?: string;
     userId?: string;
     marketplace?: string;
+    storeType?: string;
 };
 export type NamiPurchaseSuccessApple = {
     product: NamiSKU;

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.0-4";
+export declare const NAMI_REACT_NATIVE_VERSION = "3.3.0-7";

package/ios/NamiPaywallManagerBridge.swift

@@ -48,6 +48,10 @@ class RNNamiPaywallManager: RCTEventEmitter {
                 let namiSku = NamiSKU(namiId: namiId, storeId: storeId, skuType: namiSkuType)
                 let priceString = dict["price"] as? String ?? "0"
 
+                if let store = dict["storeType"] as? String, store != "Apple" {
+                    print("RNNamiPaywallManager - buySkuComplete called with the wrong store type \(dict)")
+                }
+
                 do {
                     if let transactionID = dict["transactionID"] as? String,
                        let originalTransactionID = dict["originalTransactionID"] as? String,

package/package.json

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

package/react-native-nami-sdk.podspec

@@ -31,4 +31,10 @@ Pod::Spec.new do |s|
 
   install_modules_dependencies(s)
 
+  if ENV['RCT_NEW_ARCH_ENABLED'] == '1' then
+    s.pod_target_xcconfig = {
+      'USE_HEADERMAP' => 'YES',
+    }
+   end
+
 end

package/specs/NativeNamiPaywallManager.ts

@@ -20,6 +20,7 @@ export interface Spec extends TurboModule {
     marketplace?: string;
     price?: string;
     currencyCode?: string;
+    storeType?: string;
   }): void;
 
   // Backward compatibility methods

package/src/NamiPaywallManager.ts

@@ -35,15 +35,15 @@ export const NamiPaywallManager = {
 
   // Compatibility shims
   buySkuCompleteApple: (purchase: NamiPurchaseSuccessApple): void => {
-    RNNamiPaywallManager.buySkuCompleteApple(purchase);
+    RNNamiPaywallManager.buySkuComplete(purchase);
   },
 
   buySkuCompleteAmazon: (purchase: NamiPurchaseSuccessAmazon): void => {
-    RNNamiPaywallManager.buySkuCompleteAmazon(purchase);
+    RNNamiPaywallManager.buySkuComplete(purchase);
   },
 
   buySkuCompleteGooglePlay: (purchase: NamiPurchaseSuccessGooglePlay): void => {
-    RNNamiPaywallManager.buySkuCompleteGooglePlay(purchase);
+    RNNamiPaywallManager.buySkuComplete(purchase);
   },
 
   registerBuySkuHandler: (callback: (sku: NamiSKU) => void): (() => void) => {

package/src/types.ts

@@ -255,6 +255,7 @@ export type NamiPurchaseDetails = {
   currencyCode?: string;
   userId?: string;
   marketplace?: string;
+  storeType?: string; // 'Apple', 'GooglePlay', 'Amazon'
 };
 
 export type NamiPurchaseSuccessApple = {

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.0-4';
+export const NAMI_REACT_NATIVE_VERSION = '3.3.0-7';