@jimrising/easymerchantsdk-react-native 2.5.2 → 2.5.3

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

@@ -38,3 +38,6 @@ class RecurringTVC: UITableViewCell {
     }
 
 }
+
+
+

package/ios/Pods/ViewControllers/PaymentStatusWebViewVC.swift

@@ -5,37 +5,6 @@
 //  Created by Mony's Mac on 17/07/25.
 //
 
-//import UIKit
-//import WebKit
-//
-//class PaymentStatusWebViewVC: UIViewController {
-//    
-//    var urlString: String?
-//    private var webView: WKWebView!
-//    
-//    override func viewDidLoad() {
-//        super.viewDidLoad()
-//        setupWebView()
-//        loadRequestedURL()
-//    }
-//    
-//    private func setupWebView() {
-//        webView = WKWebView(frame: self.view.bounds)
-//        webView.autoresizingMask = [.flexibleWidth, .flexibleHeight]
-//        self.view.addSubview(webView)
-//    }
-//    
-//    private func loadRequestedURL() {
-//        guard let urlString = urlString, let url = URL(string: urlString) else {
-//            return
-//        }
-//        let request = URLRequest(url: url)
-//        webView.load(request)
-//    }
-//    
-//}
-
-
 import UIKit
 import WebKit
 
@@ -97,7 +66,7 @@ class PaymentStatusWebViewVC: UIViewController, WKNavigationDelegate {
     @objc private func closeButtonTapped() {
         self.navigationController?.popViewController(animated: true)
     }
-
+    
     // MARK: - WKNavigationDelegate
     func webView(_ webView: WKWebView, didStartProvisionalNavigation navigation: WKNavigation!) {
         activityIndicator.startAnimating()

package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift

@@ -215,7 +215,7 @@
 //        lblCompleteAuthentication.text = "Wating for 3DS Authentication..."
 //        btnContinue.isHidden = true
 //        
-//        let vc = EasyPaySdk.instantiateViewController(withIdentifier: "PaymentStatusWebViewVC") as! PaymentStatusWebViewVC
+//        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "PaymentStatusWebViewVC") as! PaymentStatusWebViewVC
 //        vc.urlString = urlStr // Pass the URL to WebView VC
 //        self.navigationController?.pushViewController(vc, animated: true)
 //    }
@@ -744,14 +744,15 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
             viewPaymentDetails.isHidden = false
             btnContinue.isHidden = true
             
-            stopStatusTimers()
+            apiStatusCheckTimer?.invalidate()
+            apiStatusCheckTimer = nil
         }
     }
     
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
-        // Match Android behavior: keep polling while user is in the 3DS WebView.
-        // Only stop timers when this VC is actually being dismissed/popped.
+        // Don't stop polling when pushing the 3DS WebView; Android keeps polling while the user
+        // completes authentication. Only stop when this VC is actually being dismissed/popped.
         if isMovingFromParent || isBeingDismissed {
             stopStatusTimers()
         }
@@ -822,7 +823,7 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         lblCompleteAuthentication.text = "Waiting for 3DS Authentication..."
         btnContinue.isHidden = true
         
-        let vc = EasyPaySdk.instantiateViewController(withIdentifier: "PaymentStatusWebViewVC") as! PaymentStatusWebViewVC
+        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "PaymentStatusWebViewVC") as! PaymentStatusWebViewVC
         vc.urlString = urlStr
         self.navigationController?.pushViewController(vc, animated: true)
     }
@@ -921,7 +922,7 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                         self.lblRefferenceId.text = refToken
                         self.lblPaymentMethodValue.text = "Card"
                     }
-                    // Match Android: timeout shows warning UI only.
+                    // Match Android behavior: timeout shows warning UI only.
                 }
             }
         }
