@jimrising/easymerchantsdk-react-native 1.4.5 → 1.4.7

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

@@ -307,6 +307,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var heightViewTblViewRecurring: NSLayoutConstraint!
     @IBOutlet weak var tblViewRecurring: UITableView!
     
+    @IBOutlet weak var colVwPaymentMethodHeight: NSLayoutConstraint!
+    @IBOutlet weak var topConColViewPaymentMethodView: NSLayoutConstraint!
+    
     var chainInvoiceAddress: String?
     var lightningURI: String?
     
@@ -422,37 +425,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         tapGesture.cancelsTouchesInView = false
         self.view.addGestureRecognizer(tapGesture)
         
-        //// Check if billingInfoData is available
-//        if let billingInfoData = request.billingInfoData,
-//           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
-//            
-//            let billingVisible = fieldSection.visibility.billing
-//            let suffix = billingVisible ? " (Billing Info)" : " (Additional Info)"
-//            let buttonText = (request?.submitButtonText?.isEmpty == false
-//                              ? request!.submitButtonText! + suffix
-//                              : "Next" + suffix)
-//            
-//            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 {
-//            let amountValue = request?.amount ?? 0
-//            let amountText = String(format: "$%.2f", amountValue)
-//            let submitText = request?.submitButtonText
-//            
-//            let defaultTitle = (submitText?.isEmpty == false)
-//            ? "\(submitText!) (\(amountText))"
-//            : "Pay Now (\(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)
-//        }
-        
         if let billingInfoData = request.billingInfoData,
            let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
             
@@ -460,9 +432,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let additionalVisible = fieldSection.visibility.additional
             let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
             let amountText = String(format: "$%.2f", request?.amount ?? 0)
-
+            
             var buttonText: String
-
+            
             if !billingVisible && !additionalVisible {
                 // Both visibility false – show submitText with amount only
                 buttonText = "\(submitText) (\(amountText))"
@@ -474,7 +446,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 // Fallback
                 buttonText = "\(submitText) (\(amountText))"
             }
-
+            
             btnNext.setTitle(buttonText, for: .normal)
             btnPayNowNewCardView.setTitle(buttonText, for: .normal)
             btnPayNowNewAccountView.setTitle(buttonText, for: .normal)
@@ -485,7 +457,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let amountText = String(format: "$%.2f", request?.amount ?? 0)
             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)
@@ -493,6 +465,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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
+        txtFieldEmailAccountView.textField.text = request.email
+        txtFieldEmailGrailPayView.textField.text = request.email
+        txtFieldEmail.text = request.email
+        
         emailView.isHidden = true
         OTPView.isHidden = true
         
@@ -550,6 +530,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         setupPlanTableView()
+        
+        if let paymentMethods = request?.selectedPaymentMethods {
+            if paymentMethods.count <= 1 {
+                collVwPayment.isHidden = true
+                topConColViewPaymentMethodView.constant = 0
+                colVwPaymentMethodHeight.constant = 0
+                lblChosePaymentMethod.text = "Complete Your Payment"
+            } else {
+                collVwPayment.isHidden = false
+                topConColViewPaymentMethodView.constant = 16
+                colVwPaymentMethodHeight.constant = 70
+                lblChosePaymentMethod.text = "Chose Your Payment Method"
+                loadPaymentMethods()
+            }
+        }
     }
     
     //MARK: - View Wiil Appear
@@ -755,11 +750,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.viewSingleSavedAccount.isHidden = true
                 self.viewBankFields.isHidden = true
                 
-                //                self.viewBtnShowSavedCards.isHidden = false
-                //                self.lblBtnShowSaveCard.text = "Show Saved Cards"
-                //                self.viewBtnShowSavedCardHeight.constant = 50
-                //                self.viewBtnShowSavedCardTopCon.constant = 20
-                
                 if request.saveCard == false {
                     self.viewBtnShowSavedCards.isHidden = true
                     self.viewBtnShowSavedCardHeight.constant = 0
@@ -873,18 +863,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                 }
                 else {
-                    // self.viewBankFields.isHidden = false
-                    // self.viewTermsAndConditions.isHidden = false
                     self.grailPayBankLinkView.isHidden = true
                 }
             }
             else {
-                // self.viewBankFields.isHidden = false
-                //                self.viewBtnShowSavedCards.isHidden = false
-                //                self.lblBtnShowSaveCard.text = "Show Saved Accounts"
-                //                self.viewBtnShowSavedCardHeight.constant = 50
-                //                self.viewBtnShowSavedCardTopCon.constant = 20
-                
                 if request.saveAccount == false {
                     self.viewBtnShowSavedCards.isHidden = true
                     self.viewBtnShowSavedCardHeight.constant = 0
@@ -1667,28 +1649,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         viewAccountTypeNewAccountView.layer.cornerRadius = 8
         
         viewAccountTypeNewAccountView.isHidden = true
-        
-        //        tblViewRecurring.delegate = self
-        //        tblViewRecurring.dataSource = self
-        //        tblViewRecurring.showsVerticalScrollIndicator = false
-        //        tblViewRecurring.showsHorizontalScrollIndicator = false
-        //
-        //        viewTblViewRecurring.clipsToBounds = false
-        //        viewTblViewRecurring.layer.shadowColor = UIColor.black.cgColor
-        //        viewTblViewRecurring.layer.shadowOpacity = 0.3
-        //        viewTblViewRecurring.layer.shadowOffset = CGSize(width: 0, height: 2)
-        //        viewTblViewRecurring.layer.shadowRadius = 4
-        //        viewTblViewRecurring.layer.cornerRadius = 8
-        //        viewTblViewRecurring.layer.cornerRadius = 8
-        //
-        //        viewTblViewRecurring.isHidden = true
     }
     
     @IBAction func actionBtnChosePlanCardField(_ sender: UIButton) {
-        //        UIView.animate(withDuration: 0.3) {
-        //            self.viewTblViewRecurring.isHidden.toggle()
-        //        }
-        
         guard let plans = request?.recurringIntervals, !plans.isEmpty else {
             print("No recurring intervals available.")
             return
@@ -1930,58 +1893,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                     }
                     
-                    // Redirect based on billing visibility
-//                    if fieldSection.visibility.billing {
-//                        // Instantiate BillingInfoVC and pass the selected card data and CVV text
-//                        let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-//                        
-//                        billingInfoVC.isFrom = "SavedCards"
-//                        billingInfoVC.selectedCard = self.selectedCard // Passing the selected card data
-//                        billingInfoVC.cvvText = cvvText // Passing the CVV text
-//                        billingInfoVC.amount = Int(self.request.amount ?? 0)
-//                        billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
-//                        
-//                        if let billingInfoData = self.request.billingInfoData {
-//                            billingInfoVC.billingInfoData = billingInfoData
-//                        }
-//                        
-//                        billingInfoVC.request = self.request
-//                        billingInfoVC.chosenPlan = self.txtFieldSelectPlanSingleSavedCard.text
-//                        billingInfoVC.startDate = self.txtFieldSelectDateSingleSavedCard.text
-//                        
-//                        billingInfoVC.billingInfo = fieldSection.billing
-//                        billingInfoVC.additionalInfo = fieldSection.additional
-//                        billingInfoVC.visibility = fieldSection.visibility
-//                        
-//                        // Navigate to BillingInfoVC
-//                        self.navigationController?.pushViewController(billingInfoVC, animated: true)
-//                    }
-//                    else {
-//                        let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-//                        additionalInfoVC.isFrom = "SavedCards"
-//                        additionalInfoVC.selectedCard = self.selectedCard // Passing the selected card data
-//                        additionalInfoVC.cvvText = cvvText // Passing the CVV text
-//                        additionalInfoVC.amount = Int(self.request.amount ?? 0)
-//                        additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
-//                        
-//                        if let billingInfoData = self.request.billingInfoData {
-//                            additionalInfoVC.billingInfoData = billingInfoData
-//                        }
-//                        
-//                        additionalInfoVC.request = self.request
-//                        additionalInfoVC.chosenPlan = self.txtFieldSelectPlanSingleSavedCard.text
-//                        additionalInfoVC.startDate = self.txtFieldSelectDateSingleSavedCard.text
-//                        
-//                        additionalInfoVC.billingInfo = fieldSection.billing
-//                        additionalInfoVC.additionalInfo = fieldSection.additional
-//                        additionalInfoVC.visibility = fieldSection.visibility
-//                        
-//                        self.navigationController?.pushViewController(additionalInfoVC, animated: true)
-//                    }
-                    
                     let showBilling = fieldSection.visibility.billing
                     let showAdditional = fieldSection.visibility.additional
-
+                    
                     if !showBilling && !showAdditional {
                         self.paymentIntentFromShowCardApi()
                     }
@@ -2033,7 +1947,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         self.navigationController?.pushViewController(additionalInfoVC, animated: true)
                     }
-
                 }
             }
             catch {
@@ -2066,7 +1979,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                 }
             }
