@jimrising/easymerchantsdk-react-native 2.3.8 → 2.4.0

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

@@ -265,6 +265,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var btnSelectPlanNewGrailPayBankView: UIButton!
     @IBOutlet weak var dropDownIconNewGrailPayBankView: UIImageView!
     @IBOutlet weak var btnSelectRecurringDateNewGrailPayView: UIButton!
+    @IBOutlet weak var heightViewAbandonNewGrailPayAccountView: NSLayoutConstraint!
     
     
     //SavedBank
@@ -456,6 +457,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         return indicator
     }()
     
+    var isSavedViewVisible = false
+    var shouldShowChangeCardAfterUpdate = false
+    
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -470,66 +474,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         // Start loader
         loadingIndicator.startAnimating()
         
-        // Avoid clearing persisted Hosted Checkout values on first open
-        // logOut()
-        
-//        ///  Check if paymentIntent and clientToken are available
-//        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-//            if let clientToken = self.request.clientToken,
-//               !clientToken.isEmpty {
-//                
-//                // Save clientToken in singleton
-//                UserStoreSingleton.shared.clientToken = clientToken
-//                print("Saved clientToken in UserStoreSingleton: \(clientToken)")
-//                
-//                // Case 1: Already exist → Directly call hostedCheckout
-//                print("Skipping paymentIntentApi, using existing values")
-//                self.request.hostedCheckoutsApi { success in
-//                    DispatchQueue.main.async {
-//                        if success {
-//                            self.setupUI()
-//                        } else {
-//                            print("Hosted Checkout failed. Blocking SDK UI.")
-//                            
-//                            // Stop flow and notify failure
-//                            let result = SDKResult(
-//                                type: .error,
-//                                chargeData: ["status": false, "message": "Hosted Checkout failed"],
-//                                billingInfo: nil,
-//                                additionalInfo: nil
-//                            )
-//                            NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
-//                            self.dismiss(animated: true)
-//                        }
-//                    }
-//                }
-//            }
-//            else {
-//                // Case 2: No values → Call paymentIntentApi first
-//                print("Calling paymentIntentApi")
-//                self.request.paymentIntentApi { success in
-//                    DispatchQueue.main.async {
-//                        if success {
-//                            print("Payment Intent completed")
-//                            self.setupUI()
-//                        } else {
-//                            print("Payment Intent failed. Blocking SDK UI.")
-//                            
-//                            // Stop flow and notify failure
-//                            let result = SDKResult(
-//                                type: .error,
-//                                chargeData: ["status": false, "message": "Payment Intent failed"],
-//                                billingInfo: nil,
-//                                additionalInfo: nil
-//                            )
-//                            NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
-//                            self.dismiss(animated: true)
-//                        }
-//                    }
-//                }
-//            }
-//        }
-        
         
         // Re-save theme and client token after logOut to preserve them
         if let themeConfiguration = request.appearanceSettings {
@@ -636,6 +580,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.btnPayNowSingleAccountView.setTitle(defaultTitle, for: .normal)
                                 }
                             
