framepayments-react-native 2.0.4 → 2.0.5

package/README.md

@@ -191,6 +191,7 @@ if (result.status === 'completed') {
 |---|---|---|---|
 | `accountId` | `string` | No | The Frame account to onboard |
 | `capabilities` | `OnboardingCapability[]` | No | Which onboarding steps to include (see below) |
+| `applePayMerchantId` | `string` | No | Apple Pay merchant ID. When set, the onboarding flow includes an Apple Pay setup step. iOS only — ignored on Android. Same prerequisites as `presentApplePay`. |
 
 **`capabilities` values:**
 

package/ios/FrameSDKBridge.m

@@ -47,6 +47,12 @@ RCT_EXTERN_METHOD(presentOnboarding:(id)accountId
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
+RCT_EXTERN_METHOD(presentOnboardingWithApplePay:(id)accountId
+                  capabilities:(NSArray *)capabilities
+                  applePayMerchantId:(id)applePayMerchantId
+                  resolver:(RCTPromiseResolveBlock)resolve
+                  rejecter:(RCTPromiseRejectBlock)reject)
+
 RCT_EXTERN_METHOD(presentApplePay:(NSString *)ownerType
                   ownerId:(NSString *)ownerId
                   amount:(nonnull NSNumber *)amount
@@ -104,6 +110,17 @@ RCT_EXTERN_METHOD(presentApplePay:(NSString *)ownerType
   });
 }
 
+- (void)presentOnboardingWithApplePay:(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];
+  });
+}
+
 - (void)presentApplePay:(NSString *)ownerType ownerId:(NSString *)ownerId amount:(NSNumber *)amount currency:(NSString *)currency merchantId:(NSString *)merchantId resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
   [[[ObjCFrameSDKBridge alloc] init] presentApplePay:ownerType ownerId:ownerId amount:amount.intValue currency:currency merchantId:merchantId resolver:resolve rejecter:reject];
 }

package/ios/FrameSDKBridge.swift

@@ -45,7 +45,15 @@ public class FrameSDKBridge: NSObject {
   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, resolve: resolve, reject: reject)
+    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) {
+    let parsedCapabilities = parseCapabilities(capabilities)
+    let accountIdString = accountId as? String
+    let merchantIdString = applePayMerchantId as? String
+    presentOnboardingOnMain(from: viewController, accountId: accountIdString, capabilities: parsedCapabilities, applePayMerchantId: merchantIdString, resolve: resolve, reject: reject)
   }
 
   @objc public
@@ -179,13 +187,14 @@ public class FrameSDKBridge: NSObject {
     }
   }
 
