react-native-nami-sdk 3.0.9 → 3.0.11

package/ios/NamiPurchaseManagerBridge.m

@@ -1,14 +1,11 @@
 //
 //  NamiPurchaseManagerBridge.m
-//  namiReactNative
 //
-//  Created by Kendall Helmstetter Gelner on 12/11/19.
 //  Copyright © 2019 Nami ML Inc. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>
 #import <NamiApple/NamiApple.h>
-#import "NamiBridgeUtil.h"
 
 #import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
@@ -29,102 +26,9 @@ RCT_EXTERN_METHOD(registerPurchasesChangedHandler)
 
 RCT_EXTERN_METHOD(registerRestorePurchasesHandler)
 
-+ (BOOL)requiresMainQueueSetup {
-  return YES;
-}
-
-@end
-
-@interface NamiEmitter : RCTEventEmitter
-- (void)sendRestorePurchasesStateChanged: (enum NamiRestorePurchasesState) state
-                            newPurchases: (NSArray<NamiPurchase *> * _Nonnull) newPurchases
-                            oldPurchases: (NSArray<NamiPurchase *> * _Nonnull) oldPurchases
-                                   error: (NSError * _Nullable) error;
-- (NSDictionary *)buildRestorePurchasesStateChangedDict: (enum NamiRestorePurchasesState) state
-                                           newPurchases: (NSArray<NamiPurchase *> * _Nonnull) newPurchases
-                                           oldPurchases: (NSArray<NamiPurchase *> * _Nonnull) oldPurchases
-                                                  error: (NSError * _Nullable) error;
-+ (NamiEmitter *) reactInstance;
-@end
-
-@interface NamiPurchaseManagerBridge : NSObject <RCTBridgeModule>
-@end
-@implementation NamiPurchaseManagerBridge (RCTExternModule)
-
-
-RCT_EXTERN_METHOD(clearBypassStorePurchases)
-- (void)clearBypassStorePurchases {
-  [NamiPurchaseManager clearBypassStorePurchases];
-}
-
-
-RCT_EXPORT_METHOD(restorePurchasesWithCompletionHandler:(RCTResponseSenderBlock)completion)
-{
-    NSLog(@"NamiBridge: Info: Calling RestorePurchasesWithCompletionHandler");
-
-    [NamiPurchaseManager restorePurchasesWithStatehandler:^(enum NamiRestorePurchasesState state, NSArray<NamiPurchase *> * _Nonnull newPurchases, NSArray<NamiPurchase *> * _Nonnull oldPurchases, NSError * _Nullable error) {
-        NSDictionary *retDict = [[NamiEmitter reactInstance] buildRestorePurchasesStateChangedDict:state newPurchases:newPurchases oldPurchases:oldPurchases error:error];
-        completion(@[retDict]);
-    }];
-}
-
-RCT_EXPORT_METHOD(restorePurchases)
-{
-    NSLog(@"NamiBridge: Info: Calling RestorePurchases");
-
-    [NamiPurchaseManager restorePurchasesWithStatehandler:^(enum NamiRestorePurchasesState state, NSArray<NamiPurchase *> * _Nonnull newPurchases, NSArray<NamiPurchase *> * _Nonnull oldPurchases, NSError * _Nullable error) {
-        [[NamiEmitter reactInstance] sendRestorePurchasesStateChanged:state newPurchases:newPurchases oldPurchases:oldPurchases error:error];
-    }];
-}
+RCT_EXTERN_METHOD(presentCodeRedemptionSheet)
 
