@jimrising/easymerchantsdk-react-native 2.5.2 → 2.5.3

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

@@ -17,7 +17,7 @@ enum GrailPaySource {
     case newAccount
 }
 
-let EasyPaySdk = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle)
+let easymerchantsdk = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle)
 
 class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
@@ -693,6 +693,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         setUpTermAndConditionsButton()
         setUpTermAndConditionsForSingleSavedAccountButton()
         setUpTermAndConditionsForGrailPaySavedAccountButton()
+        viewTermsAndConditions.isUserInteractionEnabled = true
+        viewTermsAndConditions.superview?.isUserInteractionEnabled = true
+        // Add spacing between terms row and submit button (code-only so layout stays within fixed height)
+        if let termsContainerStack = viewTermsAndConditions.superview as? UIStackView,
+           let mainBankStack = termsContainerStack.superview as? UIStackView {
+            mainBankStack.setCustomSpacing(24, after: termsContainerStack)
+        }
+        // Add spacing between bank form container and submit button (they are siblings)
+        if let parentStack = viewBankFields.superview as? UIStackView {
+            parentStack.setCustomSpacing(24, after: viewBankFields)
+        } else if let parent = viewBankFields.superview {
+            for c in parent.constraints {
+                if c.firstAttribute == .top && c.secondAttribute == .bottom,
+                   (c.firstItem as? UIView) === grailPayBankLinkView, (c.secondItem as? UIView) === viewBankFields {
+                    c.constant = 24
+                    break
+                }
+                if c.firstAttribute == .bottom && c.secondAttribute == .top,
+                   (c.firstItem as? UIView) === viewBankFields, (c.secondItem as? UIView) === grailPayBankLinkView {
+                    c.constant = 24
+                    break
+                }
+            }
+        }
         setUpOpenGrailPayAgainButton()
         lblGrailPaySavedAccountNumber.text = ""
         lblGrailPaySavedAccountType.text = ""
@@ -1009,10 +1033,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
             
             if request.saveAccount == false {
-                self.heightViewBankFields.constant = 790
+                self.heightViewBankFields.constant = 790 + 24  // +24 spacing between terms row and submit button
                 self.heightViewNewAccountFields.constant = 840
             } else {
-                self.heightViewBankFields.constant = 836
+                self.heightViewBankFields.constant = 836 + 24  // +24 spacing between terms row and submit button
                 self.heightViewNewAccountFields.constant = 890
             }
             
@@ -1104,10 +1128,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
             
             if request.saveAccount == false {
-                self.heightViewBankFields.constant = 604
+                self.heightViewBankFields.constant = 604 + 24  // +24 spacing between terms row and submit button
                 self.heightViewNewAccountFields.constant = 644
             } else {
-                self.heightViewBankFields.constant = 644
+                self.heightViewBankFields.constant = 644 + 24  // +24 spacing between terms row and submit button
                 self.heightViewNewAccountFields.constant = 704
             }
             