-            
             // All validations passed, call the API
             paymentIntentFromShowSavedCardApi()
         }
@@ -2186,67 +2098,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                         }
                         
-                        // Redirect based on billing visibility
-//                        if fieldSection.visibility.billing {
-//                            // Instantiate BillingInfoVC and pass the card details
-//                            let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-//                            
-//                            // Pass the card details
-//                            billingInfoVC.cardNumber = cardNumber
-//                            billingInfoVC.expiryDate = expiryDate
-//                            billingInfoVC.cvv = cvv
-//                            billingInfoVC.nameOnCard = nameOnCard
-//                            billingInfoVC.isSavedNewCard = self.isSavedNewCardForFuture
-//                            
-//                            billingInfoVC.isFrom = "AddNewCard"
-//                            billingInfoVC.amount = Int(self.request.amount ?? 0)
-//                            billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
-//                            
-//                            if let billingInfoData = self.request.billingInfoData {
-//                                billingInfoVC.billingInfoData = billingInfoData
-//                            }
-//                            
-//                            billingInfoVC.request = self.request
-//                            billingInfoVC.chosenPlan = self.txtFieldSelectPlanNewCardView.text
-//                            billingInfoVC.startDate = self.txtFieldSelectDateNewCardView.text
-//                            
-//                            billingInfoVC.billingInfo = fieldSection.billing
-//                            billingInfoVC.additionalInfo = fieldSection.additional
-//                            billingInfoVC.visibility = fieldSection.visibility
-//                            
-//                            // Navigate to BillingInfoVC
-//                            self.navigationController?.pushViewController(billingInfoVC, animated: true)
-//                        }
-//                        else {
-//                            let additionalInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-//                            
-//                            // Pass the card details
-//                            additionalInfoVC.cardNumber = cardNumber
-//                            additionalInfoVC.expiryDate = expiryDate
-//                            additionalInfoVC.cvv = cvv
-//                            additionalInfoVC.nameOnCard = nameOnCard
-//                            additionalInfoVC.isSavedNewCard = self.isSavedNewCardForFuture
-//                            
-//                            additionalInfoVC.isFrom = "AddNewCard"
-//                            additionalInfoVC.amount = Int(self.request.amount ?? 0)
-//                            additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
-//                            
-//                            if let billingInfoData = self.request.billingInfoData {
-//                                additionalInfoVC.billingInfoData = billingInfoData
-//                            }
-//                            
-//                            additionalInfoVC.request = self.request
-//                            additionalInfoVC.chosenPlan = self.txtFieldSelectPlanNewCardView.text
-//                            additionalInfoVC.startDate = self.txtFieldSelectDateNewCardView.text
-//                            
-//                            additionalInfoVC.billingInfo = fieldSection.billing
-//                            additionalInfoVC.additionalInfo = fieldSection.additional
-//                            additionalInfoVC.visibility = fieldSection.visibility
-//                            
-//                            self.navigationController?.pushViewController(additionalInfoVC, animated: true)
-//                        }
-                        
-                        
                         let showBilling = fieldSection.visibility.billing
                         let showAdditional = fieldSection.visibility.additional
                         
@@ -2766,52 +2617,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                                 print("Billing Info Data: \(jsonDict)")
                                 
-                                // Redirect based on billing visibility
-//                                if fieldSection.visibility.billing {
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-//                                    vc.billingInfoData = billingInfoData
-//                                    vc.request = self.request
-//                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
-//                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
-//                                    vc.selectedPaymentMethod = "GrailPay"
-//                                    vc.isSavedForFuture = self.isSavedForFuture
-//                                    vc.grailPayAccountID = self.grailPayAccountID
-//                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-//                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-//                                    vc.amount = self.amount
-//                                    vc.billingInfo = fieldSection.billing
-//                                    vc.additionalInfo = fieldSection.additional
-//                                    vc.visibility = fieldSection.visibility
-//                                    vc.easyPayDelegate = self.easyPayDelegate
-//                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
-//                                    self.navigationController?.pushViewController(vc, animated: true)
-//                                }
-//                                else {
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-//                                    vc.billingInfoData = billingInfoData
-//                                    vc.request = self.request
-//                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
-//                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
-//                                    vc.selectedPaymentMethod = "GrailPay"
-//                                    vc.isSavedForFuture = self.isSavedForFuture
-//                                    vc.grailPayAccountID = self.grailPayAccountID
-//                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-//                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-//                                    vc.amount = self.amount
-//                                    vc.billingInfo = fieldSection.billing
-//                                    vc.additionalInfo = fieldSection.additional
-//                                    vc.visibility = fieldSection.visibility
-//                                    vc.easyPayDelegate = self.easyPayDelegate
-//                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
-//                                    self.navigationController?.pushViewController(vc, animated: true)
-//                                }
-                                
                                 let showBilling = fieldSection.visibility.billing
                                 let showAdditional = fieldSection.visibility.additional
