framepayments-react-native 2.0.2 → 2.0.4

package/android/.settings/org.eclipse.buildship.core.prefs

@@ -1,8 +1,8 @@
-arguments=--init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle --init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/861a75667e10803d304a058d833cb7404195ca44013d0d61d3b653eb084379b8.gradle --init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/68eb1b6516fe21c6fbba58e63c99c3207ccfc918360613709367eecde56fa77f.gradle
-auto.sync=false
+arguments=--init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/db3b08fc4a9ef609cb16b96b200fa13e563f396e9bb1ed0905fdab7bc3bc513b.gradle --init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/52cde0cfcf3e28b8b7510e992210d9614505e0911af0c190bd590d7158574963.gradle --init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/861a75667e10803d304a058d833cb7404195ca44013d0d61d3b653eb084379b8.gradle --init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/68eb1b6516fe21c6fbba58e63c99c3207ccfc918360613709367eecde56fa77f.gradle --init-script /var/folders/my/2knngz1131q4pq8rnxxjb3_h0000gn/T/da64152279c70a8b4f3de4ca9ea66fd3b3405b7aca4e1f20f2d08e5593aa1ce1.gradle
+auto.sync=true
 build.scans.enabled=false
 connection.gradle.distribution=GRADLE_DISTRIBUTION(VERSION(8.9))
-connection.project.dir=../../../android
+connection.project.dir=
 eclipse.preferences.version=1
 gradle.user.home=
 java.home=/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home

package/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Apr 30 13:46:59 PDT 2026
+#Fri May 01 16:00:34 PDT 2026

package/ios/FrameSDKBridge.swift

@@ -186,20 +186,32 @@ public class FrameSDKBridge: NSObject {
       rootView: OnboardingContainerView(
         accountId: accountId,
         requiredCapabilities: capabilities,
-        onComplete: { [weak top] in
+        onComplete: { [weak hosting] in
           delegate?.finish(completed: true)
-          top?.dismiss(animated: true)
+          hosting?.dismiss(animated: true)
         }
       )
     )
-    hosting.modalPresentationStyle = UIModalPresentationStyle.pageSheet
-    if let sheet = hosting.sheetPresentationController {
+    // Embed in a UINavigationController so the outer sheet is a UIKit container,
+    // not a SwiftUI-bridged one. On iOS 18, presenting the UIHostingController
+    // directly causes SwiftUI's SheetBridge to call dismiss on the host whenever
+    // a nested .sheet() inside the onboarding flow toggles its binding (its
+    // preferencesDidChange propagates up to the outer bridge). The nav
+    // controller breaks that propagation. Nav bar is hidden so the sheet looks
+    // identical to before.
+    let nav = UINavigationController(rootViewController: hosting)
+    nav.setNavigationBarHidden(true, animated: false)
+    nav.modalPresentationStyle = UIModalPresentationStyle.pageSheet
+    if let sheet = nav.sheetPresentationController {
       sheet.detents = [UISheetPresentationController.Detent.large()]
     }
     delegate = OnboardingDismissDelegate(resolve: resolve)
-    objc_setAssociatedObject(hosting, &onboardingDismissKey, delegate, .OBJC_ASSOCIATION_RETAIN)
-    top.present(hosting, animated: true) {
-      hosting.presentationController?.delegate = delegate
+    delegate.hostingController = nav
+    objc_setAssociatedObject(nav, &onboardingDismissKey, delegate, .OBJC_ASSOCIATION_RETAIN)
+    NSLog("[FrameRN][onb] presenting OnboardingHostingController (wrapped in UINavigationController) from \(type(of: top))")
+    top.present(nav, animated: true) {
+      nav.presentationController?.delegate = delegate
+      NSLog("[FrameRN][onb] presentation completed; presentationController=\(String(describing: nav.presentationController)) delegate set")
     }
   }
 }
@@ -245,6 +257,7 @@ private final class CartDismissDelegate: NSObject, UIAdaptivePresentationControl
 
 private final class OnboardingDismissDelegate: NSObject, UIAdaptivePresentationControllerDelegate {
   let resolve: RCTPromiseResolveBlock
+  weak var hostingController: UIViewController?
   var didFinish = false
 
   init(resolve: @escaping RCTPromiseResolveBlock) {
@@ -260,6 +273,10 @@ private final class OnboardingDismissDelegate: NSObject, UIAdaptivePresentationC
   }
 
   func presentationControllerDidDismiss(_ presentationController: UIPresentationController) {
+    // Nested SwiftUI sheets (e.g. the phone country picker) propagate this
+    // callback to the Onboarding host's delegate. Only treat dismissal of the
+    // Onboarding hosting controller itself as a cancellation.
+    guard presentationController.presentedViewController === hostingController else { return }
     finish(completed: false)
   }
 }

package/package.json

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