react-native-hyperswitch-dev-sdk 0.4.2 → 0.4.4

package/ios/hyperswitchSDK/Core/HyperPaymentWidget/PaymentWidget.swift

@@ -16,7 +16,7 @@ public class PaymentWidget: UIControl {
     private var configurationDict: [String: Any]?
     private var widgetReactTag: NSNumber?
     internal var rootReactTag: NSNumber? { widgetReactTag }
-    private var rootView: RCTRootView?
+    private var rootView: UIView?
     private var initCallback: ((PaymentResult) -> Void)?
     private var shouldProceedWithPaymentCallback: ((PaymentRequestData, @escaping (Bool) -> Void) -> Void)?
     private var cancellables = Set<AnyCancellable>()
@@ -124,7 +124,7 @@ public class PaymentWidget: UIControl {
             .sink { [weak self] in
                 guard let self = self else { return }
                 let payload: [String: Any] = ["rootTag": self.widgetReactTag ?? -1]
-                self.rootView?.bridge.enqueueJSCall(
+                RNViewManager.sharedInstance.bridge?.enqueueJSCall(
                     "RCTDeviceEventEmitter",
                     method: "emit",
                     args: ["updateIntentInit", payload],
@@ -141,7 +141,7 @@ public class PaymentWidget: UIControl {
                     "rootTag": self.widgetReactTag ?? -1,
                     "sdkAuthorization": sdkAuthorization,
                 ]
-                self.rootView?.bridge.enqueueJSCall(
+                RNViewManager.sharedInstance.bridge?.enqueueJSCall(
                     "RCTDeviceEventEmitter",
                     method: "emit",
                     args: ["updateIntentComplete", payload],
@@ -156,7 +156,7 @@ public class PaymentWidget: UIControl {
             "rootTag": self.widgetReactTag ?? -1,
             "actionType": "CONFIRM_PAYMENT_ACTION",
         ]
-        self.rootView?.bridge.enqueueJSCall(
+        RNViewManager.sharedInstance.bridge?.enqueueJSCall(
             "RCTDeviceEventEmitter",
             method: "emit",
             args: ["triggerWidgetAction", payload],
@@ -210,3 +210,4 @@ public class PaymentWidget: UIControl {
         }
     }
 }
+

package/ios/hyperswitchSDK/Core/HyperSession/PaymentSession+UIKit.swift

@@ -73,6 +73,20 @@ extension PaymentSession {
         paymentSheet.presentWithParams(from: viewController, props: params, completion: completion)
     }
 
+    /// React Native / TurboModule overload — resolves with the raw JSON string from the JS
+    /// bundle so the result reaches the promise without any re-serialisation.
+    internal func presentPaymentSheetWithParams(
+        viewController: UIViewController,
+        params: [String: Any],
+        rawCompletion: @escaping (String) -> Void
+    ) {
+        let paymentSheet = PaymentSheet(
+            paymentSessionConfiguration: paymentSessionConfiguration,
+            hyperswitchConfiguration: hyperswitchConfiguration ?? nil
+        )
+        paymentSheet.presentWithParams(from: viewController, props: params, rawCompletion: rawCompletion)
+    }
+
     public func getCustomerSavedPaymentMethods(
         _ func_: @escaping (PaymentSessionHandler) -> Void,
         configuration: SavedPaymentMethodsConfiguration? = nil

package/ios/hyperswitchSDK/Core/NativeModule/{HyperModule.swift → HyperModuleImpl.swift}

@@ -1,90 +1,187 @@
 //
-//  HyperModule.swift
-//  Hyperswitch
+//  HyperModuleImpl.swift
+//  Pods
 //
-//  Created by Harshit Srivastava on 07/03/24.
+//  Created by Kuntimaddi Manideep on 22/07/26.
 //
 
 import Foundation
 import React
 
-@objc(HyperModule)
-internal class HyperModule: RCTEventEmitter {
+@objc(HyperModuleImpl)
+public class HyperModuleImpl: NSObject {
+
+    @objc public static let shared = HyperModuleImpl()
+
+    /// The RN-registered event emitter (the ObjC++ `HyperModule` TurboModule) through
+    /// which JS-facing events are dispatched and the bridge / uiManager is reached.
+    @objc public weak var eventEmitter: RCTEventEmitter?
 
     private let applePayPaymentHandler = ApplePayHandler()
     private let expressCheckoutHandler = ExpressCheckoutLauncher()
     private var presentCallback: RCTResponseSenderBlock? = nil
-    internal static var shared: HyperModule?
 
-    override init() {
+    /// Direct reference to the currently-presented PaymentSheet.
+    /// Set by PaymentSheetView+UIKit when the sheet is presented; cleared in exitPaymentsheet.
+    /// Avoids relying on bridge.uiManager.addUIBlock (which doesn't find Fabric views).
+    private var activePaymentSheet: PaymentSheet?
+    private weak var activePaymentSheetVC: HyperUIViewController?
+
+    private override init() {
         super.init()
-        HyperModule.shared = self
     }
 
-    @objc
-    internal override static func requiresMainQueueSetup() -> Bool {
-        return true
-    }
+    // MARK: - Payment sheet registration (called from PaymentSheetView+UIKit)
 
-    @objc
-    internal override func supportedEvents() -> [String] {
-        return ["confirm", "confirmEC", "triggerWidgetAction", "updateIntentInit", "updateIntentComplete"]
+    internal func registerPaymentSheet(_ sheet: PaymentSheet, vc: HyperUIViewController) {
+        activePaymentSheet = sheet
+        activePaymentSheetVC = vc
     }
 
-    @objc
-    internal func confirm(data: [String: Any]) {
-        self.sendEvent(withName: "confirm", body: data)
+    /// The bridge backing the RN-registered emitter (embedded runtime is bridge-based).
+    private var bridge: RCTBridge? { eventEmitter?.bridge }
+
+    // MARK: - Events
+
+    @objc public func confirm(data: [String: Any]) {
+        eventEmitter?.sendEvent(withName: "confirm", body: data)
     }
     // MARK: WIP
-    //    @objc func confirmEC(data: [String: Any]) {
-    //        self.sendEvent(withName: "confirmEC", body: data)
+    //    @objc public func confirmEC(data: [String: Any]) {
+    //        eventEmitter?.sendEvent(withName: "confirmEC", body: data)
     //    }
 
-    @objc
-    private func sendMessageToNative(_ rnMessage: String) {}
+    // MARK: - Generic message passing
 
-    @objc
-    private func launchWidgetPaymentSheet(_ request: NSMutableDictionary, _ callback: @escaping RCTResponseSenderBlock) {
-        expressCheckoutHandler.launchPaymentSheet(paymentResult: request, callBack: callback)
+    @objc public func sendMessageToNative(_ rnMessage: String) {}
+
+    // MARK: - Apple Pay
+
+    @objc public func launchApplePay(_ rnMessage: String, callback: @escaping RCTResponseSenderBlock) {
+        applePayPaymentHandler.startPayment(rnMessage: rnMessage, rnCallback: callback, presentCallback: self.presentCallback)
     }
 
-    @objc
-    private func onAddPaymentMethod(_ rnMessage: String) {
-        PaymentMethodManagementWidget.onAddPaymentMethod?()
+    @objc public func startApplePay(_ rnMessage: String, callback: @escaping RCTResponseSenderBlock) {
+        callback([])
     }
 
-    @objc
-    private func launchApplePay(_ rnMessage: String, _ rnCallback: @escaping RCTResponseSenderBlock) {
-        applePayPaymentHandler.startPayment(rnMessage: rnMessage, rnCallback: rnCallback, presentCallback: self.presentCallback)
+    @objc public func presentApplePay(_ rnMessage: String, callback: @escaping RCTResponseSenderBlock) {
+        self.presentCallback = callback
     }
 
-    @objc
-    private func startApplePay(_ rnMessage: String, _ rnCallback: @escaping RCTResponseSenderBlock) {
-        rnCallback([])
+    // MARK: - Widget
+
+    @objc public func launchWidgetPaymentSheet(_ requestObj: String, callback: @escaping RCTResponseSenderBlock) {
+        let request = HyperModuleImpl.jsonObject(from: requestObj)
+        expressCheckoutHandler.launchPaymentSheet(paymentResult: request, callBack: callback)
     }
 
-    @objc
-    private func presentApplePay(_ rnMessage: String, _ rnCallback: @escaping RCTResponseSenderBlock) {
-        self.presentCallback = rnCallback
+    @objc public func onAddPaymentMethod(_ rnMessage: String) {
+        PaymentMethodManagementWidget.onAddPaymentMethod?()
     }
 
-    @objc
-    private func exitPaymentsheet(_ reactTag: NSNumber, _ rnMessage: String, _ reset: Bool) {
-        let result = paymentResult(from: rnMessage)
-        withPaymentSheet(reactTag) { vc, sheet in
-            sheet?.completion?(result)
-            vc?.dismiss(animated: false, completion: nil)
+    // MARK: - Payment sheet exits
+
+    @objc public func exitPaymentsheet(_ reactTag: NSNumber, result rnMessage: String, reset: Bool) {
+        // Consume and clear so they can't be called a second time.
+        let sheet = activePaymentSheet
+        let vc    = activePaymentSheetVC
+        activePaymentSheet   = nil
+        activePaymentSheetVC = nil
+
+        // Pass the raw JS result string directly — no PaymentResult conversion.
+        // PaymentSheet.completion is (String) -> Void, so this goes straight to
+        // the promise resolve in HyperswitchModule.presentPaymentSheet.
+        sheet?.completion?(rnMessage)
+
+        // Dismiss the VC, then release the rootView so the Fabric surface is torn down.
+        vc?.dismiss(animated: false) {
+            RNViewManager.sharedInstance.rootView?.removeFromSuperview()
+            RNViewManager.sharedInstance.rootView = nil
         }
     }
 
-    @objc
-    private func exitWidgetPaymentsheet(_ reactTag: NSNumber, _ rnMessage: String, _ reset: Bool) {
+    @objc public func exitWidgetPaymentsheet(_ reactTag: NSNumber, result rnMessage: String, reset: Bool) {
         let result = paymentResult(from: rnMessage)
         withWidget(reactTag) { w in
             w.handleConfirmPaymentResponse(result)
         }
     }
 
+    @objc public func exitPaymentMethodManagement(_ reactTag: NSNumber, result rnMessage: String, reset: Bool) {
+        exitSheet(rnMessage)
+    }
+
+    @objc public func exitCardForm(_ rnMessage: String) {
+        exitCardFormInternal(rnMessage)
+    }
+
+    // MARK: - Payment result / events
+
+    @objc public func notifyWidgetPaymentResult(_ rootTag: NSNumber, result rnMessage: String) {
+        let result = paymentResult(from: rnMessage)
+        guard case .failed = result else { return }
+        withNativePaymentWidgetView(rootTag) { view in
+            view.handleConfirmPaymentResponse(result)
+        }
+    }
+
+    @objc public func onUpdateIntentEvent(_ rootTag: NSNumber, type: String, result: String) {
+        withWidget(rootTag) { widget in
+            widget.handleUpdateIntentEvent(type: type, result: result)
+        }
+    }
+
+    @objc public func emitPaymentEvent(_ rootTag: NSNumber, eventType: String, payload: NSDictionary) {
+        let map = (payload as? [String: Any]) ?? [:]
+        resolveSubscribingTarget(rootTag) { target in
+            if let widget = target as? PaymentWidget, widget.paymentEventListener != nil {
+                widget.dispatchPaymentEvent(type: eventType, payload: map)
+            } else if let cvc = target as? CVCWidget, cvc.paymentEventListener != nil {
+                cvc.dispatchPaymentEvent(type: eventType, payload: map)
+            } else if let sheet = target as? PaymentSheet, sheet.paymentEventListener != nil {
+                sheet.dispatchPaymentEvent(type: eventType, payload: map)
+            }
+        }
+    }
+
+    @objc public func onPaymentConfirmButtonClick(_ rootTag: NSNumber, payload: String, callback: @escaping RCTResponseSenderBlock) {
+        resolveSubscribingTarget(rootTag) { target in
+            if let widget = target as? PaymentWidget {
+                widget.handleShouldProceedWithPayment(payload: payload) { shouldProceed in
+                    callback([shouldProceed])
+                }
+            } else if let sheet = target as? PaymentSheet {
+                sheet.handleShouldProceedWithPayment(payload: payload) { shouldProceed in
+                    callback([shouldProceed])
+                }
+            } else {
+                callback([true])
+            }
+        }
+    }
+
+    // MARK: - 3DS / DDC iframe bridge
+
+    @objc public func openIframeBridge(_ url: String, timeoutMs: NSNumber, callback: @escaping RCTResponseSenderBlock) {
+        DispatchQueue.main.async {
+            let headlessWebView = HeadlessWebView(url: url, timeoutMs: timeoutMs, callback: callback)
+            headlessWebView.startFlow()
+        }
+    }
+
+    // MARK: - Helpers
+
+    private static func jsonObject(from string: String) -> NSMutableDictionary {
+        guard
+            let data = string.data(using: .utf8),
+            let obj = try? JSONSerialization.jsonObject(with: data, options: []) as? [AnyHashable: Any]
+        else {
+            return NSMutableDictionary()
+        }
+        return NSMutableDictionary(dictionary: obj)
+    }
+
     private func paymentResult(from rnMessage: String) -> PaymentResult {
         guard let data = rnMessage.data(using: .utf8) else {
             return .failed(
@@ -132,42 +229,7 @@ internal class HyperModule: RCTEventEmitter {
         }
     }
 
-    @objc
-    private func exitPaymentMethodManagement(_ reactTag: NSNumber, _ rnMessage: String, _ reset: Bool) {
-        exitSheet(rnMessage)
-    }
-
-    @objc
-    private func notifyWidgetPaymentResult(_ rootTag: NSNumber, _ rnMessage: String) {
-        let result = paymentResult(from: rnMessage)
-        guard case .failed = result else { return }
-        withNativePaymentWidgetView(rootTag) { view in
-            view.handleConfirmPaymentNotification(result)
-        }
-    }
-
-    @objc
-    private func onUpdateIntentEvent(_ rootTag: NSNumber, _ type: String, _ result: String) {
-        withWidget(rootTag) { widget in
-            widget.handleUpdateIntentEvent(type: type, result: result)
-        }
-    }
-
-    @objc func emitPaymentEvent(_ rootTag: NSNumber, _ eventType: String, _ payload: NSDictionary) {
-        let map = (payload as? [String: Any]) ?? [:]
-        resolveSubscribingTarget(rootTag) { target in
-            if let widget = target as? PaymentWidget, widget.paymentEventListener != nil {
-                widget.dispatchPaymentEvent(type: eventType, payload: map)
-            } else if let cvc = target as? CVCWidget, cvc.paymentEventListener != nil {
-                cvc.dispatchPaymentEvent(type: eventType, payload: map)
-            } else if let sheet = target as? PaymentSheet, sheet.paymentEventListener != nil {
-                sheet.dispatchPaymentEvent(type: eventType, payload: map)
-            }
-        }
-    }
-
-    @objc
-    private func exitCardForm(_ rnMessage: String) {
+    private func exitCardFormInternal(_ rnMessage: String) {
         var response: String?
         var error: NSError?
 
@@ -206,7 +268,6 @@ internal class HyperModule: RCTEventEmitter {
         }
     }
 
-    @objc
     private func exitSheet(_ rnMessage: String) {
         var response: String?
         var error: NSError?
@@ -252,34 +313,10 @@ internal class HyperModule: RCTEventEmitter {
         }
     }
 
-    @objc
-    private func onPaymentConfirmButtonClick(_ rootTag: NSNumber, _ payload: String, _ callback: @escaping RCTResponseSenderBlock) {
-        resolveSubscribingTarget(rootTag) { target in
-            if let widget = target as? PaymentWidget {
-                widget.handleShouldProceedWithPayment(payload: payload) { shouldProceed in
-                    callback([shouldProceed])
-                }
-            } else if let sheet = target as? PaymentSheet {
-                sheet.handleShouldProceedWithPayment(payload: payload) { shouldProceed in
-                    callback([shouldProceed])
-                }
-            } else {
-                callback([true])
-            }
-        }
-    }
-
-    @objc
-    private func openIframeBridge(_ url: String, _ timeoutMs: NSNumber, _ callback: @escaping RCTResponseSenderBlock) {
-        DispatchQueue.main.async {
-            let headlessWebView = HeadlessWebView(url: url, timeoutMs: timeoutMs, callback: callback)
-            headlessWebView.startFlow()
-        }
-    }
-
     private func withWidget(_ rootTag: NSNumber, _ block: @escaping (PaymentWidget) -> Void) {
+        guard let bridge = self.bridge else { return }
         RCTGetUIManagerQueue().async {
-            self.bridge.uiManager.addUIBlock { _, viewRegistry in
+            bridge.uiManager.addUIBlock { _, viewRegistry in
                 guard let view = viewRegistry?[rootTag] else { return }
                 var current: UIView? = view
                 while let v = current {
@@ -293,13 +330,14 @@ internal class HyperModule: RCTEventEmitter {
         }
     }
 
-    private func withNativePaymentWidgetView(_ rootTag: NSNumber, _ block: @escaping (NativePaymentWidgetView) -> Void) {
+    private func withNativePaymentWidgetView(_ rootTag: NSNumber, _ block: @escaping (PaymentWidget) -> Void) {
+        guard let bridge = self.bridge else { return }
         RCTGetUIManagerQueue().async {
-            self.bridge.uiManager.addUIBlock { _, viewRegistry in
+            bridge.uiManager.addUIBlock { _, viewRegistry in
                 guard let view = viewRegistry?[rootTag] else { return }
                 var current: UIView? = view
                 while let v = current {
-                    if let nativeWidget = v as? NativePaymentWidgetView {
+                    if let nativeWidget = v as? PaymentWidget {
                         block(nativeWidget)
                         return
                     }
@@ -310,8 +348,12 @@ internal class HyperModule: RCTEventEmitter {
     }
 
     private func resolveSubscribingTarget(_ rootTag: NSNumber, _ block: @escaping (AnyObject?) -> Void) {
+        guard let bridge = self.bridge else {
+            DispatchQueue.main.async { block(nil) }
+            return
+        }
         RCTGetUIManagerQueue().async {
-            self.bridge.uiManager.addUIBlock { _, viewRegistry in
+            bridge.uiManager.addUIBlock { _, viewRegistry in
                 guard let view = viewRegistry?[rootTag] else {
                     DispatchQueue.main.async { block(nil) }
                     return
@@ -331,8 +373,9 @@ internal class HyperModule: RCTEventEmitter {
     }
 
     private func withPaymentSheet(_ rootTag: NSNumber, _ block: @escaping (UIViewController?, PaymentSheet?) -> Void) {
+        guard let bridge = self.bridge else { return }
         RCTGetUIManagerQueue().async {
-            self.bridge.uiManager.addUIBlock { _, viewRegistry in
+            bridge.uiManager.addUIBlock { _, viewRegistry in
                 let view = viewRegistry?[rootTag]
                 let vc = view?.reactViewController() as? HyperUIViewController
                 let sheet = vc?.paymentSheet

package/ios/hyperswitchSDK/Core/NativeModule/RNHeadlessManager.swift

@@ -2,46 +2,82 @@
 //  RNHeadlessManager.swift
 //  Hyperswitch
 //
+//  Hosts the SDK's headless React Native runtime (the "HyperHeadless" module)
+//  that drives headless payment sessions without any visible UI.
+//
+//  New Architecture note:
+//  ----------------------
+//  Mirrors RNViewManager: uses the full RCTReactNativeFactory rather than the
+//  legacy RCTBridge(delegate:launchOptions:) + RCTRootView(bridge:…) pair.
+//  The raw bridge init is incompatible with RCTSetNewArchEnabled(YES) (set
+//  globally by the host app's RN runtime), which caused EXC_BAD_ACCESS at
+//  offset 0x69f when accessing the bridge's C++ internals via RCTRootView.
+//
+//  reinvalidateBridge() is preserved for callers (PaymentSession+UIKit) that
+//  need to reset the headless runtime between sessions; it now tears down and
+//  lazily recreates the RCTReactNativeFactory instead of the bare bridge.
+//
 //  Created by Shivam Shashank on 09/11/22.
 //
 
 import Foundation
 import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
 
-internal class RNHeadlessManager: NSObject {
+internal class RNHeadlessManager: RCTDefaultReactNativeFactoryDelegate {
 
     internal var responseHandler: RNResponseHandler?
-    internal var rootView: RCTRootView?
+    internal var rootView: UIView?
 
-    internal lazy var bridgeHeadless: RCTBridge = {
-        RCTBridge.init(delegate: self, launchOptions: nil)
-    }()
+    private var reactNativeFactory: RCTReactNativeFactory?
 
     internal static let sharedInstance = RNHeadlessManager()
 
-    internal func viewForModule(_ moduleName: String, initialProperties: [String: Any]?) -> RCTRootView {
-        let rootView: RCTRootView = RCTRootView(
-            bridge: self.bridgeHeadless,
-            moduleName: moduleName,
+    // MARK: - Factory lifecycle
+
+    /// Lazily creates the RCTReactNativeFactory (and its bridge) on first use.
+    private func factory() -> RCTReactNativeFactory {
+        if let existing = reactNativeFactory {
+            return existing
+        }
+        self.dependencyProvider = RCTAppDependencyProvider()
+        let created = RCTReactNativeFactory(delegate: self)
+        reactNativeFactory = created
+        return created
+    }
+
+    // MARK: - View creation
+
+    internal func viewForModule(_ moduleName: String, initialProperties: [String: Any]?) -> UIView {
+        let view = factory().rootViewFactory.view(
+            withModuleName: moduleName,
             initialProperties: initialProperties
         )
-        self.rootView = rootView
-        return rootView
+        self.rootView = view
+        return view
     }
 
+    /// Tear down the current factory (and its bridge) so the next call to
+    /// viewForModule starts a fresh JS runtime for the new headless session.
     internal func reinvalidateBridge() {
-        self.bridgeHeadless.invalidate()
-        self.bridgeHeadless = RCTBridge.init(delegate: self, launchOptions: nil)
+        reactNativeFactory = nil
+        rootView = nil
     }
-}
 
-extension RNHeadlessManager: RCTBridgeDelegate {
-    func sourceURL(for bridge: RCTBridge) -> URL? {
-        switch Helper.getInfoPlist("HyperswitchSource") {
-        case "LocalHosted":
-            return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
-        default:
-            return Bundle(for: RNHeadlessManager.self).url(forResource: "hyperswitch", withExtension: "bundle")
-        }
+    // MARK: - RCTDefaultReactNativeFactoryDelegate
+
+    /// Use bridge mode (not bridgeless) so the headless module can use the
+    /// legacy RCTBridge event / callback APIs.
+    public override func bridgelessEnabled() -> Bool {
+        return false
+    }
+
+    override func sourceURL(for bridge: RCTBridge) -> URL? {
+        return bundleURL()
+    }
+
+    public override func bundleURL() -> URL? {
+        return Bundle(for: RNHeadlessManager.self).url(forResource: "hyperswitch", withExtension: "bundle")
     }
 }

package/ios/hyperswitchSDK/Core/NativeModule/RNViewManager.swift

@@ -2,54 +2,109 @@
 //  RNViewManager.swift
 //  Hyperswitch
 //
+//  Hosts the SDK's embedded React Native runtime that renders the payment sheet
+//  from the packaged `hyperswitch.bundle`.
+//
+//  New Architecture note:
+//  ----------------------
+//  The embedded runtime MUST be created through the full `RCTReactNativeFactory`.
+//  That initializer performs the essential RN setup — feature flags,
+//  `RCTSetNewArchEnabled`, `RCTEnableTurboModule`, the Fabric component provider —
+//  and wires a TurboModule manager that can resolve RN's own CORE modules
+//  (`DeviceInfo`, `ExceptionsManager`, `RedBox`, …). Building the low-level
+//  `RCTRootViewFactory` directly (as the old `RNBridgeFactory` did) leaves the
+//  runtime under-initialised, so `getEnforcing('DeviceInfo')` fails and the bundle
+//  can't boot — the sheet renders blank.
+//
+//  We keep the *bridge* alive by overriding `bridgelessEnabled` → false, because
+//  the SDK's widget commands still use `bridge.enqueueJSCall` / `bridge.uiManager`.
+//
 //  Created by Shivam Shashank on 09/11/22.
 //
 
 import Foundation
 import React
+import React_RCTAppDelegate
+import ReactAppDependencyProvider
 
-internal class RNViewManager: NSObject {
+internal class RNViewManager: RCTDefaultReactNativeFactoryDelegate {
 
     internal var responseHandler: RNResponseHandler?
-    internal var rootView: RCTRootView?
+    internal var rootView: UIView?
 
-    internal lazy var bridge: RCTBridge = {
-        RCTBridge.init(delegate: self, launchOptions: nil)
-    }()
+    private var reactNativeFactory: RCTReactNativeFactory?
+
+    /// Captured when the embedded bridge loads its JS source (see `sourceURL(for:)`).
+    /// The host app is bridgeless, so this embedded bridge is the SDK's only bridge.
+    private weak var capturedBridge: RCTBridge?
 
     internal static let sharedInstance = RNViewManager()
 
-    internal func viewForModule(_ moduleName: String, initialProperties: [String: Any]?) -> RCTRootView {
-        let rootView: RCTRootView = RCTRootView(
-            bridge: self.bridge,
-            moduleName: moduleName,
+    /// Lazily create the standard RN factory (does the full runtime setup).
+    private func factory() -> RCTReactNativeFactory {
+        if let existing = reactNativeFactory {
+            return existing
+        }
+        self.dependencyProvider = RCTAppDependencyProvider()
+        let created = RCTReactNativeFactory(delegate: self)
+        reactNativeFactory = created
+        return created
+    }
+
+    /// The bridge backing the embedded runtime. Kept for the SDK's widget commands
+    /// (`bridge.enqueueJSCall` / `bridge.uiManager`). Available after the first view
+    /// is created.
+    internal var bridge: RCTBridge? {
+        return capturedBridge
+    }
+
+    internal func viewForModule(_ moduleName: String, initialProperties: [String: Any]?) -> UIView {
+        let view = factory().rootViewFactory.view(
+            withModuleName: moduleName,
             initialProperties: initialProperties
         )
-        self.rootView = rootView
-        return rootView
+        self.rootView = view
+        return view
     }
-    internal func widgetViewForModule(_ moduleName: String, initialProperties: [String: Any]?) -> RCTRootView {
-        return RCTRootView(
-            bridge: self.bridge,
-            moduleName: moduleName,
+
+    internal func widgetViewForModule(_ moduleName: String, initialProperties: [String: Any]?) -> UIView {
+        return factory().rootViewFactory.view(
+            withModuleName: moduleName,
             initialProperties: initialProperties
         )
     }
-}
 
-extension RNViewManager: RCTBridgeDelegate {
-    func sourceURL(for bridge: RCTBridge) -> URL? {
-        switch Helper.getInfoPlist("HyperswitchSource") {
-        case "LocalHosted":
-            return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
-        case "LocalBundle":
-            return Bundle.main.url(forResource: "hyperswitch", withExtension: "bundle")
-        default:
-            #if canImport(HyperOTA)
-            return OTAServices.shared.getBundleURL()
-            #else
+    // MARK: - Arch configuration
+
+    /// Keep the legacy bridge alive (Fabric-on-bridge) so the SDK's
+    /// `bridge.enqueueJSCall` / `bridge.uiManager` widget commands keep working.
+    public override func bridgelessEnabled() -> Bool {
+        return false
+    }
+
+    // MARK: - Bundle source
+    // Both are required in bridge mode: the default implementations throw.
+
+    override func sourceURL(for bridge: RCTBridge) -> URL? {
+        // Called while the embedded bridge loads its JS — capture it for the SDK's
+        // bridge-dependent widget commands.
+        self.capturedBridge = bridge
+        return bundleURL()
+    }
+
+    public override func bundleURL() -> URL? {
+//        switch Helper.getInfoPlist("HyperswitchSource") {
+//        case "LocalHosted":
+//            return RCTBundleURLProvider.sharedSettings().jsBundleURL(forBundleRoot: "index")
+//        case "LocalBundle":
+//            return Bundle.main.url(forResource: "hyperswitch", withExtension: "bundle")
+//        default:
+//            #if canImport(HyperOTA)
+//            return OTAServices.shared.getBundleURL()
+//            #else
             return Bundle(for: RNViewManager.self).url(forResource: "hyperswitch", withExtension: "bundle")
-            #endif
-        }
+//            #endif
+//        }
     }
 }
+