@jimrising/easymerchantsdk-react-native 2.5.3 → 2.5.4

package/ios/Classes/EasyMerchantSdk.swift

@@ -84,7 +84,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             return
         }
         
-        guard let presentingVC = presentingViewControllerInWindowHierarchy() else {
+        guard let (presentingVC, toDismiss) = presentingViewControllerAndOptionalDismiss() else {
             reject("NO_VIEW_CONTROLLER", "Unable to find a view controller in the window hierarchy", nil)
             clearCallbacks()
             return
@@ -98,8 +98,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         }
         
         let controller = EasyPayViewController(request: request, delegate: self)
-        DispatchQueue.main.async {
-            presentingVC.present(controller, animated: true)
+        DispatchQueue.main.async { [weak self] in
+            self?.presentPaymentController(controller, from: presentingVC, dismissFirst: toDismiss)
         }
     }
     
@@ -117,15 +117,15 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             return
         }
         
-        guard let presentingVC = presentingViewControllerInWindowHierarchy() else {
+        guard let (presentingVC, toDismiss) = presentingViewControllerAndOptionalDismiss() else {
             reject("NO_VIEW_CONTROLLER", "Unable to find a view controller in the window hierarchy", nil)
             clearCallbacks()
             return
         }
         
         let controller = EasyPayViewController(request: request, delegate: self)
-        DispatchQueue.main.async {
-            presentingVC.present(controller, animated: true)
+        DispatchQueue.main.async { [weak self] in
+            self?.presentPaymentController(controller, from: presentingVC, dismissFirst: toDismiss)
         }
     }
     
@@ -155,14 +155,61 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         return UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController
     }
     
-    /// Present from the last VC in the chain whose view is in the window. RCTFabricModalHostViewController
-    /// is often on top but its view is not in the window hierarchy; presenting from it crashes.
+    /// Returns (presenter, viewControllerToDismiss). If the top is a modal host or our EasyPay, we must dismiss it first so presenter is not "already presenting".
+    private func presentingViewControllerAndOptionalDismiss() -> (UIViewController, UIViewController?)? {
+        guard var vc = keyWindowRootViewController() else { return nil }
+        while let presented = vc.presentedViewController {
+            vc = presented
+        }
+        let top = vc
+        // Step back from modal host or our own payment VC to get the real presenter
+        while (isModalHostViewController(vc) || isEasyPayViewController(vc)), let presenter = vc.presentingViewController {
+            vc = presenter
+        }
+        if isModalHostViewController(vc) || isEasyPayViewController(vc) { return nil }
+        // If top was a modal or EasyPay, that top is currently presented by vc; we must dismiss it first
+        let dismissFirst: UIViewController? = (top !== vc) ? top : nil
+        return (vc, dismissFirst)
+    }
+    
+    private func presentPaymentController(_ controller: UIViewController, from presentingVC: UIViewController, dismissFirst: UIViewController?) {
+        if let toDismiss = dismissFirst {
+            toDismiss.dismiss(animated: false) { [weak self] in
+                DispatchQueue.main.async {
+                    // After dismiss, get top then step back from modal host / EasyPay so we never present from them
+                    guard let presenter = self?.presentingViewControllerInWindowHierarchy() else {
+                        presentingVC.present(controller, animated: true)
+                        return
+                    }
+                    presenter.present(controller, animated: true)
+                }
+            }
+        } else {
+            presentingVC.present(controller, animated: true)
+        }
+    }
+    
+    /// Present from a VC that can safely present (not RCTFabricModalHostViewController; not our EasyPayViewController).
     private func presentingViewControllerInWindowHierarchy() -> UIViewController? {
         guard var vc = keyWindowRootViewController() else { return nil }
-        while let presented = vc.presentedViewController, presented.viewIfLoaded?.window != nil {
+        while let presented = vc.presentedViewController {
             vc = presented
         }
-        return vc.viewIfLoaded?.window != nil ? vc : nil
+        while (isModalHostViewController(vc) || isEasyPayViewController(vc)), let presenter = vc.presentingViewController {
+            vc = presenter
+        }
+        if isModalHostViewController(vc) || isEasyPayViewController(vc) { return nil }
+        return vc
+    }
+    
+    private func isModalHostViewController(_ vc: UIViewController?) -> Bool {
+        guard let vc = vc else { return false }
+        let name = String(describing: type(of: vc))
+        return name.contains("ModalHost") || name.contains("RCTModalHost")
+    }
+    
+    private func isEasyPayViewController(_ vc: UIViewController?) -> Bool {
+        vc is EasyPayViewController
     }
     
     private func getTopViewController() -> UIViewController? {

package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift

@@ -17,7 +17,7 @@ enum GrailPaySource {
     case newAccount
 }
 
-let easymerchantsdk = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle)
+let easymerchantsdk = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle)
 
 class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
@@ -2038,7 +2038,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTerms(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             print("Error: Could not find TermAndConditionsVC in easymerchantsdk storyboard.")
             return
         }
@@ -2066,7 +2066,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTermsAndConditions(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2118,7 +2118,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTermsGrailPayConditions(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2145,7 +2145,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTermsGrailPayNewAccountConditions(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2172,7 +2172,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTermsNewAccountViewConditions(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2785,7 +2785,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                     else if showBilling {
                         // Push to BillingInfoVC
-                        let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                        let billingInfoVC = UIStoryboard(name: "EasyPaySdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                         
                         billingInfoVC.isFrom = "SavedCards"
                         billingInfoVC.selectedCard = self.selectedCard // Passing the selected card data
@@ -2811,7 +2811,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                     else {
                         // Push to AdditionalInfoVC
-                        let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                        let additionalInfoVC = UIStoryboard(name: "EasyPaySdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                         additionalInfoVC.isFrom = "SavedCards"
                         additionalInfoVC.selectedCard = self.selectedCard // Passing the selected card data
                         additionalInfoVC.cvvText = cvvText // Passing the CVV text

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '2.5.3'
+  s.version          = '2.5.4'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "description": "",
   "main": "index.js",
   "scripts": {