-
+                                
                                 if !showBilling && !showAdditional {
                                     // Navigate directly to EmailVerificationVC
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                                    //                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
                                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                                     vc.easyPayDelegate = self.easyPayDelegate
                                     vc.grailPayAccountID = self.grailPayAccountID
@@ -2871,7 +2682,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     vc.userEmail = self.txtFieldEmailGrailPayView.text
                                     self.navigationController?.pushViewController(vc, animated: true)
                                 }
-
+                                
                             }
                         }
                     }
@@ -2882,7 +2693,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 else {
                     //If billing info is nil
                     // Navigate to EmailVerificationVC directly
-//                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                    //                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
                     let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                     vc.easyPayDelegate = self.easyPayDelegate
                     vc.grailPayAccountID = self.grailPayAccountID
@@ -2910,50 +2721,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                                 print("Billing Info Data: \(jsonDict)")
                                 
-                                // Redirect based on billing visibility
-//                                if fieldSection.visibility.billing {
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-//                                    vc.billingInfoData = billingInfoData
-//                                    vc.request = self.request
-//                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
-//                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
-//                                    vc.selectedPaymentMethod = "GrailPay"
-//                                    vc.isSavedForFuture = self.isSavedForFuture
-//                                    vc.grailPayAccountID = self.grailPayAccountID
-//                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-//                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-//                                    vc.amount = self.amount
-//                                    vc.billingInfo = fieldSection.billing
-//                                    vc.additionalInfo = fieldSection.additional
-//                                    vc.visibility = fieldSection.visibility
-//                                    vc.easyPayDelegate = self.easyPayDelegate
-//                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
-//                                    self.navigationController?.pushViewController(vc, animated: true)
-//                                }
-//                                else {
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-//                                    vc.billingInfoData = billingInfoData
-//                                    vc.request = self.request
-//                                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
-//                                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
-//                                    vc.selectedPaymentMethod = "GrailPay"
-//                                    vc.isSavedForFuture = self.isSavedForFuture
-//                                    vc.grailPayAccountID = self.grailPayAccountID
-//                                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-//                                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-//                                    vc.amount = self.amount
-//                                    vc.billingInfo = fieldSection.billing
-//                                    vc.additionalInfo = fieldSection.additional
-//                                    vc.visibility = fieldSection.visibility
-//                                    vc.easyPayDelegate = self.easyPayDelegate
-//                                    vc.userEmail = self.txtFieldEmailGrailPayView.text
-//                                    self.navigationController?.pushViewController(vc, animated: true)
-//                                }
-                                
-                                
                                 let showBilling = fieldSection.visibility.billing
                                 let showAdditional = fieldSection.visibility.additional
-
+                                
                                 if !showBilling && !showAdditional {
                                     self.grailPayAccountChargeApi()
                                 }
@@ -3051,48 +2821,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                                 print("Billing Info Data: \(jsonDict)")
                                 
-                                // Redirect based on billing visibility
-//                                if fieldSection.visibility.billing {
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-//                                    vc.billingInfoData = billingInfoData
-//                                    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 {
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-//                                    vc.billingInfoData = billingInfoData
-//                                    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)
-//                                }
-                                
-                                
                                 let showBilling = fieldSection.visibility.billing
                                 let showAdditional = fieldSection.visibility.additional
-
+                                
                                 if !showBilling && !showAdditional {
                                     self.grailPayNewAccountChargeApi()
                                 }
@@ -3156,47 +2887,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                                 print("Billing Info Data: \(jsonDict)")
                                 
-                                // Redirect based on billing visibility
-//                                if fieldSection.visibility.billing {
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-//                                    vc.billingInfoData = billingInfoData
-//                                    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 {
-//                                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-//                                    vc.billingInfoData = billingInfoData
-//                                    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)
-//                                }
-                                
                                 let showBilling = fieldSection.visibility.billing
                                 let showAdditional = fieldSection.visibility.additional
-
+                                
                                 if !showBilling && !showAdditional {
                                     self.grailPayNewAccountChargeApi()
                                 }
@@ -3376,68 +3069,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "email": UserStoreSingleton.shared.merchantEmail ?? ""
         ]
         
-//        if let billingInfoData = request.billingInfoData {
-//            do {
-//                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-//
-//                // Process Billing Info if available and contains any non-empty value
-//                let billing = fieldSection.billing.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
-//                if !billing.isEmpty {
-//                    var billingDict: [String: Any] = [:]
-//                    billing.forEach { billingDict[$0.name] = $0.value }
-//
-//                    if let address = billingDict["address"] as? String { params["address"] = address }
-//                    if let country = billingDict["country"] as? String { params["country"] = country }
-//                    if let state = billingDict["state"] as? String { params["state"] = state }
-//                    if let city = billingDict["city"] as? String { params["city"] = city }
-//                    if let postalCode = billingDict["postal_code"] as? String { params["zip"] = postalCode }
-//                }
-//
-//                // Process Additional Info if available and contains any non-empty value
-//                let additional = fieldSection.additional.filter { !($0.value.trimmingCharacters(in: .whitespaces).isEmpty) }
-//                if !additional.isEmpty {
-//                    var additionalDict: [String: Any] = [:]
-//                    additional.forEach { additionalDict[$0.name] = $0.value }
-//
-//                    if let desc = additionalDict["description"] as? String {
-//                        params["description"] = desc
-//                    }
-//
-//                    if let phone = additionalDict["phone_number"] as? String {
-//                        params["phone_number"] = phone
-//                    }
-//                    if let email = additionalDict["email"] as? String {
-//                        params["email"] = email
-//                    }
-//                    if let name = additionalDict["name"] as? String {
-//                        params["name"] = name
-//                    }
-//                }
-//
-//                // Set default description only if not already set
-//                if params["description"] == nil {
-//                    params["description"] = "Hosted payment checkout"
-//                }
-//
-//            } catch {
-//                print("Failed to decode FieldSection: \(error)")
-//                params["description"] = "Hosted payment checkout"
-//            }
-//        } else {
-//            params["description"] = "Hosted payment checkout"
-//        }
-
-        
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-
+                
                 // Billing Info
                 let billing = fieldSection.billing
                 if !billing.isEmpty {
                     var billingDict: [String: Any] = [:]
                     billing.forEach { billingDict[$0.name] = $0.value }
-
+                    
                     if let address = billingDict["address"] as? String, !address.isEmpty {
                         params["address"] = address
                     }
@@ -3454,19 +3095,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         params["zip"] = postalCode
                     }
                 }