-  private func presentOnboardingOnMain(from top: UIViewController, accountId: String?, capabilities: [FrameObjects.Capabilities], resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+  private func presentOnboardingOnMain(from top: UIViewController, accountId: String?, capabilities: [FrameObjects.Capabilities], applePayMerchantId: String?, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     var hosting: OnboardingHostingController<OnboardingContainerView>!
     var delegate: OnboardingDismissDelegate!
     hosting = OnboardingHostingController(
       rootView: OnboardingContainerView(
         accountId: accountId,
         requiredCapabilities: capabilities,
+        applePayMerchantId: applePayMerchantId,
         onComplete: { [weak hosting] in
           delegate?.finish(completed: true)
           hosting?.dismiss(animated: true)

package/lib/native.d.ts

@@ -19,6 +19,7 @@ export declare function presentCart(options: {
 export declare function presentOnboarding(options: {
     accountId?: string | null;
     capabilities?: OnboardingCapability[];
+    applePayMerchantId?: string | null;
 }): Promise<OnboardingResult>;
 export declare function presentApplePay(options: PresentApplePayOptions): Promise<ChargeIntent>;
 export declare function presentGooglePay(options: PresentGooglePayOptions): Promise<ChargeIntent>;

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,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;CACvC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAQ5B;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"}
+{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,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;CACpC,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAiB5B;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"}

package/lib/native.js

@@ -1,7 +1,7 @@
 /**
  * Native module bridge. Uses NativeModules for classic React Native bridge.
  */
-import { NativeModules } from 'react-native';
+import { NativeModules, Platform } from 'react-native';
 import { ErrorCodes } from './errors';
 const LINKING_ERROR = `The package 'framepayments-react-native' doesn't seem to be linked. Make sure you have run 'pod install' (iOS) or rebuilt the app (Android).`;
 const FrameSDK = NativeModules.FrameSDK
@@ -53,6 +53,9 @@ 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));
+    }
     return wrapPromise(FrameSDK.presentOnboarding(options.accountId ?? null, options.capabilities ?? []));
 }
 export function presentApplePay(options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "framepayments-react-native",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "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",

package/src/__tests__/native.test.ts

@@ -7,6 +7,9 @@ const mockInitialize = jest.fn((_secretKey: string, _publishableKey: string, _de
 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 mockPlatform = { OS: 'ios' as 'ios' | 'android' };
 
 jest.mock('react-native', () => ({
   NativeModules: {
@@ -15,8 +18,10 @@ jest.mock('react-native', () => ({
       presentCheckout: mockPresentCheckout,
       presentCart: mockPresentCart,
       presentOnboarding: mockPresentOnboarding,
+      presentOnboardingWithApplePay: mockPresentOnboardingWithApplePay,
     },
   },
+  Platform: mockPlatform,
 }));
 
 // Re-import after mock so we get the mocked NativeModules
@@ -27,7 +32,7 @@ let presentCart: (opts: {
   items: Array<{ id: string; title: string; amountInCents: number; imageUrl: string }>;
   shippingAmountInCents: number;
 }) => Promise<unknown>;
-let presentOnboarding: (opts: { accountId?: string | null; capabilities?: string[] }) => Promise<unknown>;
+let presentOnboarding: (opts: { accountId?: string | null; capabilities?: string[]; applePayMerchantId?: string | null }) => Promise<unknown>;
 
 beforeEach(() => {
   jest.resetModules();
@@ -35,6 +40,8 @@ beforeEach(() => {
   mockPresentCheckout.mockClear();
   mockPresentCart.mockClear();
   mockPresentOnboarding.mockClear();
+  mockPresentOnboardingWithApplePay.mockClear();
+  mockPlatform.OS = 'ios';
   const native = require('../native');
   initialize = native.initialize;
   presentCheckout = native.presentCheckout;
@@ -150,4 +157,20 @@ describe('presentOnboarding', () => {
     await presentOnboarding({});
     expect(mockPresentOnboarding).toHaveBeenCalledWith(null, []);
   });
+
+  it('routes to presentOnboardingWithApplePay on iOS when applePayMerchantId is set', 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();
+  });
+
+  it('still routes to presentOnboarding on Android even when applePayMerchantId is set', 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']);
+    expect(mockPresentOnboardingWithApplePay).not.toHaveBeenCalled();
+  });
 });

package/src/native.ts

@@ -2,7 +2,7 @@
  * Native module bridge. Uses NativeModules for classic React Native bridge.
  */
 
-import { NativeModules } from 'react-native';
+import { NativeModules, Platform } from 'react-native';
 import type {
   ChargeIntent,
   FrameCartItem,
@@ -101,8 +101,18 @@ export function presentCart(options: {
 export function presentOnboarding(options: {
   accountId?: string | null;
   capabilities?: OnboardingCapability[];
+  applePayMerchantId?: string | null;
 }): Promise<OnboardingResult> {
   guardInitialized();
+  if (Platform.OS === 'ios' && options.applePayMerchantId) {
+    return wrapPromise(
+      FrameSDK.presentOnboardingWithApplePay(
+        options.accountId ?? null,
+        options.capabilities ?? [],
+        options.applePayMerchantId
+      )
+    );
+  }
   return wrapPromise(
     FrameSDK.presentOnboarding(
       options.accountId ?? null,