framepayments-react-native 2.2.1 → 3.0.1

package/FrameReactNative.podspec

@@ -0,0 +1,44 @@
+require 'json'
+
+package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
+
+Pod::Spec.new do |s|
+  s.name         = 'FrameReactNative'
+  s.version      = package['version']
+  s.summary      = package['description']
+  s.homepage     = package['homepage']
+  s.license      = package['license']
+  s.authors      = package['author']
+  s.platforms    = { :ios => '17.0' }
+  s.source       = { :git => package['repository']['url'], :tag => "#{s.version}" }
+  s.source_files = 'ios/**/*.{h,m,mm,swift}'
+  s.requires_arc = true
+
+  # static_framework exposes the pod's generated `FrameReactNative-Swift.h` to
+  # consumers — required so host AppDelegate.mm can `#import <FrameReactNative/FrameReactNative-Swift.h>`
+  # to reach `FramePreloader`.
+  s.static_framework = true
+
+  s.dependency 'React-Core'
+
+  # Autolink Frame-iOS (SPM-only) via RN 0.81+'s Podfile SPM hook. spm.rb injects
+  # XCRemoteSwiftPackageReferences into Pods.xcodeproj at react_native_post_install;
+  # consumers get Frame-iOS + Frame-Onboarding resolved by `pod install` alone.
+  #
+  # The respond_to? guards use `include_private: true` because both helpers are
+  # top-level Ruby `def`s in react_native_pods.rb — i.e. private methods of Object.
+  # The guards exist not for RN-version compatibility (peer dep is >= 0.81) but
+  # because the RN CLI loads this podspec STANDALONE for autolinking discovery,
+  # outside the Podfile's `require 'react_native_pods.rb'` context where the
+  # helpers are defined. Without guards, `npx react-native config` would crash
+  # and return `ios: null`, breaking `use_native_modules!`.
+  if respond_to?(:spm_dependency, true)
+    spm_dependency(s,
+      url: 'https://github.com/Frame-Payments/frame-ios',
+      requirement: { kind: 'upToNextMajorVersion', minimumVersion: package['frameNativeVersions']['ios'] },
+      products: ['Frame-iOS', 'Frame-Onboarding']
+    )
+  end
+
+  install_modules_dependencies(s) if respond_to?(:install_modules_dependencies, true)
+end

package/Package.swift

@@ -0,0 +1,47 @@
+// swift-tools-version: 5.9
+// Distribution paths:
+//   • Pure-SPM consumers: add framepayments-react-native via Swift Package Manager;
+//     frame-ios resolves transitively from this manifest.
+//   • CocoaPods consumers (the common RN setup): the podspec at
+//     ios/FrameReactNative.podspec declares the same frame-ios SPM dependency via
+//     RN 0.81+'s `spm_dependency` Podfile hook, so `pod install` resolves it
+//     automatically — no Xcode "Add Package Dependencies" step required.
+//
+// IMPORTANT: keep the frame-ios version below in sync with
+// package.json:frameNativeVersions.ios. Swift Package manifests cannot read JSON,
+// so this is the one duplicated version pin. See MAINTAINING.md.
+
+import PackageDescription
+
+let package = Package(
+    name: "framepayments-react-native",
+    platforms: [
+        .iOS(.v17)
+    ],
+    products: [
+        .library(
+            name: "framepayments-react-native",
+            targets: ["framepayments-react-native"]
+        )
+    ],
+    dependencies: [
+        .package(
+            url: "https://github.com/Frame-Payments/frame-ios",
+            from: "2.2.3" // Keep in sync with package.json:frameNativeVersions.ios
+        )
+    ],
+    targets: [
+        .target(
+            name: "framepayments-react-native",
+            dependencies: [
+                .product(name: "Frame-iOS", package: "frame-ios"),
+                .product(name: "Frame-Onboarding", package: "frame-ios")
+            ],
+            path: "ios",
+            publicHeadersPath: ".",
+            cSettings: [
+                .headerSearchPath(".")
+            ]
+        )
+    ]
+)

package/README.md

