framepayments-react-native 2.0.8 → 2.1.0

package/ios/FrameSDKBridge.m

@@ -47,11 +47,6 @@ RCT_EXTERN_METHOD(presentCart:(id)customerId
                   rejecter:(RCTPromiseRejectBlock)reject)
 
 RCT_EXTERN_METHOD(presentOnboarding:(id)accountId
-                  capabilities:(NSArray *)capabilities
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-
-RCT_EXTERN_METHOD(presentOnboardingWithApplePay:(id)accountId
                   capabilities:(NSArray *)capabilities
                   applePayMerchantId:(id)applePayMerchantId
                   resolver:(RCTPromiseResolveBlock)resolve
@@ -107,25 +102,14 @@ RCT_EXTERN_METHOD(presentApplePay:(NSString *)ownerType
   });
 }
 
-- (void)presentOnboarding:(id)accountId capabilities:(NSArray *)capabilities resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    UIViewController *topVC = FrameGetTopViewController();
-    if (!topVC) {
-      reject(@"NO_ROOT_VC", @"Could not find root view controller to present onboarding", nil);
-      return;
-    }
-    [[[ObjCFrameSDKBridge alloc] init] presentOnboardingFrom:topVC accountId:accountId capabilities:capabilities resolver:resolve rejecter:reject];
-  });
-}
-
-- (void)presentOnboardingWithApplePay:(id)accountId capabilities:(NSArray *)capabilities applePayMerchantId:(id)applePayMerchantId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
+- (void)presentOnboarding:(id)accountId capabilities:(NSArray *)capabilities applePayMerchantId:(id)applePayMerchantId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
   dispatch_async(dispatch_get_main_queue(), ^{
     UIViewController *topVC = FrameGetTopViewController();
     if (!topVC) {
       reject(@"NO_ROOT_VC", @"Could not find root view controller to present onboarding", nil);
       return;
     }
-    [[[ObjCFrameSDKBridge alloc] init] presentOnboardingWithApplePayFrom:topVC accountId:accountId capabilities:capabilities applePayMerchantId:applePayMerchantId resolver:resolve rejecter:reject];
+    [[[ObjCFrameSDKBridge alloc] init] presentOnboardingFrom:topVC accountId:accountId capabilities:capabilities applePayMerchantId:applePayMerchantId resolver:resolve rejecter:reject];
   });
 }
 

package/ios/FrameSDKBridge.swift

@@ -51,14 +51,7 @@ public class FrameSDKBridge: NSObject {
   }
 
   @objc public
