@juspay-tech/react-native-hyperswitch 1.3.4 → 1.3.6

package/android/src/rn79/java/io/hyperswitch/react/HyperFragment.kt

@@ -545,6 +545,9 @@ class HyperFragment : ReactFragment() {
 
   override fun onDestroy() {
     try {
+      /* A fragment restored after recreation is a new instance, so pending callbacks can
+         never be fulfilled past this point; settle them instead of silently dropping. */
+      settlePendingCallbacks()
       unRegisterEventBus()
       callbacks.clear()
       onExit = null
@@ -554,6 +557,23 @@ class HyperFragment : ReactFragment() {
     }
   }
 
+  /* Failure payload mirrors StandardResult.Failed so the JS layer maps it to a failed result. */
+  private fun settlePendingCallbacks() {
+    val failure = StandardResult.Failed(
+      code = "SURFACE_LOST",
+      message = "The payment surface was destroyed before the flow completed",
+      error = Throwable("SURFACE_LOST")
+    ).toJSONString()
+    callbacks.values.forEach { hyperCallback ->
+      when (hyperCallback) {
+        is HyperCallback.Payment -> hyperCallback.fn(failure)
+        is HyperCallback.UpdateIntentInit -> hyperCallback.fn?.invoke()
+        is HyperCallback.UpdateIntentComplete -> hyperCallback.fn(failure)
+        is HyperCallback.ConfirmButtonTriggered -> Unit
+      }
+    }
+  }
+
   @SuppressLint("ClickableViewAccessibility")
   private fun fixScrollInterception(root: ViewGroup) {
     root.isNestedScrollingEnabled = true

package/android/src/rn81/java/io/hyperswitch/react/HyperFragment.kt

@@ -537,6 +537,9 @@ class HyperFragment : ReactFragment() {
 
   override fun onDestroy() {
     try {
+      /* A fragment restored after recreation is a new instance, so pending callbacks can
+         never be fulfilled past this point; settle them instead of silently dropping. */
+      settlePendingCallbacks()
       unRegisterEventBus()
       callbacks.clear()
       onExit = null
@@ -546,6 +549,23 @@ class HyperFragment : ReactFragment() {
     }
   }
 
+  /* Failure payload mirrors StandardResult.Failed so the JS layer maps it to a failed result. */
+  private fun settlePendingCallbacks() {
+    val failure = StandardResult.Failed(
+      code = "SURFACE_LOST",
+      message = "The payment surface was destroyed before the flow completed",
+      error = Throwable("SURFACE_LOST")
+    ).toJSONString()
+    callbacks.values.forEach { hyperCallback ->
+      when (hyperCallback) {
+        is HyperCallback.Payment -> hyperCallback.fn(failure)
+        is HyperCallback.UpdateIntentInit -> hyperCallback.fn?.invoke()
+        is HyperCallback.UpdateIntentComplete -> hyperCallback.fn(failure)
+        is HyperCallback.ConfirmButtonTriggered -> Unit
+      }
+    }
+  }
+
   @SuppressLint("ClickableViewAccessibility")
   private fun fixScrollInterception(root: ViewGroup) {
     root.isNestedScrollingEnabled = true

package/ios/Modules/ReactNative/NativeHyperswitchModuleImpl.swift

@@ -135,13 +135,15 @@ public class NativeHyperswitchModuleImpl: NSObject {
             endpointsConfig = .commonEndpoint(common)
         }
 
-        // Map environment string (Android uses "PROD"/"SANDBOX") to the Swift enum
+        // Map environment string (Android uses "PROD"/"SANDBOX"/"INTEG") to the Swift enum
         let envEnum: HyperswitchEnvironment?
         switch environment.uppercased() {
         case "PROD", "PRODUCTION":
             envEnum = .production
         case "SANDBOX":
             envEnum = .sandbox
+        case "INTEG":
+            envEnum = .integ
         default:
             envEnum = nil
         }

package/ios/hyperswitchSDK/Core/ApplePay/ApplePayHandler.swift

@@ -7,50 +7,49 @@
 
 import Foundation
 import PassKit
+import UIKit
 import React
 
 internal class ApplePayHandler: NSObject {
 
     var paymentStatus: PKPaymentAuthorizationStatus? = .failure
     var callback: RCTResponseSenderBlock?
+    private var retainedSelf: ApplePayHandler?
 
     internal func startPayment(rnMessage: String, rnCallback: @escaping RCTResponseSenderBlock, presentCallback: RCTResponseSenderBlock?) {
 
         callback = rnCallback
+        retainedSelf = self
+        NativeLog.debug("wallet_launch_called", ["wallet": "apple_pay"])
         var requiredBillingContactFields: Set<PKContactField>?
         var requiredShippingContactFields: Set<PKContactField>?
 
         guard let dict = rnMessage.toJSON() as? [String: AnyObject] else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing field payment_request_data"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing field payment_request_data"])
             return
         }
 
         guard let payment_request_data = dict["payment_request_data"] else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing field payment_request_data"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing field payment_request_data"])
             return
         }
 
         guard let countryCode = payment_request_data["country_code"] as? String else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing field country_code"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing field country_code"])
             return
         }
 
         guard let currencyCode = payment_request_data["currency_code"] as? String else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing field currency_code"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing field currency_code"])
             return
         }
         guard let total = payment_request_data["total"] as? [String: AnyObject] else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing field total"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing field total"])
             return
         }
 