-
-/// For consumable purchases, removes the SKU from Nami so a product may be purchased again.
-RCT_EXPORT_METHOD(presentCodeRedemptionSheet)
-{
-    if (@available(iOS 14.0, *)) {
-        [NamiPurchaseManager presentCodeRedemptionSheet];
-    } else {
-        NSLog(@"NamiBridge: Warning: presentCodeRedemptionSheet only present in iOS14 and higher");
-    }
-}
-
-RCT_EXPORT_METHOD(canPresentCodeRedemptionSheet:(RCTResponseSenderBlock)completion)
-{
-    if (@available(iOS 14.0, *)) {
-        completion(@[[NSNumber numberWithBool:true]]);
-    } else {
-        completion(@[[NSNumber numberWithBool:false]]);
-    }
-}
-
-/// This method does the purchase work, and can optionally be fed a paywall metadata object to pass along to the purchase flow.
-//- (void) doSKUPurchaseWithSKUID:(nonnull NSString*)skuID namiPaywall:(NamiPaywall * _Nullable)namiPaywall completion:(RCTResponseSenderBlock)completion {
-//    [NamiPurchaseManager skusForSKUIdsWithSkuIds:@[skuID] productHandler:^(BOOL success, NSArray<NamiSKU *> * _Nullable products, NSArray<NSString *> * _Nullable invalidProducts, NSError * _Nullable error) {
-//        NSLog(@"NamiBridge: Info: Products found are %@, product fetch error is %@", products, [error localizedDescription]);
-//        NamiSKU *useProduct = products.firstObject;
-//        if (useProduct != nil) {
-//            [NamiPurchaseManager buySku:useProduct responseHandler:^(NSArray<NamiPurchase *> * _Nonnull purchase, enum NamiPurchaseState purchaseState, NSError * _Nullable error) {
-//                NSLog(@"NamiBridge: Info: Purchase result is %@, purchased is %d, purchaseState is %@, error is %@", purchase, (purchaseState == NamiPurchaseStatePurchased), [NSNumber numberWithInt:(int)purchaseState], [error localizedDescription]);
-//                if (purchaseState == NamiPurchaseStatePurchased) {
-//                    completion(@[[NSNumber numberWithBool:true]]);
-//                }
-//            }];
-//        } else {
-//            completion(@[[NSNumber numberWithBool:false]]);
-//        }
-//    }];
-//
-//}
-
-@end
-
-@implementation NamiPurchaseManagerBridge
-RCT_EXPORT_MODULE_NO_LOAD(NamiPurchaseManagerBridge, NamiPurchaseManagerBridge)
-
-- (dispatch_queue_t)methodQueue
-{
-  return dispatch_get_main_queue();
-}
+RCT_EXTERN_METHOD(restorePurchases)
 
 + (BOOL)requiresMainQueueSetup {
   return YES;

package/ios/NamiPurchaseManagerBridge.swift

@@ -11,6 +11,13 @@ import React
 
 @objc(RNNamiPurchaseManager)
 class RNNamiPurchaseManager: RCTEventEmitter {
+    public static var shared: RNNamiPurchaseManager?
+
+    override init() {
+        super.init()
+        RNNamiPurchaseManager.shared = self
+    }
+
     override func supportedEvents() -> [String]! {
         return ["PurchasesChanged", "RestorePurchasesStateChanged"]
     }
@@ -47,12 +54,10 @@ class RNNamiPurchaseManager: RCTEventEmitter {
         }
 
         let skuDict: [String: Any?] = [
-            "name": sku.name,
+            "id": sku.id,
             "skuId": sku.skuId,
             "type": typeString,
-            "product": productDict,
-//            "displayText": sku.localizedDisplayText,
-//            "displaySubText": sku.localizedSubDisplayText,
+            "appleProduct": productDict,
         ]
 
         return NSDictionary(dictionary: skuDict.compactMapValues { $0 })
@@ -68,6 +73,7 @@ class RNNamiPurchaseManager: RCTEventEmitter {
         dateFormatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
         let expiresString = dateFormatter.string(from: purchase.expires ?? Date())
         let purchaseInitiatedString = dateFormatter.string(from: purchase.purchaseInitiatedTimestamp)
+
         let purchaseDict: [String: Any?] = [
             "skuId": purchase.skuId,
             "transactionIdentifier": purchase.transactionIdentifier,
@@ -168,7 +174,41 @@ class RNNamiPurchaseManager: RCTEventEmitter {
                 "newPurchases": newPurchasesDictionaries,
                 "oldPurchases": oldPurchasesDictionaries,
             ]
-            self.sendEvent(withName: "RestorePurchasesStateChanged", body: payload)
+            RNNamiPurchaseManager.shared?.sendEvent(withName: "RestorePurchasesStateChanged", body: payload)
         }
     }
+
+    @objc(restorePurchases)
+    func restorePurchases() {
+        NamiPurchaseManager.restorePurchases { state, newPurchases, oldPurchases, _ in
+            let stateString: String
+            switch state {
+            case .started:
+                stateString = "started"
+            case .finished:
+                stateString = "finished"
+            case .error:
+                stateString = "error"
+            @unknown default:
+                stateString = "error"
+            }
+            let newPurchasesDictionaries = newPurchases.map { purchase in
+                RNNamiPurchaseManager.purchaseToPurchaseDict(purchase)
+            }
+            let oldPurchasesDictionaries = oldPurchases.map { purchase in
+                RNNamiPurchaseManager.purchaseToPurchaseDict(purchase)
+            }
+            let payload: [String: Any?] = [
+                "state": stateString,
+                "newPurchases": newPurchasesDictionaries,
+                "oldPurchases": oldPurchasesDictionaries,
+            ]
+            RNNamiPurchaseManager.shared?.sendEvent(withName: "RestorePurchasesStateChanged", body: payload)
+        }
+    }
+
+    @objc(presentCodeRedemptionSheet)
+    func presentCodeRedemptionSheet() {
+        NamiPurchaseManager.presentCodeRedemptionSheet()
+    }
 }

package/ios/RNNami-Bridging-Header.h

@@ -2,4 +2,3 @@
 //  Use this file to import your target's public headers that you would like to expose to Swift.
 //
 #import <React/RCTBridgeModule.h>
-#import "NamiBridgeUtil.h"

package/ios/RNNami.xcodeproj/project.pbxproj

@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		86FA58043F9BC23498A02E29 /* libPods-RNNami.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D38955F0C8C312F217C02595 /* libPods-RNNami.a */; };
 		B3E7B58A1CC2AC0600A0062D /* RNNami.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNNami.m */; };
 		EB1C9AFB23BE9C5700CAD548 /* NamiPurchaseManagerBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1C9AF823BE9C5600CAD548 /* NamiPurchaseManagerBridge.m */; };
 		EB1C9AFC23BE9C5700CAD548 /* NamiPaywallManagerBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = EB1C9AF923BE9C5600CAD548 /* NamiPaywallManagerBridge.m */; };