-
+                
                 // Additional Info
                 let additional = fieldSection.additional
                 if !additional.isEmpty {
                     var additionalDict: [String: Any] = [:]
                     additional.forEach { additionalDict[$0.name] = $0.value }
-
+                    
                     if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                         params["description"] = desc
                     } else {
                         params["description"] = "Hosted payment checkout"
                     }
-
+                    
                     if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                         params["phone_number"] = phone
                     }
@@ -3480,7 +3121,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     // If no description in additional info, set default
                     params["description"] = "Hosted payment checkout"
                 }
-
+                
             } catch {
                 print("Failed to decode FieldSection: \(error)")
                 params["description"] = "Hosted payment checkout"
@@ -3644,13 +3285,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-
+                
                 // Billing Info
                 let billing = fieldSection.billing
                 if !billing.isEmpty {
                     var billingDict: [String: Any] = [:]
                     billing.forEach { billingDict[$0.name] = $0.value }
-
+                    
                     if let address = billingDict["address"] as? String, !address.isEmpty {
                         params["address"] = address
                     }
@@ -3667,19 +3308,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         params["zip"] = postalCode
                     }
                 }
-
+                
                 // Additional Info
                 let additional = fieldSection.additional
                 if !additional.isEmpty {
                     var additionalDict: [String: Any] = [:]
                     additional.forEach { additionalDict[$0.name] = $0.value }
-
+                    
                     if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                         params["description"] = desc
                     } else {
                         params["description"] = "Hosted payment checkout"
                     }
-
+                    
                     if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                         params["phone_number"] = phone
                     }
@@ -3693,7 +3334,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     // If no description in additional info, set default
                     params["description"] = "Hosted payment checkout"
                 }
-
+                
             } catch {
                 print("Failed to decode FieldSection: \(error)")
                 params["description"] = "Hosted payment checkout"
@@ -3774,31 +3415,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-//                                        // Pass billingInfo and additionalInfo
-//                                        if let billingData = self.request.billingInfoData,
-//                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
-//                                            
-//                                            // Extract main billing fields
-//                                            let cleanBillingInfo: [String: Any] = [
-//                                                "postal_code": billingInfoDict["postal_code"] ?? "",
-//                                                "country": billingInfoDict["country"] ?? "",
-//                                                "city": billingInfoDict["city"] ?? "",
-//                                                "address": billingInfoDict["address"] ?? "",
-//                                                "state": billingInfoDict["state"] ?? ""
-//                                            ]
-//                                            paymentDoneVC.billingInfo = cleanBillingInfo
-//                                            
-//                                            // Extract additional_info
-//                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
-//                                                let cleanAdditionalInfo: [String: Any] = [
-//                                                    "email": additional["email"] ?? "",
-//                                                    "phone_number": additional["phone_number"] ?? "",
-//                                                    "name": additional["name"] ?? "",
-//                                                    "country_code": additional["country_code"] ?? ""
-//                                                ]
-//                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
-//                                            }
-//                                        }
                                         
                                         // Pass billing info and additional info if available
                                         if let billingInfoData = self.request.billingInfoData,
@@ -3877,13 +3493,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-
+                
                 // Billing Info
                 let billing = fieldSection.billing
                 if !billing.isEmpty {
                     var billingDict: [String: Any] = [:]
                     billing.forEach { billingDict[$0.name] = $0.value }
-
+                    
                     if let address = billingDict["address"] as? String, !address.isEmpty {
                         params["address"] = address
                     }
@@ -3900,19 +3516,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         params["zip"] = postalCode
                     }
                 }
-
+                
                 // Additional Info
                 let additional = fieldSection.additional
                 if !additional.isEmpty {
                     var additionalDict: [String: Any] = [:]
                     additional.forEach { additionalDict[$0.name] = $0.value }
-
+                    
                     if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                         params["description"] = desc
                     } else {
                         params["description"] = "Hosted payment checkout"
                     }
-
+                    
                     if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                         params["phone_number"] = phone
                     }
@@ -3926,7 +3542,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     // If no description in additional info, set default
                     params["description"] = "Hosted payment checkout"
                 }
-
+                
             } catch {
                 print("Failed to decode FieldSection: \(error)")
                 params["description"] = "Hosted payment checkout"
@@ -4132,51 +3748,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                         }
                         
-//                        // Redirect based on billing visibility
-//                        if fieldSection.visibility.billing {
-//                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-//                            vc.cardNumber = cardNumber
-//                            vc.expiryDate = expiryDate
-//                            vc.cvv = cvv
-//                            vc.nameOnCard = cardName
-//                            vc.selectedPaymentMethod = self.selectedPaymentMethod
-//                            vc.isSavedForFuture = self.isSavedForFuture
-//                            vc.request = self.request
-//                            vc.chosenPlan = self.txtFieldChosePlanCard.text
-//                            vc.startDate = self.txtFieldStartDateCard.text
-//                            vc.userEmail = self.txtFieldEmailCardView.text
-//                            vc.amount = self.amount
-//                            vc.billingInfoData = billingInfoData
-//                            vc.billingInfo = fieldSection.billing
-//                            vc.additionalInfo = fieldSection.additional
-//                            vc.visibility = fieldSection.visibility
-//                            vc.easyPayDelegate = self.easyPayDelegate
-//                            self.navigationController?.pushViewController(vc, animated: true)
-//                        } else {
-//                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-//                            vc.billingInfoData = billingInfoData
-//                            vc.cardNumber = cardNumber
-//                            vc.expiryDate = expiryDate
-//                            vc.cvv = cvv
-//                            vc.nameOnCard = cardName
-//                            vc.selectedPaymentMethod = self.selectedPaymentMethod
-//                            vc.isSavedForFuture = self.isSavedForFuture
-//                            vc.request = self.request
-//                            vc.chosenPlan = self.txtFieldChosePlanCard.text
-//                            vc.startDate = self.txtFieldStartDateCard.text
-//                            vc.userEmail = self.txtFieldEmailCardView.text
-//                            vc.billingInfo = fieldSection.billing
-//                            vc.additionalInfo = fieldSection.additional
-//                            vc.amount = self.amount
-//                            vc.visibility = fieldSection.visibility
-//                            vc.easyPayDelegate = self.easyPayDelegate
-//                            self.navigationController?.pushViewController(vc, animated: true)
-//                        }
-                        
-                        
                         let showBilling = fieldSection.visibility.billing
                         let showAdditional = fieldSection.visibility.additional