+                            DispatchQueue.main.async {
+                                self.txtFieldEmailCardView.textField.text = self.request.email
+                                self.cardNameTextField.textField.text = self.request.name
+                                self.txtFieldNameOnCardNewCardView.text = self.request.name
+                                self.txtFieldEmailAccountView.textField.text = self.request.email
+                                self.txtFieldEmailGrailPayView.textField.text = self.request.email
+                                self.txtFieldEmail.text = self.request.email
+                            }
+                            
                         } else {
                             print("Hosted Checkout failed. Blocking SDK UI.")
                             // Notify failure
@@ -692,54 +645,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         tapGesture.cancelsTouchesInView = false
         self.view.addGestureRecognizer(tapGesture)
         
-//        if let billingInfoData = request.fields,
-//           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
-//            
-//            let billingVisible = fieldSection.visibility.billing
-//            let additionalVisible = fieldSection.visibility.additional
-//            let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
-//            // let amountText = String(format: "$%.2f", request?.amount ?? 0)
-//            
-//            let rawAmount = Double(request?.amount ?? 0)
-//            let amountText = String(format: "$%.2f", rawAmount)
-//            
-//            var buttonText: String
-//            
-//            if !billingVisible && !additionalVisible {
-//                // Both visibility false – show submitText with amount only
-//                buttonText = "\(submitText) (\(amountText))"
-//            } else if billingVisible {
-//                buttonText = "\(submitText) (Billing Info)"
-//            } else if additionalVisible {
-//                buttonText = "\(submitText) (Additional Info)"
-//            } else {
-//                // Fallback
-//                buttonText = "\(submitText) (\(amountText))"
-//            }
-//            
-//            btnNext.setTitle(buttonText, for: .normal)
-//            btnPayNowNewCardView.setTitle(buttonText, for: .normal)
-//            btnPayNowNewAccountView.setTitle(buttonText, for: .normal)
-//            btnPayNowSingleCard.setTitle(buttonText, for: .normal)
-//            btnPayNowSingleAccountView.setTitle(buttonText, for: .normal)
-//        } else {
-//            /// When no billingInfoData present
-//            // let amountText = String(format: "$%.2f", request?.amount ?? 0)
-//            
-//            let rawAmount = Double(request?.amount ?? 0)
-//            let amountText = String(format: "$%.2f", rawAmount)
-//            
-//            let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
-//            let defaultTitle = "\(submitText) (\(amountText))"
-//            
-//            btnNext.setTitle(defaultTitle, for: .normal)
-//            btnPayNowNewCardView.setTitle(defaultTitle, for: .normal)
-//            btnPayNowNewAccountView.setTitle(defaultTitle, for: .normal)
-//            btnPayNowSingleCard.setTitle(defaultTitle, for: .normal)
-//            btnPayNowSingleAccountView.setTitle(defaultTitle, for: .normal)
-//        }
-        
         lblEasyMerchantOne.text = "POWERED BY \(UserStoreSingleton.shared.companyName?.uppercased() ?? "")"
+        
         txtFieldEmailCardView.textField.text = request.email
         cardNameTextField.textField.text = request.name
         txtFieldNameOnCardNewCardView.text = request.name
@@ -858,13 +765,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     private func setupUI() {
         // Update merchant label
         lblEasyMerchantOne.text = "POWERED BY \(UserStoreSingleton.shared.companyName?.uppercased() ?? "")"
-        
         // Apply visibility and layout settings
         viewAppearanceOn()
-        
         // Apply theme settings
         uiFinishingTouchElements()
-        
         // Force layout update
         DispatchQueue.main.async {
             self.view.setNeedsLayout()
@@ -1211,78 +1115,255 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.heightSubViewNewAccountFields.constant = 662
         }
         
+
+        
+//        if selectedPaymentMethod == "Card" {
+//            self.grailPayBankLinkView.isHidden = true
+//            
+//            self.viewAddNewGrailPayAccount.isHidden = true
+//            self.viewAbandonGrailPayNewAccountView.isHidden = true
+//            
+//            if UserStoreSingleton.shared.isLoggedIn == true {
+//                if UserStoreSingleton.shared.customerId == nil {
+//                    self.OTPView.isHidden = true
+//                    self.viewCardFields.isHidden = false
+//                    self.viewSingleSavedCard.isHidden = true
+//                    self.viewBtnShowSavedCards.isHidden = true
+//                    self.viewBtnShowSavedCardHeight.constant = 0
+//                    self.viewBtnShowSavedCardTopCon.constant = 0
+//                    self.viewChangeCard.isHidden = true
+//                    self.viewUpdateCard.isHidden = true
+//                    self.viewAddNewCard.isHidden = true
+//                }
+//                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.viewSingleSavedAccount.isHidden = true
+//                    
+//                    self.viewBankFields.isHidden = true
+//                    // self.viewTermsAndConditions.isHidden = true
+//                    
+//                    if isSelectForPay {
+//                        viewTxtFieldCVVSingleCard.isHidden = false
+//                        btnPayNowSingleCard.isHidden = false
+//                        btnNext.isHidden = true
+//                        btnNextHeight.constant = 0
+//                        btnNextTopCon.constant = 0
+//                        if request.is_recurring == true {
+//                            txtFieldSelectPlanSingleSavedCard.isHidden = false
+//                            txtFieldSelectDateSingleSavedCard.isHidden = false
+//                            //                            if request.recurringStartDateType == .custom {
+//                            //                                txtFieldSelectDateSingleSavedCard.isHidden = false
+//                            //                            }
+//                            //                            else {
+//                            //                                txtFieldSelectDateSingleSavedCard.isHidden = true
+//                            //                            }
+//                        }
+//                        else {
+//                            txtFieldSelectPlanSingleSavedCard.isHidden = true
+//                            txtFieldSelectDateSingleSavedCard.isHidden = true
+//                        }
+//                    } else {
+//                        viewTxtFieldCVVSingleCard.isHidden = true
+//                        btnPayNowSingleCard.isHidden = true
+//                        btnNext.isHidden = true
+//                        btnNextHeight.constant = 0
+//                        btnNextTopCon.constant = 8
+//                        txtFieldSelectPlanSingleSavedCard.isHidden = true
+//                        txtFieldSelectDateSingleSavedCard.isHidden = true
+//                    }
+//                }
+//            }
+//            else {
+//                self.viewSingleSavedAccount.isHidden = true
+//                self.viewBankFields.isHidden = true
+//                
+//                if request.saveCard == false {
+//                    self.viewBtnShowSavedCards.isHidden = true
+//                    self.viewBtnShowSavedCardHeight.constant = 0
+//                    self.viewBtnShowSavedCardTopCon.constant = 0
+//                }
+//                else {
+//                    self.viewBtnShowSavedCards.isHidden = false
+//                    self.lblBtnShowSaveCard.text = "Show Saved Cards"
+//                    self.viewBtnShowSavedCardHeight.constant = 50
+//                    self.viewBtnShowSavedCardTopCon.constant = 20
+//                }
+//                
+//                self.OTPView.isHidden = true
+//                self.emailView.isHidden = true
+//                self.viewCardFields.isHidden = false
+//                self.viewSingleSavedCard.isHidden = true
+//                self.viewChangeCard.isHidden = true
+//                self.viewUpdateCard.isHidden = true
+//                self.viewAddNewCard.isHidden = true
+//                self.btnNext.isHidden = false
+//                self.btnNextHeight.constant = 50
+//                self.btnNextTopCon.constant = 20
+//                //  self.viewTermsAndConditions.isHidden = true
+//                self.viewCrypto.isHidden = true
+//            }
+//        }
+//        else if selectedPaymentMethod == "Bank" {
+//            if UserStoreSingleton.shared.isLoggedIn == true {
+//                
+//                if isFrom == "NewAccount" {
+//                    viewNewBankAccount.isHidden = false
+//                }
+//                // else {
+//                //   viewSingleSavedAccount.isHidden = false
+//                // }
+//                
+//                //  self.viewSingleSavedAccount.isHidden = false
+//                self.viewBankFields.isHidden = true
+//                self.viewBtnShowSavedCards.isHidden = true
+//                self.viewBtnShowSavedCardHeight.constant = 0
+//                self.viewBtnShowSavedCardTopCon.constant = 0
+//                self.OTPView.isHidden = true
+//                self.emailView.isHidden = true
+//                self.viewCardFields.isHidden = true
+//                self.viewSingleSavedCard.isHidden = true
+//                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.viewNewBankAccount.isHidden = true
+//                self.viewCrypto.isHidden = true
+//                
+//                // self.viewTermsAndConditions.isHidden = true
+//                
+//                self.viewChangedAccount.isHidden = true
+//                
+//                if self.isSelectForPayBank {
+//                    self.viewTermAndConditionsSingleAccountView.isHidden = false
+//                    self.btnPayNowSingleAccountView.isHidden = false
+//                    if request.is_recurring == true {
+//                        self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
+//                        self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+//                        //                        if request.recurringStartDateType == .custom {
+//                        //                            self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+//                        //                        }
+//                        //                        else {
+//                        //                            self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+//                        //                        }
+//                    }
+//                    else {
+//                        self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+//                        self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+//                    }
+//                } else {
+//                    self.viewTermAndConditionsSingleAccountView.isHidden = true
+//                    self.btnPayNowSingleAccountView.isHidden = true
+//                    self.btnNext.isHidden = true
+//                    self.btnNextHeight.constant = 0
+//                    self.btnNextTopCon.constant = 0
+//                    
+//                    self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+//                    self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+//                }
+//                
+//                if request?.authenticatedACH == true {
+//                    if isSavedNewGrailPayAccount == true {
+//                        updateUIForNewGrailPayAccount()
+//                    } else {
+//                        self.viewBankFields.isHidden = true
+//                        // self.viewTermsAndConditions.isHidden = true
+//                        
+//                        if self.grailPaySource == .existingAccount {
+//                            self.grailPayBankLinkView.isHidden = false
+//                        } else if self.grailPaySource == .newAccount {
+//                            self.grailPayBankLinkView.isHidden = true
+//                            self.viewSingleSavedAccount.isHidden = true
+//                        }
+//                        // self.grailPayBankLinkView.isHidden = false
+//                        self.btnNext.isHidden = true
+//                        self.btnNextHeight.constant = 0
+//                        self.btnNextTopCon.constant = 0
+//                        self.viewGrailPayAbandon.isHidden = true
+//                        
+//                        if isBankAccountConnected {
+//                            self.viewBtnShowSavedCards.isHidden = true
+//                            self.btnShowSavedCard.isHidden = true
+//                            self.viewBtnShowSavedCardHeight.constant = 0
+//                            self.viewBtnShowSavedCardTopCon.constant = 0
+//                        }
+//                    }
+//                }
+//                else {
+//                    self.grailPayBankLinkView.isHidden = true
+//                }
+//            }
+//            else {
+//                if request.saveAccount == false {
+//                    self.viewBtnShowSavedCards.isHidden = true
+//                    self.viewBtnShowSavedCardHeight.constant = 0
+//                    self.viewBtnShowSavedCardTopCon.constant = 0
+//                }
+//                //                else {
+//                //                    self.viewBtnShowSavedCards.isHidden = false
+//                //                    self.lblBtnShowSaveCard.text = "Show Saved Accounts"
+//                //                    self.viewBtnShowSavedCardHeight.constant = 50
+//                //                    self.viewBtnShowSavedCardTopCon.constant = 20
+//                //                }
+//                
+//                self.OTPView.isHidden = true
+//                self.emailView.isHidden = true
+//                self.viewCardFields.isHidden = true
+//                self.viewSingleSavedCard.isHidden = true
+//                self.viewChangeCard.isHidden = true
+//                self.viewUpdateCard.isHidden = true
+//                self.viewAddNewCard.isHidden = true
+//                self.btnNext.isHidden = false
+//                self.btnNextHeight.constant = 50
+//                self.btnNextTopCon.constant = 20
+//                //  self.viewTermsAndConditions.isHidden = false
+//                self.viewCrypto.isHidden = true
+//                self.viewSingleSavedAccount.isHidden = true
+//                self.viewChangedAccount.isHidden = true
+//                
+//                if request?.authenticatedACH == false {
+//                    self.viewBankFields.isHidden = false
+//                    //  self.viewTermsAndConditions.isHidden = false
+//                    self.grailPayBankLinkView.isHidden = true
+//                } else {
+//                    self.viewBankFields.isHidden = true
+//                    //  self.viewTermsAndConditions.isHidden = true
+//                    
+//                    if self.grailPaySource == .existingAccount {
+//                        self.grailPayBankLinkView.isHidden = false
+//                    } else if self.grailPaySource == .newAccount {
+//                        self.grailPayBankLinkView.isHidden = true
+//                        self.viewSingleSavedAccount.isHidden = true
+//                    }
+//                    //  self.grailPayBankLinkView.isHidden = false
+//                    self.btnNext.isHidden = true
+//                    self.btnNextHeight.constant = 0
+//                    self.btnNextTopCon.constant = 0
+//                }
+//            }
+//        }
+        
+        
+        
         if selectedPaymentMethod == "Card" {
-            self.grailPayBankLinkView.isHidden = true
-            
-            self.viewAddNewGrailPayAccount.isHidden = true
-            self.viewAbandonGrailPayNewAccountView.isHidden = true
-            
-            if UserStoreSingleton.shared.isLoggedIn == true {
-                if UserStoreSingleton.shared.customerId == nil {
-                    self.OTPView.isHidden = true
-                    self.viewCardFields.isHidden = false
-                    self.viewSingleSavedCard.isHidden = true
-                    self.viewBtnShowSavedCards.isHidden = true
-                    self.viewBtnShowSavedCardHeight.constant = 0
-                    self.viewBtnShowSavedCardTopCon.constant = 0
-                    self.viewChangeCard.isHidden = true
-                    self.viewUpdateCard.isHidden = true
-                    self.viewAddNewCard.isHidden = true
-                }
-                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.viewSingleSavedAccount.isHidden = true
-                    
-                    self.viewBankFields.isHidden = true
-                    // self.viewTermsAndConditions.isHidden = true
-                    
-                    if isSelectForPay {
-                        viewTxtFieldCVVSingleCard.isHidden = false
-                        btnPayNowSingleCard.isHidden = false
-                        btnNext.isHidden = true
-                        btnNextHeight.constant = 0
-                        btnNextTopCon.constant = 0
-                        if request.is_recurring == true {
-                            txtFieldSelectPlanSingleSavedCard.isHidden = false
-                            txtFieldSelectDateSingleSavedCard.isHidden = false
-                            //                            if request.recurringStartDateType == .custom {
-                            //                                txtFieldSelectDateSingleSavedCard.isHidden = false
-                            //                            }
-                            //                            else {
-                            //                                txtFieldSelectDateSingleSavedCard.isHidden = true
-                            //                            }
-                        }
-                        else {
-                            txtFieldSelectPlanSingleSavedCard.isHidden = true
-                            txtFieldSelectDateSingleSavedCard.isHidden = true
-                        }
-                    } else {
-                        viewTxtFieldCVVSingleCard.isHidden = true
-                        btnPayNowSingleCard.isHidden = true
-                        btnNext.isHidden = true
-                        btnNextHeight.constant = 0
-                        btnNextTopCon.constant = 8
-                        txtFieldSelectPlanSingleSavedCard.isHidden = true
-                        txtFieldSelectDateSingleSavedCard.isHidden = true
-                    }
-                }
-            }
-            else {
+            if UserStoreSingleton.shared.isLoggedIn == false {
                 self.viewSingleSavedAccount.isHidden = true
                 self.viewBankFields.isHidden = true
                 
@@ -1298,6 +1379,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.viewBtnShowSavedCardTopCon.constant = 20
                 }
                 
+                self.btnShowSavedCard.isHidden = false   // ✅ added
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
                 self.viewCardFields.isHidden = false
@@ -1308,8 +1390,59 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.btnNext.isHidden = false
                 self.btnNextHeight.constant = 50
                 self.btnNextTopCon.constant = 20
-                //  self.viewTermsAndConditions.isHidden = true
                 self.viewCrypto.isHidden = true
+                self.grailPayBankLinkView.isHidden = true   // ✅ added
+                self.viewAddNewGrailPayAccount.isHidden = true   // ✅ added
+                self.viewChangedAccount.isHidden = true
+            } else {
+                self.lblBtnShowSaveCard.text = "Show Saved Cards"   // ✅ added
+                
+                self.viewSingleSavedAccount.isHidden = true
+                self.viewBankFields.isHidden = true
+
+                self.viewBtnShowSavedCards.isHidden = false
+                self.viewBtnShowSavedCardHeight.constant = 50
+                self.viewBtnShowSavedCardTopCon.constant = 20
+                
+                self.btnShowSavedCard.isHidden = false   // ✅ added
+                self.OTPView.isHidden = true
+                self.emailView.isHidden = true
+                self.viewCardFields.isHidden = false
+                self.viewChangeCard.isHidden = true
+                self.viewUpdateCard.isHidden = true
+                self.viewAddNewCard.isHidden = true
+
+                self.btnNext.isHidden = false
+                self.btnNextHeight.constant = 50
+                self.btnNextTopCon.constant = 20
+                
+                self.viewChangedAccount.isHidden = true   // ✅ added
+                self.viewNewBankAccount.isHidden = true   // ✅ added
+                self.viewCrypto.isHidden = true   // ✅ added
+                self.grailPayBankLinkView.isHidden = true   // ✅ added
+                self.viewAddNewGrailPayAccount.isHidden = true   // ✅ added
+                
+                if self.isSelectForPay {
+                    self.viewTxtFieldCVVSingleCard.isHidden = false
+                    self.btnPayNowSingleCard.isHidden = false
+                    self.btnNext.isHidden = true
+                    self.btnNextHeight.constant = 0
+                    self.btnNextTopCon.constant = 0
+                    if self.request.is_recurring == true {
+                        self.txtFieldSelectPlanSingleSavedCard.isHidden = false
+                        self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                    }
+                    else {
+                        self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                        self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                    }
+                } else {
+                    self.viewTxtFieldCVVSingleCard.isHidden = true
+                    self.btnPayNowSingleCard.isHidden = true
+
+                    self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                    self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                }
             }
         }
         else if selectedPaymentMethod == "Bank" {
@@ -1318,15 +1451,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if isFrom == "NewAccount" {
                     viewNewBankAccount.isHidden = false
                 }
-                // else {
-                //   viewSingleSavedAccount.isHidden = false
-                // }
+               
+                self.viewBankFields.isHidden = false
+//                self.viewBtnShowSavedCards.isHidden = true
+//                self.viewBtnShowSavedCardHeight.constant = 0
+//                self.viewBtnShowSavedCardTopCon.constant = 0
+                
+                self.viewBtnShowSavedCards.isHidden = false
+                self.viewBtnShowSavedCardHeight.constant = 50
+                self.viewBtnShowSavedCardTopCon.constant = 20
                 
-                //  self.viewSingleSavedAccount.isHidden = false
-                self.viewBankFields.isHidden = true
-                self.viewBtnShowSavedCards.isHidden = true
-                self.viewBtnShowSavedCardHeight.constant = 0
-                self.viewBtnShowSavedCardTopCon.constant = 0
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
                 self.viewCardFields.isHidden = true
@@ -1340,9 +1474,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 
                 self.viewNewBankAccount.isHidden = true
                 self.viewCrypto.isHidden = true
-                
-                // self.viewTermsAndConditions.isHidden = true
-                
+                                
                 self.viewChangedAccount.isHidden = true
                 
                 if self.isSelectForPayBank {
@@ -1351,12 +1483,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     if request.is_recurring == true {
                         self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
                         self.txtFieldSelectDateSingleSavedBankView.isHidden = false
-                        //                        if request.recurringStartDateType == .custom {
-                        //                            self.txtFieldSelectDateSingleSavedBankView.isHidden = false
-                        //                        }
-                        //                        else {
-                        //                            self.txtFieldSelectDateSingleSavedBankView.isHidden = true
-                        //                        }
                     }
                     else {
                         self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
@@ -1365,10 +1491,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 } else {
                     self.viewTermAndConditionsSingleAccountView.isHidden = true
                     self.btnPayNowSingleAccountView.isHidden = true
-                    self.btnNext.isHidden = true
-                    self.btnNextHeight.constant = 0
-                    self.btnNextTopCon.constant = 0
+//                    self.btnNext.isHidden = true
+//                    self.btnNextHeight.constant = 0
+//                    self.btnNextTopCon.constant = 0
                     
+                    self.btnNext.isHidden = false
+                    self.btnNextHeight.constant = 50
+                    self.btnNextTopCon.constant = 20
+
                     self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
                     self.txtFieldSelectDateSingleSavedBankView.isHidden = true
                 }
@@ -1378,7 +1508,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         updateUIForNewGrailPayAccount()
                     } else {
                         self.viewBankFields.isHidden = true
-                        // self.viewTermsAndConditions.isHidden = true
                         
                         if self.grailPaySource == .existingAccount {
                             self.grailPayBankLinkView.isHidden = false
@@ -1386,12 +1515,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.grailPayBankLinkView.isHidden = true
                             self.viewSingleSavedAccount.isHidden = true
                         }
-                        // self.grailPayBankLinkView.isHidden = false
                         self.btnNext.isHidden = true
                         self.btnNextHeight.constant = 0
                         self.btnNextTopCon.constant = 0
                         self.viewGrailPayAbandon.isHidden = true
                         
+                        self.viewBtnShowSavedCards.isHidden = false
+                        self.btnShowSavedCard.isHidden = false
+                        self.viewBtnShowSavedCardHeight.constant = 50
+                        self.viewBtnShowSavedCardTopCon.constant = 20
+                        
                         if isBankAccountConnected {
                             self.viewBtnShowSavedCards.isHidden = true
                             self.btnShowSavedCard.isHidden = true
@@ -1410,12 +1543,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.viewBtnShowSavedCardHeight.constant = 0
                     self.viewBtnShowSavedCardTopCon.constant = 0
                 }
-                //                else {
-                //                    self.viewBtnShowSavedCards.isHidden = false
-                //                    self.lblBtnShowSaveCard.text = "Show Saved Accounts"
-                //                    self.viewBtnShowSavedCardHeight.constant = 50
-                //                    self.viewBtnShowSavedCardTopCon.constant = 20
-                //                }
                 
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
@@ -1427,18 +1554,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.btnNext.isHidden = false
                 self.btnNextHeight.constant = 50
                 self.btnNextTopCon.constant = 20
-                //  self.viewTermsAndConditions.isHidden = false
                 self.viewCrypto.isHidden = true
                 self.viewSingleSavedAccount.isHidden = true
                 self.viewChangedAccount.isHidden = true
                 
                 if request?.authenticatedACH == false {
                     self.viewBankFields.isHidden = false
-                    //  self.viewTermsAndConditions.isHidden = false
                     self.grailPayBankLinkView.isHidden = true
                 } else {
                     self.viewBankFields.isHidden = true
-                    //  self.viewTermsAndConditions.isHidden = true
                     
                     if self.grailPaySource == .existingAccount {
                         self.grailPayBankLinkView.isHidden = false
@@ -1446,7 +1570,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         self.grailPayBankLinkView.isHidden = true
                         self.viewSingleSavedAccount.isHidden = true
                     }
-                    //  self.grailPayBankLinkView.isHidden = false
                     self.btnNext.isHidden = true
                     self.btnNextHeight.constant = 0
                     self.btnNextTopCon.constant = 0
@@ -2382,10 +2505,118 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         viewBtnShowSavedCardTopCon.constant = shouldShow ? 16 : 0
     }
     
+//    @IBAction func actionBtnShowSavedCards(_ sender: UIButton) {
+//        if UserStoreSingleton.shared.customerToken == nil {
+//            emailView.isHidden = false
+//            OTPView.isHidden = true
+//            updateShowSavedCardsVisibility()
+//        }
+//        else {
+//          //  UserStoreSingleton.shared.isLoggedIn = true
+//            
+//            emailView.isHidden = true
+//            OTPView.isHidden = true
+//            
+//            if self.selectedPaymentMethod == "Card" {
+//                if UserStoreSingleton.shared.customerId == nil {
+//                    self.OTPView.isHidden = true
+//                    self.viewCardFields.isHidden = false
+//                    self.viewSingleSavedCard.isHidden = true
+//                    self.viewBtnShowSavedCards.isHidden = true
+//                    self.viewBtnShowSavedCardHeight.constant = 0
+//                    self.viewBtnShowSavedCardTopCon.constant = 0
+//                    self.viewChangeCard.isHidden = true
+//                    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
+//                }
+//                
+//                self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+//                self.txtFieldSelectDateSingleSavedCard.isHidden = true
+//                
+//                self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+//                self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+//            } else if self.selectedPaymentMethod == "Bank" {
+//                self.getShowBankAccountsApi()
+//            }
+//        }
+//    }
+    
+    
     @IBAction func actionBtnShowSavedCards(_ sender: UIButton) {
-        emailView.isHidden = false
-        OTPView.isHidden = true
-        updateShowSavedCardsVisibility()
+        if UserStoreSingleton.shared.customerToken == nil {
+            emailView.isHidden = false
+            OTPView.isHidden = true
+            updateShowSavedCardsVisibility()
+        }
+        else {
+            isSavedViewVisible = true
+            
+            emailView.isHidden = true
+            OTPView.isHidden = true
+            
+            if self.selectedPaymentMethod == "Card" {
+                if UserStoreSingleton.shared.customerId == nil {
+                    self.OTPView.isHidden = true
+                    self.viewCardFields.isHidden = false
+                    self.viewSingleSavedCard.isHidden = true
+//                    self.viewBtnShowSavedCards.isHidden = true
+//                    self.viewBtnShowSavedCardHeight.constant = 0
+//                    self.viewBtnShowSavedCardTopCon.constant = 0
+                    self.viewChangeCard.isHidden = true
+                    self.viewUpdateCard.isHidden = true
+                    self.viewAddNewCard.isHidden = true
+                } else {
+                    // ✅ Only show saved cards when button tapped
+                    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
+                }
+                
+                self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                
+                self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+                self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+            } else if self.selectedPaymentMethod == "Bank" {
+                // ✅ Only show saved banks when button tapped
+                self.getShowBankAccountsApi()
+                self.viewBankFields.isHidden = true
+                self.viewSingleSavedAccount.isHidden = false
+                self.btnNext.isHidden = true
+                self.btnNextHeight.constant = 0
+                self.btnNextTopCon.constant = 0
+            }
+        }
     }
     
     @IBAction func actionBtnCloseEmailView(_ sender: UIButton) {
@@ -2417,8 +2648,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectSingleSavedCard(_ sender: UIButton) {
-        // Use the currently selectedCardIndex instead of sender.tag
-        guard let index = selectedCardIndex, index < savedCards.count else {
+        // Use the currently selectedCardIndex, default to 0 if not set
+        let index = selectedCardIndex ?? 0
+        guard index < savedCards.count else {
             showAlert(title: "No Card Selected", message: "Please select a card from the list first.")
             return
         }
@@ -2436,13 +2668,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         btnNext.isHidden = true
         btnNextHeight.constant = 0
         btnNextTopCon.constant = isSelectForPay ? 0 : 8
-        
-        //        // Handle recurring fields visibility
-        //        let showRecurringFields = isSelectForPay && request.is_recurring == true
-        //        let isCustomRecurring = request.recurringStartDateType == .custom
-        //        txtFieldSelectPlanSingleSavedCard.isHidden = !showRecurringFields
-        //        txtFieldSelectDateSingleSavedCard.isHidden = !(showRecurringFields && isCustomRecurring)
-        
+    
         // Handle recurring fields visibility
         let showRecurringFields = isSelectForPay && request.is_recurring == true
         txtFieldSelectPlanSingleSavedCard.isHidden = !showRecurringFields
@@ -2811,16 +3037,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSaveCardForFuture(_ sender: UIButton) {
-        isSavedForFuture.toggle()
+        isSavedNewCardForFuture.toggle()
         // Change the image based on the state
-        let imageName = isSavedForFuture ? "checkmark.square.fill" : "square"
+        let imageName = isSavedNewCardForFuture ? "checkmark.square.fill" : "square"
         btnCheckBoxSavedCard.setImage(UIImage(systemName: imageName), for: .normal)
     }
     
     @IBAction func actionBtnGrailPayCheckBoxSaveAccountForFuture(_ sender: UIButton) {
-        isSavedForFuture.toggle()
+        isSavedNewAccount.toggle()
         // Change the image based on the state
-        let imageName = isSavedForFuture ? "checkmark.square.fill" : "square"
+        let imageName = isSavedNewAccount ? "checkmark.square.fill" : "square"
         btnCheckBoxGrailPaySaveAccount.setImage(UIImage(systemName: imageName), for: .normal)
     }
     
@@ -3016,6 +3242,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 self.lblGrailPaySavedAccountType.text = "Type: \(accountType.capitalized)"
                             }
                             
+                            // ✅ Add Change button (like Android)
+                            self.addChangeButtonToGrailPaySavedAccount()
+                            
                             // ✅ Optionally hide abandon view if visible
                             self.viewGrailPayAbandon.isHidden = true
                             
@@ -3170,6 +3399,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             
                             // ✅ Optionally hide abandon view if visible
                             self.viewAbandonGrailPayNewAccountView.isHidden = true
+                            self.heightViewAbandonNewGrailPayAccountView.constant = 0
                             
                             if self.selectedPaymentMethod == "Bank" {
                                 self.viewBtnShowSavedCards.isHidden = true
@@ -3202,7 +3432,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction private func actionBtnLinkGrailPayBankAccount(_ sender: UIButton) {
         if isBankAccountConnected {
-            
             let email = self.txtFieldEmailGrailPayView.text.trimmingCharacters(in: .whitespacesAndNewlines)
             
             // Recurring Plan + Date Validation (only if is_recurring is true)
@@ -3234,7 +3463,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 return
             }
             
-            if isSavedForFuture {
+            if isSavedNewAccount {
                 //If billing info is available
                 if let billingInfoData = request.fields {
                     do {
@@ -3265,7 +3494,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
                                         vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
                                         vc.request = self.request
-                                        vc.isSavedForFuture = self.isSavedForFuture
+                                        vc.isSavedForFuture = self.isSavedNewAccount
                                         vc.selectedPaymentMethod = "GrailPay"
                                         vc.userEmail = self.txtFieldEmailGrailPayView.text
                                         vc.billingInfoData = billingInfoData // Send the data even if not shown
@@ -3285,7 +3514,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
                                     vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
                                     vc.selectedPaymentMethod = "GrailPay"
-                                    vc.isSavedForFuture = self.isSavedForFuture
+                                    vc.isSavedForFuture = self.isSavedNewAccount
                                     vc.grailPayAccountID = self.grailPayAccountID
                                     vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
                                     vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
@@ -3305,7 +3534,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
                                     vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
                                     vc.selectedPaymentMethod = "GrailPay"
-                                    vc.isSavedForFuture = self.isSavedForFuture
+                                    vc.isSavedForFuture = self.isSavedNewAccount
                                     vc.grailPayAccountID = self.grailPayAccountID
                                     vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
                                     vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
@@ -3337,11 +3566,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
                         vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
                         vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
-                        vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
-                        vc.request = self.request
-                        vc.isSavedForFuture = self.isSavedForFuture
-                        vc.selectedPaymentMethod = "GrailPay"
-                        vc.email = self.txtFieldEmailGrailPayView.text
+                                        vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+                                        vc.request = self.request
+                                        vc.isSavedForFuture = self.isSavedNewAccount
+                                        vc.selectedPaymentMethod = "GrailPay"
+                                        vc.email = self.txtFieldEmailGrailPayView.text
                         vc.amount = self.amount
                         self.navigationController?.pushViewController(vc, animated: true)
                     }
@@ -3373,7 +3602,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
                                     vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
                                     vc.selectedPaymentMethod = "GrailPay"
-                                    vc.isSavedForFuture = self.isSavedForFuture
+                                    vc.isSavedForFuture = self.isSavedNewAccount
                                     vc.grailPayAccountID = self.grailPayAccountID
                                     vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
                                     vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
@@ -3393,7 +3622,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
                                     vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
                                     vc.selectedPaymentMethod = "GrailPay"
-                                    vc.isSavedForFuture = self.isSavedForFuture
+                                    vc.isSavedForFuture = self.isSavedNewAccount
                                     vc.grailPayAccountID = self.grailPayAccountID
                                     vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
                                     vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
@@ -3425,6 +3654,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionLinkNewGrailPayAccount(_ sender: UIButton) {
+        print("button tapped")
         if isNewBankAccountConnected {
             // Recurring Plan + Date Validation (only if is_recurring is true)
             if let req = self.request, req.is_recurring == true {
@@ -3447,6 +3677,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             
             if isSavedForFuture {
+                
                 //If billing info is available
                 if let billingInfoData = request.fields {
                     do {
@@ -3510,6 +3741,63 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         print("Failed to decode billingInfoData: \(error.localizedDescription)")
                     }
                 }
+                else {
+                    // If billing info is nil
+                    DispatchQueue.main.async {
+                        // Create empty/default section
+                        let fieldSection = FieldSection(
+                            visibility: FieldsVisibility(billing: false, additional: false),
+                            billing: [],
+                            additional: []
+                        )
+                        
+                        let showBilling = fieldSection.visibility.billing
+                        let showAdditional = fieldSection.visibility.additional
+                        
+                        if !showBilling && !showAdditional {
+                            self.grailPayNewAccountChargeApi()
+                        }
+                        else if showBilling {
+                            // Push to BillingInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            vc.billingInfoData = nil
+                            vc.request = self.request
+                            vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
+                            vc.startDate = self.txtFieldSelectDateNewGrailPayBankView.text
+                            vc.selectedPaymentMethod = "NewGrailPayAccount"
+                            vc.isSavedForFuture = self.isSavedForFuture
+                            vc.grailPayAccountID = self.newGrailPayAccountID
+                            vc.selectedGrailPayAccountType = self.selectedNewGrailPayAccountType
+                            vc.selectedGrailPayAccountName = self.selectedNewGrailPayAccountName
+                            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 {
+                            // Push to AdditionalInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            vc.billingInfoData = nil
+                            vc.request = self.request
+                            vc.chosenPlan = self.txtFieldChosePlanNewGrailPayBankView.text
+                            vc.startDate = self.txtFieldSelectDateNewGrailPayBankView.text
+                            vc.selectedPaymentMethod = "NewGrailPayAccount"
+                            vc.isSavedForFuture = self.isSavedForFuture
+                            vc.grailPayAccountID = self.newGrailPayAccountID
+                            vc.selectedGrailPayAccountType = self.selectedNewGrailPayAccountType
+                            vc.selectedGrailPayAccountName = self.selectedNewGrailPayAccountName
+                            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 {
                 // Check if billing info data exists and is valid JSON without save
@@ -3614,7 +3902,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     } else if self.grailPaySource == .newAccount {
                         self.newGrailPayAccountConnectApi(account: selectedAccount)
                         self.lblAbandonGrailPayNewAccountView.text = "Default account successfully set"
-                        self.viewAbandonGrailPayNewAccountView.isHidden = false
+//                        self.viewAbandonGrailPayNewAccountView.isHidden = false
+                        self.viewAbandonGrailPayNewAccountView.isHidden = true
+                        self.heightViewAbandonNewGrailPayAccountView.constant = 0
                         
                         self.selectedNewGrailPayAccountType = selectedAccount["account_type"] as? String
                         self.selectedNewGrailPayAccountName = selectedAccount["name"] as? String
@@ -3688,7 +3978,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     func updateUIForNewGrailPayAccount() {
         self.viewAddNewGrailPayAccount.isHidden = false
-        self.viewAbandonGrailPayNewAccountView.isHidden = false
+       // self.viewAbandonGrailPayNewAccountView.isHidden = false
+        self.viewAbandonGrailPayNewAccountView.isHidden = true
+        self.heightViewAbandonNewGrailPayAccountView.constant = 0
         self.viewSingleSavedAccount.isHidden = true
         self.grailPayBankLinkView.isHidden = true
     }
@@ -3702,8 +3994,48 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         else if grailPaySource == .newAccount {
             lblAbandonGrailPayNewAccountView.text = message
             lblAbandonGrailPayNewAccountView.textColor = .systemRed
-            viewAbandonGrailPayNewAccountView.isHidden = false
+           // viewAbandonGrailPayNewAccountView.isHidden = false
+            self.viewAbandonGrailPayNewAccountView.isHidden = true
+            self.heightViewAbandonNewGrailPayAccountView.constant = 0
+        }
+    }
+    
+    // Add "Change" button to GrailPay saved account card (like Android)
+    func addChangeButtonToGrailPaySavedAccount() {
+        // Remove any existing change button first
+        viewGrailPaySavedAccount.subviews.first(where: { $0.tag == 999 })?.removeFromSuperview()
+        
+        let changeButton = UIButton(type: .system)
+        changeButton.setTitle("Change", for: .normal)
+        changeButton.tag = 999 // Tag to identify and remove later if needed
+        changeButton.translatesAutoresizingMaskIntoConstraints = false
+        changeButton.addTarget(self, action: #selector(changeGrailPayAccount), for: .touchUpInside)
+        
+        // Style the button
+        if let primaryColor = UserStoreSingleton.shared.primary_btn_bg_col,
+           let uiColor = UIColor(hex: primaryColor) {
+            changeButton.setTitleColor(uiColor, for: .normal)
+        } else {
+            changeButton.setTitleColor(.systemBlue, for: .normal)
+        }
+        
+        if let fontSize = UserStoreSingleton.shared.fontSize,
+           let fontSizeDouble = Double(fontSize) {
+            changeButton.titleLabel?.font = UIFont.systemFont(ofSize: CGFloat(fontSizeDouble), weight: .medium)
         }
+        
+        viewGrailPaySavedAccount.addSubview(changeButton)
+        
+        // Position button on the right side (like Android)
+        NSLayoutConstraint.activate([
+            changeButton.trailingAnchor.constraint(equalTo: viewGrailPaySavedAccount.trailingAnchor, constant: -16),
+            changeButton.centerYAnchor.constraint(equalTo: viewGrailPaySavedAccount.centerYAnchor)
+        ])
+    }
+    
+    @objc func changeGrailPayAccount() {
+        print("🔄 Change GrailPay account requested - launching GrailPay again")
+        launchGrailPay()
     }
     
     //MARK: - Grail Pay Banking Payment Charge Api without saving bank and without Login
@@ -3961,8 +4293,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "name": self.selectedGrailPayAccountName ?? "",
             "description": "payment checkout",
             "email": txtFieldEmailGrailPayView.text,
-            "save_account": 1,
-            "is_default": 1,
+            "save_account": isSavedNewAccount ? 1 : 0,
+            "is_default": isSavedNewAccount ? 1 : 0,
             "customer_id": UserStoreSingleton.shared.customerId ?? "",
             "create_customer": "1",
         ]
@@ -4196,6 +4528,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+        
         var params: [String: Any] = [
             "account_id": self.newGrailPayAccountID ?? "",
             "account_type": self.selectedNewGrailPayAccountType ?? "",
@@ -4203,7 +4542,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "description": "payment checkout",
             "customer_id": self.grailPayNewAccountCustomerID ?? "",
             "save_account": isSavedForFuture ? 1 : 0,
-            "email": UserStoreSingleton.shared.verificationEmail ?? ""
+            "email": finalEmail
         ]
         
         // Add is_default parameter if save_card is 1
@@ -4432,12 +4771,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+        
         var params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
             "description": "payment checkout",
             "currency": "usd",
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "email": finalEmail
         ]
         
         if let billingInfoData = request.fields {
@@ -5377,9 +5723,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSaveAccountForFuture(_ sender: UIButton) {
-        isSavedForFuture.toggle()
+        isSavedNewAccount.toggle()
         // Change the image based on the state
-        let imageName = isSavedForFuture ? "checkmark.square.fill" : "square"
+        let imageName = isSavedNewAccount ? "checkmark.square.fill" : "square"
         btnCheckSavedAccountForFuture.setImage(UIImage(systemName: imageName), for: .normal)
     }
     
@@ -6155,6 +6501,144 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
+    // MARK: - GET Show Cards API
+//    func getShowCardsApi() {
+//        //  showLoadingIndicator()
+//        
+//        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()
+//        
+//        guard let serviceURL = URL(string: fullURL) else {
+//            print("❌ Invalid URL: \(fullURL)")
+//            // hideLoadingIndicator()
+//            return
+//        }
+//        
+//        var uRLRequest = URLRequest(url: serviceURL)
+//        uRLRequest.httpMethod = "GET"
+//        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
+//        let task = session.dataTask(with: uRLRequest) { [weak self] (data, response, error) in
+//            guard let self = self else { return }
+//            
+//            if let error = error {
+//                print("❌ Error in getShowCardsApi: \(error.localizedDescription)")
+//                if let httpResponse = response as? HTTPURLResponse {
+//                    print("📡 HTTP Status Code: \(httpResponse.statusCode)")
+//                }
+//                return
+//            }
+//            
+//            guard let data = data else {
+//                print("❌ No data received in getShowCardsApi.")
+//                return
+//            }
+//            
+//            do {
+//                if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+//                   let cards = jsonResponse["Cards"] as? [[String: Any]] {
+//                    
+//                    print("✅ Parsed JSON Response:\n\(jsonResponse)")
+//                    
+//                    if cards.isEmpty {
+//                        DispatchQueue.main.async {
+//                            self.showToast(message: "No saved card is available")
+//                            self.viewCardFields.isHidden = false
+//                            self.btnNext.isHidden = false
+//                            self.btnNextHeight.constant = 50
+//                            self.btnNextTopCon.constant = 20
+//                            self.viewSingleSavedCard.isHidden = true
+//                            self.viewChangeCard.isHidden = true
+//                        }
+//                        return
+//                    }
+//                    else {
+//                        DispatchQueue.main.async {
+//                            self.viewSingleSavedCard.isHidden = false
+//                            self.viewChangeCard.isHidden = true
+//                        }
+//                    }
+//                    
+//                    // Map JSON response to CardModel array
+//                    self.savedCards = cards.compactMap { cardDict in
+//                        return CardModel(
+//                            cardBrandName: cardDict["card_brand_name"] as? String ?? "",
+//                            cardId: cardDict["card_id"] as? String ?? "",
+//                            cardType: cardDict["card_type"] as? String ?? "",
+//                            ccLast4: cardDict["cc_last_4"] as? String ?? "",
+//                            ccValidThru: cardDict["cc_valid_thru"] as? String ?? "",
+//                            customerId: cardDict["customer_id"] as? String ?? "",
+//                            isDefault: (cardDict["is_default"] as? Int ?? 0) == 1
+//                        )
+//                    }
+//                    
+//                    print("💳 Saved Cards:")
+//                    self.savedCards.forEach { card in
+//                        print("""
+//                        --------------------------
+//                        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)"
+//                            self.lblExpireDateSingelSavedCard.text = "Expiry: \(firstCard.ccValidThru)"
+//                            
+//                            self.selectedCardIndex = 0
+//                            self.selectedCard = self.savedCards[0]
+//                            self.updateSingleCardView(for: 0)
+//                            
+//                        }
+//                        
+//                        self.tblViewSavedCardsList.reloadData()
+//                        
+//                        if self.isSelectForPay {
+//                            self.viewTxtFieldCVVSingleCard.isHidden = false
+//                            self.btnPayNowSingleCard.isHidden = false
+//                            self.btnNext.isHidden = true
+//                            self.btnNextHeight.constant = 0
+//                            self.btnNextTopCon.constant = 0
+//                            
+//                            if self.request.is_recurring == true {
+//                                self.txtFieldSelectPlanSingleSavedCard.isHidden = false
+//                                self.txtFieldSelectDateSingleSavedCard.isHidden = false
+//                                // if self.request.recurringStartDateType == .custom {
+//                                //                                    self.txtFieldSelectDateSingleSavedCard.isHidden = false
+//                                //                                }
+//                            } else {
+//                                self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+//                                self.txtFieldSelectDateSingleSavedCard.isHidden = true
+//                            }
+//                        } else {
+//                            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
+//                        }
+//                    }
+//                }
+//            } catch {
+//                print("❌ JSON parsing failed: \(error.localizedDescription)")
+//            }
+//        }
+//        task.resume()
+//    }
+    
     // MARK: - GET Show Cards API
     func getShowCardsApi() {
         //  showLoadingIndicator()
@@ -6193,33 +6677,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             
             do {
-//                // Print raw JSON string for inspection
-//                if let rawJSON = String(data: data, encoding: .utf8) {
-//                    print("📦 Raw JSON Response:\n\(rawJSON)")
-//                }
-                
                 if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let cards = jsonResponse["Cards"] as? [[String: Any]] {
                     
                     print("✅ Parsed JSON Response:\n\(jsonResponse)")
                     
-                    if cards.isEmpty {
-                        DispatchQueue.main.async {
-                            self.showToast(message: "No saved card is available")
-                            self.viewCardFields.isHidden = false
-                            self.btnNext.isHidden = false
-                            self.btnNextHeight.constant = 50
-                            self.btnNextTopCon.constant = 20
-                            self.viewSingleSavedCard.isHidden = true
-                        }
-                        return
-                    }
-                    else {
-                        DispatchQueue.main.async {
-                            self.viewSingleSavedCard.isHidden = false
-                        }
-                    }
-                    
                     // Map JSON response to CardModel array
                     self.savedCards = cards.compactMap { cardDict in
                         return CardModel(
@@ -6249,18 +6711,59 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                     
                     DispatchQueue.main.async {
-                        if let firstCard = self.savedCards.first {
+                        if self.savedCards.isEmpty {
+                           // self.showToast(message: "No saved card is available")
+                            self.viewCardFields.isHidden = false
+                            self.btnNext.isHidden = false
+                            self.btnNextHeight.constant = 50
+                            self.btnNextTopCon.constant = 20
+                            self.viewSingleSavedCard.isHidden = true
+                            self.viewChangeCard.isHidden = true
+                            
+                            self.viewBtnShowSavedCards.isHidden = false
+                            self.iconShowSavedCard.isHidden = true
+                            self.lblBtnShowSaveCard.text = "No saved card is available"
+                            self.btnShowSavedCard.isHidden = true
+                            self.viewBtnShowSavedCardHeight.constant = 50
+                            self.viewBtnShowSavedCardTopCon.constant = 20
+                            return
+                        }
+                        else {
+                            self.viewBtnShowSavedCards.isHidden = true
+                            self.viewBtnShowSavedCardHeight.constant = 0
+                            self.viewBtnShowSavedCardTopCon.constant = 0
+                        }
+                        
+                        // Hide all remove/update buttons
+                        for visibleCell in self.tblViewSavedCardsList.visibleCells {
+                            if let cell = visibleCell as? SavedCardsTVC {
+                                cell.isRemoveUpdateViewVisible = false
+                                cell.viewBtnRemoveUpdate.isHidden = true
+                            }
+                        }
+                        
+                        self.tblViewSavedCardsList.reloadData()
+                        self.viewChangedAccount.isHidden = true
+                        
+                        // Show Change Card view if updated, else show first saved card
+                        if self.shouldShowChangeCardAfterUpdate {
+                            self.viewChangeCard.isHidden = false
+                            self.viewSingleSavedCard.isHidden = true
+                            self.shouldShowChangeCardAfterUpdate = false
+                        } else if let firstCard = self.savedCards.first {
                             self.lblCardNumberSigleSavedCard.text = "****\(firstCard.ccLast4)"
                             self.lblExpireDateSingelSavedCard.text = "Expiry: \(firstCard.ccValidThru)"
-                            
                             self.selectedCardIndex = 0
                             self.selectedCard = self.savedCards[0]
                             self.updateSingleCardView(for: 0)
+                            self.viewSingleSavedCard.isHidden = false
+                            self.viewChangeCard.isHidden = true
                             
+                            // Reset selection state for single card view
+                            self.isSelectForPay = false
                         }
                         
-                        self.tblViewSavedCardsList.reloadData()
-                        
+                        // Show/hide CVV, Next button, recurring plan fields
                         if self.isSelectForPay {
                             self.viewTxtFieldCVVSingleCard.isHidden = false
                             self.btnPayNowSingleCard.isHidden = false
@@ -6271,9 +6774,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             if self.request.is_recurring == true {
                                 self.txtFieldSelectPlanSingleSavedCard.isHidden = false
                                 self.txtFieldSelectDateSingleSavedCard.isHidden = false
-                                //                                if self.request.recurringStartDateType == .custom {
-                                //                                    self.txtFieldSelectDateSingleSavedCard.isHidden = false
-                                //                                }
                             } else {
                                 self.txtFieldSelectPlanSingleSavedCard.isHidden = true
                                 self.txtFieldSelectDateSingleSavedCard.isHidden = true
@@ -6289,9 +6789,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                     }
                 }
-//                else {
-//                    print("⚠️ JSON structure unexpected or 'Cards' key missing")
-//                }
             } catch {
                 print("❌ JSON parsing failed: \(error.localizedDescription)")
             }
@@ -6320,8 +6817,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let emailText = txtFieldEmailCardView.text
             let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
             
-            requestBody["save_card"] = 1
-            requestBody["is_default"] = "1"
+            requestBody["save_card"] = isSavedNewCardForFuture ? 1 : 0
+            if isSavedNewCardForFuture {
+                requestBody["is_default"] = "1"
+            }
             
             if let customerId = UserStoreSingleton.shared.customerId {
                 requestBody["customer"] = customerId
@@ -6335,27 +6834,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
         
-//        if let req = request, req.is_recurring == true {
-//            if let recurringType = req.recurringStartDateType, recurringType == .custom,
-//               let startDateText = txtFieldStartDateCard?.text, !startDateText.isEmpty {
-//                let inputFormatter = DateFormatter()
-//                inputFormatter.dateFormat = "dd/MM/yyyy"
-//                
-//                let outputFormatter = DateFormatter()
-//                outputFormatter.dateFormat = "MM/dd/yyyy"
-//                
-//                if let date = inputFormatter.date(from: startDateText) {
-//                    requestBody["start_date"] = outputFormatter.string(from: date)
-//                } else {
-//                    print("Invalid start date format.")
-//                }
-//            }
-//            
-//            if let plan = txtFieldChosePlanCard?.text, !plan.isEmpty {
-//                requestBody["interval"] = plan.lowercased()
-//            }
-//        }
-        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let startDateText = txtFieldStartDateCard?.text, !startDateText.isEmpty {
@@ -6401,6 +6879,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             case .success(let json):
                 print("Parsed Response: \(json)")
                 DispatchQueue.main.async {
+                    // ✅ Handle duplicate transaction error inside success response
+                    if let status = json["status"] as? Bool, status == false,
+                       let message = json["message"] as? String,
+                       message.lowercased().contains("duplicate transaction") {
+                        self.presentPaymentErrorVC(errorMessage: message)
+                        return
+                    }
+                    
+                    if let status = json["status"] as? Int, status == 0,
+                       let message = json["message"] as? String,
+                       message.lowercased().contains("duplicate transaction") {
+                        self.presentPaymentErrorVC(errorMessage: message)
+                        return
+                    }
+                    
                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                         paymentDoneVC.chargeData = json
                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
@@ -6579,7 +7072,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let emailText = txtFieldEmailCardView.text
             let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
             
-            params["save_card"] = 1
+            params["save_card"] = isSavedNewCardForFuture ? 1 : 0
             params["is_default"] = "1"
             params["tokenize"] = request.tokenOnly ?? ""
             params["username"] = emailPrefix
@@ -6612,35 +7105,54 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             
             switch result {
+                
             case .success(let json):
                 print("Parsed Response: \(json)")
+                
                 DispatchQueue.main.async {
+                    // ✅ Handle duplicate transaction error inside success response
+                    if let status = json["status"] as? Bool, status == false,
+                       let message = json["message"] as? String,
+                       message.lowercased().contains("duplicate transaction") {
+                        self.presentPaymentErrorVC(errorMessage: message)
+                        return
+                    }
+                    
+                    if let status = json["status"] as? Int, status == 0,
+                       let message = json["message"] as? String,
+                       message.lowercased().contains("duplicate transaction") {
+                        self.presentPaymentErrorVC(errorMessage: message)
+                        return
+                    }
+                    
+                    // ✅ Normal flow (only if not duplicate error)
                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                         paymentDoneVC.chargeData = json
                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
                         paymentDoneVC.request = self.request
-                        // Pass billing info and additional info if available
+                        
+                        // Pass billing + additional info
                         if let billingInfoData = self.request.fields,
                            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                             
-                            // Filter billing info: only include non-empty values
-                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                            let filteredBilling = fieldSection.billing.filter { !$0.value.trimmingCharacters(in: .whitespaces).isEmpty }
                             paymentDoneVC.billingInfoData = filteredBilling
                             var billingDict: [String: Any] = [:]
                             filteredBilling.forEach { billingDict[$0.name] = $0.value }
                             paymentDoneVC.billingInfo = billingDict
                             
-                            // Filter additional info: only include non-empty values
-                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
+                            let filteredAdditional = fieldSection.additional.filter { !$0.value.trimmingCharacters(in: .whitespaces).isEmpty }
                             paymentDoneVC.additionalInfoData = filteredAdditional
                             var additionalDict: [String: Any] = [:]
                             filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
                             paymentDoneVC.additionalInfo = additionalDict
                         }
+                        
                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                     }
                 }
+
                 
             case .failure(let error):
                 if let data = data,
@@ -6660,8 +7172,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentFromShowSavedCardApi() {
         showLoadingIndicator()
         
-        let emailText = UserStoreSingleton.shared.verificationEmail ?? ""
-        let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+//        let emailText = UserStoreSingleton.shared.verificationEmail ?? ""
+//        let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
+        
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+
+        let emailPrefix: String
+        if !finalEmail.isEmpty {
+            emailPrefix = finalEmail.components(separatedBy: "@").first ?? ""
+        } else {
+            emailPrefix = ""
+        }
         
         // Determine name: use request.name if available, otherwise fallback to email prefix
         let nameParam: String
@@ -6678,7 +7204,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "cvc": txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
             "customer_id": selectedCard?.customerId ?? "",
             "name": nameParam,
-            "email": UserStoreSingleton.shared.verificationEmail ?? ""
+            "email": finalEmail
         ]
         
         // Add these if recurring is enabled
@@ -6749,6 +7275,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             case .success(let json):
                 print("Parsed Response: \(json)")
                 DispatchQueue.main.async {
+                    // ✅ Handle duplicate transaction error inside success response
+                    if let status = json["status"] as? Bool, status == false,
+                       let message = json["message"] as? String,
+                       message.lowercased().contains("duplicate transaction") {
+                        self.presentPaymentErrorVC(errorMessage: message)
+                        return
+                    }
+                    
+                    if let status = json["status"] as? Int, status == 0,
+                       let message = json["message"] as? String,
+                       message.lowercased().contains("duplicate transaction") {
+                        self.presentPaymentErrorVC(errorMessage: message)
+                        return
+                    }
+                    
                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                         paymentDoneVC.chargeData = json
                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
@@ -6817,6 +7358,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+
         var params: [String: Any] = [
             "currency": "usd",
             "payment_method": "card",
@@ -6825,7 +7373,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "customer_id" : selectedCard?.customerId ?? "",
             "card_id" : selectedCard?.cardId ?? "",
             "cvc" : txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
-            "email": UserStoreSingleton.shared.verificationEmail ?? ""
+            "email": finalEmail
         ]
         
         if let billingInfoData = request.fields {
@@ -6976,40 +7524,57 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
-                                DispatchQueue.main.async {
-                                    if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
-                                        paymentDoneVC.chargeData = responseObject
-                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
-                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        paymentDoneVC.request = self.request
-                                        // Pass billing info and additional info if available
-                                        if let billingInfoData = self.request.fields,
-                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
-                                            
-                                            // Filter billing info: only include non-empty values
-                                            let filteredBilling = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
-                                            paymentDoneVC.billingInfoData = filteredBilling
-                                            var billingDict: [String: Any] = [:]
-                                            filteredBilling.forEach { billingDict[$0.name] = $0.value }
-                                            paymentDoneVC.billingInfo = billingDict
-                                            
-                                            // Filter additional info: only include non-empty values
-                                            let filteredAdditional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
-                                            paymentDoneVC.additionalInfoData = filteredAdditional
-                                            var additionalDict: [String: Any] = [:]
-                                            filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
-                                            paymentDoneVC.additionalInfo = additionalDict
-                                        }
-                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                return
+                            }
+                            
+                            // ✅ Normal success flow
+                            DispatchQueue.main.async {
+                                if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
+                                    paymentDoneVC.chargeData = responseObject
+                                    paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                    paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                    paymentDoneVC.request = self.request
+                                    
+                                    if let billingInfoData = self.request.fields,
+                                       let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
+                                        
+                                        let filteredBilling = fieldSection.billing.filter { !$0.value.trimmingCharacters(in: .whitespaces).isEmpty }
+                                        paymentDoneVC.billingInfoData = filteredBilling
+                                        var billingDict: [String: Any] = [:]
+                                        filteredBilling.forEach { billingDict[$0.name] = $0.value }
+                                        paymentDoneVC.billingInfo = billingDict
+                                        
+                                        let filteredAdditional = fieldSection.additional.filter { !$0.value.trimmingCharacters(in: .whitespaces).isEmpty }
+                                        paymentDoneVC.additionalInfoData = filteredAdditional
+                                        var additionalDict: [String: Any] = [:]
+                                        filteredAdditional.forEach { additionalDict[$0.name] = $0.value }
+                                        paymentDoneVC.additionalInfo = additionalDict
                                     }
+                                    
+                                    self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                 }
                             }
-                        } else {
+                        }
+                        else {
                             self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
                         }
                     } catch let jsonError {
@@ -7110,7 +7675,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         showLoadingIndicator()
         
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
@@ -7126,7 +7691,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+      //  let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+        
+        let emailPrefix: String
+        if !finalEmail.isEmpty {
+            emailPrefix = finalEmail.components(separatedBy: "@").first ?? ""
+        } else {
+            emailPrefix = ""
+        }
         
         var params: [String: Any] = [
             "name": nameText,
@@ -7139,7 +7718,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "currency": "usd",
             "payment_method": "card",
             "save_card": isSavedNewCardForFuture ? 1 : 0,
-            "email" : UserStoreSingleton.shared.verificationEmail ?? ""
+            "email" : finalEmail
         ]
         
         // Add is_default parameter if save_card is 1
@@ -7240,11 +7819,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -7322,7 +7918,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+       // let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+        
+        let emailPrefix: String
+        if !finalEmail.isEmpty {
+            emailPrefix = finalEmail.components(separatedBy: "@").first ?? ""
+        } else {
+            emailPrefix = ""
+        }
         
         // Get the text fields from the selected cell and trim whitespace
         let nameText = txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -7341,11 +7951,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "currency": "usd",
             "payment_method": "card",
             "save_card": isSavedNewCardForFuture ? 1 : 0,
-            "email" : UserStoreSingleton.shared.verificationEmail ?? ""
+            "email" : finalEmail
         ]
         
         // Add is_default parameter if save_card is 1
-        if isSavedNewCard {
+        if isSavedNewCardForFuture {
             params["is_default"] = "1"
         }
         
@@ -7460,7 +8070,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["customer_id"] = customerId
         } else {
             params["username"] = emailPrefix
-            params["email"] = UserStoreSingleton.shared.verificationEmail
+            params["email"] = finalEmail
         }
         
         // ✅ Include metadata only if it has at least 1 key-value pair
@@ -7505,11 +8115,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -7561,14 +8188,159 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     //MARK: - Update Cards Api.
+//    func updateCardApi(cardID: String) {
+//        
+//        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()+"/\(cardID)"
+//        
+//        guard let serviceURL = URL(string: fullURL) else {
+//            print("Invalid URL")
+//            return
+//        }
+//        
+//        var request = URLRequest(url: serviceURL)
+//        request.httpMethod = "PUT"
+//        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
+//        let nameText = txtFieldNameOnCardUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+//        let cvvText = txtFieldCVVUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+//        let expiryText = txtFieldExpireDateUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+//        
+//        // Check if any field is empty
+//        if expiryText.isEmpty || cvvText.isEmpty || nameText.isEmpty {
+//            let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
+//            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+//            self.present(alert, animated: true, completion: nil)
+//            return
+//        }
+//        
+//        // Split expiry
+//        let exp = expiryText.split(separator: "/")
+//        guard exp.count == 2,
+//              let month = Int(exp[0]),
+//              let year = Int(exp[1]) else {
+//            showAlert(title: "Invalid Expiry Date", message: "Please enter in MM/yy format (e.g., 09/25).")
+//            return
+//        }
+//
+//        // Convert 2-digit year -> 4-digit year dynamically
+//        let currentYear = Calendar.current.component(.year, from: Date())
+//        let currentCentury = currentYear / 100 // e.g., 20 for 2025
+//        let fullYear = (year + currentCentury * 100)
+//
+//        // Build expiry date as last day of the month
+//        var components = DateComponents()
+//        components.year = fullYear
+//        components.month = month + 1
+//        components.day = 0  // trick: day 0 gives last day of previous month
+//        let calendar = Calendar.current
+//
+//        if let expiryDate = calendar.date(from: components) {
+//            let now = Date()
+//            if expiryDate < now {
+//                showAlert(title: "Expired Card", message: "The expiry date cannot be in the past.")
+//                return
+//            }
+//        } else {
+//            showAlert(title: "Invalid Expiry Date", message: "Please enter in MM/yy format (e.g., 09/25).")
+//            return
+//        }
+//
+//        // Set up parameters with selected card details
+//        let params: [String: Any] = [
+//            "card_id": cardID,
+//            "cardholder_name": nameText,
+//            "cvc": cvvText,
+//            "exp_month": expiryText.components(separatedBy: "/").first ?? "",
+//            "exp_year": expiryText.components(separatedBy: "/").last ?? "",
+//        ]
+//        
+//        print(params)
+//        
+//        do {
+//            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+//            request.httpBody = jsonData
+//            if let jsonString = String(data: jsonData, encoding: .utf8) {
+//                print("JSON Payload: \(jsonString)")
+//            }
+//        } catch let error {
+//            print("Error creating JSON data: \(error)")
+//          //  hideLoadingIndicator()
+//            return
+//        }
+//        
+//        let session = URLSession.shared
+//        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+//            
+//            if let error = error {
+//                self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+//                return
+//            }
+//            
+//            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+//                self.presentPaymentErrorVC(errorMessage: "Invalid response")
+//                return
+//            }
+//            
+//            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+//                if let data = serviceData {
+//                    do {
+//                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+//                            print("Response Data: \(responseObject)")
+//                            DispatchQueue.main.async {
+//                                self.viewUpdateCard.isHidden = true
+//                                self.viewChangeCard.isHidden = false
+//                                self.OTPView.isHidden = true
+//                                self.viewCardFields.isHidden = true
+//                                self.viewSingleSavedCard.isHidden = true
+//                                self.viewBtnShowSavedCards.isHidden = true
+//                                self.viewBtnShowSavedCardHeight.constant = 0
+//                                self.viewBtnShowSavedCardTopCon.constant = 0
+//                                self.viewUpdateCard.isHidden = true
+//                                self.viewAddNewCard.isHidden = true
+//                                self.btnNext.isHidden = true
+//                                self.btnNextHeight.constant = 0
+//                                self.btnNextTopCon.constant = 8
+//                                
+//                                self.getShowCardsApi()
+//                                
+//                                self.txtFieldNameOnCardUpdateCardView.text = ""
+//                                self.txtFieldExpireDateUpdateCardView.text = ""
+//                                self.txtFieldCVVUpdateCardView.text = ""
+//                            }
+//                        } else {
+//                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
+//                        }
+//                    } catch let jsonError {
+//                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+//                    }
+//                } else {
+//                    self.presentPaymentErrorVC(errorMessage: "No data received")
+//                }
+//            } else {
+//                if let data = serviceData,
+//                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+//                   let message = responseObj["message"] as? String {
+//                    self.presentPaymentErrorVC(errorMessage: message)
+//                } else {
+//                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+//                }
+//            }
+//        }
+//        task.resume()
+//    }
+    
+    // MARK: - Update Cards API
     func updateCardApi(cardID: String) {
-        showLoadingIndicator()
         
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()+"/\(cardID)"
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path() + "/\(cardID)"
         
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
-            hideLoadingIndicator()
             return
         }
         
@@ -7577,23 +8349,20 @@ 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
         let nameText = txtFieldNameOnCardUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let cvvText = txtFieldCVVUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let expiryText = txtFieldExpireDateUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         
-        // Check if any field is empty
-        if expiryText.isEmpty || cvvText.isEmpty || nameText.isEmpty {
+        guard !nameText.isEmpty, !cvvText.isEmpty, !expiryText.isEmpty else {
             let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
-            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-            self.present(alert, animated: true, completion: nil)
+            alert.addAction(UIAlertAction(title: "OK", style: .default))
+            self.present(alert, animated: true)
             return
         }
         
-        // Split expiry
+        // Validate expiry
         let exp = expiryText.split(separator: "/")
         guard exp.count == 2,
               let month = Int(exp[0]),
@@ -7602,107 +8371,64 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
 
-        // Convert 2-digit year -> 4-digit year dynamically
         let currentYear = Calendar.current.component(.year, from: Date())
-        let currentCentury = currentYear / 100 // e.g., 20 for 2025
-        let fullYear = (year + currentCentury * 100)
+        let currentCentury = currentYear / 100
+        let fullYear = year + currentCentury * 100
 
-        // Build expiry date as last day of the month
         var components = DateComponents()
         components.year = fullYear
         components.month = month + 1
-        components.day = 0  // trick: day 0 gives last day of previous month
-        let calendar = Calendar.current
-
-        if let expiryDate = calendar.date(from: components) {
-            let now = Date()
-            if expiryDate < now {
-                showAlert(title: "Expired Card", message: "The expiry date cannot be in the past.")
-                return
-            }
-        } else {
-            showAlert(title: "Invalid Expiry Date", message: "Please enter in MM/yy format (e.g., 09/25).")
+        components.day = 0
+        
+        if let expiryDate = Calendar.current.date(from: components), expiryDate < Date() {
+            showAlert(title: "Expired Card", message: "The expiry date cannot be in the past.")
             return
         }
-
-        // Set up parameters with selected card details
+        
         let params: [String: Any] = [
             "card_id": cardID,
             "cardholder_name": nameText,
             "cvc": cvvText,
-            "exp_month": expiryText.components(separatedBy: "/").first ?? "",
-            "exp_year": expiryText.components(separatedBy: "/").last ?? "",
+            "exp_month": exp[0],
+            "exp_year": exp[1],
         ]
         
-        print(params)
-        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
-            if let jsonString = String(data: jsonData, encoding: .utf8) {
-                print("JSON Payload: \(jsonString)")
-            }
-        } catch let error {
-            print("Error creating JSON data: \(error)")
-            hideLoadingIndicator()
+        } catch {
+            print("Error creating JSON: \(error)")
             return
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
-            
-            DispatchQueue.main.async {
-                self.hideLoadingIndicator() // Stop loader when response is received
-            }
+        let task = session.dataTask(with: request) { [weak self] data, response, error in
+            guard let self = self else { return }
             
             if let error = error {
                 self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
                 return
             }
             
-            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+            guard let httpResponse = response as? HTTPURLResponse else {
                 self.presentPaymentErrorVC(errorMessage: "Invalid response")
                 return
             }
             
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-                if let data = serviceData {
-                    do {
-                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-                            print("Response Data: \(responseObject)")
-                            DispatchQueue.main.async {
-                                
-                                self.viewUpdateCard.isHidden = true
-                                self.viewChangeCard.isHidden = false
-                                self.OTPView.isHidden = true
-                                self.viewCardFields.isHidden = true
-                                self.viewSingleSavedCard.isHidden = true
-                                self.viewBtnShowSavedCards.isHidden = true
-                                self.viewBtnShowSavedCardHeight.constant = 0
-                                self.viewBtnShowSavedCardTopCon.constant = 0
-                                self.viewUpdateCard.isHidden = true
-                                self.viewAddNewCard.isHidden = true
-                                self.btnNext.isHidden = true
-                                self.btnNextHeight.constant = 0
-                                self.btnNextTopCon.constant = 8
-                                
-                                self.getShowCardsApi()
-                                
-                                self.txtFieldNameOnCardUpdateCardView.text = ""
-                                self.txtFieldExpireDateUpdateCardView.text = ""
-                                self.txtFieldCVVUpdateCardView.text = ""
-                            }
-                        } else {
-                            self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
-                        }
-                    } catch let jsonError {
-                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
-                    }
-                } else {
-                    self.presentPaymentErrorVC(errorMessage: "No data received")
+                DispatchQueue.main.async {
+                    self.viewUpdateCard.isHidden = true
+                    // Flag to show Change Card view after refresh
+                    self.shouldShowChangeCardAfterUpdate = true
+                    // Clear input fields
+                    self.txtFieldNameOnCardUpdateCardView.text = ""
+                    self.txtFieldExpireDateUpdateCardView.text = ""
+                    self.txtFieldCVVUpdateCardView.text = ""
+                    
+                    self.getShowCardsApi()
                 }
             } else {
-                if let data = serviceData,
+                if let data = data,
                    let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let message = responseObj["message"] as? String {
                     self.presentPaymentErrorVC(errorMessage: message)
@@ -7713,13 +8439,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     // MARK: - Delete Card API
     func deleteCardApi(cardID: String, at index: Int) {
         showLoadingIndicator()
         
         let endpoint = EnvironmentConfig.Endpoints.getCards.path()
-        let fullURL = EnvironmentConfig.baseURL + "\(endpoint)/\(cardID)"
+        let fullURL = EnvironmentConfig.baseURL + endpoint
+        
+        // ✅ Print full URL
+        print("DELETE Card API URL: \(fullURL)")
         
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
@@ -7738,6 +8467,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             print("Customer-Token is nil")
         }
         
+        // ✅ Add card_id in request body
+        let body: [String: Any] = ["card_id": cardID]
+        
+        do {
+            request.httpBody = try JSONSerialization.data(withJSONObject: body, options: [])
+            if let jsonString = String(data: request.httpBody!, encoding: .utf8) {
+                print("DELETE Card Request Body: \(jsonString)")
+            }
+        } catch {
+            print("Error encoding body: \(error)")
+        }
+        
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] data, response, error in
             guard let self = self else { return }
@@ -7767,8 +8508,42 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                            let message = json["message"] as? String {
                             DispatchQueue.main.async {
                                 self.showToast(message: message)
-                                // Optionally, remove the card from list at `index`
+                                
+                                // ✅ Handle remove logic
+                                if self.savedCards.count == 1 {
+                                    // If this was the last card → refresh everything
+                                    self.getShowCardsApi()
+                                } else {
+                                    // If multiple cards → remove only this card
+                                    self.savedCards.remove(at: index)
+                                    // Reset all cells' isRemoveUpdateViewVisible to false
+                                    for row in 0..<self.tblViewSavedCardsList.numberOfRows(inSection: 0) {
+                                        if let cell = self.tblViewSavedCardsList.cellForRow(at: IndexPath(row: row, section: 0)) as? SavedCardsTVC {
+                                            cell.isRemoveUpdateViewVisible = false
+                                            cell.viewBtnRemoveUpdate.isHidden = true
+                                        }
+                                    }
+                                    self.tblViewSavedCardsList.reloadData()
+                                    
+                                    if self.selectedCardIndex == index {
+                                        self.viewSingleSavedCard.isHidden = true
+                                        self.selectedCardIndex = nil
+                                    }
+                                    
+                                    // Hide single card view if it was showing deleted one
+                                    if self.selectedCardIndex == index {
+                                        self.viewSingleSavedCard.isHidden = true
+                                        self.selectedCardIndex = nil
+                                    }
+                                    
+                                    // Adjust selected index if needed
+                                    if let selectedIndex = self.selectedCardIndex, selectedIndex > index {
+                                        self.selectedCardIndex = selectedIndex - 1
+                                    }
+                                }
+                                
                             }
+                            
                         }
                     } catch {
                         print("JSON parsing error: \(error)")
@@ -7864,13 +8639,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         print("Number of bank accounts: \(self.bankAccounts.count)")
                         
                         if self.bankAccounts.isEmpty {
-                            self.showToast(message: "No saved bank accounts is available.")
+                           // self.showToast(message: "No saved bank accounts is available.")
                             self.viewSingleSavedAccount.isHidden = true
                             self.viewSingleSavedCard.isHidden = true
                             self.OTPView.isHidden = true
-                            self.viewBtnShowSavedCards.isHidden = true
-                            self.viewBtnShowSavedCardHeight.constant = 0
-                            self.viewBtnShowSavedCardTopCon.constant = 8
+                            self.viewChangedAccount.isHidden = true
+//                            self.viewBtnShowSavedCards.isHidden = true
+//                            self.viewBtnShowSavedCardHeight.constant = 0
+//                            self.viewBtnShowSavedCardTopCon.constant = 8
+                            
+                            self.viewBtnShowSavedCards.isHidden = false
+                            self.iconShowSavedCard.isHidden = true
+                            self.lblBtnShowSaveCard.text = "No saved bank accounts is available"
+                            self.btnShowSavedCard.isHidden = true
+                            self.viewBtnShowSavedCardHeight.constant = 50
+                            self.viewBtnShowSavedCardTopCon.constant = 20
                             
                             if self.request.authenticatedACH == true {
                                 self.viewBankFields.isHidden = true
@@ -8003,7 +8786,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let emailText = txtFieldEmailAccountView.text
             let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
             
-            params["save_account"] = 1
+            params["save_account"] = isSavedNewAccount ? 1 : 0
             
             if let customerId = UserStoreSingleton.shared.customerId, !customerId.isEmpty {
                 params["customer"] = customerId
@@ -8102,11 +8885,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -8203,7 +9003,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let emailText = txtFieldEmailAccountView.text
             let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
             
-            params["save_account"] = 1
+            params["save_account"] = isSavedNewAccount ? 1 : 0
             
             if let customerId = UserStoreSingleton.shared.customerId, !customerId.isEmpty {
                 params["customer"] = customerId
@@ -8364,11 +9164,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -8441,13 +9258,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+
         var params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
             "payment_method": "ach",
             "description": "Test Description",
             "currency": "usd",
-            "email": UserStoreSingleton.shared.verificationEmail ?? ""
+            "email": finalEmail
         ]
         
         // Add these if recurring is enabled
@@ -8536,11 +9360,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -8620,13 +9461,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+        
         var params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
             "payment_method": "ach",
             "description": "Test Description",
             "currency": "usd",
-            "email": UserStoreSingleton.shared.verificationEmail ?? ""
+            "email": finalEmail
         ]
         
         if let billingInfoData = request.fields {
@@ -8777,11 +9625,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -8859,10 +9724,17 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+        
         var params: [String: Any] = [
             // "name": accountName,
             "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName),
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "email": finalEmail,
             "description": "Test Description",
             "currency": "usd",
             "account_type": accountType.lowercased(),
@@ -8958,11 +9830,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -9047,9 +9936,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+        
         var params: [String: Any] = [
             "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName),
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "email": finalEmail,
             "description": "Test Description",
             "currency": "usd",
             "account_type": accountType.lowercased(),
@@ -9207,11 +10103,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -9290,11 +10203,25 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         
-        let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+       // let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
+        
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+
+        let emailPrefix: String
+        if !finalEmail.isEmpty {
+            emailPrefix = finalEmail.components(separatedBy: "@").first ?? ""
+        } else {
+            emailPrefix = ""
+        }
         
         var params: [String: Any] = [
             "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName),
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "email": finalEmail,
             "description": "Test Description",
             "currency": "usd",
             "account_type": accountType.lowercased(),
@@ -9302,7 +10229,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "account_number": accountNumber,
             "payment_mode": "auth_and_capture",
             "levelIndicator": 1,
-            "save_account": 1,
+            "save_account": isSavedNewAccount ? 1 : 0,
             "payment_method": "ach"
         ]
         
@@ -9398,11 +10325,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
                                         paymentDoneVC.chargeData = responseObject
@@ -9462,31 +10406,120 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     //MARK: - Delete Bank Account Api.
-    func deleteAccountApi(accountID: String, at index: Int) {
-        showLoadingIndicator()
-        
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()+"/\(accountID)"
-        
-        guard let serviceURL = URL(string: fullURL) else {
-            print("Invalid URL")
-            hideLoadingIndicator()
-            return
-        }
-        
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "DELETE"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
-        let token = UserStoreSingleton.shared.customerToken
-       // print("Setting customerToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+//    func deleteAccountApi(accountID: String, at index: Int) {
+//        showLoadingIndicator()
+//        
+//        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.account.path()+"/\(accountID)"
+//        
+//        guard let serviceURL = URL(string: fullURL) else {
+//            print("Invalid URL")
+//            hideLoadingIndicator()
+//            return
+//        }
+//        
+//        var request = URLRequest(url: serviceURL)
+//        request.httpMethod = "DELETE"
+//        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
+//        let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
+//            guard let self = self else { return }
+//            
+//            DispatchQueue.main.async {
+//                self.hideLoadingIndicator() // Stop loader when response is received
+//            }
+//            
+//            if let error = error {
+//                DispatchQueue.main.async {
+//                    self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+//                }
+//                return
+//            }
+//            
+//            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+//                DispatchQueue.main.async {
+//                    self.presentPaymentErrorVC(errorMessage: "Invalid response")
+//                }
+//                return
+//            }
+//            
+//            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+//                
+//                if let data = serviceData {
+//                    do {
+//                        // Try to parse the data as JSON
+//                        if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+//                           let message = jsonResponse["message"] as? String {
+//                            DispatchQueue.main.async {
+//                                self.showToast(message: message)
+//                                self.getShowBankAccountsApi()
+//                            }
+//                        }
+//                    } catch let jsonError {
+//                        print("Error parsing JSON response: \(jsonError.localizedDescription)")
+//                    }
+//                } else {
+//                    print("No data received.")
+//                }
+//            } else {
+//                DispatchQueue.main.async {
+//                    if let data = serviceData,
+//                       let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+//                       let message = responseObj["message"] as? String {
+//                        self.presentPaymentErrorVC(errorMessage: message)
+//                    } else {
+//                        self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+//                    }
+//                }
+//            }
+//        }
+//        task.resume()
+//    }
+    
+    //MARK: - Delete Bank Account Api.
+    func deleteAccountApi(accountID: String, at index: Int) {
+        showLoadingIndicator()
+        
+        // Keep accountID in path
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.account.path() + "/\(accountID)"
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "DELETE"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        if let token = UserStoreSingleton.shared.customerToken {
+            request.addValue(token, forHTTPHeaderField: "Customer-Token")
+        }
+        
+        // Also send accountID in request body
+        let parameters: [String: Any] = [
+            "account_id": accountID   // check if backend wants "accountId" instead
+        ]
+        
+        do {
+            request.httpBody = try JSONSerialization.data(withJSONObject: parameters, options: [])
+        } catch {
+            print("Error serializing parameters: \(error.localizedDescription)")
+            hideLoadingIndicator()
+            return
+        }
         
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
             guard let self = self else { return }
             
             DispatchQueue.main.async {
-                self.hideLoadingIndicator() // Stop loader when response is received
+                self.hideLoadingIndicator()
             }
             
             if let error = error {
@@ -9504,22 +10537,29 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-                
                 if let data = serviceData {
                     do {
-                        // Try to parse the data as JSON
                         if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                            let message = jsonResponse["message"] as? String {
                             DispatchQueue.main.async {
                                 self.showToast(message: message)
-                                self.getShowBankAccountsApi()
+                                // self.getShowBankAccountsApi()
+                               
+                                if self.bankAccounts.count == 1 {
+                                    // Only one left, reload fresh from API
+                                    self.getShowBankAccountsApi()
+                                } else {
+                                    // Remove locally from list
+                                    self.bankAccounts.remove(at: index)
+                                    // Reload table to reset button tags
+                                    self.tblViewSavedBankAccounts.reloadData()
+                                }
+                                
                             }
                         }
                     } catch let jsonError {
                         print("Error parsing JSON response: \(jsonError.localizedDescription)")
                     }
-                } else {
-                    print("No data received.")
                 }
             } else {
                 DispatchQueue.main.async {
@@ -9780,7 +10820,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let emailText = txtFieldEmailCardView.text
             let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
             
-            params["save_card"] = 1
+            params["save_card"] = isSavedNewCardForFuture ? 1 : 0
             params["is_default"] = "1"
             params["tokenize"] = request.tokenOnly ?? ""
             params["username"] = emailPrefix
@@ -9945,11 +10985,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
                                         
@@ -10102,9 +11159,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        let finalEmail: String
+        if let verificationEmail = UserStoreSingleton.shared.verificationEmail, !verificationEmail.isEmpty {
+            finalEmail = verificationEmail
+        } else {
+            finalEmail = request.email ?? ""
+        }
+        
         var params: [String: Any] = [
             "name": nameText,
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "email": finalEmail,
             "card_number": cardNumberText,
             "cardholder_name": nameText,
             "exp_month": expiryText.components(separatedBy: "/").first ?? "",
@@ -10270,11 +11334,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             
-                            // Check if status is 0 and handle the error
+                            // ✅ Handle duplicate transaction case
+                            if let status = responseObject["status"] as? Bool, status == false,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            if let status = responseObject["status"] as? Int, status == 0,
+                               let message = responseObject["message"] as? String,
+                               message.lowercased().contains("duplicate transaction") {
+                                self.presentPaymentErrorVC(errorMessage: message)
+                                return
+                            }
+                            
+                            // ✅ Handle generic "status == 0" error case
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
-                            } else {
+                                return
+                            }
+                            else {
                                 DispatchQueue.main.async {
                                     if let paymentDoneVC = self.storyboard?.instantiateViewController(withIdentifier: "ThreeDSecurePaymentDoneVC") as? ThreeDSecurePaymentDoneVC {
                                         
@@ -10425,82 +11506,198 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
         selectedPaymentMethod = method
         
         switch method {
+//        case "Card":
+//            if UserStoreSingleton.shared.isLoggedIn == false {
+//                self.viewSingleSavedAccount.isHidden = true
+//                self.viewBankFields.isHidden = true
+//                
+//                if request.saveCard == false {
+//                    self.viewBtnShowSavedCards.isHidden = true
+//                    self.viewBtnShowSavedCardHeight.constant = 0
+//                    self.viewBtnShowSavedCardTopCon.constant = 0
+//                }
+//                else {
+//                    self.viewBtnShowSavedCards.isHidden = false
+//                    self.lblBtnShowSaveCard.text = "Show Saved Cards"
+//                    self.viewBtnShowSavedCardHeight.constant = 50
+//                    self.viewBtnShowSavedCardTopCon.constant = 20
+//                }
+//                
+//                self.btnShowSavedCard.isHidden = false
+//                self.OTPView.isHidden = true
+//                self.emailView.isHidden = true
+//                self.viewCardFields.isHidden = false
+//                self.viewSingleSavedCard.isHidden = true
+//                self.viewChangeCard.isHidden = true
+//                self.viewUpdateCard.isHidden = true
+//                self.viewAddNewCard.isHidden = true
+//                self.btnNext.isHidden = false
+//                self.btnNextHeight.constant = 50
+//                self.btnNextTopCon.constant = 20
+//                //  self.viewTermsAndConditions.isHidden = true
+//                self.viewCrypto.isHidden = true
+//                self.grailPayBankLinkView.isHidden = true
+//                self.viewAddNewGrailPayAccount.isHidden = true
+//            } else {
+//                self.lblBtnShowSaveCard.text = "Show Saved Cards"
+//                self.getShowCardsApi()
+//                //  self.viewSingleSavedCard.isHidden = false
+//                
+//                self.viewSingleSavedAccount.isHidden = true
+//                self.viewBankFields.isHidden = true
+//                self.viewBtnShowSavedCards.isHidden = true
+//                self.viewBtnShowSavedCardHeight.constant = 0
+//                self.viewBtnShowSavedCardTopCon.constant = 0
+//                self.btnShowSavedCard.isHidden = true
+//                self.OTPView.isHidden = true
+//                self.emailView.isHidden = true
+//                self.viewCardFields.isHidden = true
+//                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.viewChangedAccount.isHidden = true
+//                self.viewNewBankAccount.isHidden = true
+//                self.viewCrypto.isHidden = true
+//                self.grailPayBankLinkView.isHidden = true
+//                self.viewAddNewGrailPayAccount.isHidden = true
+//                
+//                if self.isSelectForPay {
+//                    self.viewTxtFieldCVVSingleCard.isHidden = false
+//                    self.btnPayNowSingleCard.isHidden = false
+//                    self.btnNext.isHidden = true
+//                    self.btnNextHeight.constant = 0
+//                    self.btnNextTopCon.constant = 0
+//                    if self.request.is_recurring == true {
+//                        self.txtFieldSelectPlanSingleSavedCard.isHidden = false
+//                        self.txtFieldSelectDateSingleSavedCard.isHidden = false
+//                        // if request.recurringStartDateType == .custom {
+//                        //    self.txtFieldSelectDateSingleSavedCard.isHidden = false
+//                        // }
+//                    }
+//                    else {
+//                        self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+//                        self.txtFieldSelectDateSingleSavedCard.isHidden = true
+//                    }
+//                } else {
+//                    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
+//                }
+//            }
+//            
+//        case "Bank":
+//            if UserStoreSingleton.shared.isLoggedIn == false {
+//                
+//                if request.saveAccount == false {
+//                    self.viewBtnShowSavedCards.isHidden = true
+//                    self.viewBtnShowSavedCardHeight.constant = 0
+//                    self.viewBtnShowSavedCardTopCon.constant = 0
+//                }
+//                else {
+//                    self.viewBtnShowSavedCards.isHidden = false
+//                    self.lblBtnShowSaveCard.text = "Show Saved Account"
+//                    self.viewBtnShowSavedCardHeight.constant = 50
+//                    self.viewBtnShowSavedCardTopCon.constant = 20
+//                }
+//                
+//                self.OTPView.isHidden = true
+//                self.emailView.isHidden = true
+//                self.viewCardFields.isHidden = true
+//                self.viewSingleSavedCard.isHidden = true
+//                self.viewChangeCard.isHidden = true
+//                self.viewUpdateCard.isHidden = true
+//                self.viewAddNewCard.isHidden = true
+//                self.btnNext.isHidden = false
+//                self.btnNextHeight.constant = 50
+//                self.btnNextTopCon.constant = 20
+//                // self.viewTermsAndConditions.isHidden = false
+//                self.viewCrypto.isHidden = true
+//                self.viewSingleSavedAccount.isHidden = true
+//                
+//                if request?.authenticatedACH == false {
+//                    self.viewBankFields.isHidden = false
+//                    //  self.viewTermsAndConditions.isHidden = false
+//                    self.grailPayBankLinkView.isHidden = true
+//                    self.viewGrailPayAbandon.isHidden = true
+//                    
+//                } else {
+//                    self.viewBankFields.isHidden = true
+//                    //  self.viewTermsAndConditions.isHidden = true
+//                    self.grailPayBankLinkView.isHidden = false
+//                    self.btnNext.isHidden = true
+//                    self.btnNextHeight.constant = 0
+//                    self.btnNextTopCon.constant = 0
+//                    self.viewGrailPayAbandon.isHidden = true
+//                    
+//                    if isBankAccountConnected {
+//                        self.viewBtnShowSavedCards.isHidden = true
+//                        self.btnShowSavedCard.isHidden = true
+//                        self.viewBtnShowSavedCardHeight.constant = 0
+//                        self.viewBtnShowSavedCardTopCon.constant = 0
+//                    }
+//                    
+//                }
+//            } else {
+//                self.lblBtnShowSaveCard.text = "Show Saved Account"
+//                self.viewCardFields.isHidden = true
+//                self.viewChangeCard.isHidden = true
+//                self.viewAddNewCard.isHidden = true
+//                // self.viewBtnShowSavedCards.isHidden = false
+//                
+//                if request?.authenticatedACH == true {
+//                    self.viewBankFields.isHidden = true
+//                    //  self.viewTermsAndConditions.isHidden = true
+//                    self.grailPayBankLinkView.isHidden = false
+//                    self.btnNext.isHidden = true
+//                    self.btnNextHeight.constant = 0
+//                    self.btnNextTopCon.constant = 0
+//                    self.viewGrailPayAbandon.isHidden = true
+//                    
+//                    if isBankAccountConnected {
+//                        self.viewBtnShowSavedCards.isHidden = true
+//                        self.btnShowSavedCard.isHidden = true
+//                        self.viewBtnShowSavedCardHeight.constant = 0
+//                        self.viewBtnShowSavedCardTopCon.constant = 0
+//                    }
+//                }
+//                
+//                getShowBankAccountsApi()
+//            }
+            
+            
+            
+            
+            
+          
+            
+            
+            
         case "Card":
-            if UserStoreSingleton.shared.isLoggedIn == false {
-                self.viewSingleSavedAccount.isHidden = true
-                self.viewBankFields.isHidden = true
-                
-                if request.saveCard == false {
-                    self.viewBtnShowSavedCards.isHidden = true
-                    self.viewBtnShowSavedCardHeight.constant = 0
-                    self.viewBtnShowSavedCardTopCon.constant = 0
-                }
-                else {
-                    self.viewBtnShowSavedCards.isHidden = false
-                    self.lblBtnShowSaveCard.text = "Show Saved Cards"
-                    self.viewBtnShowSavedCardHeight.constant = 50
-                    self.viewBtnShowSavedCardTopCon.constant = 20
-                }
-                
-                self.btnShowSavedCard.isHidden = false
-                self.OTPView.isHidden = true
-                self.emailView.isHidden = true
-                self.viewCardFields.isHidden = false
-                self.viewSingleSavedCard.isHidden = true
-                self.viewChangeCard.isHidden = true
-                self.viewUpdateCard.isHidden = true
-                self.viewAddNewCard.isHidden = true
-                self.btnNext.isHidden = false
-                self.btnNextHeight.constant = 50
-                self.btnNextTopCon.constant = 20
-                //  self.viewTermsAndConditions.isHidden = true
-                self.viewCrypto.isHidden = true
-                self.grailPayBankLinkView.isHidden = true
-                self.viewAddNewGrailPayAccount.isHidden = true
-            } else {
-                self.lblBtnShowSaveCard.text = "Show Saved Cards"
-                self.getShowCardsApi()
-                //  self.viewSingleSavedCard.isHidden = false
-                
-                self.viewSingleSavedAccount.isHidden = true
-                self.viewBankFields.isHidden = true
-                self.viewBtnShowSavedCards.isHidden = true
-                self.viewBtnShowSavedCardHeight.constant = 0
-                self.viewBtnShowSavedCardTopCon.constant = 0
-                self.btnShowSavedCard.isHidden = true
-                self.OTPView.isHidden = true
-                self.emailView.isHidden = true
-                self.viewCardFields.isHidden = true
-                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.viewChangedAccount.isHidden = true
-                self.viewNewBankAccount.isHidden = true
-                self.viewCrypto.isHidden = true
-                self.grailPayBankLinkView.isHidden = true
-                self.viewAddNewGrailPayAccount.isHidden = true
-                
-                if self.isSelectForPay {
-                    self.viewTxtFieldCVVSingleCard.isHidden = false
-                    self.btnPayNowSingleCard.isHidden = false
-                    self.btnNext.isHidden = true
-                    self.btnNextHeight.constant = 0
-                    self.btnNextTopCon.constant = 0
-                    if self.request.is_recurring == true {
-                        self.txtFieldSelectPlanSingleSavedCard.isHidden = false
-                        self.txtFieldSelectDateSingleSavedCard.isHidden = false
-                        //                        if request.recurringStartDateType == .custom {
-                        //                            self.txtFieldSelectDateSingleSavedCard.isHidden = false
-                        //                        }
-                    }
-                    else {
-                        self.txtFieldSelectPlanSingleSavedCard.isHidden = true
-                        self.txtFieldSelectDateSingleSavedCard.isHidden = true
-                    }
-                } else {
+            // Reset to entry UI on collection tap
+            self.viewSingleSavedAccount.isHidden = true
+            self.viewBankFields.isHidden = true
+            self.grailPayBankLinkView.isHidden = true
+            
+            if isSavedViewVisible {
+                // ✅ Show saved card only if button tapped
+                if UserStoreSingleton.shared.customerId != nil {
+                    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
@@ -10508,86 +11705,202 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                     self.btnNextTopCon.constant = 8
                     self.txtFieldSelectPlanSingleSavedCard.isHidden = true
                     self.txtFieldSelectDateSingleSavedCard.isHidden = true
-                }
-            }
-            
-        case "Bank":
-            if UserStoreSingleton.shared.isLoggedIn == false {
-                
-                if request.saveAccount == false {
-                    self.viewBtnShowSavedCards.isHidden = true
-                    self.viewBtnShowSavedCardHeight.constant = 0
-                    self.viewBtnShowSavedCardTopCon.constant = 0
-                }
-                else {
+                    
                     self.viewBtnShowSavedCards.isHidden = false
-                    self.lblBtnShowSaveCard.text = "Show Saved Account"
                     self.viewBtnShowSavedCardHeight.constant = 50
                     self.viewBtnShowSavedCardTopCon.constant = 20
-                }
-                
-                self.OTPView.isHidden = true
-                self.emailView.isHidden = true
-                self.viewCardFields.isHidden = true
-                self.viewSingleSavedCard.isHidden = true
-                self.viewChangeCard.isHidden = true
-                self.viewUpdateCard.isHidden = true
-                self.viewAddNewCard.isHidden = true
-                self.btnNext.isHidden = false
-                self.btnNextHeight.constant = 50
-                self.btnNextTopCon.constant = 20
-                // self.viewTermsAndConditions.isHidden = false
-                self.viewCrypto.isHidden = true
-                self.viewSingleSavedAccount.isHidden = true
-                
-                if request?.authenticatedACH == false {
-                    self.viewBankFields.isHidden = false
-                    //  self.viewTermsAndConditions.isHidden = false
-                    self.grailPayBankLinkView.isHidden = true
-                    self.viewGrailPayAbandon.isHidden = true
-                    
                 } else {
-                    self.viewBankFields.isHidden = true
-                    //  self.viewTermsAndConditions.isHidden = true
-                    self.grailPayBankLinkView.isHidden = false
-                    self.btnNext.isHidden = true
-                    self.btnNextHeight.constant = 0
-                    self.btnNextTopCon.constant = 0
-                    self.viewGrailPayAbandon.isHidden = true
+                    // If logged in but no customerId
+                    self.OTPView.isHidden = true
+                    self.viewCardFields.isHidden = false
+                    self.viewSingleSavedCard.isHidden = true
+//                    self.viewBtnShowSavedCards.isHidden = true
+//                    self.viewBtnShowSavedCardHeight.constant = 0
+//                    self.viewBtnShowSavedCardTopCon.constant = 0
+                    self.viewChangeCard.isHidden = true
+                    self.viewUpdateCard.isHidden = true
+                    self.viewAddNewCard.isHidden = true
                     
-                    if isBankAccountConnected {
+                    self.viewBtnShowSavedCards.isHidden = false
+                    self.lblBtnShowSaveCard.text = "Show Saved Card"
+                    self.viewBtnShowSavedCardHeight.constant = 50
+                    self.viewBtnShowSavedCardTopCon.constant = 20
+                }
+            } else {
+                // Entry UI
+                if UserStoreSingleton.shared.isLoggedIn == false {
+                    if request.saveCard == false {
                         self.viewBtnShowSavedCards.isHidden = true
-                        self.btnShowSavedCard.isHidden = true
                         self.viewBtnShowSavedCardHeight.constant = 0
                         self.viewBtnShowSavedCardTopCon.constant = 0
+                    } else {
+                        self.viewBtnShowSavedCards.isHidden = false
+                        self.lblBtnShowSaveCard.text = "Show Saved Cards"
+                        self.viewBtnShowSavedCardHeight.constant = 50
+                        self.viewBtnShowSavedCardTopCon.constant = 20
                     }
                     
+                    self.btnShowSavedCard.isHidden = false
+                    self.OTPView.isHidden = true
+                    self.emailView.isHidden = true
+                    self.viewCardFields.isHidden = false
+                    self.viewSingleSavedCard.isHidden = true
+                    self.viewChangeCard.isHidden = true
+                    self.viewUpdateCard.isHidden = true
+                    self.viewAddNewCard.isHidden = true
+                    self.btnNext.isHidden = false
+                    self.btnNextHeight.constant = 50
+                    self.btnNextTopCon.constant = 20
+                    self.viewCrypto.isHidden = true
+                    self.grailPayBankLinkView.isHidden = true
+                    self.viewAddNewGrailPayAccount.isHidden = true
+                } else {
+                    self.lblBtnShowSaveCard.text = "Show Saved Cards"
+                    self.viewSingleSavedAccount.isHidden = true
+                    self.viewBankFields.isHidden = true
+                    self.viewBtnShowSavedCards.isHidden = false
+                    self.viewBtnShowSavedCardHeight.constant = 50
+                    self.viewBtnShowSavedCardTopCon.constant = 20
+                    self.btnShowSavedCard.isHidden = false
+                    self.OTPView.isHidden = true
+                    self.emailView.isHidden = true
+                    self.viewCardFields.isHidden = false
+                    self.viewChangeCard.isHidden = true
+                    self.viewUpdateCard.isHidden = true
+                    self.viewAddNewCard.isHidden = true
+                    self.btnNext.isHidden = false
+                    self.btnNextHeight.constant = 50
+                    self.btnNextTopCon.constant = 20
+                    self.viewChangedAccount.isHidden = true
+                    self.viewNewBankAccount.isHidden = true
+                    self.viewCrypto.isHidden = true
+                    self.grailPayBankLinkView.isHidden = true
+                    self.viewAddNewGrailPayAccount.isHidden = true
+                    
+                    if self.isSelectForPay {
+                        self.viewTxtFieldCVVSingleCard.isHidden = false
+                        self.btnPayNowSingleCard.isHidden = false
+                        self.btnNext.isHidden = true
+                        self.btnNextHeight.constant = 0
+                        self.btnNextTopCon.constant = 0
+                        if self.request.is_recurring == true {
+                            self.txtFieldSelectPlanSingleSavedCard.isHidden = false
+                            self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                        } else {
+                            self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                            self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                        }
+                    } else {
+                        self.viewTxtFieldCVVSingleCard.isHidden = true
+                        self.btnPayNowSingleCard.isHidden = true
+                        self.btnNext.isHidden = false
+                        self.btnNextHeight.constant = 50
+                        self.btnNextTopCon.constant = 20
+                        self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                        self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                    }
                 }
-            } else {
-                self.lblBtnShowSaveCard.text = "Show Saved Account"
+            }
+            
+        case "Bank":
+            if isSavedViewVisible {
+                // ✅ Show saved bank only when button tapped
+                self.getShowBankAccountsApi()
+                self.viewBankFields.isHidden = true
+                self.viewSingleSavedAccount.isHidden = false
+                self.btnNext.isHidden = true
+                self.btnNextHeight.constant = 0
+                self.btnNextTopCon.constant = 0
+                
                 self.viewCardFields.isHidden = true
+                
                 self.viewChangeCard.isHidden = true
+                self.viewUpdateCard.isHidden = true
                 self.viewAddNewCard.isHidden = true
-                // self.viewBtnShowSavedCards.isHidden = false
-                
                 if request?.authenticatedACH == true {
-                    self.viewBankFields.isHidden = true
-                    //  self.viewTermsAndConditions.isHidden = true
                     self.grailPayBankLinkView.isHidden = false
-                    self.btnNext.isHidden = true
-                    self.btnNextHeight.constant = 0
-                    self.btnNextTopCon.constant = 0
-                    self.viewGrailPayAbandon.isHidden = true
-                    
-                    if isBankAccountConnected {
+                }
+                
+                self.viewBtnShowSavedCards.isHidden = false
+                self.lblBtnShowSaveCard.text = "Show Saved Account"
+                self.viewBtnShowSavedCardHeight.constant = 50
+                self.viewBtnShowSavedCardTopCon.constant = 20
+               
+            } else {
+                if UserStoreSingleton.shared.isLoggedIn == false {
+                    if request.saveAccount == false {
                         self.viewBtnShowSavedCards.isHidden = true
-                        self.btnShowSavedCard.isHidden = true
                         self.viewBtnShowSavedCardHeight.constant = 0
                         self.viewBtnShowSavedCardTopCon.constant = 0
+                    } else {
+                        self.viewBtnShowSavedCards.isHidden = false
+                        self.lblBtnShowSaveCard.text = "Show Saved Account"
+                        self.viewBtnShowSavedCardHeight.constant = 50
+                        self.viewBtnShowSavedCardTopCon.constant = 20
+                    }
+                    
+                    self.OTPView.isHidden = true
+                    self.emailView.isHidden = true
+                    self.viewCardFields.isHidden = true
+                    self.viewSingleSavedCard.isHidden = true
+                    self.viewChangeCard.isHidden = true
+                    self.viewUpdateCard.isHidden = true
+                    self.viewAddNewCard.isHidden = true
+                    self.btnNext.isHidden = false
+                    self.btnNextHeight.constant = 50
+                    self.btnNextTopCon.constant = 20
+                    self.viewCrypto.isHidden = true
+                    self.viewSingleSavedAccount.isHidden = true
+                    
+                    if request?.authenticatedACH == false {
+                        self.viewBankFields.isHidden = false
+                        self.grailPayBankLinkView.isHidden = true
+                        self.viewGrailPayAbandon.isHidden = true
+                    } else {
+                        // authenticatedACH == true
+                        self.viewBankFields.isHidden = true
+                        self.grailPayBankLinkView.isHidden = false
+                        self.btnNext.isHidden = true
+                        self.btnNextHeight.constant = 0
+                        self.btnNextTopCon.constant = 0
+                        self.viewGrailPayAbandon.isHidden = true
+                        
+                        if isBankAccountConnected {
+                            self.viewBtnShowSavedCards.isHidden = true
+                            self.btnShowSavedCard.isHidden = true
+                            self.viewBtnShowSavedCardHeight.constant = 0
+                            self.viewBtnShowSavedCardTopCon.constant = 0
+                        }
+                    }
+                } else {
+                    self.lblBtnShowSaveCard.text = "Show Saved Account"
+                   
+                    self.viewCardFields.isHidden = true
+                    self.viewChangeCard.isHidden = true
+                    self.viewAddNewCard.isHidden = true
+                    
+                    if request?.authenticatedACH == true {
+                        self.viewBankFields.isHidden = true
+                        self.grailPayBankLinkView.isHidden = false
+                        self.btnNext.isHidden = true
+                        self.btnNextHeight.constant = 0
+                        self.btnNextTopCon.constant = 0
+                        self.viewGrailPayAbandon.isHidden = true
+                        
+                        if isBankAccountConnected {
+                            self.viewBtnShowSavedCards.isHidden = true
+                            self.btnShowSavedCard.isHidden = true
+                            self.viewBtnShowSavedCardHeight.constant = 0
+                            self.viewBtnShowSavedCardTopCon.constant = 0
+                        }
+                    } else {
+                        self.viewBankFields.isHidden = false
+                        self.grailPayBankLinkView.isHidden = true
+                        self.btnNext.isHidden = false
+                        self.btnNextHeight.constant = 50
+                        self.btnNextTopCon.constant = 20
                     }
                 }
-                
-                getShowBankAccountsApi()
             }
             
         case "Crypto":
@@ -10619,7 +11932,9 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
             
             self.grailPayBankLinkView.isHidden = true
             self.viewAddNewGrailPayAccount.isHidden = true
+           // self.viewAbandonGrailPayNewAccountView.isHidden = true
             self.viewAbandonGrailPayNewAccountView.isHidden = true
+            self.heightViewAbandonNewGrailPayAccountView.constant = 0
             
         default:
             break
@@ -10647,9 +11962,6 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         else if tableView == tblViewAccountTypeNewAccountView {
             return arrAccountType.count
         }
-        //        else if tableView == tblViewRecurring {
-        //            return planOptions.count
-        //        }
         return 0
     }
     
@@ -10698,11 +12010,6 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             cell.lblAccountType.text = arrAccountType[indexPath.row]
             return cell
         }
-        //        else if tableView == tblViewRecurring {
-        //            let cell = tableView.dequeueReusableCell(withIdentifier: "RecurringTVC", for: indexPath) as! RecurringTVC
-        //            cell.lblRecurringDuration.text = planOptions[indexPath.row]
-        //            return cell
-        //        }
         
         return UITableViewCell()
     }
@@ -10724,6 +12031,12 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
     
     func configureSavedCardCell(_ cell: SavedCardsTVC, at indexPath: IndexPath) {
         let card = savedCards[indexPath.row]
+        print("Configuring cell at indexPath.row: \(indexPath.row), card: ****\(card.ccLast4)")
+        cell.btnSelectCard.tag = indexPath.row
+        cell.btnThreeDot.tag = indexPath.row
+        cell.btnRemoveCard.tag = indexPath.row
+        cell.btnUpdateCard.tag = indexPath.row
+        print("Set button tags to: \(indexPath.row)")
         cell.lblCardNumber.text = "****\(card.ccLast4)"
         cell.lblExpireDate.isHidden = false
         cell.lblExpireDate.text = "Expiry: \(card.ccValidThru)"
@@ -10755,7 +12068,7 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         // Hide or show the remove/update view based on cell state
         cell.viewBtnRemoveUpdate.isHidden = !cell.isRemoveUpdateViewVisible
     }
-    
+        
     //Bank
     func configureAddNewAccountCell(_ cell: SavedAccountTVC) {
         cell.lblAccountNumber.text = "New Account"
@@ -10809,9 +12122,6 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         else if tableView == tblViewAccountTypeNewAccountView {
             return 45
         }
-        //        else if tableView == tblViewRecurring {
-        //            return 45
-        //        }
         else {
             return 80
         }
@@ -10840,11 +12150,6 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
                 addNewCardTapped(UIButton()) // Dummy UIButton
             }
         }
-        //        else if tableView == tblViewRecurring {
-        //            let selectedAccountType = planOptions[indexPath.row]
-        //            txtFieldChosePlanCard.text = selectedAccountType // Fill the selected account type into the text field
-        //            viewTblViewRecurring.isHidden = true
-        //        }
     }
     
     @objc func btnSelectCardTapped(_ sender: UIButton) {
@@ -10874,6 +12179,10 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         lblCardNumberSigleSavedCard.text = "****\(selectedCard.ccLast4)"
         lblExpireDateSingelSavedCard.text = "Expiry: \(selectedCard.ccValidThru)"
         
+        // Update the selected card and index
+        self.selectedCard = selectedCard
+        self.selectedCardIndex = index
+        
         if isSelectForPay {
             viewTxtFieldCVVSingleCard.isHidden = false
             btnPayNowSingleCard.isHidden = false
@@ -10895,7 +12204,10 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
     
     @objc func btnRemoveCardTapped(_ sender: UIButton) {
         let index = sender.tag
-        
+        guard index < savedCards.count else {
+            print("Invalid index: \(index)")
+            return
+        }
         let selectedCard = savedCards[index]
         selectedCardID = selectedCard.cardId
         
@@ -10907,7 +12219,6 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         let noAction = UIAlertAction(title: "No", style: .cancel, handler: nil)
         let yesAction = UIAlertAction(title: "Yes", style: .destructive) { [weak self] _ in
             guard let self = self else { return }
-            // Call the deleteCardApi with the selected card ID
             self.deleteCardApi(cardID: selectedCard.cardId, at: index)
         }
         alertController.addAction(noAction)
@@ -11055,6 +12366,11 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
     @objc func btnRemoveBankAccountTapped(_ sender: UIButton) {
         let index = sender.tag
         
+        guard index >= 0 && index < bankAccounts.count else {
+            print("Invalid index tapped: \(index)")
+            return
+        }
+        
         let selectedAccount = bankAccounts[index]
         selectedBankID = selectedAccount.account_id
         
@@ -11066,7 +12382,6 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         let noAction = UIAlertAction(title: "No", style: .cancel, handler: nil)
         let yesAction = UIAlertAction(title: "Yes", style: .destructive) { [weak self] _ in
             guard let self = self else { return }
-            // Call the deleteCardApi with the selected card ID
             self.deleteAccountApi(accountID: selectedAccount.account_id ?? "", at: index)
         }
         alertController.addAction(noAction)
@@ -11139,7 +12454,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
         
         // Handle card CVV input for both old and new card fields
         else if textField == cardCvvTextField.textField || textField == txtFieldCVVNewCardView || textField == txtFieldCVVUpdateCardView || textField == txtFieldCVVSingleSavedCard {
-            let maxLength = 3
+            let maxLength = 4
             let currentString = (textField.text ?? "") as NSString
             let newString = currentString.replacingCharacters(in: range, with: string)
             return newString.count <= maxLength