@@ -4,7 +4,7 @@ React Native SDK for [Frame Payments](https://framepayments.com). Bridges the na
 
 ## Requirements
 
-- React Native >= 0.74
+- React Native >= 0.81 (autolinking on iOS depends on RN's `spm_dependency` Podfile hook, which stabilized in 0.81)
 - iOS 17+ / Android 8.0+ (API 26+)
 - A [Frame](https://framepayments.com) account and API key
 
@@ -18,19 +18,13 @@ yarn add framepayments-react-native
 
 ### iOS setup
 
-#### 1. Add the Frame iOS SDK via Swift Package Manager
-
-The React Native SDK's native layer depends on the Frame iOS SDK, which must be added manually via SPM — CocoaPods cannot pull it in automatically.
-
-In Xcode: **File → Add Package Dependencies**, enter:
-
-```
-https://github.com/Frame-Payments/frame-ios
+```bash
+cd ios && pod install && cd ..
 ```
 
-Add the **Frame-iOS** package and select the version you need.
+That's it. `pod install` autolinks the React Native bridge **and** resolves the underlying Frame iOS SDK (Frame-iOS + Frame-Onboarding) via Swift Package Manager — no Xcode "Add Package Dependencies" step required.
 
-#### 2. Preload Frame on the main thread
+#### Preload Frame on the main thread
 
 Add this to your `AppDelegate.m` or `AppDelegate.mm` **before** `[super application:didFinishLaunchingWithOptions:]`:
 
@@ -48,15 +42,11 @@ This prevents the **"Helpers are not supported by the default hub"** crash, whic
 
 > If your app module name isn't the default (i.e., not matching the generated `-Swift.h` header), set `FRAME_SWIFT_HEADER=YourApp-Swift.h` in your target's **Preprocessor Macros** in Xcode build settings.
 
-#### 3. Install pods
-
-```bash
-cd ios && pod install && cd ..
-```
+> Using Swift Package Manager directly instead of CocoaPods? The package's `Package.swift` resolves `frame-ios` transitively, so just add `framepayments-react-native` via **File → Add Package Dependencies** in Xcode.
 
 ### Android setup
 
-No extra steps required. Autolinking handles the native module automatically.
+No extra steps required. Autolinking handles the native module automatically and pulls in `com.framepayments:framesdk*` from Maven Central.
 
 ---
 
@@ -101,6 +91,8 @@ Initializes the native SDK. Must be called before any `present*` method. Call on
 await Frame.initialize({
   secretKey: 'sk_sandbox_...',      // your Frame secret key
   publishableKey: 'pk_sandbox_...', // your Frame publishable key
+  applePayMerchantId: 'merchant.com.yourapp', // optional — see Apple Pay section
+  googlePayMerchantId: 'BCR2DN4T...',         // optional — see Google Pay section
   debugMode: false,                 // set true in development to enable native debug logging
 });
 ```
@@ -109,6 +101,8 @@ await Frame.initialize({
 |---|---|---|---|
 | `secretKey` | `string` | Yes | Your Frame secret key (`sk_…`). Used for server-style operations. |
 | `publishableKey` | `string` | Yes | Your Frame publishable key (`pk_…`). Used for client-side operations like wallet payments. |
+| `applePayMerchantId` | `string` | No | Apple Pay merchant identifier (`merchant.com.…`). Single source of truth for every Apple Pay surface — `presentApplePay`, the bundled checkout's wallet row, the onboarding wallet attach button. iOS-only; ignored on Android. |
+| `googlePayMerchantId` | `string` | No | Google Pay merchant identifier from the Google Pay & Wallet Console. Single source of truth for every Google Pay surface — `presentGooglePay`, the bundled checkout's wallet row, the onboarding wallet attach button. Android-only; ignored on iOS. |
 | `debugMode` | `boolean` | No | Enables native debug logging and routes wallet flows through sandbox/test environments. Default: `false`. |
 
 ---
@@ -194,7 +188,8 @@ 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`. |
+
+The Apple Pay / Google Pay wallet attach steps are rendered automatically when the corresponding merchant ID was passed to `Frame.initialize`. No per-call merchant params here.
 
 **`capabilities` values:**
 
@@ -227,6 +222,8 @@ if (result.status === 'completed') {
 
 Launches the native Apple Pay sheet, creates a Frame payment method from the authorized payment, and creates a charge against the owner. Resolves with the resulting resource's id string. Render your own button — Apple's `PKPaymentButton`, a community wrapper, or your own design-system component — and call this from its `onPress`.
 
+The Apple Pay merchant ID is configured **once** at `Frame.initialize({ applePayMerchantId })`; there is no per-call merchant parameter.
+
 The `owner` determines which downstream resource is created:
 
 - `owner.type === 'customer'` → creates a `ChargeIntent` against the customer; resolves with the ChargeIntent's `id`.
@@ -242,7 +239,6 @@ const transferId = await Frame.presentApplePay({
   amount: 15000,
   currency: 'usd',
   owner: { type: 'account', id: 'acct_xxx' },
-  merchantId: 'merchant.com.yourapp',
 });
 
 // Customer → ChargeIntent
@@ -250,7 +246,6 @@ const chargeIntentId = await Frame.presentApplePay({
   amount: 15000,
   currency: 'usd',
   owner: { type: 'customer', id: 'cus_xxx' },
-  merchantId: 'merchant.com.yourapp',
 });
 ```
 
@@ -259,23 +254,42 @@ const chargeIntentId = await Frame.presentApplePay({
 | `amount` | `number` | Yes | Payment amount in cents |
 | `currency` | `string` | No | ISO 4217 currency code. Default `'usd'` |
 | `owner` | `{ type: 'customer' \| 'account', id: string }` | Yes | Customer or account that owns the resulting payment method and charge |
-| `merchantId` | `string` | Yes | Apple Pay merchant ID configured in your Apple Developer account |
 
 **Returns:** `Promise<string>` — the created `ChargeIntent`'s `id` (for customer owners) or the `Transfer`'s `id` (for account owners).
 
-The promise rejects with `code: 'USER_CANCELED'` when the user dismisses the sheet, `'INVALID_OWNER'` if the owner is missing or malformed, `'APPLE_PAY_UNAVAILABLE'` if the device cannot make Apple Pay payments, `'NOT_ATTESTED'` if device attestation has not completed yet (try again in a moment), `'PAYMENT_METHOD_FAILED'` when the wallet payment method could not be persisted, and `'PAYMENT_FAILED'` when the downstream ChargeIntent or Transfer could not be created.
+The promise rejects with `code: 'USER_CANCELED'` when the user dismisses the sheet, `'INVALID_OWNER'` if the owner is missing or malformed, `'INVALID_MERCHANT_ID'` if `applePayMerchantId` was not configured at `Frame.initialize`, `'APPLE_PAY_UNAVAILABLE'` if the device cannot make Apple Pay payments, `'NOT_ATTESTED'` if device attestation has not completed yet (try again in a moment), `'PAYMENT_METHOD_FAILED'` when the wallet payment method could not be persisted, and `'PAYMENT_FAILED'` when the downstream ChargeIntent or Transfer could not be created.
+
+#### Required iOS setup
 
-**Required iOS setup:**
+Apple Pay setup is a four-part process: create a merchant ID with Apple, configure your Xcode project, pass the merchant ID to `Frame.initialize`, then **contact Frame** to enable the feature on your account.
 
-1. **Apple Pay capability + merchant ID.** Add Apple Pay in your target's *Signing & Capabilities*, and register a merchant ID in your Apple Developer account.
-2. **App Attest entitlement.** The Frame iOS SDK uses Apple's App Attest for device attestation on every Apple Pay payment. Add to your `.entitlements`:
+1. **Create a merchant identifier.** Sign in to [developer.apple.com → Certificates, Identifiers & Profiles → Identifiers → Merchant IDs](https://developer.apple.com/account/resources/identifiers/list/merchant), click **+**, choose **Merchant IDs**, and create one in reverse-DNS form (e.g. `merchant.com.yourapp`).
+2. **Add the Apple Pay capability in Xcode.** Open your project, select your **app target**, go to **Signing & Capabilities** → **+ Capability** → **Apple Pay**, and add the merchant ID you created in step 1. Xcode writes it into your entitlements file:
+   ```xml
+   <key>com.apple.developer.in-app-payments</key>
+   <array>
+       <string>merchant.com.yourapp</string>
+   </array>
+   ```
+3. **App Attest entitlement.** Frame uses Apple's App Attest for device attestation on every Apple Pay payment. Add to your `.entitlements`:
    ```xml
    <key>com.apple.developer.devicecheck.appattest-environment</key>
    <string>development</string>
    ```
-   Use `production` for App Store builds.
-3. **Real device required.** App Attest does not work in the simulator.
-4. **Frame dashboard configuration.** In your Frame dashboard, go to **Settings → Device Attestation** and set your Apple Team ID and the Bundle ID of your iOS app. These must exactly match the app you're running — the backend computes `SHA256("<TeamID>.<BundleID>")` and compares it to the hash signed by the device. If they don't match, payment-method creation fails with `App ID verification failed`.
+   Use `production` for App Store builds. App Attest does not work in the simulator — Apple Pay requires a real device.
+4. **Frame dashboard — device attestation.** In your Frame dashboard, **Settings → Device Attestation**, set your Apple Team ID and the Bundle ID of your iOS app. These must exactly match the app you're running — the backend computes `SHA256("<TeamID>.<BundleID>")` and compares it to the hash signed by the device. If they don't match, payment-method creation fails with `App ID verification failed`.
+5. **Pass the merchant ID to `Frame.initialize`.** This is the single source of truth — every Frame Apple Pay surface reads it from here.
+   ```ts
+   await Frame.initialize({
+     secretKey: 'sk_...',
+     publishableKey: 'pk_...',
+     applePayMerchantId: 'merchant.com.yourapp',
+   });
+   ```
+
+#### Enabling Apple Pay on your account
+
+Once the steps above are complete, contact Frame at [support@framepayments.com](mailto:support@framepayments.com) (or via your [Frame dashboard](https://framepayments.com)) and we'll enable Apple Pay on your account. Apple Pay charges won't succeed until this is done on our side.
 
 On non-iOS platforms `Frame.presentApplePay` rejects synchronously with a not-supported error.
 
@@ -285,6 +299,8 @@ On non-iOS platforms `Frame.presentApplePay` rejects synchronously with a not-su
 
 Launches the native Google Pay sheet, creates a Frame payment method from the wallet token, and creates a charge against the owner. Resolves with the resulting resource's id string. Render your own button (Google's `PayButton` from `play-services-pay`, a community wrapper, or your own component) and call this from its `onPress`.
 
+The Google Pay merchant ID is configured **once** at `Frame.initialize({ googlePayMerchantId })`; there is no per-call merchant parameter.
+
 The `owner` mirrors `presentApplePay` and determines which downstream resource is created:
 
 - `owner.type === 'customer'` → creates a `ChargeIntent` against the customer; resolves with the ChargeIntent's `id`.
@@ -312,21 +328,36 @@ const chargeIntentId = await Frame.presentGooglePay({
 | `amountCents` | `number` | Yes | Payment amount in cents |
 | `owner` | `{ type: 'customer' \| 'account', id: string }` | Yes | Customer or account that owns the resulting payment method and charge |
 | `currencyCode` | `string` | No | ISO 4217 currency code. Default `'USD'` |
-| `googlePayMerchantId` | `string` | No | Google Pay merchant ID override |
 
 **Returns:** `Promise<string>` — the created `ChargeIntent`'s `id` (for customer owners) or the `Transfer`'s `id` (for account owners).
 
-The promise rejects with `code: 'USER_CANCELED'` when the user dismisses the sheet, `'INVALID_OWNER'` if the owner is missing or malformed, `'GOOGLE_PAY_UNAVAILABLE'` if Google Pay is not ready on the device (no signed-in account, no test card, or Wallet API disabled), and `'PAYMENT_FAILED'` for backend failures.
+The promise rejects with `code: 'USER_CANCELED'` when the user dismisses the sheet, `'INVALID_OWNER'` if the owner is missing or malformed, `'GOOGLE_PAY_UNAVAILABLE'` if Google Pay is not ready on the device (no signed-in account, no test card, no `googlePayMerchantId` configured at `Frame.initialize`, or Wallet API disabled in the manifest), and `'PAYMENT_FAILED'` for backend failures.
+
+#### Required Android setup
 
-**Required Android setup:**
+Google Pay setup is a four-part process: get a merchant ID from Google, declare the wallet capability in your manifest, pass the merchant ID to `Frame.initialize`, then **contact Frame** to enable the feature on your account.
 
-1. **Google Pay metadata.** Add to your app's `AndroidManifest.xml` inside `<application>`:
+1. **Obtain a Google Pay merchant ID.** Sign up for a [Google Pay & Wallet Console](https://pay.google.com/business/console/) account, complete the business profile, and accept the Google Pay API Terms of Service. Your **Merchant ID** (looks like `BCR2DN4T…`) appears on the Business Console home page once approved.
+2. **Declare the wallet capability in `AndroidManifest.xml`.** Inside `<application>`:
    ```xml
    <meta-data
        android:name="com.google.android.gms.wallet.api.enabled"
        android:value="true" />
    ```
-2. **Test environment.** When the SDK is initialized with `debugMode: true`, Google Pay runs in `ENVIRONMENT_TEST`; otherwise it uses `ENVIRONMENT_PRODUCTION`.
+   Without this entry the Google Pay button stays hidden — the Wallet API is opted-out by default.
+3. **Test environment.** When the SDK is initialized with `debugMode: true`, Google Pay runs in `ENVIRONMENT_TEST`; otherwise it uses `ENVIRONMENT_PRODUCTION`.
+4. **Pass the merchant ID to `Frame.initialize`.** This is the single source of truth — every Frame Google Pay surface reads it from here.
+   ```ts
+   await Frame.initialize({
+     secretKey: 'sk_...',
+     publishableKey: 'pk_...',
+     googlePayMerchantId: 'BCR2DN4T...',
+   });
+   ```
+
+#### Enabling Google Pay on your account
+
+Once the steps above are complete, contact Frame at [support@framepayments.com](mailto:support@framepayments.com) (or via your [Frame dashboard](https://framepayments.com)) and we'll enable Google Pay on your account. Google Pay charges won't succeed until this is done on our side.
 
 On non-Android platforms `Frame.presentGooglePay` rejects synchronously with a not-supported error.
 

package/android/build.gradle

@@ -1,3 +1,5 @@
+import groovy.json.JsonSlurper
+
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'org.jetbrains.kotlin.plugin.compose'
@@ -6,6 +8,10 @@ def safeExtGet(prop, fallback) {
   rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
+// Single source of truth for Frame native SDK versions — see package.json:frameNativeVersions.
+def frameNativeVersions = new JsonSlurper().parse(file("$projectDir/../package.json")).frameNativeVersions
+def frameAndroidVersion = frameNativeVersions.android
+
 android {
   namespace "com.framepayments.reactnativeframe"
   compileSdk safeExtGet('compileSdkVersion', 36)
@@ -31,9 +37,9 @@ android {
 dependencies {
   implementation 'com.facebook.react:react-native:+'
   implementation "org.jetbrains.kotlin:kotlin-stdlib:2.1.0"
-  implementation 'com.framepayments:framesdk:2.0.7'
-  implementation 'com.framepayments:framesdk_ui:2.0.7'
-  implementation 'com.framepayments:framesdk_onboarding:2.0.7'
+  implementation "com.framepayments:framesdk:${frameAndroidVersion}"
+  implementation "com.framepayments:framesdk_ui:${frameAndroidVersion}"
+  implementation "com.framepayments:framesdk_onboarding:${frameAndroidVersion}"
   // Required by FrameGooglePayButton (PaymentsClient, WalletConstants).
   // framesdk_ui declares this as `implementation`, so it is not exposed transitively.
   implementation 'com.google.android.gms:play-services-wallet:19.4.0'

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

@@ -7,6 +7,7 @@ import android.os.Looper
 import android.widget.FrameLayout
 import androidx.appcompat.app.AppCompatActivity
 import com.framepayments.framesdk.FrameNetworking
+import com.framepayments.framesdk.FrameResult
 import com.framepayments.framesdk_ui.FrameCheckoutView
 
 class FrameCheckoutActivity : AppCompatActivity() {
@@ -68,9 +69,23 @@ class FrameCheckoutActivity : AppCompatActivity() {
   private fun addCheckoutView(container: FrameLayout, accountId: String, amount: Int) {
     val checkoutView = FrameCheckoutView(this)
     FrameRNTheme.current?.let { checkoutView.setTheme(it) }
-    checkoutView.configure(accountId, amount) { transferId ->
-      setResult(RESULT_OK, Intent().putExtra(EXTRA_TRANSFER_ID, transferId))
-      finish()
+    checkoutView.configure(accountId, amount) { result ->
+      when (result) {
+        is FrameResult.Completed -> {
+          setResult(RESULT_OK, Intent().putExtra(EXTRA_TRANSFER_ID, result.id))
+          finish()
+        }
+        FrameResult.Cancelled -> {
+          setResult(RESULT_CANCELED)
+          finish()
+        }
+        is FrameResult.Failed -> {
+          // Surfaced as USER_CANCELED at the JS layer (RESULT_CANCELED maps to it in FrameSDKModule).
+          // Per-error toast UI is already shown by the native FrameCheckoutView before this fires.
+          setResult(RESULT_CANCELED)
+          finish()
+        }
+      }
     }
     container.addView(checkoutView)
   }

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

@@ -4,6 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.FrameLayout
 import androidx.appcompat.app.AppCompatActivity
+import com.framepayments.framesdk.FrameResult
 import com.framepayments.framesdk_ui.FrameCartItem
 import com.framepayments.framesdk_ui.FrameCartView
 import com.framepayments.framesdk_ui.FrameCheckoutView
@@ -75,9 +76,21 @@ class FrameFlowActivity : AppCompatActivity() {
     container.removeAllViews()
     checkoutView = FrameCheckoutView(this).apply {
       FrameRNTheme.current?.let { setTheme(it) }
-      configure(accountId, amount) { transferId ->
-        setResult(RESULT_OK, Intent().putExtra(EXTRA_TRANSFER_ID, transferId))
-        finish()
+      configure(accountId, amount) { result ->
+        when (result) {
+          is FrameResult.Completed -> {
+            setResult(RESULT_OK, Intent().putExtra(EXTRA_TRANSFER_ID, result.id))
+            finish()
+          }
+          FrameResult.Cancelled -> {
+            setResult(RESULT_CANCELED)
+            finish()
+          }
+          is FrameResult.Failed -> {
+            setResult(RESULT_CANCELED)
+            finish()
+          }
+        }
       }
     }
     container.addView(checkoutView)

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

@@ -40,7 +40,6 @@ class FrameGooglePayActivity : AppCompatActivity() {
     val ownerType = intent.getStringExtra(EXTRA_OWNER_TYPE)
     val ownerId = intent.getStringExtra(EXTRA_OWNER_ID)
     val currencyCode = intent.getStringExtra(EXTRA_CURRENCY) ?: "USD"
-    val googlePayMerchantId = intent.getStringExtra(EXTRA_MERCHANT_ID)
 
     if (amountCents <= 0) {
       deliverFailure("Invalid amountCents")
@@ -68,7 +67,6 @@ class FrameGooglePayActivity : AppCompatActivity() {
       amountCents = amountCents,
       owner = owner,
       currencyCode = currencyCode,
-      googlePayMerchantId = googlePayMerchantId,
       onResult = { result -> handleResult(result) },
       onReadinessChanged = { isReady -> handleReadiness(isReady) }
     )
@@ -153,7 +151,6 @@ class FrameGooglePayActivity : AppCompatActivity() {
     const val EXTRA_OWNER_TYPE = "owner_type"
     const val EXTRA_OWNER_ID = "owner_id"
     const val EXTRA_CURRENCY = "currency"
-    const val EXTRA_MERCHANT_ID = "merchant_id"
     /**
      * The id of the resource created by the wallet flow. Holds a Transfer id when
      * the owner was an account, or a ChargeIntent id when the owner was a customer.

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

@@ -19,12 +19,10 @@ class FrameOnboardingActivity : ComponentActivity() {
     val accountId = intent.getStringExtra(EXTRA_ACCOUNT_ID)
     val capabilitiesJson = intent.getStringExtra(EXTRA_CAPABILITIES_JSON) ?: "[]"
     val capabilities = parseCapabilities(capabilitiesJson)
-    val googlePayMerchantId = intent.getStringExtra(EXTRA_GOOGLE_PAY_MERCHANT_ID)
 
     val config = OnboardingConfig(
       accountId = accountId,
-      requiredCapabilities = capabilities,
-      googlePayMerchantId = googlePayMerchantId
+      requiredCapabilities = capabilities
     )
 
     val themeOverride = FrameRNTheme.current
@@ -44,7 +42,7 @@ class FrameOnboardingActivity : ComponentActivity() {
               setResult(RESULT_CANCELED)
               finish()
             }
-            is OnboardingResult.Error -> {
+            is OnboardingResult.Failed -> {
               setResult(RESULT_CANCELED)
               finish()
             }
@@ -69,7 +67,6 @@ class FrameOnboardingActivity : ComponentActivity() {
   companion object {
     const val EXTRA_ACCOUNT_ID = "account_id"
     const val EXTRA_CAPABILITIES_JSON = "capabilities_json"
-    const val EXTRA_GOOGLE_PAY_MERCHANT_ID = "google_pay_merchant_id"
     const val EXTRA_PAYMENT_METHOD_ID = "payment_method_id"
     const val REQUEST_CODE = 9003
   }

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

@@ -7,9 +7,10 @@ import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.ReactContextBaseJavaModule
 import com.facebook.react.bridge.ReactMethod
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableNativeMap
 import com.framepayments.framesdk.FrameNetworking
-import org.json.JSONObject
 
 class FrameSDKModule(reactContext: ReactApplicationContext) :
   ReactContextBaseJavaModule(reactContext), ActivityEventListener {
@@ -35,12 +36,17 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     secretKey: String,
     publishableKey: String,
     debugMode: Boolean,
-    theme: com.facebook.react.bridge.ReadableMap?,
+    applePayMerchantId: String?,
+    googlePayMerchantId: String?,
+    theme: ReadableMap?,
     promise: Promise
   ) {
     try {
       val ctx = reactApplicationContext.applicationContext
-      FrameNetworking.initializeWithAPIKey(ctx, secretKey, publishableKey, debugMode)
+      // applePayMerchantId is iOS-only; accepted in the bridge signature so the JS Frame.initialize()
+      // API stays cross-platform, but ignored here. frame-android has no Apple Pay surface.
+      @Suppress("UNUSED_PARAMETER") val ignoredApplePayMerchantId = applePayMerchantId
+      FrameNetworking.initializeWithAPIKey(ctx, secretKey, publishableKey, googlePayMerchantId, debugMode)
       FrameRNTheme.current = theme?.takeIf { it.keySetIterator().hasNextKey() }?.let {
         FrameRNTheme.parse(ctx, it)
       }
@@ -69,7 +75,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun presentCart(
     accountId: String?,
-    items: com.facebook.react.bridge.ReadableArray,
+    items: ReadableArray,
     shippingAmountInCents: Double,
     promise: Promise
   ) {
@@ -98,7 +104,6 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     ownerType: String?,
     ownerId: String?,
     currencyCode: String?,
-    googlePayMerchantId: String?,
     promise: Promise
   ) {
     val activity = reactApplicationContext.currentActivity ?: run {
@@ -128,7 +133,6 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
         putExtra(FrameGooglePayActivity.EXTRA_OWNER_TYPE, ownerType)
         putExtra(FrameGooglePayActivity.EXTRA_OWNER_ID, ownerId)
         putExtra(FrameGooglePayActivity.EXTRA_CURRENCY, currencyCode ?: "USD")
-        putExtra(FrameGooglePayActivity.EXTRA_MERCHANT_ID, googlePayMerchantId)
       }
       activity.startActivity(intent)
     }
@@ -137,8 +141,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
   @ReactMethod
   fun presentOnboarding(
     accountId: String?,
-    capabilities: com.facebook.react.bridge.ReadableArray,
-    googlePayMerchantId: String?,
+    capabilities: ReadableArray,
     promise: Promise
   ) {
     val activity = reactApplicationContext.currentActivity ?: run {
@@ -151,13 +154,12 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
       val intent = Intent(activity, FrameOnboardingActivity::class.java).apply {
         putExtra(FrameOnboardingActivity.EXTRA_ACCOUNT_ID, accountId)
         putExtra(FrameOnboardingActivity.EXTRA_CAPABILITIES_JSON, capabilitiesJson)
-        putExtra(FrameOnboardingActivity.EXTRA_GOOGLE_PAY_MERCHANT_ID, googlePayMerchantId)
       }
       activity.startActivityForResult(intent, FrameOnboardingActivity.REQUEST_CODE)
     }
   }
 
-  private fun readableArrayToJson(items: com.facebook.react.bridge.ReadableArray): String? {
+  private fun readableArrayToJson(items: ReadableArray): String? {
     val arr = org.json.JSONArray()
     for (i in 0 until items.size()) {
       val item = items.getMap(i) ?: return null
@@ -171,7 +173,7 @@ class FrameSDKModule(reactContext: ReactApplicationContext) :
     return arr.toString()
   }
 
-  private fun readableArrayToJsonArray(arr: com.facebook.react.bridge.ReadableArray): String {
+  private fun readableArrayToJsonArray(arr: ReadableArray): String {
     val jsonArr = org.json.JSONArray()
     for (i in 0 until arr.size()) {
       arr.getString(i)?.let { jsonArr.put(it) }

package/ios/ApplePayPresenter.swift

@@ -28,7 +28,6 @@ final class ApplePayPresenter: NSObject, PKPaymentAuthorizationControllerDelegat
   private let amount: Int
   private let currency: String
   private let owner: Owner
-  private let merchantId: String
   private let resolve: (Any?) -> Void
   private let reject: (String, String, Error?) -> Void
 
@@ -46,13 +45,11 @@ final class ApplePayPresenter: NSObject, PKPaymentAuthorizationControllerDelegat
   init(amount: Int,
        currency: String,
        owner: Owner,
-       merchantId: String,
        resolve: @escaping (Any?) -> Void,
        reject: @escaping (String, String, Error?) -> Void) {
     self.amount = amount
     self.currency = currency
     self.owner = owner
-    self.merchantId = merchantId
     self.resolve = resolve
     self.reject = reject
   }
@@ -63,7 +60,7 @@ final class ApplePayPresenter: NSObject, PKPaymentAuthorizationControllerDelegat
 
   func present() {
     let request = PKPaymentRequest()
-    request.merchantIdentifier = merchantId
+    request.merchantIdentifier = FrameNetworking.shared.applePayMerchantId ?? ""
     request.supportedNetworks = Self.supportedNetworks
     request.merchantCapabilities = .threeDSecure
     request.countryCode = "US"

package/ios/FramePreloader.h

@@ -0,0 +1,23 @@
+//
+//  FramePreloader.h
+//  FrameReactNative
+//
+//  Public Obj-C interface for the Swift `FramePreloader` class. Lets consumers
+//  reach `+[FramePreloader preloadOnMainThread]` from AppDelegate.mm (or any
+//  .m/.mm file) via `#import "FramePreloader.h"`, without needing modules
+//  enabled in C++ context.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface FramePreloader : NSObject
+
+/// Call from AppDelegate before [super application:didFinishLaunchingWithOptions:].
+/// Forces Frame (and its deps: Evervault, Sift) to load on the main thread.
++ (void)preloadOnMainThread;
+
+@end
+
+NS_ASSUME_NONNULL_END