-
+                        
                         if !showBilling && !showAdditional {
                             if self.isSavedForFuture {
                                 self.navigateCardDataToEmailVerificationVC()
@@ -4289,9 +3863,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                         }
                         
-                        // Redirect based on billing visibility
-                        if fieldSection.visibility.billing {
-                            // Proceed to BillingInfoVC
+                        let showBilling = fieldSection.visibility.billing
+                        let showAdditional = fieldSection.visibility.additional
+                        
+                        if !showBilling && !showAdditional {
+                            if self.isSavedForFuture {
+                                self.navigateBankDataToEmailVerificationVC()
+                            } else {
+                                self.accountBankChargeApi()
+                            }
+                        }
+                        else if showBilling {
+                            // Push to BillingInfoVC
                             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             vc.accountName = self.txtFieldAccountName.text
                             vc.routingNumber = self.txtFieldRoutingNumber.text
@@ -4314,6 +3897,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.navigationController?.pushViewController(vc, animated: true)
                         }
                         else {
+                            // Push to AdditionalInfoVC
                             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             vc.accountName = self.txtFieldAccountName.text
                             vc.routingNumber = self.txtFieldRoutingNumber.text
@@ -4517,7 +4101,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     // Function to navigate to EmailVerificationVC
     func navigateCardDataToEmailVerificationVC() {
-//        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+        //        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
             if let billingInfoData = request.billingInfoData {
                 do {
@@ -4549,9 +4133,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
         }
     }
-        
+    
     func navigateBankDataToEmailVerificationVC() {
-        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+        //        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+        if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
             if let billingInfoData = request.billingInfoData {
                 do {
                     let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
@@ -4600,10 +4185,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if selectedPaymentMethod == "Card" {
             self.viewSingleSavedAccount.isHidden = true
             self.viewBankFields.isHidden = true
-            //            self.viewBtnShowSavedCards.isHidden = false
-            //            self.lblBtnShowSaveCard.text = "Show Saved Cards"
-            //            self.viewBtnShowSavedCardHeight.constant = 50
-            //            self.viewBtnShowSavedCardTopCon.constant = 20
             
             if request.saveCard == false {
                 self.viewBtnShowSavedCards.isHidden = true
@@ -4632,10 +4213,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         else if selectedPaymentMethod == "Bank" {
             self.viewBankFields.isHidden = false
-            //            self.viewBtnShowSavedCards.isHidden = false
-            //            self.lblBtnShowSaveCard.text = "Show Saved Accounts"
-            //            self.viewBtnShowSavedCardHeight.constant = 50
-            //            self.viewBtnShowSavedCardTopCon.constant = 20
             
             if request.saveAccount == false {
                 self.viewBtnShowSavedCards.isHidden = true
@@ -4823,50 +4400,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 return
                             }
                             
-//                            // Redirect based on billing visibility
-//                            if fieldSection.visibility.billing {
-//                                // Proceed with the Pay Now action
-//                                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-//                                // Pass the customer_id and account_id to BillingInfoVC
-//                                vc.customerID = self.selectedbankAccounts?.customer_id
-//                                vc.accountID = self.selectedbankAccounts?.account_id
-//                                vc.billingInfoData = billingInfoData
-//                                vc.isFrom = "SavedBank"
-//                                vc.selectedPaymentMethod = "Bank"
-//                                vc.chosenPlan = self.txtFieldSelectPlanSingleSavedBankView.text
-//                                vc.startDate = self.txtFieldSelectDateSingleSavedBankView.text
-//                                vc.request = self.request
-//                                vc.amount = self.amount
-//                                vc.billingInfo = fieldSection.billing
-//                                vc.additionalInfo = fieldSection.additional
-//                                vc.visibility = fieldSection.visibility
-//                                vc.easyPayDelegate = self.easyPayDelegate
-//                                self.navigationController?.pushViewController(vc, animated: true)
-//                            }
-//                            else {
-//                                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
-//                                vc.customerID = self.selectedbankAccounts?.customer_id
-//                                vc.accountID = self.selectedbankAccounts?.account_id
-//                                vc.billingInfoData = billingInfoData
-//                                vc.isFrom = "SavedBank"
-//                                vc.selectedPaymentMethod = "Bank"
-//                                vc.chosenPlan = self.txtFieldSelectPlanSingleSavedBankView.text
-//                                vc.startDate = self.txtFieldSelectDateSingleSavedBankView.text
-//                                vc.request = self.request
-//                                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)
-//                            }
-                            
-                            
                             let showBilling = fieldSection.visibility.billing
                             let showAdditional = fieldSection.visibility.additional
-
+                            
                             if !showBilling && !showAdditional {
-                                self.grailPayAaccountChargeSingleSavedAccountApi()
+                                if self.request.authenticatedACH == true {
+                                    self.grailPayAaccountChargeSingleSavedAccountApi()
+                                } else {
+                                    self.accountBankChargeSavedBankAccountApi()
+                                }
                             }
                             else if showBilling {
                                 // Push to BillingInfoVC
@@ -5015,9 +4557,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         let isSavedNewAccount = self.isSavedNewAccount
                         let isFromValue = isSavedNewAccount ? "AddNewAccountWithSave" : "AddNewAccountWithoutSave"
                         
-                        // Redirect based on billing visibility
-                        if fieldSection.visibility.billing {
-                            // Proceed with the Pay Now action
+                        let showBilling = fieldSection.visibility.billing
+                        let showAdditional = fieldSection.visibility.additional
+                        
+                        if !showBilling && !showAdditional {
+                            self.accountBankChargeAddNewAccountApi()
+                        }
+                        else if showBilling {
+                            // Push to BillingInfoVC
                             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
                             vc.accountName = accountName
                             vc.routingNumber = routingNumber
@@ -5040,6 +4587,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.navigationController?.pushViewController(vc, animated: true)
                         }
                         else {
+                            // Push to AdditionalInfoVC
                             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
                             vc.accountName = accountName
                             vc.routingNumber = routingNumber
@@ -5867,13 +5415,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-
+                
                 // Billing Info
                 let billing = fieldSection.billing
                 if !billing.isEmpty {
                     var billingDict: [String: Any] = [:]
                     billing.forEach { billingDict[$0.name] = $0.value }
-
+                    
                     if let address = billingDict["address"] as? String, !address.isEmpty {
                         params["address"] = address
                     }
@@ -5890,19 +5438,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         params["zip"] = postalCode
                     }
                 }
-
+                
                 // Additional Info
                 let additional = fieldSection.additional
                 if !additional.isEmpty {
                     var additionalDict: [String: Any] = [:]
                     additional.forEach { additionalDict[$0.name] = $0.value }
-
+                    
                     if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                         params["description"] = desc
                     } else {
                         params["description"] = "Hosted payment checkout"
                     }
-
+                    
                     if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                         params["phone_number"] = phone
                     }
@@ -5916,7 +5464,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     // If no description in additional info, set default
                     params["description"] = "Hosted payment checkout"
                 }
-
+                
             } catch {
                 print("Failed to decode FieldSection: \(error)")
                 params["description"] = "Hosted payment checkout"
@@ -6007,7 +5555,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                             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
@@ -6234,13 +5782,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-
+                
                 // Billing Info
                 let billing = fieldSection.billing
                 if !billing.isEmpty {
                     var billingDict: [String: Any] = [:]
                     billing.forEach { billingDict[$0.name] = $0.value }
-
+                    
                     if let address = billingDict["address"] as? String, !address.isEmpty {
                         params["address"] = address
                     }
@@ -6257,19 +5805,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         params["zip"] = postalCode
                     }
                 }
-
+                
                 // Additional Info
                 let additional = fieldSection.additional
                 if !additional.isEmpty {
                     var additionalDict: [String: Any] = [:]
                     additional.forEach { additionalDict[$0.name] = $0.value }
-
+                    
                     if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                         params["description"] = desc
                     } else {
                         params["description"] = "Hosted payment checkout"
                     }
-
+                    
                     if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                         params["phone_number"] = phone
                     }
@@ -6283,7 +5831,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     // If no description in additional info, set default
                     params["description"] = "Hosted payment checkout"
                 }
-
+                
             } catch {
                 print("Failed to decode FieldSection: \(error)")
                 params["description"] = "Hosted payment checkout"
@@ -6371,7 +5919,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                             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
@@ -6698,13 +6246,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-
+                
                 // Billing Info
                 let billing = fieldSection.billing
                 if !billing.isEmpty {
                     var billingDict: [String: Any] = [:]
                     billing.forEach { billingDict[$0.name] = $0.value }
-
+                    
                     if let address = billingDict["address"] as? String, !address.isEmpty {
                         params["address"] = address
                     }
@@ -6721,19 +6269,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         params["zip"] = postalCode
                     }
                 }
-
+                
                 // Additional Info
                 let additional = fieldSection.additional
                 if !additional.isEmpty {
                     var additionalDict: [String: Any] = [:]
                     additional.forEach { additionalDict[$0.name] = $0.value }
-
+                    
                     if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                         params["description"] = desc
                     } else {
                         params["description"] = "Hosted payment checkout"
                     }
-
+                    
                     if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                         params["phone_number"] = phone
                     }
@@ -6747,7 +6295,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     // If no description in additional info, set default
                     params["description"] = "Hosted payment checkout"
                 }
-
+                
             } catch {
                 print("Failed to decode FieldSection: \(error)")
                 params["description"] = "Hosted payment checkout"
@@ -6845,7 +6393,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                             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
@@ -7042,11 +6590,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
-    //MARK: - Delete Cards Api.
+    // MARK: - Delete Card API
     func deleteCardApi(cardID: String, at index: Int) {
         showLoadingIndicator()
         
-        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()+"/\(cardID)"
+        let endpoint = EnvironmentConfig.Endpoints.getCards.path()
+        let fullURL = EnvironmentConfig.baseURL + "\(endpoint)/\(cardID)"
         
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
@@ -7058,68 +6607,70 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         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")
+        // Add Customer-Token
+        if let token = UserStoreSingleton.shared.customerToken {
+            request.addValue(token, forHTTPHeaderField: "Customer-Token")
+        } else {
+            print("Customer-Token is nil")
+        }
         
         // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
+        if let apiKey = EnvironmentConfig.apiKey {
             request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+        }
+        if let apiSecret = EnvironmentConfig.apiSecret {
             request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
+        let task = session.dataTask(with: request) { [weak self] data, response, 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 {
                 DispatchQueue.main.async {
-                    self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
+                    self.presentPaymentErrorVC(errorMessage: "Request failed: \(error.localizedDescription)")
                 }
                 return
             }
             
-            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+            guard let httpResponse = response as? HTTPURLResponse else {
                 DispatchQueue.main.async {
-                    self.presentPaymentErrorVC(errorMessage: "Invalid response")
+                    self.presentPaymentErrorVC(errorMessage: "Invalid server response")
                 }
                 return
             }
             
-            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-                
-                if let data = serviceData {
+            if (200...299).contains(httpResponse.statusCode) {
+                if let data = data {
                     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 {
+                        if let json = try JSONSerialization.jsonObject(with: data) as? [String: Any],
+                           let message = json["message"] as? String {
                             DispatchQueue.main.async {
                                 self.showToast(message: message)
+                                // Optionally, remove the card from list at `index`
                             }
                         }
-                    } catch let jsonError {
-                        print("Error parsing JSON response: \(jsonError.localizedDescription)")
+                    } catch {
+                        print("JSON parsing error: \(error)")
                     }
-                } 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 {
+                    if let data = data,
+                       let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+                       let message = json["message"] as? String {
                         self.presentPaymentErrorVC(errorMessage: message)
                     } else {
-                        self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                        self.presentPaymentErrorVC(errorMessage: "Failed with status: \(httpResponse.statusCode)")
                     }
                 }
             }
         }
+        
         task.resume()
     }
     
@@ -7438,10 +6989,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
-    //MARK: - Banking Account Charge Api from Regular saved bank account if Billing info is nil
-    func accountChargeSavedBankAccountApi() {
+    //MARK: - Banking Account Charge Api If Billing info is availalbe but their visibility is false
+    func accountBankChargeApi() {
         showLoadingIndicator()
-        
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -7466,41 +7016,635 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         var params: [String: Any] = [
-            "account_id": selectedbankAccounts?.account_id ?? "",
-            "customer": selectedbankAccounts?.customer_id ?? "",
-            "payment_method": "ach",
-            "description": "Test Description",
+            "name": txtFieldAccountName.text ?? "",
+            "email": "test@gmail.com",
+            "description": "TestDescription",
             "currency": "usd",
+            "account_type": txtFieldAccountType.text?.lowercased() ?? "",
+            "routing_number": txtFieldRoutingNumber.text?.replacingOccurrences(of: " ", with: "") ?? "",
+            "account_number":  txtFieldAccountNumber.text?.replacingOccurrences(of: " ", with: "") ?? "",
+            "payment_mode": "auth_and_capture",
+            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
+            "levelIndicator": 1,
         ]
         
-        // Add these if recurring is enabled
-        if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = txtFieldSelectDateSingleSavedBankView?.text, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
                     
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
                     }
-                }
-            }
-            
-            params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
-        }
-        
-        print(params)
-        
-        do {
-            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            uRLRequest.httpBody = jsonData
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+                
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+                    
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+                    
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+                
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = txtFieldSelectDateViewBankFields?.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) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = txtFieldSelectPlanViewBankFields.text.lowercased()
+        }
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.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: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("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)")
+                            
+                            // Check if status is 0 and handle the error
+                            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
+                                        // Pass the selected payment method
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           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)
+                                    }
+                                }
+                            }
+                        } 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: - Banking Account Charge Api from Regular saved bank account if Billing info is nil
+    func accountChargeSavedBankAccountApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        var params: [String: Any] = [
+            "account_id": selectedbankAccounts?.account_id ?? "",
+            "customer": selectedbankAccounts?.customer_id ?? "",
+            "payment_method": "ach",
+            "description": "Test Description",
+            "currency": "usd",
+        ]
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = txtFieldSelectDateSingleSavedBankView?.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) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.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: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("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)")
+                            
+                            // Check if status is 0 and handle the error
+                            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
+                                        // Pass the selected payment method
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billingInfo and additionalInfo
+                                        if let billingData = self.request.billingInfoData,
+                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
+                                            
+                                            // Extract main billing fields
+                                            let cleanBillingInfo: [String: Any] = [
+                                                "postal_code": billingInfoDict["postal_code"] ?? "",
+                                                "country": billingInfoDict["country"] ?? "",
+                                                "city": billingInfoDict["city"] ?? "",
+                                                "address": billingInfoDict["address"] ?? "",
+                                                "state": billingInfoDict["state"] ?? ""
+                                            ]
+                                            paymentDoneVC.billingInfo = cleanBillingInfo
+                                            
+                                            // Extract additional_info
+                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
+                                                let cleanAdditionalInfo: [String: Any] = [
+                                                    "email": additional["email"] ?? "",
+                                                    "phone_number": additional["phone_number"] ?? "",
+                                                    "name": additional["name"] ?? "",
+                                                    "country_code": additional["country_code"] ?? ""
+                                                ]
+                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
+                                            }
+                                        }
+                                        self.navigationController?.pushViewController(paymentDoneVC, animated: true)
+                                    }
+                                }
+                            }
+                        } 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: - Banking Account Charge Api from Regular saved bank account if Billing info is available but their visibility is false
+    func accountBankChargeSavedBankAccountApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        var params: [String: Any] = [
+            "account_id": selectedbankAccounts?.account_id ?? "",
+            "customer": selectedbankAccounts?.customer_id ?? "",
+            "payment_method": "ach",
+            "description": "Test Description",
+            "currency": "usd",
+        ]
+        
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+                    
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+                
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+                    
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+                    
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+                
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = txtFieldSelectDateSingleSavedBankView?.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) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = txtFieldSelectPlanSingleSavedBankView.text.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.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: uRLRequest) { (serviceData, serviceResponse, error) in
+            
+            DispatchQueue.main.async {
+                self.hideLoadingIndicator() // Stop loader when response is received
+            }
+            
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+                print("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)")
+                            
+                            // Check if status is 0 and handle the error
+                            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
+                                        // Pass the selected payment method
+                                        paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
+                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           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)
+                                    }
+                                }
+                            }
+                        } 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: - Banking Account Charge Api from add new account if billing info is nil and user not saved the account
+    func accountChargeAddNewAccountApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var uRLRequest = URLRequest(url: serviceURL)
+        uRLRequest.httpMethod = "POST"
+        uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+        
+        var params: [String: Any] = [
+            "name": accountName,
+            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "description": "Test Description",
+            "currency": "usd",
+            "account_type": accountType.lowercased(),
+            "routing_number": routingNumber,
+            "account_number": accountNumber,
+            "payment_mode": "auth_and_capture",
+            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
+            "levelIndicator": 1,
+        ]
+        
+        // Add these if recurring is enabled
+        if let req = request, req.is_recurring == true {
+            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                // Only send start_date if type is .custom and field is not empty
+                if let startDateText = txtFieldSelectDateNewAccountView?.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) {
+                        let apiFormattedDate = outputFormatter.string(from: date)
+                        params["start_date"] = apiFormattedDate
+                    } else {
+                        print("Invalid date format in startDateText")
+                    }
+                }
+            }
+            
+            params["interval"] = txtFieldSelectPlanNewAccountView.text.lowercased()
+        }
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            uRLRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -7595,8 +7739,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         task.resume()
     }
     