@@ -38,12 +37,9 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
-		134814201AA4EA6300B7C361 /* libRNNami.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNNami.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		5C0ED6F1EABFB69B20A67C29 /* Pods-RNNami.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNNami.debug.xcconfig"; path = "Target Support Files/Pods-RNNami/Pods-RNNami.debug.xcconfig"; sourceTree = "<group>"; };
-		90B290F36EAE177CDC017BA3 /* Pods-RNNami.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNNami.release.xcconfig"; path = "Target Support Files/Pods-RNNami/Pods-RNNami.release.xcconfig"; sourceTree = "<group>"; };
+		134814201AA4EA6300B7C361 /* libRNNami.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; name = libRNNami.a; path = "/Users/dannami/Nami/Source/react-native-nami-sdk/ios/build/Debug-iphoneos/libRNNami.a"; sourceTree = "<absolute>"; };
 		B3E7B5881CC2AC0600A0062D /* RNNami.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNNami.h; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* RNNami.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNNami.m; sourceTree = "<group>"; };
-		D38955F0C8C312F217C02595 /* libPods-RNNami.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-RNNami.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		EB1C9AF823BE9C5600CAD548 /* NamiPurchaseManagerBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NamiPurchaseManagerBridge.m; sourceTree = "<group>"; };
 		EB1C9AF923BE9C5600CAD548 /* NamiPaywallManagerBridge.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NamiPaywallManagerBridge.m; sourceTree = "<group>"; };
 		EB1C9AFA23BE9C5700CAD548 /* NamiEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NamiEmitter.m; sourceTree = "<group>"; };
@@ -67,21 +63,12 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				86FA58043F9BC23498A02E29 /* libPods-RNNami.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
-		134814211AA4EA7D00B7C361 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				134814201AA4EA6300B7C361 /* libRNNami.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
@@ -98,29 +85,9 @@
 				EBC59E5C23C5514B008A123A /* Nami.m */,
 				EB1C9AFA23BE9C5700CAD548 /* NamiEmitter.m */,
 				EBEEAC0F243C29C800E01389 /* NamiMLManagerBridge.m */,