@@ -59,29 +58,25 @@ internal class ApplePayHandler: NSObject {
             let type = total["type"] as? String
         else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing fields amount, label, type"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing fields amount, label, type"])
             return
         }
 
         guard let merchant_capabilities_array = payment_request_data["merchant_capabilities"] as? [String] else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing field merchant_capabilities"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing field merchant_capabilities"])
             return
         }
 
         guard let merchantIdentifier = payment_request_data["merchant_identifier"] as? String else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing field merchant_identifier"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing field merchant_identifier"])
             return
         }
 
         guard let supported_networks_array = payment_request_data["supported_networks"] as? [String] else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: missing field supported_networks"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: missing field supported_networks"])
             return
         }
 
@@ -134,8 +129,7 @@ internal class ApplePayHandler: NSObject {
             PKPaymentAuthorizationViewController(paymentRequest: paymentRequest) != nil
         else {
             presentCallback?([])
-            callback?([["status": "Failed", "message": "ApplePay: cannot make payments"]])
-            callback = nil
+            finish(["status": "Failed", "message": "ApplePay: cannot make payments"])
             return
         }
         let paymentController = PKPaymentAuthorizationController(paymentRequest: paymentRequest)
@@ -145,11 +139,28 @@ internal class ApplePayHandler: NSObject {
             if presented {
                 self.paymentStatus = nil
             } else {
-                self.callback?([["status": "Failed", "message": "ApplePay: unable to present"]])
-                self.callback = nil
+                NativeLog.error("wallet_present_failed", ["wallet": "apple_pay"])
+                self.finish(["status": "Failed", "message": "ApplePay: unable to present"])
             }
         })
     }
+
+    private func complete(_ result: [String: Any]) {
+        guard let callback else {
+            NativeLog.warning("wallet_result_dropped", ["wallet": "apple_pay", "status": result["status"] as? String])
+            return
+        }
+        self.callback = nil
+        NativeLog.debug("wallet_result_delivered", ["wallet": "apple_pay", "status": result["status"] as? String])
+        callback([result])
+    }
+
+    private func finish(_ result: [String: Any]? = nil) {
+        if let result {
+            complete(result)
+        }
+        retainedSelf = nil
+    }
 }
 
 /// Extension to conform to PKPaymentAuthorizationControllerDelegate
@@ -178,33 +189,33 @@ extension ApplePayHandler: PKPaymentAuthorizationControllerDelegate {
         default: paymentType = "unknown"
         }
 