-    //MARK: - Banking Account Charge Api from add new account if billing info is nil and user not saved the account
-    func accountChargeAddNewAccountApi() {
+    //MARK: - Banking Account Charge Api from add new account if billing info is available but their visibilty is false
+    func accountBankChargeAddNewAccountApi() {
         showLoadingIndicator()
         
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
@@ -7640,6 +7784,68 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "levelIndicator": 1,
         ]
         
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                
+                // Billing Info
+                let billing = fieldSection.billing
+                if !billing.isEmpty {
+                    var billingDict: [String: Any] = [:]
+                    billing.forEach { billingDict[$0.name] = $0.value }
+                    
+                    if let address = billingDict["address"] as? String, !address.isEmpty {
+                        params["address"] = address
+                    }
+                    if let country = billingDict["country"] as? String, !country.isEmpty {
+                        params["country"] = country
+                    }
+                    if let state = billingDict["state"] as? String, !state.isEmpty {
+                        params["state"] = state
+                    }
+                    if let city = billingDict["city"] as? String, !city.isEmpty {
+                        params["city"] = city
+                    }
+                    if let postalCode = billingDict["postal_code"] as? String, !postalCode.isEmpty {
+                        params["zip"] = postalCode
+                    }
+                }
+                
+                // Additional Info
+                let additional = fieldSection.additional
+                if !additional.isEmpty {
+                    var additionalDict: [String: Any] = [:]
+                    additional.forEach { additionalDict[$0.name] = $0.value }
+                    
+                    if let desc = additionalDict["description"] as? String, !desc.isEmpty {
+                        params["description"] = desc
+                    } else {
+                        params["description"] = "Hosted payment checkout"
+                    }
+                    
+                    if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
+                        params["phone_number"] = phone
+                    }
+                    if let email = additionalDict["email"] as? String, !email.isEmpty {
+                        params["email"] = email
+                    }
+                    if let name = additionalDict["name"] as? String, !name.isEmpty {
+                        params["name"] = name
+                    }
+                } else {
+                    // If no description in additional info, set default
+                    params["description"] = "Hosted payment checkout"
+                }
+                
+            } catch {
+                print("Failed to decode FieldSection: \(error)")
+                params["description"] = "Hosted payment checkout"
+            }
+        } else {
+            // Fallback if billingInfoData is missing
+            params["description"] = "Hosted payment checkout"
+        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
             if let recurringType = req.recurringStartDateType, recurringType == .custom {
@@ -7711,30 +7917,23 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        // Pass billingInfo and additionalInfo
-                                        if let billingData = self.request.billingInfoData,
-                                           let billingInfoDict = try? JSONSerialization.jsonObject(with: billingData, options: []) as? [String: Any] {
+                                        // Pass billing info and additional info if available
+                                        if let billingInfoData = self.request.billingInfoData,
+                                           let fieldSection = try? JSONDecoder().decode(FieldSection.self, from: billingInfoData) {
                                             
-                                            // Extract main billing fields
-                                            let cleanBillingInfo: [String: Any] = [
-                                                "postal_code": billingInfoDict["postal_code"] ?? "",
-                                                "country": billingInfoDict["country"] ?? "",
-                                                "city": billingInfoDict["city"] ?? "",
-                                                "address": billingInfoDict["address"] ?? "",
-                                                "state": billingInfoDict["state"] ?? ""
-                                            ]
-                                            paymentDoneVC.billingInfo = cleanBillingInfo
+                                            // 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
                                             
-                                            // Extract additional_info
-                                            if let additional = billingInfoDict["additional_info"] as? [String: Any] {
-                                                let cleanAdditionalInfo: [String: Any] = [
-                                                    "email": additional["email"] ?? "",
-                                                    "phone_number": additional["phone_number"] ?? "",
-                                                    "name": additional["name"] ?? "",
-                                                    "country_code": additional["country_code"] ?? ""
-                                                ]
-                                                paymentDoneVC.additionalInfo = cleanAdditionalInfo
-                                            }
+                                            // 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)
                                     }
@@ -8265,7 +8464,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         var params: [String: Any] = [
             "name": cardNameTextField.text,
-            "email": UserStoreSingleton.shared.merchantEmail ?? "",
+            "email": txtFieldEmailCardView.text,
             "card_number": cardNumberTextField.text.replacingOccurrences(of: " ", with: ""),
             "cardholder_name": cardNameTextField.text,
             "exp_month": cardExpiryTextField.text.components(separatedBy: "/").first ?? "",
@@ -8280,13 +8479,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-
+                
                 // Billing Info
                 let billing = fieldSection.billing
                 if !billing.isEmpty {
                     var billingDict: [String: Any] = [:]
                     billing.forEach { billingDict[$0.name] = $0.value }
-
+                    
                     if let address = billingDict["address"] as? String, !address.isEmpty {
                         params["address"] = address
                     }
@@ -8303,19 +8502,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         params["zip"] = postalCode
                     }
                 }
-
+                
                 // Additional Info
                 let additional = fieldSection.additional
                 if !additional.isEmpty {
                     var additionalDict: [String: Any] = [:]
                     additional.forEach { additionalDict[$0.name] = $0.value }
-
+                    
                     if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                         params["description"] = desc
                     } else {
                         params["description"] = "Hosted payment checkout"
                     }
-
+                    
                     if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                         params["phone_number"] = phone
                     }
@@ -8329,7 +8528,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     // If no description in additional info, set default
                     params["description"] = "Hosted payment checkout"
                 }
-
+                
             } catch {
                 print("Failed to decode FieldSection: \(error)")
                 params["description"] = "Hosted payment checkout"
@@ -8422,7 +8621,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                             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
@@ -8572,13 +8771,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if let billingInfoData = request.billingInfoData {
             do {
                 let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
-
+                
                 // Billing Info
                 let billing = fieldSection.billing
                 if !billing.isEmpty {
                     var billingDict: [String: Any] = [:]
                     billing.forEach { billingDict[$0.name] = $0.value }
-
+                    
                     if let address = billingDict["address"] as? String, !address.isEmpty {
                         params["address"] = address
                     }
@@ -8595,19 +8794,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         params["zip"] = postalCode
                     }
                 }
-
+                
                 // Additional Info
                 let additional = fieldSection.additional
                 if !additional.isEmpty {
                     var additionalDict: [String: Any] = [:]
                     additional.forEach { additionalDict[$0.name] = $0.value }
-
+                    
                     if let desc = additionalDict["description"] as? String, !desc.isEmpty {
                         params["description"] = desc
                     } else {
                         params["description"] = "Hosted payment checkout"
                     }
-
+                    
                     if let phone = additionalDict["phone_number"] as? String, !phone.isEmpty {
                         params["phone_number"] = phone
                     }
@@ -8621,7 +8820,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     // If no description in additional info, set default
                     params["description"] = "Hosted payment checkout"
                 }
-
+                
             } catch {
                 print("Failed to decode FieldSection: \(error)")
                 params["description"] = "Hosted payment checkout"
@@ -8712,7 +8911,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                             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
@@ -8846,10 +9045,6 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
             if UserStoreSingleton.shared.isLoggedIn == false {
                 self.viewSingleSavedAccount.isHidden = true
                 self.viewBankFields.isHidden = true
-                //                self.viewBtnShowSavedCards.isHidden = false
-                //                self.lblBtnShowSaveCard.text = "Show Saved Cards"
-                //                self.viewBtnShowSavedCardHeight.constant = 50
-                //                self.viewBtnShowSavedCardTopCon.constant = 20
                 
                 if request.saveCard == false {
                     self.viewBtnShowSavedCards.isHidden = true
@@ -8931,11 +9126,6 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
             
         case "Bank":
             if UserStoreSingleton.shared.isLoggedIn == false {
-                //  self.viewBankFields.isHidden = false
-                //                self.viewBtnShowSavedCards.isHidden = false
-                //                self.lblBtnShowSaveCard.text = "Show Saved Accounts"
-                //                self.viewBtnShowSavedCardHeight.constant = 50
-                //                self.viewBtnShowSavedCardTopCon.constant = 20
                 
                 if request.saveAccount == false {
                     self.viewBtnShowSavedCards.isHidden = true
@@ -10158,7 +10348,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
     
 }
 
-//MARK: - BlinkCard
+////MARK: - BlinkCard
 //extension PaymentInfoVC: MBCBlinkCardOverlayViewControllerDelegate {
 //    func blinkCardOverlayViewControllerDidFinishScanning(_ blinkCardOverlayViewController: MBCBlinkCardOverlayViewController, state: MBCRecognizerResultState) {
 //        /** This is done on background thread */
@@ -10213,7 +10403,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
 //    }
 //    
 //}
-
+//
 //extension PaymentInfoVC: CustomOverlayDelegate {
 //    func didFinishScanningCard(cardNumber: String, expiryDate: String, cvv: String, nameOnCard: String) {
 //        // Update the text fields with scanned details