-				134814211AA4EA7D00B7C361 /* Products */,
-				82475599A9F3B58440ACDC6E /* Frameworks */,
-				A17A44E9FF56BDEADE788165 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
-		82475599A9F3B58440ACDC6E /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				D38955F0C8C312F217C02595 /* libPods-RNNami.a */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		A17A44E9FF56BDEADE788165 /* Pods */ = {
-			isa = PBXGroup;
-			children = (
-				5C0ED6F1EABFB69B20A67C29 /* Pods-RNNami.debug.xcconfig */,
-				90B290F36EAE177CDC017BA3 /* Pods-RNNami.release.xcconfig */,
-			);
-			path = Pods;
-			sourceTree = "<group>";
-		};
 		FA3AB38329E009D200FD2E8D /* NamiPaywallManager */ = {
 			isa = PBXGroup;
 			children = (
@@ -173,7 +140,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNNami" */;
 			buildPhases = (
-				D4E4645754B75DF6DB7C7A3E /* [CP] Check Pods Manifest.lock */,
 				58B511D71A9E6C8500147676 /* Sources */,
 				58B511D81A9E6C8500147676 /* Frameworks */,
 				58B511D91A9E6C8500147676 /* CopyFiles */,
@@ -220,31 +186,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXShellScriptBuildPhase section */
-		D4E4645754B75DF6DB7C7A3E /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-RNNami-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-/* End PBXShellScriptBuildPhase section */
-
 /* Begin PBXSourcesBuildPhase section */
 		58B511D71A9E6C8500147676 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -356,7 +297,6 @@
 		};
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 5C0ED6F1EABFB69B20A67C29 /* Pods-RNNami.debug.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (
@@ -379,7 +319,6 @@
 		};
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 90B290F36EAE177CDC017BA3 /* Pods-RNNami.release.xcconfig */;
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				HEADER_SEARCH_PATHS = (

package/ios/RNNami.xcworkspace/contents.xcworkspacedata

@@ -4,7 +4,4 @@
    <FileRef
       location = "group:RNNami.xcodeproj">
    </FileRef>
-   <FileRef
-      location = "group:Pods/Pods.xcodeproj">
-   </FileRef>
 </Workspace>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nami-sdk",
-  "version": "3.0.9",
+  "version": "3.0.11",
   "description": "React Native Module for Nami - Easy subscriptions & in-app purchases, with powerful built-in paywalls and A/B testing.",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,7 @@
     "in-app-purchase",
     "ios",
     "ipados",
+    "tvos",
     "paywall",
     "react-native",
     "storekit",
@@ -41,14 +42,24 @@
     }
   ],
   "license": "SEE LICENSE FILE",
+  "standard": {
+    "ignore": [
+      "examples/*"
+    ]
+  },
   "peerDependencies": {
-    "react": "^17.0.2",
-    "react-native": "^0.65.2"
+    "react": ">=17",
+    "react-native": ">=0.65"
   },
   "devDependencies": {
+    "@react-native-community/eslint-config": "^3.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.7",
+    "eslint": "^8.41.0",
+    "prettier": "^2.8.7",
     "react": "^17.0.2",
     "react-native": "^0.65.2",
-    "react-native-codegen": "^0.0.12"
+    "react-native-codegen": "^0.0.12",
+    "typescript": "^5.0.2"
   },
   "repository": {
     "type": "git",

package/react-native-nami-sdk.podspec

@@ -13,12 +13,14 @@ Pod::Spec.new do |s|
   s.homepage     = package['homepage']
   s.license      = package['license']
 
-  s.platform     = :ios, "14.0"
+  s.platforms = { :ios => "14.0", :tvos => "15.0" }
+
+
   s.source       = { :git => "https://github.com/namiml/react-native-nami-sdk.git", :tag => "#{s.version}" }
   s.source_files = "ios/**/*.{h,m,swift}"
   s.requires_arc = true
 
-  s.dependency 'Nami', '3.0.9'
+  s.dependency 'Nami', '3.0.14'
   s.dependency 'React'
 
 end

package/src/Nami.d.ts

@@ -10,7 +10,6 @@ export type NamiConfiguration = {
   "appPlatformID-android": string;
   logLevel: string;
   namiLanguageCode?: NamiLanguageCodes;
-  bypassStore?: boolean;
 };
 
 export type NamiLanguageCodes =

package/src/NamiCustomerManager.js

@@ -6,14 +6,14 @@ export const NamiCustomerManager = {
   emitter: new NativeEventEmitter(RNNamiCustomerManager),
   ...RNNamiCustomerManager,
   login: (customerId, callback) => {
-    if (Platform.OS === "ios") {
+    if (Platform.OS === "ios" || Platform.isTVOS) {
       RNNamiCustomerManager.login(customerId, callback ?? (() => {}));
     } else {
       RNNamiCustomerManager.login(customerId);
     }
   },
   logout: (callback) => {
-    if (Platform.OS === "ios") {
+    if (Platform.OS === "ios" || Platform.isTVOS) {
       RNNamiCustomerManager.logout(callback ?? (() => {}));
     } else {
       RNNamiCustomerManager.logout();

package/src/NamiMLManager.d.ts

@@ -1,5 +1,5 @@
 export const NamiMLManager: {
-    coreAction: (label: string) => void;
-    enterCoreContent: (label: string | string[]) => void;
-    exitCoreContent: (label: string | string[]) => void;
+  coreAction: (label: string) => void;
+  enterCoreContent: (label: string | string[]) => void;
+  exitCoreContent: (label: string | string[]) => void;
 };

package/src/NamiMLManager.js

@@ -3,5 +3,5 @@ import { NativeModules } from "react-native";
 export const { NamiMLManagerBridge } = NativeModules;
 
 export const NamiMLManager = {
- ...NamiMLManagerBridge
+  ...NamiMLManagerBridge,
 };

package/src/NamiPaywallManager.d.ts

@@ -2,25 +2,20 @@ import { EmitterSubscription } from "react-native";
 import { NamiSKU } from "./types";
 
 export const NamiPaywallManager: {
-  buySkuCompleteIos: (purchaseSuccess: PurchaseSuccessIos) => void;
-  buySkuCompleteAmazon: (purchaseSuccess: PurchaseSuccessAmazon) => void;
+  buySkuCompleteApple: (purchaseSuccess: NamiPurchaseSuccessApple) => void;
+  buySkuCompleteAmazon: (purchaseSuccess: NamiPurchaseSuccessAmazon) => void;
   buySkuCompleteGooglePlay: (
-    purchaseSuccess: PurchaseSuccessGooglePlay
+    purchaseSuccess: NamiPurchaseSuccessGooglePlay
   ) => void;
-  dismiss: (animated: boolean, callback: () => void) => void;
-  displayedViewController: () => void;
-  renderCustomUiHandler: () => any;
+  dismiss: (animated?: boolean) => void;
   registerBuySkuHandler: (
     callback: (sku: NamiSKU) => void
   ) => EmitterSubscription["remove"];
-  registerCloseHandler: (
-    blockDismiss: boolean,
-    callback: (resultObject: { blockingPaywallClosed: boolean }) => void
-  ) => EmitterSubscription["remove"];
+  registerCloseHandler: (callback: () => void) => EmitterSubscription["remove"];
 };
 
-export type PurchaseSuccessIos = {
-  product: PurchaseSuccessProduct;
+export type NamiPurchaseSuccessApple = {
+  product: NamiSKU;
   transactionID: string;
   originalTransactionID: string;
   originalPurchaseDate: number;
@@ -31,8 +26,8 @@ export type PurchaseSuccessIos = {
   locale: string;
 };
 
-export type PurchaseSuccessGooglePlay = {
-  product: PurchaseSuccessProduct;
+export type NamiPurchaseSuccessGooglePlay = {
+  product: NamiSKU;
   orderId: string;
   purchaseDate: number;
   expiresDate?: number;
@@ -40,8 +35,8 @@ export type PurchaseSuccessGooglePlay = {
   purchaseSource: "CAMPAIGN" | "MARKETPLACE" | "UNKNOWN";
 };
 
-export type PurchaseSuccessAmazon = {
-  product: PurchaseSuccessProduct;
+export type NamiPurchaseSuccessAmazon = {
+  product: NamiSKU;
   purchaseDate: number;
   expiresDate?: number;
   purchaseSource: "CAMPAIGN" | "MARKETPLACE" | "UNKNOWN";
@@ -51,19 +46,6 @@ export type PurchaseSuccessAmazon = {
   marketplace: string;
 };
 
-export type PurchaseSuccessProduct = {
-  id: string;
-  platformID: string;
-  skuId: string;
-  languageCode: string;
-  name: string;
-  featured: boolean;
-  storeId: string;
-  type: number;
-  isFeatured: boolean;
-  namiID: string;
-};
-
 export enum NamiPaywallAction {
   BUY_SKU = "BUY_SKU",
   SELECT_SKU = "SELECT_SKU",
@@ -78,5 +60,4 @@ export enum NamiPaywallAction {
   PURCHASE_PENDING = "PURCHASE_PENDING",
   PURCHASE_UNKNOWN = "PURCHASE_UNKNOWN",
   PURCHASE_DEFERRED = "PURCHASE_DEFERRED",
-  SHOW_PAYWALL = "SHOW_PAYWALL",
 }

package/src/NamiPaywallManager.js

@@ -6,7 +6,7 @@ export const NamiPaywallManager = {
   paywallEmitter: new NativeEventEmitter(RNNamiPaywallManager),
   ...RNNamiPaywallManager,
   ...NamiPaywallManagerBridge,
-  buySkuCompleteIos(purchaseSuccess) {
+  buySkuCompleteApple(purchaseSuccess) {
     RNNamiPaywallManager.buySkuComplete(purchaseSuccess);
   },
   buySkuCompleteAmazon(purchaseSuccess) {
@@ -18,20 +18,25 @@ export const NamiPaywallManager = {
   registerBuySkuHandler(callback) {
     var subscription = this.paywallEmitter.addListener(
       "RegisterBuySKU",
-      callback
+      (sku) => {
+        callback(sku);
+      }
     );
     RNNamiPaywallManager.registerBuySkuHandler();
     return subscription.remove;
   },
-  registerCloseHandler(blockDismiss, callback) {
+  registerCloseHandler(callback) {
     var subscription;
     subscription = this.paywallEmitter.addListener(
-      "BlockingPaywallClosed",
-      () => {
-        subscription.remove();
-        callback();
+      "PaywallCloseRequested",
+      (body) => {
+        callback(body);
       }
     );
-    RNNamiPaywallManager.registerCloseHandler(blockDismiss);
+    RNNamiPaywallManager.registerCloseHandler();
+    return subscription.remove;
+  },
+  dismiss(animated) {
+    RNNamiPaywallManager.dismiss(animated ?? true);
   },
 };

package/src/NamiPurchaseManager.d.ts

@@ -1,14 +1,18 @@
 import { EmitterSubscription } from "react-native";
 import { NamiSKU } from "./types";
-import { NamiEntitlement } from "./NamiEntitlementManager";
 
 export const NamiPurchaseManager: {
   allPurchases: () => NamiPurchase[];
   anySkuPurchased: (skuIds: string[]) => boolean;
   consumePurchasedSku: (skuId: string) => void;
-  clearBypassStorePurchases: () => void;
   presentCodeRedemptionSheet: () => void;
-  restorePurchases: () => void;
+  restorePurchases: (
+    callback: (
+      purchaseState: NamiPurchasesState,
+      purchases: NamiPurchase[],
+      error: string
+    ) => void
+  ) => EmitterSubscription["remove"];
   skuPurchased: (skuId: string) => boolean;
   registerPurchasesChangedHandler: (
     callback: (

package/src/types.ts

@@ -1,7 +1,10 @@
 export type NamiSKU = {
-  name: string;
+  id: string;
+  name?: string;
   skuId: string;
-  product?: SKProduct;
+  appleProduct?: AppleProduct;
+  googleProduct?: GoogleProduct;
+  amazonProduct?: AmazonProduct;
   type: NamiSKUType;
 };
 
@@ -25,7 +28,7 @@ export enum NamiRestorePurchasesState {
 
 export type NamiSKUType = "unknown" | "one_time_purchase" | "subscription";
 
-export type SKProduct = {
+export type AppleProduct = {
   localizedDescription: string;
   localizedMultipliedPrice: string;
   localizedPrice: string;
@@ -34,3 +37,7 @@ export type SKProduct = {
   priceCurrency: string;
   priceLanguage: string;
 };
+
+export type GoogleProduct = {};
+
+export type AmazonProduct = {};