-        self.callback?(
+        complete(
             [
-                [
-                    "status": "Success",
-                    "payment_data": dataString,
-                    "payment_method": [
-                        "type": paymentType,
-                        "network": payment.token.paymentMethod.network ?? "",
-                        "display_name": payment.token.paymentMethod.displayName ?? "",
-                    ],
-                    "transaction_identifier": payment.token.transactionIdentifier,
-                    "billing_contact": convertPKContactToDictionary(payment.billingContact),
-                    "shipping_contact": convertPKContactToDictionary(payment.shippingContact),
-                ]
+                "status": "Success",
+                "payment_data": dataString,
+                "payment_method": [
+                    "type": paymentType,
+                    "network": payment.token.paymentMethod.network ?? "",
+                    "display_name": payment.token.paymentMethod.displayName ?? "",
+                ],
+                "transaction_identifier": payment.token.transactionIdentifier,
+                "billing_contact": convertPKContactToDictionary(payment.billingContact),
+                "shipping_contact": convertPKContactToDictionary(payment.shippingContact),
             ]
         )
-        self.callback = nil
         completion(PKPaymentAuthorizationResult(status: paymentStatus ?? .failure, errors: errors))
     }
     /// Handle completion of the payment authorization flow
     internal func paymentAuthorizationControllerDidFinish(_ controller: PKPaymentAuthorizationController) {
+        controller.delegate = nil
         controller.dismiss {
             DispatchQueue.main.async {
                 if self.paymentStatus == .failure {
-                    self.callback?([["status": "Failed", "message": "ApplePay: payment failed"]])
+                    self.finish(["status": "Failed", "message": "ApplePay: payment failed"])
                 } else if self.paymentStatus == nil {
-                    self.callback?([["status": "Cancelled"]])
+                    self.finish(["status": "Cancelled"])
+                } else {
+                    self.finish()
                 }
             }
         }

package/ios/hyperswitchSDK/Core/HyperPaymentSheet/PaymentSheetView+UIKit.swift

@@ -19,17 +19,13 @@ internal extension PaymentSheet {
         completion: @escaping (String) -> Void
     ) {
         self.completion = completion
+        NativeLog.debug("present_payment_sheet_called")
 
         let paymentSheetViewController = HyperUIViewController()
         paymentSheetViewController.paymentSheet = self
         paymentSheetViewController.modalPresentationStyle = .overFullScreen
         paymentSheetViewController.view = rootView
 
-        // Register the sheet and VC directly with HyperModuleImpl so that
-        // exitPaymentsheet can call the completion without relying on
-        // bridge.uiManager.addUIBlock (which doesn't find Fabric-rendered views).
-        HyperModuleImpl.shared.registerPaymentSheet(self, vc: paymentSheetViewController)
-
         presentingViewController.present(paymentSheetViewController, animated: false)
     }
 

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

@@ -55,27 +55,13 @@ public class HyperModuleImpl: NSObject {
         }
     }
 
-    private let applePayPaymentHandler = ApplePayHandler()
     private let expressCheckoutHandler = ExpressCheckoutLauncher()
     private var presentCallback: RCTResponseSenderBlock? = nil
 
-    /// 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?
-
     internal override init() {
         super.init()
     }
 
