@jimrising/easymerchantsdk-react-native 2.5.3 → 2.5.5

package/android/build.gradle

@@ -96,7 +96,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.13.0'
 
     // Third-party libs
-    implementation 'com.app:paysdk:1.7.0'
+    implementation 'com.app:paysdk:1.7.1'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation 'com.github.bumptech.glide:glide:5.0.4'
     implementation 'com.github.androidmads:QRGenerator:1.0.5'

package/ios/ApiManager/APIHeaders.swift

@@ -14,12 +14,12 @@ struct APIHeaders {
 
     static func clientTokenHeader() -> [String: String] {
         guard let token = UserStoreSingleton.shared.clientToken else { return [:] }
-        return ["Client-Token": token]
+        return ["client-token": token]
     }
 
     static func customerTokenHeader() -> [String: String] {
         guard let token = UserStoreSingleton.shared.customerToken else { return [:] }
-        return ["Customer-Token": token]
+        return ["customer-token": token]
     }
 
     /// API key/secret headers (match Android SDK: X-Api-Key, X-Api-Secret)

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/Models/Request.swift

@@ -934,7 +934,7 @@ public final class Request: NSObject {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         //        let tokenn = UserStoreSingleton.shared.customerToken
-        //        uRLRequest.addValue(tokenn ?? "", forHTTPHeaderField: "Customer-Token")
+        //        uRLRequest.addValue(tokenn ?? "", forHTTPHeaderField: "customer-token")
         
         let token = clientToken ?? UserStoreSingleton.shared.clientToken ?? ""
         uRLRequest.addValue(token, forHTTPHeaderField: "clientToken")

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
@@ -4162,7 +4162,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         var params: [String: Any] = [
             "account_id": self.grailPayAccountID ?? "",
@@ -4378,7 +4378,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let emailText = txtFieldEmailGrailPayView.text
         let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
@@ -4611,7 +4611,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let finalEmail: String
         if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
@@ -4843,7 +4843,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let finalEmail: String
         if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
@@ -6433,7 +6433,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         // Use the clientToken from your singleton
         let token = UserStoreSingleton.shared.clientToken
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        request.addValue(token ?? "", forHTTPHeaderField: "client-token")
         // Match Android: send_otp also needs X-Api-Key / X-Api-Secret for merchant auth
         if let apiKey = EnvironmentConfig.apiKey, let apiSecret = EnvironmentConfig.apiSecret {
             request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
@@ -6452,7 +6452,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let apiSecretMask = EnvironmentConfig.apiSecret.map { _ in "****" } ?? "nil"
         NSLog("[send_otp] ----- REQUEST -----")
         NSLog("[send_otp] URL: %@", fullURL)
-        NSLog("[send_otp] Headers: Content-Type=application/json, Client-Token=%@, X-Api-Key=%@, X-Api-Secret=%@", clientTokenMask, apiKeyMask, apiSecretMask)
+        NSLog("[send_otp] Headers: Content-Type=application/json, client-token=%@, X-Api-Key=%@, X-Api-Secret=%@", clientTokenMask, apiKeyMask, apiSecretMask)
         NSLog("[send_otp] Body: %@", params.description)
         
         do {
@@ -6527,8 +6527,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         urlRequest.httpMethod = "POST"
         urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
-        // Verify_otp: match Android — only Customer-Token + Content-Type (no X-Api-Key/X-Api-Secret)
-        urlRequest.addValue(UserStoreSingleton.shared.customerToken ?? "", forHTTPHeaderField: "Customer-Token")
+        // Verify_otp: match Android — only customer-token + Content-Type (no X-Api-Key/X-Api-Secret)
+        urlRequest.addValue(UserStoreSingleton.shared.customerToken ?? "", forHTTPHeaderField: "customer-token")
         
         // Safe access from main thread (assumes you call this from main thread)
         let email = self.txtFieldEmail.text ?? ""
@@ -6545,7 +6545,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let customerTokenMask = customerT.isEmpty ? "nil" : String(customerT.prefix(8)) + "..."
         NSLog("[verify_otp] ----- REQUEST -----")
         NSLog("[verify_otp] URL: %@", fullURL)
-        NSLog("[verify_otp] Headers: Customer-Token=%@, Content-Type=application/json", customerTokenMask)
+        NSLog("[verify_otp] Headers: customer-token=%@, Content-Type=application/json", customerTokenMask)
         NSLog("[verify_otp] Body: card_search_value=%@, card_search_key=email, otp=%@", email, String(repeating: "*", count: otp.count))
         
         do {
@@ -6682,7 +6682,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
 //        
 //        let token = UserStoreSingleton.shared.customerToken
-//        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+//        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "customer-token")
 //        
 //        let session = URLSession.shared
 //        let task = session.dataTask(with: uRLRequest) { [weak self] (data, response, error) in
@@ -6798,7 +6798,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.customerToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "customer-token")
         
         let session = URLSession.shared
         let task = session.dataTask(with: uRLRequest) { [weak self] (data, response, error) in
@@ -7465,7 +7465,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let finalEmail: String
         if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
@@ -7787,7 +7787,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
       //  let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
@@ -8006,7 +8006,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
        // let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
@@ -8284,7 +8284,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
 //        
 //        let token = UserStoreSingleton.shared.customerToken
-//        request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+//        request.addValue(token ?? "", forHTTPHeaderField: "customer-token")
 //        
 //        // Get the text fields from the selected cell and trim whitespace
 //        let nameText = txtFieldNameOnCardUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -8425,7 +8425,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.customerToken
-        request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+        request.addValue(token ?? "", forHTTPHeaderField: "customer-token")
         
         let nameText = txtFieldNameOnCardUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let cvvText = txtFieldCVVUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -8533,9 +8533,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         request.httpMethod = "DELETE"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
-        // Add Customer-Token
+        // Add customer-token
         if let token = UserStoreSingleton.shared.customerToken {
-            request.addValue(token, forHTTPHeaderField: "Customer-Token")
+            request.addValue(token, forHTTPHeaderField: "customer-token")
         } else {
         }
         
@@ -8666,7 +8666,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        urlRequest.addValue(token, forHTTPHeaderField: "Customer-Token")
+        urlRequest.addValue(token, forHTTPHeaderField: "customer-token")
         
         let session = URLSession.shared
         let task = session.dataTask(with: urlRequest) { [weak self] (data, response, error) in
@@ -8822,7 +8822,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         var params: [String: Any] = [
             "name": txtFieldAccountName.text ?? "",
@@ -9029,7 +9029,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         var params: [String: Any] = [
             "name": !(request.name?.isEmpty ?? true) ? request.name! : (txtFieldAccountName.text ?? ""),
@@ -9291,7 +9291,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let finalEmail: String
         if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
@@ -9484,7 +9484,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let finalEmail: String
         if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
@@ -9731,7 +9731,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -9933,7 +9933,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -10190,7 +10190,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         // Retrieve and trim text field values (removing leading and trailing whitespace)
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -10410,7 +10410,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
 //        
 //        let token = UserStoreSingleton.shared.customerToken
-//        request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+//        request.addValue(token ?? "", forHTTPHeaderField: "customer-token")
 //        
 //        let session = URLSession.shared
 //        let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
@@ -10482,7 +10482,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         if let token = UserStoreSingleton.shared.customerToken {
-            request.addValue(token, forHTTPHeaderField: "Customer-Token")
+            request.addValue(token, forHTTPHeaderField: "customer-token")
         }
         
         // Also send accountID in request body
@@ -10574,7 +10574,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        urlRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         var params: [String: Any] = [
             "name": UserStoreSingleton.shared.merchantName ?? "",
@@ -10711,7 +10711,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        request.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (data, response, error) in
@@ -10765,7 +10765,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         var params: [String: Any] = [
             "name": cardNameTextField.text,
@@ -11115,7 +11115,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "client-token")
         
         let finalEmail: String
         if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {

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.5'
   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.5",
   "description": "",
   "main": "index.js",
   "scripts": {