react-native-nami-sdk 3.3.0-3 → 3.3.0-6

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/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-3";
+export declare const NAMI_REACT_NATIVE_VERSION = "3.3.0-6";

package/ios/Nami.swift

@@ -8,9 +8,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    extension RNNami: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//    extension RNNami: RCTTurboModule {}
+// #endif
 
 @objc(RNNami)
 class RNNami: NSObject {

package/ios/NamiCampaignManagerBridge.swift

@@ -10,9 +10,9 @@ import NamiApple
 import os
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    extension RNNamiCampaignManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//    extension RNNamiCampaignManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiCampaignManager)
 class RNNamiCampaignManager: RCTEventEmitter {

package/ios/NamiCustomerManager.swift

@@ -9,9 +9,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    extension RNNamiCustomerManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//    extension RNNamiCustomerManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiCustomerManager)
 class RNNamiCustomerManager: RCTEventEmitter {

package/ios/NamiEntitlementManagerBridge.swift

@@ -9,9 +9,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    extension RNNamiEntitlementManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//     extension RNNamiEntitlementManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiEntitlementManager)
 class RNNamiEntitlementManager: RCTEventEmitter {

package/ios/NamiFlowManagerBridge.swift

@@ -9,9 +9,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    extension RNNamiFlowManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//     extension RNNamiFlowManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiFlowManager)
 class RNNamiFlowManager: RCTEventEmitter {

package/ios/NamiPaywallManagerBridge.swift

@@ -9,9 +9,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    extension RNNamiPaywallManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//     extension RNNamiPaywallManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiPaywallManager)
 class RNNamiPaywallManager: RCTEventEmitter {
@@ -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/ios/NamiPurchaseManagerBridge.swift

@@ -9,9 +9,9 @@ import Foundation
 import NamiApple
 import React
 
-#if RCT_NEW_ARCH_ENABLED
-    extension RNNamiPurchaseManager: RCTTurboModule {}
-#endif
+// #if RCT_NEW_ARCH_ENABLED
+//     extension RNNamiPurchaseManager: RCTTurboModule {}
+// #endif
 
 @objc(RNNamiPurchaseManager)
 class RNNamiPurchaseManager: RCTEventEmitter {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.3.0-3",
+  "version": "3.3.0-6",
   "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-3';
+export const NAMI_REACT_NATIVE_VERSION = '3.3.0-6';