@@ -2014,7 +2038,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTerms(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+            print("Error: Could not find TermAndConditionsVC in easymerchantsdk storyboard.")
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2041,7 +2066,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTermsAndConditions(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2052,6 +2077,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func setUpOpenGrailPayAgainButton() {
         viewGrailPaySavedAccount.addSubview(btnOpenGrailPayAgain)
         let labelsStack = lblGrailPaySavedAccountNumber.superview!
+        // Deactivate constraint pinning labels stack trailing to superview so we can add the button
         for c in viewGrailPaySavedAccount.constraints {
             let matches = (c.firstItem as? UIView) === labelsStack && c.firstAttribute == .trailing
                 || (c.secondItem as? UIView) === labelsStack && c.secondAttribute == .trailing
@@ -2092,7 +2118,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTermsGrailPayConditions(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2119,7 +2145,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTermsGrailPayNewAccountConditions(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2146,7 +2172,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @objc func aboutTermsNewAccountViewConditions(sender: UITapGestureRecognizer) {
-        guard let vc = UIStoryboard(name: "EasyPaySdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             return
         }
         vc.modalPresentationStyle = .overFullScreen
@@ -2716,6 +2742,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnPayNowSingleSavedCard(_ sender: UIButton) {
+        showDebugPayButtonAlert(message: "Pay for SAVED CARD — actionBtnPayNowSingleSavedCard")
         // Check if billingInfoData is not nil or empty
         if let billingInfoData = request.fields,
            let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
@@ -2758,7 +2785,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                     else if showBilling {
                         // Push to BillingInfoVC
-                        let billingInfoVC = UIStoryboard(name: "EasyPaySdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                        let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                         
                         billingInfoVC.isFrom = "SavedCards"
                         billingInfoVC.selectedCard = self.selectedCard // Passing the selected card data
@@ -2784,7 +2811,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                     else {
                         // Push to AdditionalInfoVC
-                        let additionalInfoVC = UIStoryboard(name: "EasyPaySdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                        let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", 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
@@ -2882,7 +2909,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction func actionBtnPayNowNewCardView(_ sender: UIButton) {
         NSLog("[PayButton] CARD FORM SUBMIT — actionBtnPayNowNewCardView")
+        showDebugPayButtonAlert(message: "Pay for NEW CARD — actionBtnPayNowNewCardView")
+        NSLog("%@", "[PayNowNewCard] isLoggedIn=\(UserStoreSingleton.shared.isLoggedIn), request.saveCard=\(request.saveCard), isSavedNewCardForFuture=\(isSavedNewCardForFuture)")
         if UserStoreSingleton.shared.isLoggedIn == true {
+            NSLog("%@", "[PayNowNewCard] → taking LOGGED IN branch")
             //if billing info is availbale
             if let billingInfoData = request.fields,
                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
@@ -2960,8 +2990,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         let showBilling = fieldSection.visibility.billing
                         let showAdditional = fieldSection.visibility.additional
-                        
+                        NSLog("%@", "[PayNowNewCard] LOGGED IN: showBilling=\(showBilling), showAdditional=\(showAdditional)")
                         if !showBilling && !showAdditional {
+                            NSLog("%@", "[PayNowNewCard] LOGGED IN: no billing → calling payment API directly")
                             if self.request.secureAuthentication == true {
                                 self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                             } else {
@@ -2970,7 +3001,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else if showBilling {
                             // Push to BillingInfoVC
-                            let billingInfoVC = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            let billingInfoVC = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             // Pass the card details
                             billingInfoVC.cardNumber = cardNumber
                             billingInfoVC.expiryDate = expiryDate
@@ -2997,7 +3028,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else {
                             // Push to AdditionalInfoVC
-                            let additionalInfoVC = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            let additionalInfoVC = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             // Pass the card details
                             additionalInfoVC.cardNumber = cardNumber
                             additionalInfoVC.expiryDate = expiryDate
@@ -3028,6 +3059,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             }
             else {
+                NSLog("%@", "[PayNowNewCard] LOGGED IN: no billingInfoData → calling payment API")
                 if request.secureAuthentication == true {
                     threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                 }
@@ -3036,6 +3068,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             }
         } else {
+            NSLog("%@", "[PayNowNewCard] → taking NOT LOGGED IN branch")
             // User not logged in — same check as ACH flow: if save card checked → verify (OTP) first
             if let billingInfoData = request.fields,
                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
@@ -3097,10 +3130,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         let showBilling = fieldSection.visibility.billing
                         let showAdditional = fieldSection.visibility.additional
+                        NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: showBilling=\(showBilling), showAdditional=\(showAdditional)")
                         if !showBilling && !showAdditional {
-                            let saveCardChecked = (self.request.saveCard == true) || self.isSavedNewCardForFuture
+                            // Use only the user's checkbox so we don't ask for OTP when they didn't tick "save card"
+                            let saveCardChecked = self.isSavedNewCardForFuture
                             if saveCardChecked {
-                                if let vc = EasyPaySdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+                                if let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
                                     vc.easyPayDelegate = self.easyPayDelegate
                                     vc.cardNumber = cardNumber
                                     vc.expiryDate = expiryDate
@@ -3113,6 +3148,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.userEmail = self.request.email
                                     vc.amount = self.request.amount ?? 0
                                     vc.isSavedForFuture = self.isSavedNewCardForFuture
+                                    vc.isSavedNewCard = self.isSavedNewCardForFuture
                                     if let billingInfoData = self.request.fields {
                                         vc.billingInfoData = billingInfoData
                                     }
@@ -3121,8 +3157,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.visibility = fieldSection.visibility
                                     vc.email = self.request.email
                                     self.navigationController?.pushViewController(vc, animated: true)
+                                } else {
+                                    NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: OTPVerificationVC instantiation failed")
                                 }
                             } else {
+                                NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: saveCard not checked → calling payment API (bypassing OTP)")
                                 if self.request.secureAuthentication == true {
                                     self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                                 } else {
@@ -3130,7 +3169,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                             }
                         } else if showBilling {
-                            let billingInfoVC = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: pushing BillingInfoVC")
+                            let billingInfoVC = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             billingInfoVC.cardNumber = cardNumber
                             billingInfoVC.expiryDate = expiryDate
                             billingInfoVC.cvv = cvv
@@ -3150,7 +3190,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             billingInfoVC.visibility = fieldSection.visibility
                             self.navigationController?.pushViewController(billingInfoVC, animated: true)
                         } else {
-                            let additionalInfoVC = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: pushing AdditionalInfoVC")
+                            let additionalInfoVC = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             additionalInfoVC.cardNumber = cardNumber
                             additionalInfoVC.expiryDate = expiryDate
                             additionalInfoVC.cvv = cvv
@@ -3172,8 +3213,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                     }
                 } catch {
+                    NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: decode fieldSection catch")
                 }
             } else {
+                NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: no billingInfoData → calling payment API (bypassing OTP)")
                 if request.secureAuthentication == true {
                     threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                 } else {
@@ -3552,6 +3595,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction private func actionBtnLinkGrailPayBankAccount(_ sender: UIButton) {
+        showDebugPayButtonAlert(message: "Pay for GRAILPAY (saved/linked bank) — actionBtnLinkGrailPayBankAccount")
         if isBankAccountConnected {
             let email = self.txtFieldEmailGrailPayView.text.trimmingCharacters(in: .whitespacesAndNewlines)
             
@@ -3605,8 +3649,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     }
                                     else {
                                         // Navigate directly to EmailVerificationVC
-                                        // let vc = EasyPaySdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                                        let vc = EasyPaySdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
+                                        // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                                        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                                         vc.easyPayDelegate = self.easyPayDelegate
                                         vc.grailPayAccountID = self.grailPayAccountID
                                         vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
@@ -3628,7 +3672,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                                 else if showBilling {
                                     // Push to BillingInfoVC
-                                    let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
                                     vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
@@ -3648,7 +3692,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                                 else {
                                     // Push to AdditionalInfoVC
-                                    let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
                                     vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
@@ -3678,8 +3722,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         grailPayAccountChargeWithSaveApi()
                     } else {
                         // Navigate to EmailVerificationVC directly
-                        // let vc = EasyPaySdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                        let vc = EasyPaySdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
+                        // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                         vc.easyPayDelegate = self.easyPayDelegate
                         vc.grailPayAccountID = self.grailPayAccountID
                         vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
@@ -3714,7 +3758,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                                 else if showBilling {
                                     // Push to BillingInfoVC
-                                    let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
                                     vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
@@ -3734,7 +3778,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                                 else {
                                     // Push to AdditionalInfoVC
-                                    let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
                                     vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
@@ -3771,6 +3815,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionLinkNewGrailPayAccount(_ sender: UIButton) {
+        showDebugPayButtonAlert(message: "Pay for NEW GRAILPAY ACCOUNT — actionLinkNewGrailPayAccount")
         if isNewBankAccountConnected {
             // Recurring Plan + Date Validation (only if is_recurring is true)
             if let req = self.request, req.is_recurring == true {
@@ -3813,7 +3858,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                                 else if showBilling {
                                     // Push to BillingInfoVC
-                                    let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
                                     vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
@@ -3832,7 +3877,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                                 else {
                                     // Push to AdditionalInfoVC
-                                    let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
                                     vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
@@ -3873,7 +3918,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else if showBilling {
                             // Push to BillingInfoVC
-                            let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             vc.billingInfoData = nil
                             vc.request = self.request
                             vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
@@ -3892,7 +3937,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else {
                             // Push to AdditionalInfoVC
-                            let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             vc.billingInfoData = nil
                             vc.request = self.request
                             vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
@@ -3933,7 +3978,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                                 else if showBilling {
                                     // Push to BillingInfoVC
-                                    let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
                                     vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
@@ -3952,7 +3997,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                                 else {
                                     // Push to AdditionalInfoVC
-                                    let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                     vc.billingInfoData = billingInfoData
                                     vc.request = self.request
                                     vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
@@ -5151,8 +5196,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         let showBilling = fieldSection.visibility.billing
                         let showAdditional = fieldSection.visibility.additional
-                        // Same as ACH: use request.saveCard OR checkbox (isSavedNewCardForFuture) — card checkbox sets isSavedNewCardForFuture
-                        let saveCardChecked = (self.request.saveCard == true) || self.isSavedNewCardForFuture
+                        // Use only the user's checkbox (isSavedNewCardForFuture); do not use request.saveCard so we don't ask for OTP when user didn't tick "save card"
+                        let saveCardChecked = self.isSavedNewCardForFuture
                         if !showBilling && !showAdditional {
                             if saveCardChecked {
                                 if UserStoreSingleton.shared.isLoggedIn == true {
@@ -5175,13 +5220,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else if showBilling {
                             // Push to BillingInfoVC
-                            let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             vc.cardNumber = cardNumber
                             vc.expiryDate = expiryDate
                             vc.cvv = cvv
                             vc.nameOnCard = cardName
                             vc.selectedPaymentMethod = self.selectedPaymentMethod
                             vc.isSavedForFuture = self.isSavedNewAccount
+                            vc.isSavedNewCard = self.isSavedNewCardForFuture
                             vc.request = self.request
                             vc.chosenPlan = self.txtFieldChosePlanCard.text
                             vc.startDate = self.txtFieldStartDateCard.text
@@ -5196,7 +5242,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else {
                             // Push to AdditionalInfoVC
-                            let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             vc.billingInfoData = billingInfoData
                             vc.cardNumber = cardNumber
                             vc.expiryDate = expiryDate
@@ -5204,6 +5250,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             vc.nameOnCard = cardName
                             vc.selectedPaymentMethod = self.selectedPaymentMethod
                             vc.isSavedForFuture = self.isSavedNewAccount
+                            vc.isSavedNewCard = self.isSavedNewCardForFuture
                             vc.request = self.request
                             vc.chosenPlan = self.txtFieldChosePlanCard.text
                             vc.startDate = self.txtFieldStartDateCard.text
@@ -5294,7 +5341,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else if showBilling {
                             // Push to BillingInfoVC
-                            let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             vc.accountName = self.txtFieldAccountName.text
                             vc.routingNumber = self.txtFieldRoutingNumber.text
                             vc.accountType = self.txtFieldAccountType.text
@@ -5317,7 +5364,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else {
                             // Push to AdditionalInfoVC
-                            let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             vc.accountName = self.txtFieldAccountName.text
                             vc.routingNumber = self.txtFieldRoutingNumber.text
                             vc.accountType = self.txtFieldAccountType.text
@@ -5474,6 +5521,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             vc.nameOnCard = self.cardNameTextField.text
                             vc.selectedPaymentMethod = self.selectedPaymentMethod
                             vc.isSavedForFuture = isSavedForFuture
+                            vc.isSavedNewCard = isSavedForFuture
                             vc.easyPayDelegate = self.easyPayDelegate // Pass delegate if needed
                             vc.request = self.request
                             vc.chosenPlan = self.txtFieldChosePlanCard.text
@@ -5584,6 +5632,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     emailVerificationVC.nameOnCard = self.cardNameTextField.text
                     emailVerificationVC.selectedPaymentMethod = self.selectedPaymentMethod
                     emailVerificationVC.isSavedForFuture = isSavedForFuture
+                    emailVerificationVC.isSavedNewCard = isSavedForFuture
                     emailVerificationVC.easyPayDelegate = self.easyPayDelegate // Pass delegate if needed
                     emailVerificationVC.request = self.request
                     emailVerificationVC.chosenPlan = self.txtFieldChosePlanCard.text
@@ -5818,6 +5867,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnPayNowSingleAccountView(_ sender: UIButton) {
+        showDebugPayButtonAlert(message: "Pay for SAVED BANK ACCOUNT — actionBtnPayNowSingleAccountView")
         guard let selectedIndex = selectedBankIndex else {
             showAlert(message: "Please select a bank account")
             return
@@ -5893,7 +5943,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                             else if showBilling {
                                 // Push to BillingInfoVC
-                                let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                                 vc.customerID = self.selectedbankAccounts?.customer_id
                                 vc.accountID = self.selectedbankAccounts?.account_id
                                 vc.billingInfoData = billingInfoData
@@ -5911,7 +5961,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                             else {
                                 // Push to AdditionalInfoVC
-                                let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                                 vc.customerID = self.selectedbankAccounts?.customer_id
                                 vc.accountID = self.selectedbankAccounts?.account_id
                                 vc.billingInfoData = billingInfoData
@@ -5979,6 +6029,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnPayNowNewAccountView(_ sender: UIButton) {
+        showDebugPayButtonAlert(message: "Pay for NEW BANK ACCOUNT (manual ACH) — actionBtnPayNowNewAccountView")
         // Check if billingInfoData is not nil or empty
         if let billingInfoData = request.fields {
             do {
@@ -6044,12 +6095,86 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         let showBilling = fieldSection.visibility.billing
                         let showAdditional = fieldSection.visibility.additional
                         
-                        if !showBilling && !showAdditional {
+                        let customerId = UserStoreSingleton.shared.customerId ?? ""
+                        let needsOTP = isSavedNewAccount && customerId.isEmpty
+                        
+                        if needsOTP {
+                            // Save account checked and no customer ID → always require OTP first (same as GrailPay / save card)
+                            if let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
+                                vc.easyPayDelegate = self.easyPayDelegate
+                                vc.request = self.request
+                                vc.selectedPaymentMethod = "Bank"
+                                vc.isFrom = "AddNewAccountWithSave"
+                                vc.accountName = accountName
+                                vc.routingNumber = routingNumber
+                                vc.accountType = accountType
+                                vc.accountNumber = accountNumber
+                                vc.userEmail = self.request.email
+                                vc.email = self.request.email
+                                vc.isSavedNewAccount = true
+                                vc.amount = Double(self.request.amount ?? 0)
+                                vc.chosenPlan = self.txtFieldSelectPlanNewAccountView.text
+                                vc.startDate = self.txtFieldSelectDateNewAccountView.text
+                                if let billingInfoData = self.request.fields {
+                                    vc.billingInfoData = billingInfoData
+                                }
+                                vc.billingInfo = fieldSection.billing
+                                vc.additionalInfo = fieldSection.additional
+                                vc.visibility = fieldSection.visibility
+                                vc.afterOTPFlow = showBilling ? "billing" : (showAdditional ? "additional" : "direct")
+                                self.navigationController?.pushViewController(vc, animated: true)
+                            } else {
+                                if !showBilling && !showAdditional {
+                                    self.accountBankChargeAddNewAccountApi()
+                                } else if showBilling {
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                                    vc.accountName = accountName
+                                    vc.routingNumber = routingNumber
+                                    vc.accountType = accountType
+                                    vc.accountNumber = accountNumber
+                                    vc.billingInfoData = billingInfoData
+                                    vc.selectedPaymentMethod = "Bank"
+                                    vc.isFrom = isFromValue
+                                    vc.isSavedNewAccount = isSavedNewAccount
+                                    vc.delegate = self
+                                    vc.chosenPlan = self.txtFieldSelectPlanNewAccountView.text
+                                    vc.startDate = self.txtFieldSelectDateNewAccountView.text
+                                    vc.request = self.request
+                                    vc.selectedPaymentMethod = self.selectedPaymentMethod
+                                    vc.amount = self.amount
+                                    vc.billingInfo = fieldSection.billing
+                                    vc.additionalInfo = fieldSection.additional
+                                    vc.visibility = fieldSection.visibility
+                                    vc.easyPayDelegate = self.easyPayDelegate
+                                    self.navigationController?.pushViewController(vc, animated: true)
+                                } else {
+                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                                    vc.accountName = accountName
+                                    vc.routingNumber = routingNumber
+                                    vc.accountType = accountType
+                                    vc.accountNumber = accountNumber
+                                    vc.billingInfoData = billingInfoData
+                                    vc.selectedPaymentMethod = "Bank"
+                                    vc.isFrom = isFromValue
+                                    vc.isSavedNewAccount = isSavedNewAccount
+                                    vc.chosenPlan = self.txtFieldSelectPlanNewAccountView.text
+                                    vc.startDate = self.txtFieldSelectDateNewAccountView.text
+                                    vc.request = self.request
+                                    vc.selectedPaymentMethod = self.selectedPaymentMethod
+                                    vc.amount = self.amount
+                                    vc.billingInfo = fieldSection.billing
+                                    vc.additionalInfo = fieldSection.additional
+                                    vc.visibility = fieldSection.visibility
+                                    vc.easyPayDelegate = self.easyPayDelegate
+                                    self.navigationController?.pushViewController(vc, animated: true)
+                                }
+                            }
+                        } else if !showBilling && !showAdditional {
                             self.accountBankChargeAddNewAccountApi()
                         }
                         else if showBilling {
                             // Push to BillingInfoVC
-                            let vc = EasyPaySdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             vc.accountName = accountName
                             vc.routingNumber = routingNumber
                             vc.accountType = accountType
@@ -6072,7 +6197,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                         else {
                             // Push to AdditionalInfoVC
-                            let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             vc.accountName = accountName
                             vc.routingNumber = routingNumber
                             vc.accountType = accountType
@@ -6081,7 +6206,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             vc.selectedPaymentMethod = "Bank"
                             vc.isFrom = isFromValue
                             vc.isSavedNewAccount = isSavedNewAccount
-                            // vc.delegate = self
                             vc.chosenPlan = self.txtFieldSelectPlanNewAccountView.text
                             vc.startDate = self.txtFieldSelectDateNewAccountView.text
                             vc.request = self.request
@@ -6149,7 +6273,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             }
             
-            let isSavedNewAccount = isSavedNewAccount
+            let isSavedNewAccount = self.isSavedNewAccount
             // If Billing info is nil or empty, call the appropriate API
             if isSavedNewAccount {
                 // Call accountChargeApi if the account is saved
@@ -6281,6 +6405,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
     }
     
+    /// Debug: log which pay button was tapped (remove when done).
+    private func showDebugPayButtonAlert(message: String) {
+        NSLog("[PayButton] %@", message)
+    }
+
     private func showLicenseErrorAlert(message: String) {
         let alert = UIAlertController(title: "License Error", message: message, preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
@@ -6305,6 +6434,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         // Use the clientToken from your singleton
         let token = UserStoreSingleton.shared.clientToken
         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")
+            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+        }
         
         // Define the parameters for the request
         let params: [String: Any] = [
@@ -6312,6 +6446,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "card_search_key": "email"
         ]
         
+        // Log send_otp request (headers masked for sharing)
+        let clientTokenMask = (token ?? "").isEmpty ? "nil" : String((token ?? "").prefix(8)) + "..."
+        let apiKeyMask = EnvironmentConfig.apiKey.map { $0.isEmpty ? "nil" : String($0.prefix(8)) + "..." } ?? "nil"
+        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] Body: %@", params.description)
+        
         do {
             // Convert the dictionary to JSON
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
@@ -6338,6 +6481,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 return
             }
             
+            // Log send_otp response
+            let statusCode = httpResponse.statusCode
+            let bodyStr = serviceData.flatMap { String(data: $0, encoding: .utf8) } ?? ""
+            NSLog("[send_otp] ----- RESPONSE -----")
+            NSLog("[send_otp] Status: %d", statusCode)
+            NSLog("[send_otp] Body: %@", bodyStr)
+            
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = serviceData {
                     do {
@@ -6377,9 +6527,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         urlRequest.httpMethod = "POST"
         urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
-        // Use customer_token instead of client_token for verify_otp API
-        let token = UserStoreSingleton.shared.customerToken
-        urlRequest.addValue(token ?? "", 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 ?? ""
@@ -6391,6 +6540,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "otp": otp
         ]
         
+        // Log verify_otp request (headers masked for sharing)
+        let customerT = UserStoreSingleton.shared.customerToken ?? ""
+        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] Body: card_search_value=%@, card_search_key=email, otp=%@", email, String(repeating: "*", count: otp.count))
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             urlRequest.httpBody = jsonData
@@ -6415,6 +6572,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 return
             }
             
+            // Log verify_otp response
+            let statusCode = httpResponse.statusCode
+            let bodyStr = serviceData.flatMap { String(data: $0, encoding: .utf8) } ?? ""
+            NSLog("[verify_otp] ----- RESPONSE -----")
+            NSLog("[verify_otp] Status: %d", statusCode)
+            NSLog("[verify_otp] Body: %@", bodyStr)
+            
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 guard let data = serviceData else {
                     return
@@ -6437,9 +6601,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             UserStoreSingleton.shared.verificationEmail = email
                             UserStoreSingleton.shared.isLoggedIn = true
                             
-                            
-                            //  self.btnSettings.isHidden = false
-                            
                             if self.selectedPaymentMethod == "Card" {
                                 if customerId.isEmpty {
                                     self.OTPView.isHidden = true
@@ -6452,30 +6613,35 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.viewUpdateCard.isHidden = true
                                     self.viewAddNewCard.isHidden = true
                                 } else {
-                                    self.getShowCardsApi()
                                     self.OTPView.isHidden = true
-                                    self.viewCardFields.isHidden = true
-                                    self.viewSingleSavedCard.isHidden = false
-                                    self.viewBtnShowSavedCards.isHidden = true
-                                    self.viewBtnShowSavedCardHeight.constant = 0
-                                    self.viewBtnShowSavedCardTopCon.constant = 0
-                                    self.viewChangeCard.isHidden = true
-                                    self.viewUpdateCard.isHidden = true
-                                    self.viewAddNewCard.isHidden = true
-                                    
-                                    self.viewTxtFieldCVVSingleCard.isHidden = true
-                                    self.btnPayNowSingleCard.isHidden = true
-                                    self.btnNext.isHidden = true
-                                    self.btnNextHeight.constant = 0
-                                    self.btnNextTopCon.constant = 8
+                                    // After verify_otp: run charge so card is saved (same pattern as OTPVerificationVC → paymentIntentWithSavedCardApi / paymentIntentApi)
+                                    if self.isSavedNewCardForFuture {
+                                        if self.request.secureAuthentication == true {
+                                            self.threeDSecurePaymentNewCardApi(customerId: customerId)
+                                        } else {
+                                            self.paymentIntentAddNewCardApi(customerId: customerId)
+                                        }
+                                    } else {
+                                        self.getShowCardsApi()
+                                        self.viewCardFields.isHidden = true
+                                        self.viewSingleSavedCard.isHidden = false
+                                        self.viewBtnShowSavedCards.isHidden = true
+                                        self.viewBtnShowSavedCardHeight.constant = 0
+                                        self.viewBtnShowSavedCardTopCon.constant = 0
+                                        self.viewChangeCard.isHidden = true
+                                        self.viewUpdateCard.isHidden = true
+                                        self.viewAddNewCard.isHidden = true
+                                        self.viewTxtFieldCVVSingleCard.isHidden = true
+                                        self.btnPayNowSingleCard.isHidden = true
+                                        self.btnNext.isHidden = true
+                                        self.btnNextHeight.constant = 0
+                                        self.btnNextTopCon.constant = 8
+                                    }
                                 }
-                                
                                 self.txtFieldSelectPlanSingleSavedCard.isHidden = true
                                 self.txtFieldSelectDateSingleSavedCard.isHidden = true
-                                
                                 self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
                                 self.txtFieldSelectDateSingleSavedBankView.isHidden = true
-                                
                             } else if self.selectedPaymentMethod == "Bank" {
                                 self.getShowBankAccountsApi()
                             }
@@ -6516,7 +6682,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
 //        
 //        let token = UserStoreSingleton.shared.customerToken
-//       // print("🔑 Setting customerToken header: \(token ?? "None")")
 //        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
 //        
 //        let session = URLSession.shared
@@ -6570,19 +6735,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //                        )
 //                    }
 //                    
-//                    self.savedCards.forEach { card in
-//                        --------------------------
-//                        Card Brand: \(card.cardBrandName)
-//                        Card ID: \(card.cardId)
-//                        Card Type: \(card.cardType)
-//                        Last 4: ****\(card.ccLast4)
-//                        Expiry: \(card.ccValidThru)
-//                        Customer ID: \(card.customerId)
-//                        Is Default: \(card.isDefault)
-//                        --------------------------
-//                        """)
-//                    }
-//                    
 //                    DispatchQueue.main.async {
 //                        if let firstCard = self.savedCards.first {
 //                            self.lblCardNumberSigleSavedCard.text = "****\(firstCard.ccLast4)"
@@ -6680,19 +6832,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         )
                     }
                     
-                    self.savedCards.forEach { card in
-                        --------------------------
-                        Card Brand: \(card.cardBrandName)
-                        Card ID: \(card.cardId)
-                        Card Type: \(card.cardType)
-                        Last 4: ****\(card.ccLast4)
-                        Expiry: \(card.ccValidThru)
-                        Customer ID: \(card.customerId)
-                        Is Default: \(card.isDefault)
-                        --------------------------
-                        """)
-                    }
-                    
                     DispatchQueue.main.async {
                         if self.savedCards.isEmpty {
                            // self.showToast(message: "No saved card is available")
@@ -8145,7 +8284,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
 //        
 //        let token = UserStoreSingleton.shared.customerToken
-//       // print("Setting customerToken header: \(token ?? "None")")
 //        request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
 //        
 //        // Get the text fields from the selected cell and trim whitespace
@@ -9819,6 +9957,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "account_number": accountNumber,
             "payment_mode": "auth_and_capture",
             "levelIndicator": 1,
+            "save_account": isSavedNewAccount ? 1 : 0,
+            "payment_method": "ach",
         ]
         
         if let billingInfoData = request.fields {
@@ -10270,7 +10410,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
 //        
 //        let token = UserStoreSingleton.shared.customerToken
-//       // print("Setting customerToken header: \(token ?? "None")")
 //        request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
 //        
 //        let session = URLSession.shared
@@ -10830,7 +10969,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
                                         
-                                        let urlString = responseObject["redirect_url"] as? String ?? responseObject["location_url"] as? String ?? ""
+                                        // Use only redirect_url for 3DS WebView (match Android)
+                                        let urlString = responseObject["redirect_url"] as? String ?? ""
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
@@ -11168,7 +11308,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
                                         
-                                        let urlString = responseObject["redirect_url"] as? String ?? responseObject["location_url"] as? String ?? ""
+                                        // Use only redirect_url for 3DS WebView (match Android)
+                                        let urlString = responseObject["redirect_url"] as? String ?? ""
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
@@ -12053,35 +12194,32 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
     }
     
     @objc func addNewCardTapped(_ sender: UIButton) {
-        // Make the Add New Card view visible
-        viewAddNewCard.isHidden = false
-        
-        // Hide other conflicting views to prevent UI overlap
+        // Go back to first card form (same as initial) instead of showing the separate "new card" UI
+        viewAddNewCard.isHidden = true
         viewSingleSavedCard.isHidden = true
         viewChangeCard.isHidden = true
         viewUpdateCard.isHidden = true
-        viewCardFields.isHidden = true
-        
-        // Adjust visibility of any other related views if necessary
-        viewBtnShowSavedCards.isHidden = true
-        viewBtnShowSavedCardHeight.constant = 0
-        viewBtnShowSavedCardTopCon.constant = 0
-        btnNext.isHidden = true
-        btnNextHeight.constant = 0
-        btnNextTopCon.constant = 8
+        viewCardFields.isHidden = false
+        viewBtnShowSavedCards.isHidden = false
+        viewBtnShowSavedCardHeight.constant = 50
+        viewBtnShowSavedCardTopCon.constant = 20
+        btnNext.isHidden = false
+        btnNextHeight.constant = 50
+        btnNextTopCon.constant = 20
     }
     
     //Bank Cell
     @objc func addNewBankAccountTapped(_ sender: UIButton) {
+        // Go back to first bank form (same as initial) instead of showing the separate "new account" UI
         if request.authenticatedACH == true {
-            self.viewAddNewGrailPayAccount.isHidden = false
-            
+            self.viewAddNewGrailPayAccount.isHidden = true
             self.viewNewBankAccount.isHidden = true
             self.viewSingleSavedAccount.isHidden = true
             self.viewBankFields.isHidden = true
-            self.viewBtnShowSavedCards.isHidden = true
-            self.viewBtnShowSavedCardHeight.constant = 0
-            self.viewBtnShowSavedCardTopCon.constant = 0
+            self.grailPayBankLinkView.isHidden = false
+            self.viewBtnShowSavedCards.isHidden = false
+            self.viewBtnShowSavedCardHeight.constant = 50
+            self.viewBtnShowSavedCardTopCon.constant = 20
             self.OTPView.isHidden = true
             self.emailView.isHidden = true
             self.viewCardFields.isHidden = true
@@ -12096,13 +12234,12 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         }
         else {
             self.viewAddNewGrailPayAccount.isHidden = true
-            
-            self.viewNewBankAccount.isHidden = false
+            self.viewNewBankAccount.isHidden = true
             self.viewSingleSavedAccount.isHidden = true
-            self.viewBankFields.isHidden = true
-            self.viewBtnShowSavedCards.isHidden = true
-            self.viewBtnShowSavedCardHeight.constant = 0
-            self.viewBtnShowSavedCardTopCon.constant = 0
+            self.viewBankFields.isHidden = false
+            self.viewBtnShowSavedCards.isHidden = false
+            self.viewBtnShowSavedCardHeight.constant = 50
+            self.viewBtnShowSavedCardTopCon.constant = 20
             self.OTPView.isHidden = true
             self.emailView.isHidden = true
             self.viewCardFields.isHidden = true
@@ -12110,12 +12247,11 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             self.viewChangeCard.isHidden = true
             self.viewUpdateCard.isHidden = true
             self.viewAddNewCard.isHidden = true
-            self.btnNext.isHidden = true
-            self.btnNextHeight.constant = 0
-            self.btnNextTopCon.constant = 8
+            self.btnNext.isHidden = false
+            self.btnNextHeight.constant = 50
+            self.btnNextTopCon.constant = 20
             self.viewChangedAccount.isHidden = true
         }
-        
     }
     
     @objc func btnSelectAccountTapped(_ sender: UIButton) {
@@ -12871,5 +13007,4 @@ extension PaymentInfoVC: UITextFieldDelegate {
         }
     }
     
-}
-
+}