framepayments-react-native 2.1.1 → 2.1.3

package/android/src/main/java/com/framepayments/reactnativeframe/FrameSDKModule.kt

@@ -50,7 +50,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
   }
 
   @ReactMethod
-  fun presentCheckout(customerId: String?, amount: Double, promise: Promise) {
+  fun presentCheckout(accountId: String?, amount: Double, promise: Promise) {
     val activity = reactApplicationContext.currentActivity ?: run {
       promise.reject("NO_ACTIVITY", "No current activity", null)
       return
@@ -58,7 +58,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     checkoutPromise = promise
     activity.runOnUiThread {
       val intent = Intent(activity, FrameCheckoutActivity::class.java).apply {
-        putExtra(FrameCheckoutActivity.EXTRA_CUSTOMER_ID, customerId)
+        putExtra(FrameCheckoutActivity.EXTRA_ACCOUNT_ID, accountId)
         putExtra(FrameCheckoutActivity.EXTRA_AMOUNT, amount.toInt())
       }
       activity.startActivityForResult(intent, FrameCheckoutActivity.REQUEST_CODE)
@@ -67,7 +67,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
 
   @ReactMethod
   fun presentCart(
-    customerId: String?,
+    accountId: String?,
     items: com.facebook.react.bridge.ReadableArray,
     shippingAmountInCents: Double,
     promise: Promise
@@ -83,7 +83,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     cartPromise = promise
     activity.runOnUiThread {
       val intent = Intent(activity, FrameFlowActivity::class.java).apply {
-        putExtra(FrameFlowActivity.EXTRA_CUSTOMER_ID, customerId)
+        putExtra(FrameFlowActivity.EXTRA_ACCOUNT_ID, accountId)
         putExtra(FrameFlowActivity.EXTRA_ITEMS_JSON, itemsJson)
         putExtra(FrameFlowActivity.EXTRA_SHIPPING_CENTS, shippingAmountInCents.toInt())
       }
@@ -94,7 +94,8 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun presentGooglePay(
     amountCents: Double,
-    customerId: String?,
+    ownerType: String?,
+    ownerId: String?,
     currencyCode: String?,
     googlePayMerchantId: String?,
     promise: Promise
@@ -108,6 +109,14 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
       promise.reject("INVALID_AMOUNT", "amountCents must be positive", null)
       return
     }
+    if (ownerType != "customer" && ownerType != "account") {
+      promise.reject("INVALID_OWNER", "owner.type must be 'customer' or 'account'", null)
+      return
+    }
+    if (ownerId.isNullOrEmpty()) {
+      promise.reject("INVALID_OWNER", "owner.id is required", null)
+      return
+    }
     googlePayPromise = promise
     pendingGooglePayCallback = { resultCode, data ->
       handleGooglePayResult(resultCode, data)
@@ -115,7 +124,8 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     activity.runOnUiThread {
       val intent = Intent(activity, FrameGooglePayActivity::class.java).apply {
         putExtra(FrameGooglePayActivity.EXTRA_AMOUNT_CENTS, amountInt)
-        putExtra(FrameGooglePayActivity.EXTRA_CUSTOMER_ID, customerId)
+        putExtra(FrameGooglePayActivity.EXTRA_OWNER_TYPE, ownerType)
+        putExtra(FrameGooglePayActivity.EXTRA_OWNER_ID, ownerId)
         putExtra(FrameGooglePayActivity.EXTRA_CURRENCY, currencyCode ?: "USD")
         putExtra(FrameGooglePayActivity.EXTRA_MERCHANT_ID, googlePayMerchantId)
       }
@@ -182,17 +192,11 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     val promise = checkoutPromise ?: return
     checkoutPromise = null
     if (resultCode == Activity.RESULT_OK && data != null) {
-      val json = data.getStringExtra(FrameCheckoutActivity.EXTRA_CHARGE_INTENT_JSON)
-      if (json != null) {
-        try {
-          val obj = JSONObject(json)
-          val map = jsonObjectToWritableMap(obj)
-          promise.resolve(map)
-        } catch (e: Exception) {
-          promise.reject("PARSE_ERROR", e.message, e)
-        }
+      val transferId = data.getStringExtra(FrameCheckoutActivity.EXTRA_TRANSFER_ID)
+      if (!transferId.isNullOrEmpty()) {
+        promise.resolve(transferId)
       } else {
-        promise.reject("NO_RESULT", "No charge intent in result", null)
+        promise.reject("NO_RESULT", "No transfer id in result", null)
       }
     } else {
       promise.reject("USER_CANCELED", "User cancelled checkout", null)
@@ -203,17 +207,11 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     val promise = cartPromise ?: return
     cartPromise = null
     if (resultCode == Activity.RESULT_OK && data != null) {
-      val json = data.getStringExtra(FrameFlowActivity.EXTRA_CHARGE_INTENT_JSON)
-      if (json != null) {
-        try {
-          val obj = JSONObject(json)
-          val map = jsonObjectToWritableMap(obj)
-          promise.resolve(map)
-        } catch (e: Exception) {
-          promise.reject("PARSE_ERROR", e.message, e)
-        }
+      val transferId = data.getStringExtra(FrameFlowActivity.EXTRA_TRANSFER_ID)
+      if (!transferId.isNullOrEmpty()) {
+        promise.resolve(transferId)
       } else {
-        promise.reject("NO_RESULT", "No charge intent in result", null)
+        promise.reject("NO_RESULT", "No transfer id in result", null)
       }
     } else {
       promise.reject("USER_CANCELED", "User cancelled", null)
@@ -225,16 +223,11 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     googlePayPromise = null
     when (resultCode) {
       Activity.RESULT_OK -> {
-        val json = data?.getStringExtra(FrameGooglePayActivity.EXTRA_CHARGE_INTENT_JSON)
-        if (json != null) {
-          try {
-            val map = jsonObjectToWritableMap(JSONObject(json))
-            promise.resolve(map)
-          } catch (e: Exception) {
-            promise.reject("PARSE_ERROR", e.message, e)
-          }
+        val id = data?.getStringExtra(FrameGooglePayActivity.EXTRA_CHARGE_ID)
+        if (id.isNullOrEmpty()) {
+          promise.reject("NO_RESULT", "Google Pay returned no charge id", null)
         } else {
-          promise.reject("NO_RESULT", "No charge intent in result", null)
+          promise.resolve(id)
         }
       }
       FrameGooglePayActivity.RESULT_FAILURE -> {

package/ios/ApplePayPresenter.swift

@@ -3,10 +3,14 @@
 //  FrameReactNative
 //
 //  Programmatic Apple Pay presentation for Frame.presentApplePay(). Wraps
-//  PKPaymentAuthorizationController + ApplePayAPI + ChargeIntentsAPI directly
-//  so we can detect the user-cancel path (PKPaymentAuthorizationController's
-//  didFinish fires for both success and cancel; the underlying SDK's view
-//  model only delivers success, so we re-implement that flow here).
+//  PKPaymentAuthorizationController + ApplePayAPI + (ChargeIntentsAPI | TransfersAPI)
+//  directly so we can detect the user-cancel path — PKPaymentAuthorizationController's
+//  didFinish fires for both success and cancel, and the underlying SDK's view
+//  model only delivers success, so we re-implement that flow here.
+//
+//  Supports both:
+//   - `.customer(id)` owner → creates a `ChargeIntent`; resolves with the ChargeIntent id.
+//   - `.account(id)`  owner → creates a `Transfer`;     resolves with the Transfer id.
 //
 
 import Foundation
@@ -16,9 +20,14 @@ import Frame
 @MainActor
 final class ApplePayPresenter: NSObject, PKPaymentAuthorizationControllerDelegate {
 
+  enum Owner {
+    case customer(String)
+    case account(String)
+  }
+
   private let amount: Int
   private let currency: String
-  private let owner: FrameApplePayViewModel.PaymentMethodOwner
+  private let owner: Owner
   private let merchantId: String
   private let resolve: (Any?) -> Void
   private let reject: (String, String, Error?) -> Void
@@ -36,7 +45,7 @@ final class ApplePayPresenter: NSObject, PKPaymentAuthorizationControllerDelegat
 
   init(amount: Int,
        currency: String,
-       owner: FrameApplePayViewModel.PaymentMethodOwner,
+       owner: Owner,
        merchantId: String,
        resolve: @escaping (Any?) -> Void,
        reject: @escaping (String, String, Error?) -> Void) {
@@ -80,6 +89,8 @@ final class ApplePayPresenter: NSObject, PKPaymentAuthorizationControllerDelegat
     didAuthorizePayment payment: PKPayment
   ) async -> PKPaymentAuthorizationResult {
     do {
+      // 1. Create the Frame PaymentMethod from the Apple Pay token, scoped to
+      //    whichever owner the caller asked for.
       let (paymentMethod, methodError): (FrameObjects.PaymentMethod?, NetworkingError?)
       switch owner {
       case .customer(let customerId):
@@ -97,27 +108,45 @@ final class ApplePayPresenter: NSObject, PKPaymentAuthorizationControllerDelegat
         return PKPaymentAuthorizationResult(status: .failure, errors: nil)
       }
 
-      let request: ChargeIntentsRequests.CreateChargeIntentRequest
+      // 2. Create the charge. Customer owners produce a ChargeIntent; account
+      //    owners produce a Transfer. Both surface the resulting id to JS — the
+      //    caller knows which resource the id refers to based on the owner.
       switch owner {
       case .customer(let customerId):
-        request = ChargeIntentsRequests.CreateChargeIntentRequest(
-          amount: amount, currency: currency, customer: customerId,
-          paymentMethod: paymentMethodId, confirm: true, authorizationMode: .automatic
+        let request = ChargeIntentsRequests.CreateChargeIntentRequest(
+          amount: amount,
+          currency: currency,
+          customer: customerId,
+          paymentMethod: paymentMethodId,
+          confirm: true,
+          authorizationMode: .automatic
         )
+        let (chargeIntent, chargeError) = try await ChargeIntentsAPI.createChargeIntent(request: request)
+
+        if let chargeIntent {
+          deliverSuccess(id: chargeIntent.id)
+          return PKPaymentAuthorizationResult(status: .success, errors: nil)
+        } else {
+          deliverFailure(code: "PAYMENT_FAILED", error: chargeError)
+          return PKPaymentAuthorizationResult(status: .failure, errors: nil)
+        }
+
       case .account(let accountId):
-        request = ChargeIntentsRequests.CreateChargeIntentRequest(
-          amount: amount, currency: currency, account: accountId,
-          paymentMethod: paymentMethodId, confirm: true, authorizationMode: .automatic
+        let request = TransferRequests.CreateTransferRequest(
+          amount: amount,
+          accountId: accountId,
+          currency: currency,
+          sourcePaymentMethodId: paymentMethodId
         )
-      }
-      let (chargeIntent, chargeError) = try await ChargeIntentsAPI.createChargeIntent(request: request)
-
-      if let chargeIntent {
-        deliverSuccess(chargeIntent)
-        return PKPaymentAuthorizationResult(status: .success, errors: nil)
-      } else {
-        deliverFailure(code: "CHARGE_INTENT_FAILED", error: chargeError)
-        return PKPaymentAuthorizationResult(status: .failure, errors: nil)
+        let (transfer, transferError) = try await TransfersAPI.createTransfer(request: request)
+
+        if let transfer {
+          deliverSuccess(id: transfer.id)
+          return PKPaymentAuthorizationResult(status: .success, errors: nil)
+        } else {
+          deliverFailure(code: "PAYMENT_FAILED", error: transferError)
+          return PKPaymentAuthorizationResult(status: .failure, errors: nil)
+        }
       }
     } catch {
       deliverFailure(code: "PAYMENT_FAILED", error: error)
@@ -136,14 +165,10 @@ final class ApplePayPresenter: NSObject, PKPaymentAuthorizationControllerDelegat
 
   // MARK: - Result delivery
 
-  private func deliverSuccess(_ intent: FrameObjects.ChargeIntent) {
+  private func deliverSuccess(id: String) {
     guard !didDeliverResult else { return }
     didDeliverResult = true
-    if let dict = FrameSDKBridge.encodeChargeIntent(intent) {
-      resolve(dict)
-    } else {
-      reject("ENCODE_ERROR", "Failed to encode charge intent", nil)
-    }
+    resolve(id)
   }
 
   private func deliverFailure(code: String, error: Error?) {

package/ios/FrameSDKBridge.m

@@ -32,12 +32,12 @@ RCT_EXTERN_METHOD(initialize:(NSString *)secretKey
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(presentCheckout:(id)customerId
+RCT_EXTERN_METHOD(presentCheckout:(id)accountId
                   amount:(nonnull NSNumber *)amount
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(presentCart:(id)customerId
+RCT_EXTERN_METHOD(presentCart:(id)accountId
                   items:(NSArray *)items
                   shippingAmountInCents:(nonnull NSNumber *)shippingAmountInCents
                   resolver:(RCTPromiseResolveBlock)resolve
@@ -72,26 +72,26 @@ RCT_EXTERN_METHOD(presentApplePay:(NSString *)ownerType
   [[[ObjCFrameSDKBridge alloc] init] initialize:secretKey publishableKey:publishableKey debugMode:debugMode theme:theme resolver:resolve rejecter:reject];
 }
 
-- (void)presentCheckout:(id)customerId amount:(NSNumber *)amount resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
+- (void)presentCheckout:(id)accountId amount:(NSNumber *)amount 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 checkout", nil);
       return;
     }
-    NSString *cId = [customerId isKindOfClass:[NSString class]] ? (NSString *)customerId : nil;
-    [[[ObjCFrameSDKBridge alloc] init] presentCheckoutFrom:topVC customerId:cId amount:amount.intValue resolver:resolve rejecter:reject];
+    NSString *aId = [accountId isKindOfClass:[NSString class]] ? (NSString *)accountId : nil;
+    [[[ObjCFrameSDKBridge alloc] init] presentCheckoutFrom:topVC accountId:aId amount:amount.intValue resolver:resolve rejecter:reject];
   });
 }
 
-- (void)presentCart:(id)customerId items:(NSArray *)items shippingAmountInCents:(NSNumber *)shippingAmountInCents resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
+- (void)presentCart:(id)accountId items:(NSArray *)items shippingAmountInCents:(NSNumber *)shippingAmountInCents 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 cart", nil);
       return;
     }
-    [[[ObjCFrameSDKBridge alloc] init] presentCartFrom:topVC customerId:customerId items:items shippingAmountInCents:shippingAmountInCents.integerValue resolver:resolve rejecter:reject];
+    [[[ObjCFrameSDKBridge alloc] init] presentCartFrom:topVC accountId:accountId items:items shippingAmountInCents:shippingAmountInCents.integerValue resolver:resolve rejecter:reject];
   });
 }
 

package/ios/FrameSDKBridge.swift

@@ -30,17 +30,25 @@ public class FrameSDKBridge: NSObject {
   }
 
   @objc public
-  func presentCheckout(from viewController: UIViewController, customerId: String?, amount: Int, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
-    presentCheckoutOnMain(from: viewController, customerId: customerId, amount: amount, resolve: resolve, reject: reject)
+  func presentCheckout(from viewController: UIViewController, accountId: String?, amount: Int, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+    guard let accountId, !accountId.isEmpty else {
+      reject("INVALID_ACCOUNT", "Frame.presentCheckout requires a non-empty accountId", nil)
+      return
+    }
+    presentCheckoutOnMain(from: viewController, accountId: accountId, amount: amount, resolve: resolve, reject: reject)
   }
 
   @objc public
-  func presentCart(from viewController: UIViewController, customerId: NSObject?, items: NSArray, shippingAmountInCents: Int, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+  func presentCart(from viewController: UIViewController, accountId: NSObject?, items: NSArray, shippingAmountInCents: Int, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
     guard let cartItems = parseCartItems(items) else {
       reject("INVALID_ITEMS", "Invalid cart items array", nil)
       return
     }
-    presentCartOnMain(from: viewController, customerId: customerId as? String, cartItems: cartItems, shippingAmountInCents: shippingAmountInCents, resolve: resolve, reject: reject)
+    guard let accountIdString = accountId as? String, !accountIdString.isEmpty else {
+      reject("INVALID_ACCOUNT", "Frame.presentCart requires a non-empty accountId", nil)
+      return
+    }
+    presentCartOnMain(from: viewController, accountId: accountIdString, cartItems: cartItems, shippingAmountInCents: shippingAmountInCents, resolve: resolve, reject: reject)
   }
 
   @objc public
@@ -55,10 +63,10 @@ public class FrameSDKBridge: NSObject {
   func presentApplePay(_ ownerType: String, ownerId: String, amount: Int, currency: String, merchantId: String, resolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
     DispatchQueue.main.async {
       Task { @MainActor in
-        let owner: FrameApplePayViewModel.PaymentMethodOwner
+        let owner: ApplePayPresenter.Owner
         switch ownerType {
         case "customer": owner = .customer(ownerId)
-        case "account": owner = .account(ownerId)
+        case "account":  owner = .account(ownerId)
         default:
           reject("INVALID_OWNER", "owner.type must be 'customer' or 'account'", nil)
           return
@@ -97,19 +105,19 @@ public class FrameSDKBridge: NSObject {
 
   // MARK: - Private helpers
 
-  private func presentCheckoutOnMain(from top: UIViewController, customerId: String?, amount: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+  private func presentCheckoutOnMain(from top: UIViewController, accountId: String, amount: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
     var hosting: CheckoutHostingController!
     hosting = CheckoutHostingController(rootView: FrameCheckoutView(
-      customerId: customerId,
+      accountId: accountId,
       paymentAmount: amount,
-      checkoutCallback: { [weak hosting] chargeIntent in
+      checkoutCallback: { [weak hosting] success, transferId in
         hosting?.didComplete = true
         top.dismiss(animated: true)
         DispatchQueue.main.async {
-          if let dict = Self.encodeChargeIntent(chargeIntent) {
-            resolve(dict)
+          if success, let transferId {
+            resolve(transferId)
           } else {
-            reject("ENCODE_ERROR", "Failed to encode charge intent", nil)
+            reject("PAYMENT_FAILED", "Checkout did not produce a transfer id", nil)
           }
         }
       }
@@ -128,11 +136,6 @@ public class FrameSDKBridge: NSObject {
     }
   }
 
-  internal static func encodeChargeIntent(_ intent: FrameObjects.ChargeIntent) -> [String: Any]? {
-    guard let data = try? JSONEncoder().encode(intent) else { return nil }
-    return try? JSONSerialization.jsonObject(with: data) as? [String: Any]
-  }
-
   private struct RNFrameCartItem: FrameCartItem {
     var id: String
     var imageURL: String
@@ -163,19 +166,29 @@ public class FrameSDKBridge: NSObject {
     return result
   }
 
-  private func presentCartOnMain(from top: UIViewController, customerId: String?, cartItems: [RNFrameCartItem], shippingAmountInCents: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+  private func presentCartOnMain(from top: UIViewController, accountId: String, cartItems: [RNFrameCartItem], shippingAmountInCents: Int, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    // Single dismiss delegate guards against double-resolve: the inner checkout
+    // calls `finish(.success)` with the transfer id; bare-dismiss (swipe-down
+    // without completing checkout) calls `finish(.cancel)`.
+    let delegate = CartDismissDelegate(resolve: resolve, reject: reject)
     let cartView = FrameCartView(
-      customer: nil,
+      accountId: accountId,
       cartItems: cartItems,
-      shippingAmountInCents: shippingAmountInCents
+      shippingAmountInCents: shippingAmountInCents,
+      checkoutCallback: { [weak top, delegate] success, transferId in
+        if success, let transferId {
+          delegate.finish(.success(transferId))
+        } else {
+          delegate.finish(.cancel)
+        }
+        top?.dismiss(animated: true)
+      }
     )
     let hosting = UIHostingController(rootView: cartView)
     hosting.modalPresentationStyle = UIModalPresentationStyle.pageSheet
     if let sheet = hosting.sheetPresentationController {
       sheet.detents = [UISheetPresentationController.Detent.large()]
     }
-    // When the sheet is dismissed (swipe or close), resolve. Note: FrameCartView does not expose ChargeIntent from nested checkout.
-    let delegate = CartDismissDelegate(resolve: resolve)
     objc_setAssociatedObject(hosting, &cartDismissKey, delegate, .OBJC_ASSOCIATION_RETAIN)
     top.present(hosting, animated: true) {
       hosting.presentationController?.delegate = delegate
@@ -237,12 +250,8 @@ private final class CheckoutHostingController: UIHostingController<FrameCheckout
     onCancel?()
   }
 
-  override func viewDidDisappear(_ animated: Bool) {
-    super.viewDidDisappear(animated)
-    cancel()
-  }
-
   func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+    guard presentationController.presentedViewController === self else { return }
     cancel()
   }
 }
@@ -254,13 +263,34 @@ private final class OnboardingHostingController<V: View>: UIHostingController<V>
 // MARK: - Delegates
 
 private final class CartDismissDelegate: NSObject, UIAdaptivePresentationControllerDelegate {
-  let resolve: RCTPromiseResolveBlock
-  init(resolve: @escaping RCTPromiseResolveBlock) { self.resolve = resolve }
-  func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
-    DispatchQueue.main.async { [resolve] in
-      resolve([String: Any]())
+  enum Outcome {
+    case success(String)
+    case cancel
+  }
+
+  private let resolve: RCTPromiseResolveBlock
+  private let reject: RCTPromiseRejectBlock
+  private var didFinish = false
+
+  init(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
+    self.resolve = resolve
+    self.reject = reject
+  }
+
+  func finish(_ outcome: Outcome) {
+    guard !didFinish else { return }
+    didFinish = true
+    DispatchQueue.main.async { [resolve, reject] in
+      switch outcome {
+      case .success(let transferId): resolve(transferId)
+      case .cancel: reject("USER_CANCELED", "User dismissed cart without completing checkout", nil)
+      }
     }
   }
+
+  func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+    finish(.cancel)
+  }
 }
 
 private final class OnboardingDismissDelegate: NSObject, UIAdaptivePresentationControllerDelegate {

package/lib/errors.d.ts

@@ -7,12 +7,20 @@ export declare const ErrorCodes: {
     readonly NO_ROOT_VC: "NO_ROOT_VC";
     readonly NO_ACTIVITY: "NO_ACTIVITY";
     readonly INVALID_ITEMS: "INVALID_ITEMS";
+    readonly INVALID_ACCOUNT: "INVALID_ACCOUNT";
+    readonly INVALID_OWNER: "INVALID_OWNER";
+    readonly INVALID_MERCHANT_ID: "INVALID_MERCHANT_ID";
+    readonly INVALID_AMOUNT: "INVALID_AMOUNT";
     readonly NETWORK_ERROR: "NETWORK_ERROR";
     readonly API_ERROR: "API_ERROR";
     readonly PARSE_ERROR: "PARSE_ERROR";
     readonly NO_RESULT: "NO_RESULT";
     readonly INIT_FAILED: "INIT_FAILED";
-    readonly ENCODE_ERROR: "ENCODE_ERROR";
+    readonly APPLE_PAY_UNAVAILABLE: "APPLE_PAY_UNAVAILABLE";
+    readonly GOOGLE_PAY_UNAVAILABLE: "GOOGLE_PAY_UNAVAILABLE";
+    readonly NOT_ATTESTED: "NOT_ATTESTED";
+    readonly PAYMENT_METHOD_FAILED: "PAYMENT_METHOD_FAILED";
+    readonly PAYMENT_FAILED: "PAYMENT_FAILED";
 };
 export type FrameErrorCode = (typeof ErrorCodes)[keyof typeof ErrorCodes];
 export interface FrameErrorShape {

package/lib/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;;;CAYb,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CASrE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,eAAe,CAetE"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../src/errors.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;CAoBb,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,UAAU,CAAC,CAAC,MAAM,OAAO,UAAU,CAAC,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,eAAe,CASrE;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,OAAO,GAAG,eAAe,CAetE"}

package/lib/errors.js

@@ -7,12 +7,20 @@ export const ErrorCodes = {
     NO_ROOT_VC: 'NO_ROOT_VC',
     NO_ACTIVITY: 'NO_ACTIVITY',
     INVALID_ITEMS: 'INVALID_ITEMS',
+    INVALID_ACCOUNT: 'INVALID_ACCOUNT',
+    INVALID_OWNER: 'INVALID_OWNER',
+    INVALID_MERCHANT_ID: 'INVALID_MERCHANT_ID',
+    INVALID_AMOUNT: 'INVALID_AMOUNT',
     NETWORK_ERROR: 'NETWORK_ERROR',
     API_ERROR: 'API_ERROR',
     PARSE_ERROR: 'PARSE_ERROR',
     NO_RESULT: 'NO_RESULT',
     INIT_FAILED: 'INIT_FAILED',
-    ENCODE_ERROR: 'ENCODE_ERROR',
+    APPLE_PAY_UNAVAILABLE: 'APPLE_PAY_UNAVAILABLE',
+    GOOGLE_PAY_UNAVAILABLE: 'GOOGLE_PAY_UNAVAILABLE',
+    NOT_ATTESTED: 'NOT_ATTESTED',
+    PAYMENT_METHOD_FAILED: 'PAYMENT_METHOD_FAILED',
+    PAYMENT_FAILED: 'PAYMENT_FAILED',
 };
 export function isFrameError(error) {
     return (typeof error === 'object' &&

package/lib/index.d.ts

@@ -9,7 +9,7 @@
  */
 import { initialize, presentCheckout, presentCart, presentOnboarding, presentApplePay, presentGooglePay } from './native';
 export { initialize, presentCheckout, presentCart, presentOnboarding, presentApplePay, presentGooglePay, } from './native';
-export type { FrameCartItem, ChargeIntent, ChargeIntentStatus, AuthorizationMode, FrameError, BillingAddress, PaymentCard, BankAccount, PaymentMethod, OnboardingCapability, OnboardingResult, OnboardingResultStatus, ApplePayOwner, PresentApplePayOptions, PresentGooglePayOptions, FrameTheme, FrameThemeColor, FrameThemeFont, FrameThemeColors, FrameThemeFonts, FrameThemeRadii, } from './types';
+export type { FrameCartItem, FrameError, BillingAddress, PaymentCard, BankAccount, PaymentMethod, OnboardingCapability, OnboardingResult, OnboardingResultStatus, WalletOwner, ApplePayOwner, PresentApplePayOptions, PresentGooglePayOptions, FrameTheme, FrameThemeColor, FrameThemeFont, FrameThemeColors, FrameThemeFonts, FrameThemeRadii, } from './types';
 export { ErrorCodes } from './errors';
 export type { FrameErrorShape, FrameErrorCode } from './errors';
 /** Default export for Frame.initialize(), Frame.presentCheckout(), Frame.presentCart(), Frame.presentOnboarding(), Frame.presentApplePay(), Frame.presentGooglePay() */

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,UAAU,EACV,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,UAAU,EACV,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,eAAe,EACf,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAClB,YAAY,EACV,aAAa,EACb,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,UAAU,EACV,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,aAAa,EACb,sBAAsB,EACtB,uBAAuB,EACvB,UAAU,EACV,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,eAAe,GAChB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEhE,wKAAwK;;;;;;;;;AACxK,wBAOE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EACL,UAAU,EACV,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EACjB,MAAM,UAAU,CAAC;AAElB,OAAO,EACL,UAAU,EACV,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,eAAe,EACf,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAClB,YAAY,EACV,aAAa,EACb,UAAU,EACV,cAAc,EACd,WAAW,EACX,WAAW,EACX,aAAa,EACb,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,WAAW,EACX,aAAa,EACb,sBAAsB,EACtB,uBAAuB,EACvB,UAAU,EACV,eAAe,EACf,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,eAAe,GAChB,MAAM,SAAS,CAAC;AACjB,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AACtC,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAEhE,wKAAwK;;;;;;;;;AACxK,wBAOE"}

package/lib/native.d.ts

@@ -1,7 +1,7 @@
 /**
  * Native module bridge. Uses NativeModules for classic React Native bridge.
  */
-import type { ChargeIntent, FrameCartItem, FrameTheme, OnboardingCapability, OnboardingResult, PresentApplePayOptions, PresentGooglePayOptions } from './types';
+import type { FrameCartItem, FrameTheme, OnboardingCapability, OnboardingResult, PresentApplePayOptions, PresentGooglePayOptions } from './types';
 export declare function initialize(options: {
     secretKey: string;
     publishableKey: string;
@@ -14,21 +14,51 @@ export declare function initialize(options: {
      */
     theme?: FrameTheme;
 }): Promise<void>;
+/**
+ * Presents the Frame checkout sheet for the given account. Resolves with the
+ * created Transfer's id string on success, or rejects with `USER_CANCELED` if
+ * the user dismisses the sheet.
+ *
+ * `accountId` is required: the bundled checkout creates a `Transfer`, which is
+ * account-scoped. Callers needing a customer/ChargeIntent flow should use
+ * `presentApplePay` / `presentGooglePay` directly with a customer owner.
+ */
 export declare function presentCheckout(options: {
-    customerId?: string | null;
+    accountId: string;
     amount: number;
-}): Promise<ChargeIntent>;
+}): Promise<string>;
+/**
+ * Presents the Frame cart UI; tapping checkout routes through the same flow
+ * as `presentCheckout` and resolves with the created Transfer's id string.
+ *
+ * `accountId` is required for the same reason as `presentCheckout`.
+ */
 export declare function presentCart(options: {
-    customerId?: string | null;
+    accountId: string;
     items: FrameCartItem[];
     shippingAmountInCents: number;
-}): Promise<ChargeIntent>;
+}): Promise<string>;
 export declare function presentOnboarding(options: {
     accountId?: string | null;
     capabilities?: OnboardingCapability[];
     applePayMerchantId?: string | null;
     googlePayMerchantId?: string | null;
 }): Promise<OnboardingResult>;
-export declare function presentApplePay(options: PresentApplePayOptions): Promise<ChargeIntent>;
-export declare function presentGooglePay(options: PresentGooglePayOptions): Promise<ChargeIntent>;
+/**
+ * Presents the Apple Pay sheet and creates a charge from the resulting wallet
+ * payment method. Resolves with the created resource's id string on success,
+ * or rejects with `USER_CANCELED` if the sheet is dismissed.
+ *
+ *  - `owner.type === 'customer'` → creates a `ChargeIntent`; resolves with its id.
+ *  - `owner.type === 'account'`  → creates a `Transfer`;     resolves with its id.
+ */
+export declare function presentApplePay(options: PresentApplePayOptions): Promise<string>;
+/**
+ * Presents Google Pay and creates a charge from the resulting wallet payment method.
+ * Resolves with the created resource's id string on success.
+ *
+ *  - `owner.type === 'customer'` → creates a `ChargeIntent`; resolves with its id.
+ *  - `owner.type === 'account'`  → creates a `Transfer`;     resolves with its id.
+ */
+export declare function presentGooglePay(options: PresentGooglePayOptions): Promise<string>;
 //# sourceMappingURL=native.d.ts.map

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;AAsBjB,wBAAgB,UAAU,CAAC,OAAO,EAAE;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBhB;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"}
+{"version":3,"file":"native.d.ts","sourceRoot":"","sources":["../src/native.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH,OAAO,KAAK,EACV,aAAa,EACb,UAAU,EACV,oBAAoB,EACpB,gBAAgB,EAChB,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,SAAS,CAAC;AAiCjB,wBAAgB,UAAU,CAAC,OAAO,EAAE;IAClC,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;OAKG;IACH,KAAK,CAAC,EAAE,UAAU,CAAC;CACpB,GAAG,OAAO,CAAC,IAAI,CAAC,CAoBhB;AAwBD;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACvC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;CAChB,GAAG,OAAO,CAAC,MAAM,CAAC,CAQlB;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IACnC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,aAAa,EAAE,CAAC;IACvB,qBAAqB,EAAE,MAAM,CAAC;CAC/B,GAAG,OAAO,CAAC,MAAM,CAAC,CAYlB;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;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,MAAM,CAAC,CAoBhF;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,MAAM,CAAC,CAiBlF"}