-    // MARK: - Payment sheet registration (called from PaymentSheetView+UIKit)
-
-    internal func registerPaymentSheet(_ sheet: PaymentSheet, vc: HyperUIViewController) {
-        activePaymentSheet = sheet
-        activePaymentSheetVC = vc
-    }
-
     private func onMain(_ work: @escaping () -> Void) {
         if Thread.isMainThread {
             work()
@@ -130,7 +116,9 @@ public class HyperModuleImpl: NSObject {
     // MARK: - Apple Pay
 
     @objc public func launchApplePay(_ rnMessage: String, callback: @escaping RCTResponseSenderBlock) {
-        applePayPaymentHandler.startPayment(rnMessage: rnMessage, rnCallback: callback, presentCallback: self.presentCallback)
+        let presentCallback = self.presentCallback
+        self.presentCallback = nil
+        ApplePayHandler().startPayment(rnMessage: rnMessage, rnCallback: callback, presentCallback: presentCallback)
     }
 
     @objc public func startApplePay(_ rnMessage: String, callback: @escaping RCTResponseSenderBlock) {
@@ -171,21 +159,24 @@ public class HyperModuleImpl: NSObject {
     // 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
+        withPaymentSheet(reactTag) { vc, sheet in
+            guard let sheet else {
+                NativeLog.error("exit_payment_sheet_no_sheet", ["rootTag": reactTag.intValue, "vcFound": vc != nil])
+                return
+            }
+            let completion = sheet.completion
+            sheet.completion = nil
+            guard let vc else {
+                NativeLog.warning("exit_payment_sheet_no_view_controller")
+                completion?(rnMessage)
+                return
+            }
+            vc.dismiss(animated: false) {
+                NativeLog.debug("exit_payment_sheet_resolved", ["completionPresent": completion != nil])
+                RNViewManager.sharedInstance.rootView?.removeFromSuperview()
+                RNViewManager.sharedInstance.rootView = nil
+                completion?(rnMessage)
+            }
         }
     }
 
@@ -489,10 +480,34 @@ public class HyperModuleImpl: NSObject {
 
     private func withPaymentSheet(_ rootTag: NSNumber, _ block: @escaping (UIViewController?, PaymentSheet?) -> Void) {
         DispatchQueue.main.async {
-            let view = self.resolveView(forRootTag: rootTag)
-            let vc = view?.reactViewController() as? HyperUIViewController
-            let sheet = vc?.paymentSheet
-            block(vc, sheet)
+            let vc: HyperUIViewController?
+            if let view = self.resolveView(forRootTag: rootTag) {
+                vc = view.reactViewController() as? HyperUIViewController
+            } else {
+                vc = HyperModuleImpl.topmostPaymentSheetController()
+            }
+            block(vc, vc?.paymentSheet)
         }
     }
+
+    private static func topmostPaymentSheetController() -> HyperUIViewController? {
+        let windows = UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .flatMap { $0.windows }
+            .sorted { $0.isKeyWindow && !$1.isKeyWindow }
+        for window in windows {
+            var found: HyperUIViewController?
+            var current = window.rootViewController
+            while let vc = current {
+                if let sheetVC = vc as? HyperUIViewController, sheetVC.paymentSheet != nil {
+                    found = sheetVC
+                }
+                current = vc.presentedViewController
+            }
+            if let found {
+                return found
+            }
+        }
+        return nil
+    }
 }

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

@@ -22,7 +22,7 @@ internal class RNHeadlessManagerDelegate: RNFactoryDelegate {
     }
 }
 
-internal class RNHeadlessManager: RCTDefaultReactNativeFactoryDelegate {
+internal class RNHeadlessManager: RCTDefaultReactNativeFactoryDelegate, ReactHostManager {
 
     internal var responseHandler: RNResponseHandler?
     internal var rootView: UIView?
@@ -42,6 +42,7 @@ internal class RNHeadlessManager: RCTDefaultReactNativeFactoryDelegate {
             return existing
         }
         delegate.dependencyProvider = RCTAppDependencyProvider()
+        delegate.manager = self
         let created = RCTReactNativeFactory(delegate: delegate)
         factory = created
         return created
@@ -102,17 +103,6 @@ internal class RNHeadlessManager: RCTDefaultReactNativeFactoryDelegate {
         }
     }
 
-    // MARK: - RCTTurboModuleManagerDelegate
-
-    @objc public func getModuleInstanceFromClass(_ moduleClass: AnyClass) -> AnyObject? {
-        if String(describing: moduleClass) == "HyperModule",
-           let shim = (moduleClass as? NSObject.Type)?.init() as? HyperModuleShim {
-            hyperModule.attach(to: shim)
-            return shim as AnyObject
-        }
-        return nil
-    }
-
     public override func bridgelessEnabled() -> Bool {
         return true
     }