-  func presentOnboarding(from viewController: UIViewController, accountId: NSObject?, capabilities: NSArray, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-    let parsedCapabilities = parseCapabilities(capabilities)
-    let accountIdString = accountId as? String
-    presentOnboardingOnMain(from: viewController, accountId: accountIdString, capabilities: parsedCapabilities, applePayMerchantId: nil, resolve: resolve, reject: reject)
-  }
-
-  @objc public
-  func presentOnboardingWithApplePay(from viewController: UIViewController, accountId: NSObject?, capabilities: NSArray, applePayMerchantId: NSObject?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+  func presentOnboarding(from viewController: UIViewController, accountId: NSObject?, capabilities: NSArray, applePayMerchantId: NSObject?, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
     let parsedCapabilities = parseCapabilities(capabilities)
     let accountIdString = accountId as? String
     let merchantIdString = applePayMerchantId as? String
@@ -208,9 +201,9 @@ public class FrameSDKBridge: NSObject {
           accountId: accountId,
           requiredCapabilities: capabilities,
           applePayMerchantId: applePayMerchantId,
-          onComplete: { [weak hosting] in
+          onComplete: { [weak top] in
             delegate?.finish(completed: true)
-            hosting?.dismiss(animated: true)
+            top?.dismiss(animated: true)
           }
         ),
         theme: FrameRNTheme.resolved()

package/lib/native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,UAAU,EACV,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAmBjB,wBAAgB,UAAU,CAAC,OAAO,EAAE;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhB;AAwBD,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,YAAY,CAAC,CAKxB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACnC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;CAC/B,GAAG,OAAO,CAAC,YAAY,CAAC,CASxB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACtC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0B5B;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,YAAY,CAAC,CAoBtF;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC,CAUxF;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAMhE"}
+{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,UAAU,EACV,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAmBjB,wBAAgB,UAAU,CAAC,OAAO,EAAE;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhB;AAwBD,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,YAAY,CAAC,CAKxB;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACnC,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;CAC/B,GAAG,OAAO,CAAC,YAAY,CAAC,CASxB;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,YAAY,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACtC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,mBAAmB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAkB5B;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,YAAY,CAAC,CAoBtF;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,YAAY,CAAC,CAUxF;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAMhE"}

package/lib/native.js

@@ -53,11 +53,8 @@ export function presentCart(options) {
 }
 export function presentOnboarding(options) {
     guardInitialized();
-    if (Platform.OS === 'ios' && options.applePayMerchantId) {
-        return wrapPromise(FrameSDK.presentOnboardingWithApplePay(options.accountId ?? null, options.capabilities ?? [], options.applePayMerchantId));
-    }
     if (Platform.OS === 'ios') {
-        return wrapPromise(FrameSDK.presentOnboarding(options.accountId ?? null, options.capabilities ?? []));
+        return wrapPromise(FrameSDK.presentOnboarding(options.accountId ?? null, options.capabilities ?? [], options.applePayMerchantId ?? null));
     }
     return wrapPromise(FrameSDK.presentOnboarding(options.accountId ?? null, options.capabilities ?? [], options.googlePayMerchantId ?? null));
 }

package/package.json

@@ -1,14 +1,16 @@
 {
   "name": "framepayments-react-native",
-  "version": "2.0.8",
+  "version": "2.1.0",
   "description": "React Native SDK for Frame Payments - modal checkout and cart, with API usage via frame-node.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
     "build": "tsc",
+    "watch": "tsc --watch",
     "typecheck": "tsc --noEmit",
     "lint": "eslint src --ext .ts,.tsx",
     "test": "jest",
+    "prepare": "npm run build",
     "prepublishOnly": "npm run build"
   },
   "keywords": [

package/src/__tests__/native.test.ts

@@ -6,8 +6,7 @@
 const mockInitialize = jest.fn((_secretKey: string, _publishableKey: string, _debugMode: boolean) => Promise.resolve());
 const mockPresentCheckout = jest.fn((_customerId: unknown, _amount: number) => Promise.resolve({ id: 'ci_1', amount: 10000 }));
 const mockPresentCart = jest.fn((_customerId: unknown, _items: unknown[], _shipping: number) => Promise.resolve({ id: 'ci_2', amount: 15000 }));
-const mockPresentOnboarding = jest.fn((_accountId: unknown, _capabilities: unknown[]) => Promise.resolve({ status: 'completed', paymentMethodId: 'pm_1' }));
-const mockPresentOnboardingWithApplePay = jest.fn((_accountId: unknown, _capabilities: unknown[], _merchantId: string) => Promise.resolve({ status: 'completed', paymentMethodId: 'pm_2' }));
+const mockPresentOnboarding = jest.fn((_accountId: unknown, _capabilities: unknown[], _merchantId: string | null) => Promise.resolve({ status: 'completed', paymentMethodId: 'pm_1' }));
 
 const mockPlatform = { OS: 'ios' as 'ios' | 'android' };
 
@@ -18,7 +17,6 @@ jest.mock('react-native', () => ({
       presentCheckout: mockPresentCheckout,
       presentCart: mockPresentCart,
       presentOnboarding: mockPresentOnboarding,
-      presentOnboardingWithApplePay: mockPresentOnboardingWithApplePay,
     },
   },
   Platform: mockPlatform,
@@ -40,7 +38,6 @@ beforeEach(() => {
   mockPresentCheckout.mockClear();
   mockPresentCart.mockClear();
   mockPresentOnboarding.mockClear();
-  mockPresentOnboardingWithApplePay.mockClear();
   mockPlatform.OS = 'ios';
   const native = require('../native');
   initialize = native.initialize;
@@ -145,33 +142,33 @@ describe('presentOnboarding', () => {
     expect(mockPresentOnboarding).not.toHaveBeenCalled();
   });
 
-  it('calls native presentOnboarding with accountId and capabilities after initialize', async () => {
+  it('calls native presentOnboarding with accountId, capabilities, and null merchantId after initialize on iOS', async () => {
+    mockPlatform.OS = 'ios';
     await initialize({ secretKey: 'sk_xxx', publishableKey: 'pk_xxx' });
     const result = await presentOnboarding({ accountId: 'acct_1', capabilities: ['kyc', 'bank_account_verification'] });
     expect(mockPresentOnboarding).toHaveBeenCalledWith('acct_1', ['kyc', 'bank_account_verification'], null);
     expect(result).toEqual({ status: 'completed', paymentMethodId: 'pm_1' });
   });
 
-  it('passes null for accountId and empty array for capabilities when not provided', async () => {
+  it('passes null for accountId and empty array for capabilities when not provided on iOS', async () => {
+    mockPlatform.OS = 'ios';
     await initialize({ secretKey: 'sk_xxx', publishableKey: 'pk_xxx' });
     await presentOnboarding({});
     expect(mockPresentOnboarding).toHaveBeenCalledWith(null, [], null);
   });
 
-  it('routes to presentOnboardingWithApplePay on iOS when applePayMerchantId is set', async () => {
+  it('forwards applePayMerchantId on iOS', async () => {
     mockPlatform.OS = 'ios';
     await initialize({ secretKey: 'sk_xxx', publishableKey: 'pk_xxx' });
     await presentOnboarding({ accountId: 'acct_1', capabilities: ['kyc'], applePayMerchantId: 'merchant.com.example' });
-    expect(mockPresentOnboardingWithApplePay).toHaveBeenCalledWith('acct_1', ['kyc'], 'merchant.com.example');
-    expect(mockPresentOnboarding).not.toHaveBeenCalled();
+    expect(mockPresentOnboarding).toHaveBeenCalledWith('acct_1', ['kyc'], 'merchant.com.example');
   });
 
-  it('still routes to presentOnboarding on Android even when applePayMerchantId is set', async () => {
+  it('ignores applePayMerchantId on Android', async () => {
     mockPlatform.OS = 'android';
     await initialize({ secretKey: 'sk_xxx', publishableKey: 'pk_xxx' });
     await presentOnboarding({ accountId: 'acct_1', capabilities: ['kyc'], applePayMerchantId: 'merchant.com.example' });
     expect(mockPresentOnboarding).toHaveBeenCalledWith('acct_1', ['kyc'], null);
-    expect(mockPresentOnboardingWithApplePay).not.toHaveBeenCalled();
   });
 
   it('forwards googlePayMerchantId to native presentOnboarding on Android', async () => {
@@ -180,4 +177,11 @@ describe('presentOnboarding', () => {
     await presentOnboarding({ accountId: 'acct_1', capabilities: ['kyc'], googlePayMerchantId: 'BCR2DN4T...' });
     expect(mockPresentOnboarding).toHaveBeenCalledWith('acct_1', ['kyc'], 'BCR2DN4T...');
   });
+
+  it('ignores googlePayMerchantId on iOS', async () => {
+    mockPlatform.OS = 'ios';
+    await initialize({ secretKey: 'sk_xxx', publishableKey: 'pk_xxx' });
+    await presentOnboarding({ accountId: 'acct_1', capabilities: ['kyc'], googlePayMerchantId: 'BCR2DN4T...' });
+    expect(mockPresentOnboarding).toHaveBeenCalledWith('acct_1', ['kyc'], null);
+  });
 });

package/src/native.ts

@@ -106,20 +106,12 @@ export function presentOnboarding(options: {
   googlePayMerchantId?: string | null;
 }): Promise<OnboardingResult> {
   guardInitialized();
-  if (Platform.OS === 'ios' && options.applePayMerchantId) {
-    return wrapPromise(
-      FrameSDK.presentOnboardingWithApplePay(
-        options.accountId ?? null,
-        options.capabilities ?? [],
-        options.applePayMerchantId
-      )
-    );
-  }
   if (Platform.OS === 'ios') {
     return wrapPromise(
       FrameSDK.presentOnboarding(
         options.accountId ?? null,
-        options.capabilities ?? []
+        options.capabilities ?? [],
+        options.applePayMerchantId ?? null
       )
     );
   }