@@ -1158,6 +1159,9 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                                 self.imgViewPaymentDone.tintColor = .systemRed
                                 self.lblCompleteAuthentication.text = "Authentication Expired"
                             } else {
+                                // Includes "completed" and any other non-initiated status.
+                                // Android's catch-all shows the "success" icon for any non-initiated status
+                                // except explicit failure/expired.
                                 self.imgViewPaymentDone.image = UIImage(named: "payment_done_icon", in: .easyPayBundle, compatibleWith: nil)
                                 self.imgViewPaymentDone.tintColor = nil
                                 self.lblCompleteAuthentication.text = "Authentication Completed"

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '2.5.2'
+  s.version          = '2.5.3'
   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.2",
+  "version": "2.5.3",
   "description": "",
   "main": "index.js",
   "scripts": {

package/ACH_CHARGE_ENDPOINT_TRACE.md

@@ -1,69 +0,0 @@
-# Back-trace: `/api/v1/ach/charge` → PaymentInfoVC only (ignore billing/additional)
-
-Endpoint: **`/api/v1/ach/charge`**  
-Built as: `EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()`  
-File: **`em-MobileCheckoutSDK-ReactNative/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift`**
-
-Billing and Additional Info flows (BillingInfoVC / AdditionalInfoVC) are ignored here; only direct ACH charge from PaymentInfoVC is listed.
-
----
-
-## 1. Manual bank form (bank fields) — **Next** button
-
-- **Action:** `actionBtnNext`
-- **When:** Bank selected, manual bank fields form, **no billing/additional** (or nil `request.fields`).
-- **Direct ACH call:**
-  - **`accountBankChargeApi()`** (~line 9023)
-  - **`accountChargeApi()`** (no-arg, ~line 8816)
-
----
-
-## 2. New manual ACH (add new bank account) — **Pay** button
-
-- **Action:** `actionBtnPayNowNewAccountView`
-- **When:** Add-new-bank-account form, **no billing/additional** (and no OTP needed, or billing nil).
-- **Direct ACH call:**
-  - **`accountBankChargeAddNewAccountApi()`** (~line 9926) — when no billing/additional and no OTP
-  - **`accountChargeAddNewAccountApi()`** (~line 9724) — when `request.fields` is nil and not saving
-  - **`accountChargeApi(customerId:)`** (~line 10183) — when `request.fields` is nil and saving (has customerId)
-
----
-
-## 3. Saved bank (single saved account) — **Pay** button
-
-- **Action:** `actionBtnPayNowSingleAccountView`
-- **When:** Saved bank selected, **no billing/additional**.
-- **Direct ACH call:**
-  - **`grailPayAaccountChargeSingleSavedAccountApi()`** (~line 4830)
-  - (In other branch when not authenticated ACH: **`accountBankChargeSavedBankAccountApi()`** — in PaymentInfoVC; if present it also hits ach/charge.)
-
----
-
-## 4. GrailPay — existing linked account
-
-- **Action:** Same **Next**-button flow when GrailPay + existing account, **no billing/additional**.
-- **Direct ACH call:**
-  - **`grailPayAccountChargeApi()`** (~line 4149) — no save
-  - **`grailPayAccountChargeWithSaveApi()`** (~line 4365) — with save
-
----
-
-## 5. GrailPay — new account
-
-- **Action:** New GrailPay account flow, **no billing/additional**.
-- **Direct ACH call:**
-  - **`grailPayNewAccountChargeApi()`** (~line 4598)
-
----
-
-## Summary (PaymentInfoVC only, no billing/additional)
-
-| Button / flow                    | API method that calls ach/charge                    |
-|----------------------------------|-----------------------------------------------------|
-| **actionBtnNext** (manual bank)  | `accountBankChargeApi`, `accountChargeApi()`        |
-| **actionBtnPayNowNewAccountView**| `accountBankChargeAddNewAccountApi`, `accountChargeAddNewAccountApi`, `accountChargeApi(customerId:)` |
-| **actionBtnPayNowSingleAccountView** | `grailPayAaccountChargeSingleSavedAccountApi` (and `accountBankChargeSavedBankAccountApi` in another branch) |
-| GrailPay existing (Next)         | `grailPayAccountChargeApi`, `grailPayAccountChargeWithSaveApi` |
-| GrailPay new                     | `grailPayNewAccountChargeApi`                       |
-
-All of the above use **`EnvironmentConfig.Endpoints.achCharge.path()`** → **`/api/v1/ach/charge`**.