@jimrising/easymerchantsdk-react-native 1.3.8 → 1.4.1

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

@@ -76,6 +76,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var viewTxtFieldStartDateCard: UIView!
     @IBOutlet weak var imgViewChosePlanCardDropIcon: UIImageView!
     @IBOutlet weak var imgViewCalenderIconCard: UIImageView!
+    @IBOutlet weak var txtFieldEmailCardView: TextFieldStackView!
+    @IBOutlet weak var viewTxtFieldEmailCardView: UIView!
     
     @IBOutlet weak var btnScanCard: UIButton!
     
@@ -176,7 +178,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var viewTextFieldConfirmAccount: UIView!
     @IBOutlet weak var txtFieldSelectPlanViewBankFields: TextFieldStackView!
     @IBOutlet weak var txtFieldSelectDateViewBankFields: TextFieldStackView!
+    @IBOutlet weak var txtFieldEmailAccountView: TextFieldStackView!
+    @IBOutlet weak var viewTxtFieldEmailAccountView: UIView!
     
+    @IBOutlet weak var viewSaveCardForFutureCardView: UIStackView!
     @IBOutlet weak var heightViewBankFields: NSLayoutConstraint!
     
     //GrailPay
@@ -199,6 +204,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var txtFieldChosePlanGrailPayBankView: TextFieldStackView!
     @IBOutlet weak var txtFieldSelectDateGrailPayBankView: TextFieldStackView!
     @IBOutlet weak var bankIconGrailPayBankView: UIImageView!
+    @IBOutlet weak var viewSaveAccountForFutureGrailPayView: UIStackView!
     
     //New GrailPay Account
     @IBOutlet weak var viewAddNewGrailPayAccount: UIView!
@@ -223,6 +229,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var txtFieldChosePlanNewGrailPayBankView: TextFieldStackView!
     @IBOutlet weak var txtFieldSelectDateNewGrailPayBankView: TextFieldStackView!
     @IBOutlet weak var imgViewBankIconGrailPayNewBank: UIImageView!
+    @IBOutlet weak var viewSaveAccountForFututeNewGrailPayAccountView: UIStackView!
     
     //SavedBank
     @IBOutlet weak var viewSingleSavedAccount: UIView!
@@ -265,6 +272,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBOutlet weak var heightViewNewAccountFields: NSLayoutConstraint!
     @IBOutlet weak var heightSubViewNewAccountFields: NSLayoutConstraint!
+    @IBOutlet weak var viewSaveAccountForFutureNewAccountView: UIStackView!
+    
     
     //Crypto
     @IBOutlet weak var viewCrypto: UIView!
@@ -339,7 +348,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     var selectedBank: BankAccountModel?
     var isSelectForPayBank: Bool = false
     var selectedBankIndex: Int? = nil
-    var arrAccountType = ["Saving", "Checking"]
+    var arrAccountType = ["saving", "checking", "ledger"]
     
     var agreeTermsAndCondtition: Bool = false
     
@@ -353,7 +362,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     var isFrom = String()
     
     //Blink Card
-   // var blinkCardRecognizer: MBCBlinkCardRecognizer!
+//    var blinkCardRecognizer: MBCBlinkCardRecognizer!
     
     // Variables for Card Scanning Data Back
     var cardNumber: String?
@@ -388,6 +397,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     var startDatePickerHandler: DatePickerHandler?
     
+    var isSavedNewCard: Bool = false
+    
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -412,10 +423,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         //// Check if billingInfoData is available
         if let billingInfoData = request.billingInfoData,
-           let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
-           let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
-            // If `submitButtonText` is not empty, use it; otherwise, default to "Next (Billing Info)"
-            let buttonText = (request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! + " (Billing Info)" : "Next (Billing Info)")
+           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)
@@ -541,9 +555,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.txtFieldSelectDateGrailPayBankView.isHidden = false
                 self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
                 
-                self.heightViewBankFields.constant = 696
-                self.heightViewNewCardFields.constant = 624
-                self.heightViewNewAccountFields.constant = 808
+                if request.saveAccount == false {
+                    self.heightViewBankFields.constant = 790
+                    self.heightViewNewAccountFields.constant = 788
+                } else {
+                    self.heightViewBankFields.constant = 836
+                    self.heightViewNewAccountFields.constant = 844
+                }
+                
+                if request.saveCard == false {
+                    self.heightViewNewCardFields.constant = 595
+                } else {
+                    self.heightViewNewCardFields.constant = 648
+                }
+                
                 self.heightSubViewNewAccountFields.constant = 738
             } else {
                 self.txtFieldStartDateCard.isHidden = true
@@ -555,9 +580,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.txtFieldSelectDateGrailPayBankView.isHidden = true
                 self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
                 
-                self.heightViewBankFields.constant = 600
-                self.heightViewNewCardFields.constant = 529
-                self.heightViewNewAccountFields.constant = 713
+                if request.saveAccount == false {
+                    self.heightViewBankFields.constant = 700
+                    self.heightViewNewAccountFields.constant = 690
+                } else {
+                    self.heightViewBankFields.constant = 740
+                    self.heightViewNewAccountFields.constant = 738
+                }
+                
+                if request.saveCard == false {
+                    self.heightViewNewCardFields.constant = 500
+                } else {
+                    self.heightViewNewCardFields.constant = 553
+                }
+                
                 self.heightSubViewNewAccountFields.constant = 643
             }
             
@@ -587,9 +623,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.txtFieldSelectDateGrailPayBankView.isHidden = true
             self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
             
-            self.heightViewBankFields.constant = 506
-            self.heightViewNewCardFields.constant = 434
-            self.heightViewNewAccountFields.constant = 628
+            if request.saveAccount == false {
+                self.heightViewBankFields.constant = 604
+                self.heightViewNewAccountFields.constant = 600
+            } else {
+                self.heightViewBankFields.constant = 644
+                self.heightViewNewAccountFields.constant = 660
+            }
+            
+            if request.saveCard == false {
+                self.heightViewNewCardFields.constant = 404
+            } else {
+                self.heightViewNewCardFields.constant = 458
+            }
+            
             self.heightSubViewNewAccountFields.constant = 558
         }
         
@@ -666,10 +713,24 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             else {
                 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
+                
+                //                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
+                    self.viewBtnShowSavedCardTopCon.constant = 0
+                }
+                else {
+                    self.viewBtnShowSavedCards.isHidden = false
+                    self.lblBtnShowSaveCard.text = "Show Saved Cards"
+                    self.viewBtnShowSavedCardHeight.constant = 50
+                    self.viewBtnShowSavedCardTopCon.constant = 20
+                }
+                
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
                 self.viewCardFields.isHidden = false
@@ -778,10 +839,23 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             else {
                 // self.viewBankFields.isHidden = false
-                self.viewBtnShowSavedCards.isHidden = false
-                self.lblBtnShowSaveCard.text = "Show Saved Accounts"
-                self.viewBtnShowSavedCardHeight.constant = 50
-                self.viewBtnShowSavedCardTopCon.constant = 20
+                //                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
+                    self.viewBtnShowSavedCardTopCon.constant = 0
+                }
+                else {
+                    self.viewBtnShowSavedCards.isHidden = false
+                    self.lblBtnShowSaveCard.text = "Show Saved Accounts"
+                    self.viewBtnShowSavedCardHeight.constant = 50
+                    self.viewBtnShowSavedCardTopCon.constant = 20
+                }
+                
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
                 self.viewCardFields.isHidden = true
@@ -1161,6 +1235,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         cardExpiryTextField.textField.delegate = self
         cardCvvTextField.textField.delegate = self
         cardNameTextField.textField.delegate = self
+        txtFieldEmailCardView.textField.delegate = self
         
         txtFieldEmail.delegate = self
         
@@ -1184,20 +1259,42 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         txtFieldAccountTypeNewAccountView.delegate = self
         txtFieldAccountNumber.delegate = self
         txtFieldConfirmBankAccount.delegate = self
+        txtFieldEmailAccountView.textField.delegate = self
     }
     
     private func updateSaveButtons() {
         let isSavedCard = request?.saveCard ?? false
         let isSavedAccount = request?.saveAccount ?? false
         
-        let cardImageName = isSavedCard ? "checkmark.square.fill" : "square"
-        let accountImageName = isSavedAccount ? "checkmark.square.fill" : "square"
+        let defaultImageName = "square" // always show unselected initially
         
-        btnCheckBoxSavedCard.setImage(UIImage(systemName: cardImageName), for: .normal)
-        btnSavedCardForFutureNewCardView.setImage(UIImage(systemName: cardImageName), for: .normal)
+        // Card Buttons: Show/hide based on saveCard
+        btnCheckBoxSavedCard.isHidden = !isSavedCard
+        btnSavedCardForFutureNewCardView.isHidden = !isSavedCard
         
-        btnCheckSavedAccountForFuture.setImage(UIImage(systemName: accountImageName), for: .normal)
-        btnSavedNewAccountForFuture.setImage(UIImage(systemName: accountImageName), for: .normal)
+        if isSavedCard {
+            btnCheckBoxSavedCard.setImage(UIImage(systemName: defaultImageName), for: .normal)
+            btnSavedCardForFutureNewCardView.setImage(UIImage(systemName: defaultImageName), for: .normal)
+        }
+        
+        // Account Buttons: Show/hide based on saveAccount
+        let accountButtons: [UIButton] = [
+            btnCheckBoxGrailPaySaveAccount,
+            btnCheckBoxGrailPayNewAccountSaveAccount
+        ]
+        
+        for button in accountButtons {
+            button.isHidden = !isSavedAccount
+            if isSavedAccount {
+                button.setImage(UIImage(systemName: defaultImageName), for: .normal)
+            }
+        }
+        
+        // Other related UI changes for account
+        viewSaveCardForFutureCardView?.isHidden = !isSavedAccount
+        viewSaveAccountForFutureNewAccountView?.isHidden = !isSavedAccount
+        viewSaveAccountForFutureGrailPayView?.isHidden = !isSavedAccount
+        viewSaveAccountForFututeNewGrailPayAccountView?.isHidden = !isSavedAccount
     }
     
     //MARK: - Term & Conditions setup for normal bank fields view
@@ -1759,53 +1856,88 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
            let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
             print("Billing Info Data: \(jsonDict)")
             
-            let cvvText = txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-            
-            if cvvText.isEmpty {
-                self.showAlert(title: "Missing CVV", message: "Please enter the CVV to proceed.")
-                return
-            } else if cvvText.count < 3 {
-                self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
-                return
-            }
-            
-            // Recurring Plan + Date Validation (only if is_recurring is true)
-            if let req = self.request, req.is_recurring == true {
-                if txtFieldSelectPlanSingleSavedCard.text.isEmpty {
-                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
-                    return
-                }
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
-                if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                    if txtFieldSelectDateSingleSavedCard.text.isEmpty {
-                        self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                DispatchQueue.main.async {
+                    let cvvText = self.txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                    
+                    if cvvText.isEmpty {
+                        self.showAlert(title: "Missing CVV", message: "Please enter the CVV to proceed.")
+                        return
+                    } else if cvvText.count < 3 {
+                        self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
                         return
                     }
+                    
+                    // Recurring Plan + Date Validation (only if is_recurring is true)
+                    if let req = self.request, req.is_recurring == true {
+                        if self.txtFieldSelectPlanSingleSavedCard.text.isEmpty {
+                            self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                            return
+                        }
+                        
+                        if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                            if self.txtFieldSelectDateSingleSavedCard.text.isEmpty {
+                                self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                                return
+                            }
+                        }
+                    }
+                    
+                    // 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)
+                    }
                 }
             }
-            
-            // 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 = selectedCard // Passing the selected card data
-            billingInfoVC.cvvText = cvvText // Passing the CVV text
-            billingInfoVC.amount = Int(request.amount)
-            billingInfoVC.selectedPaymentMethod = selectedPaymentMethod
-            
-            // Pass the billing info data and auth token
-            if let billingInfoData = request.billingInfoData,
-               let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
-               let jsonDict = json as? [String: Any] {
-                billingInfoVC.billingInfoData = jsonDict
+            catch {
+                print("Failed to decode billingInfoData: \(error.localizedDescription)")
             }
-            
-            billingInfoVC.request = self.request
-            billingInfoVC.chosenPlan = txtFieldSelectPlanSingleSavedCard.text
-            billingInfoVC.startDate = txtFieldSelectDateSingleSavedCard.text
-            
-            // Navigate to BillingInfoVC
-            self.navigationController?.pushViewController(billingInfoVC, animated: true)
         }
         else {
             // If billingInfoData is nil or empty, set the button title to "Pay Now"
@@ -1886,99 +2018,140 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                 print("Billing Info Data: \(jsonDict)")
                 
-                // Retrieve and trim text field values (removing leading and trailing whitespace)
-                let cardNumber = txtFieldCardNumberNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-                let expiryDate = txtFieldExpiryDateNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-                let cvv = txtFieldCVVNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-                let nameOnCard = txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-                
-                // Check if any field is empty
-                if cardNumber.isEmpty || expiryDate.isEmpty || cvv.isEmpty || nameOnCard.isEmpty {
-                    let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
-                    alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-                    self.present(alert, animated: true, completion: nil)
-                    return
-                }
-                
-                // Validate expiry date format
-                let expiryDateFormat = "MM/yyyy"
-                let dateFormatter = DateFormatter()
-                dateFormatter.dateFormat = expiryDateFormat
-                dateFormatter.locale = Locale(identifier: "en_US_POSIX")
-                
-                // Split the expiry date and validate its format
-                let exp = expiryDate.split(separator: "/")
-                if exp.count != 2 || exp[0].count != 2 || exp[1].count != 4 {
-                    let alert = UIAlertController(title: "Invalid Expiry Date", message: "Please enter the expiry date in the format MM/yyyy.", preferredStyle: .alert)
-                    alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-                    self.present(alert, animated: true, completion: nil)
-                    return
-                }
-                
-                // Check if the expiry date is valid
-                if let expiryDateObj = dateFormatter.date(from: expiryDate) {
-                    // Check if the expiry date is in the past
-                    let currentDate = Date()
-                    let calendar = Calendar.current
-                    let currentMonthYear = calendar.date(from: calendar.dateComponents([.year, .month], from: currentDate))
-                    if expiryDateObj < currentMonthYear! {
-                        let alert = UIAlertController(title: "Expired Card", message: "The expiry date cannot be in the past. Please enter a valid expiry date.", preferredStyle: .alert)
-                        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-                        self.present(alert, animated: true, completion: nil)
-                        return
-                    }
-                } else {
-                    let alert = UIAlertController(title: "Invalid Expiry Date", message: "Please enter the expiry date in the format MM/yyyy.", preferredStyle: .alert)
-                    alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-                    self.present(alert, animated: true, completion: nil)
-                    return
-                }
-                
-                // Recurring Plan + Date Validation (only if is_recurring is true)
-                if let req = self.request, req.is_recurring == true {
-                    if txtFieldSelectPlanNewCardView.text.isEmpty {
-                        self.showAlert(title: "Missing Information", message: "Please choose your plan.")
-                        return
-                    }
+                do {
+                    let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                     
-                    if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                        if txtFieldSelectDateNewCardView.text.isEmpty {
-                            self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                    DispatchQueue.main.async {
+                        // Retrieve and trim text field values (removing leading and trailing whitespace)
+                        let cardNumber = self.txtFieldCardNumberNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        let expiryDate = self.txtFieldExpiryDateNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        let cvv = self.txtFieldCVVNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        let nameOnCard = self.txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        
+                        // Check if any field is empty
+                        if cardNumber.isEmpty || expiryDate.isEmpty || cvv.isEmpty || nameOnCard.isEmpty {
+                            let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
+                            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+                            self.present(alert, animated: true, completion: nil)
+                            return
+                        }
+                        
+                        // Validate expiry date format
+                        let expiryDateFormat = "MM/yyyy"
+                        let dateFormatter = DateFormatter()
+                        dateFormatter.dateFormat = expiryDateFormat
+                        dateFormatter.locale = Locale(identifier: "en_US_POSIX")
+                        
+                        // Split the expiry date and validate its format
+                        let exp = expiryDate.split(separator: "/")
+                        if exp.count != 2 || exp[0].count != 2 || exp[1].count != 4 {
+                            let alert = UIAlertController(title: "Invalid Expiry Date", message: "Please enter the expiry date in the format MM/yyyy.", preferredStyle: .alert)
+                            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+                            self.present(alert, animated: true, completion: nil)
+                            return
+                        }
+                        
+                        // Check if the expiry date is valid
+                        if let expiryDateObj = dateFormatter.date(from: expiryDate) {
+                            // Check if the expiry date is in the past
+                            let currentDate = Date()
+                            let calendar = Calendar.current
+                            let currentMonthYear = calendar.date(from: calendar.dateComponents([.year, .month], from: currentDate))
+                            if expiryDateObj < currentMonthYear! {
+                                let alert = UIAlertController(title: "Expired Card", message: "The expiry date cannot be in the past. Please enter a valid expiry date.", preferredStyle: .alert)
+                                alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+                                self.present(alert, animated: true, completion: nil)
+                                return
+                            }
+                        } else {
+                            let alert = UIAlertController(title: "Invalid Expiry Date", message: "Please enter the expiry date in the format MM/yyyy.", preferredStyle: .alert)
+                            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+                            self.present(alert, animated: true, completion: nil)
                             return
                         }
+                        
+                        // Recurring Plan + Date Validation (only if is_recurring is true)
+                        if let req = self.request, req.is_recurring == true {
+                            if self.txtFieldSelectPlanNewCardView.text.isEmpty {
+                                self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                                return
+                            }
+                            
+                            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                                if self.txtFieldSelectDateNewCardView.text.isEmpty {
+                                    self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                                    return
+                                }
+                            }
+                        }
+                        
+                        // 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)
+                        }
                     }
                 }
-                
-                // 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 = isSavedNewCardForFuture
-                
-                billingInfoVC.isFrom = "AddNewCard"
-                billingInfoVC.amount = Int(request.amount)
-                billingInfoVC.selectedPaymentMethod = selectedPaymentMethod
-                
-                // Pass the billing info data and auth token
-                if let billingInfoData = request.billingInfoData,
-                   let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
-                   let jsonDict = json as? [String: Any] {
-                    billingInfoVC.billingInfoData = jsonDict
+                catch {
+                    print("Failed to decode billingInfoData: \(error.localizedDescription)")
                 }
-                
-                billingInfoVC.request = self.request
-                billingInfoVC.chosenPlan = txtFieldSelectPlanNewCardView.text
-                billingInfoVC.startDate = txtFieldSelectDateNewCardView.text
-                
-                // Navigate to BillingInfoVC
-                self.navigationController?.pushViewController(billingInfoVC, animated: true)
             }
             else {
-                if request.enable3DS == true {
+                if request.secureAuthentication == true {
                     threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                 }
                 else {
@@ -2397,24 +2570,146 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             
             guard agreeTermsAndCondtition else {
-                self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
+                self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions.")
                 return
             }
             
             if isSavedForFuture {
-                // Navigate to next screen without calling the API
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
-                vc.selectedPaymentMethod = "GrailPay"
-                vc.easyPayDelegate = self.easyPayDelegate
-                vc.grailPayAccountID = self.grailPayAccountID
-                vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
-                vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
-                self.navigationController?.pushViewController(vc, animated: true)
+                //If billing info is available
+                if let billingInfoData = request.billingInfoData {
+                    do {
+                        let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                        
+                        DispatchQueue.main.async {
+                            
+                            if let billingInfoData = self.request.billingInfoData,
+                               let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
+                               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
+                                    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
+                                    self.navigationController?.pushViewController(vc, animated: true)
+                                }
+                            }
+                        }
+                    }
+                    catch {
+                        print("Failed to decode billingInfoData: \(error.localizedDescription)")
+                    }
+                }
+                else {
+                    //If billing info is nil
+                    // Navigate to EmailVerificationVC directly
+                    let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                    vc.easyPayDelegate = self.easyPayDelegate
+                    vc.grailPayAccountID = self.grailPayAccountID
+                    vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+                    vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
+                    vc.chosenPlan = self.txtFieldChosePlanGrailPayBankView.text
+                    vc.startDate = self.txtFieldSelectDateGrailPayBankView.text
+                    vc.request = self.request
+                    vc.isSavedForFuture = self.isSavedForFuture
+                    vc.selectedPaymentMethod = "GrailPay"
+                    self.navigationController?.pushViewController(vc, animated: true)
+                }
             } else {
-                // Proceed to call API if not saving for future
-                grailPayAccountChargeApi()
+                // Check if billing info data exists and is valid JSON without save
+                if let billingInfoData = request.billingInfoData {
+                    do {
+                        let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                        
+                        DispatchQueue.main.async {
+                            
+                            if let billingInfoData = self.request.billingInfoData,
+                               let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
+                               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
+                                    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
+                                    self.navigationController?.pushViewController(vc, animated: true)
+                                }
+                            }
+                        }
+                    }
+                    catch {
+                        print("Failed to decode billingInfoData: \(error.localizedDescription)")
+                    }
+                }
+                else {
+                    // Proceed to call API if billing info not available
+                    grailPayAccountChargeApi()
+                }
             }
         } else {
+            // Launch GrailPay account linking
             grailPaySource = .existingAccount
             launchGrailPay()
         }
@@ -2443,10 +2738,124 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             
             if isSavedForFuture {
-                grailPayNewAccountSavingChargeApi()
+                //If billing info is available
+                if let billingInfoData = request.billingInfoData {
+                    do {
+                        let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                        
+                        DispatchQueue.main.async {
+                            
+                            if let billingInfoData = self.request.billingInfoData,
+                               let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
+                               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)
+                                }
+                            }
+                        }
+                    }
+                    catch {
+                        print("Failed to decode billingInfoData: \(error.localizedDescription)")
+                    }
+                }
             }
             else {
-                grailPayNewAccountChargeApi()
+                // Check if billing info data exists and is valid JSON without save
+                if let billingInfoData = request.billingInfoData {
+                    do {
+                        let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
+                        
+                        DispatchQueue.main.async {
+                            
+                            if let billingInfoData = self.request.billingInfoData,
+                               let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
+                               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)
+                                }
+                            }
+                        }
+                    }
+                    catch {
+                        print("Failed to decode billingInfoData: \(error.localizedDescription)")
+                    }
+                }
+                else {
+                    // Proceed to call API if billing info not available
+                    grailPayNewAccountChargeApi()
+                }
             }
         } else {
             grailPaySource = .newAccount
@@ -2467,30 +2876,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             case .success:
                 if let chargeData = result.chargeData,
                    let dataArray = chargeData["data"] as? [[String: Any]],
-                   let firstAccount = dataArray.first {
+                   let selectedAccount = dataArray.first {
                     
-                    print("✅ Bank connected: \(firstAccount)")
-                    self.selectedGrailPayAccountType = firstAccount["account_type"] as? String
-                    self.selectedGrailPayAccountName = firstAccount["name"] as? String
+                    print("✅ Bank connected: \(selectedAccount)")
+                    self.selectedGrailPayAccountType = selectedAccount["account_type"] as? String
+                    self.selectedGrailPayAccountName = selectedAccount["name"] as? String
                     
                     if self.grailPaySource == .existingAccount {
-                        self.accountConnectApi(account: firstAccount)
+                        self.accountConnectApi(account: selectedAccount)
                         self.lblGrailPayAabandonError.text = "Default account successfully set"
                         self.viewGrailPayAbandon.isHidden = false
                     } else if self.grailPaySource == .newAccount {
-                        self.newGrailPayAccountConnectApi(account: firstAccount)
+                        self.newGrailPayAccountConnectApi(account: selectedAccount)
                         self.lblAbandonGrailPayNewAccountView.text = "Default account successfully set"
                         self.viewAbandonGrailPayNewAccountView.isHidden = false
                         
-                        self.selectedNewGrailPayAccountType = firstAccount["account_type"] as? String
-                        self.selectedNewGrailPayAccountName = firstAccount["name"] as? String
+                        self.selectedNewGrailPayAccountType = selectedAccount["account_type"] as? String
+                        self.selectedNewGrailPayAccountName = selectedAccount["name"] as? String
                     }
                     
                     if self.selectedPaymentMethod == "Bank" {
                         self.viewBtnShowSavedCards.isHidden = true
                     }
                     
-                    let amountText = String(format: "$%.2f", self.request.amount)
+                    let amountText = String(format: "$%.2f", self.request.amount ?? 0)
                     let submitText = self.request.submitButtonText
                     let defaultTitle = (submitText?.isEmpty == false)
                     ? "\(submitText!) (\(amountText))"
@@ -2570,7 +2979,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "account_type": self.selectedGrailPayAccountType ?? "",
             "name": self.selectedGrailPayAccountName ?? "",
             "description": "payment checkout",
-            "email": "newmerchantadminuser12@test.com"
+            "email": UserStoreSingleton.shared.merchantEmail ?? ""
         ]
         
         // Add these if recurring is enabled
@@ -2643,7 +3052,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
-                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        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)
                                     }
                                 }
@@ -2774,140 +3208,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
-                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
-                                        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: - GrailPay New Account Banking Payment Charge Api with saving bank.
-    func grailPayNewAccountSavingChargeApi() {
-        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")
-        
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
-        var params: [String: Any] = [
-            "account_id": self.newGrailPayAccountID ?? "",
-            "account_type": self.selectedNewGrailPayAccountType ?? "",
-            "name": self.selectedNewGrailPayAccountName ?? "",
-            "description": "payment checkout",
-            "customer_id": self.grailPayNewAccountCustomerID ?? "",
-            "save_account" : 1,
-            "is_default": 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 = txtFieldSelectDateNewGrailPayBankView?.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"] = txtFieldChosePlanNewGrailPayBankView.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 the delegate
+                                        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)
                                     }
                                 }
@@ -3069,34 +3395,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBAction func actionBtnNext(_ sender: UIButton) {
         // Check if billing info data exists and is valid JSON
         if let billingInfoData = request.billingInfoData {
-            DispatchQueue.global(qos: .userInitiated).async { [weak self] in
-                // Perform JSON parsing in a background thread
-                guard let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
-                      let jsonDict = json as? [String: Any], !jsonDict.isEmpty else {
-                    return
-                }
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
                 DispatchQueue.main.async {
-                    // Ensure UI updates happen on the main thread
-                    guard let self = self else { return }
-                    
                     if self.selectedPaymentMethod == "Card" {
-                        // Trim whitespace and newlines
                         let cardNumber = self.cardNumberTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                         let expiryDate = self.cardExpiryTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                         let cvv = self.cardCvvTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                         let cardName = self.cardNameTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
-                        
-                        // Remove spaces from card number for validation
+                        let email = self.txtFieldEmailCardView.text.trimmingCharacters(in: .whitespacesAndNewlines)
                         let sanitizedCardNumber = cardNumber.replacingOccurrences(of: " ", with: "")
-                        
-                        // Regular expression for expiry date format MM/yyyy
                         let expiryDateRegex = #"^(0[1-9]|1[0-2])\/\d{4}$"#
-                        
-                        // Regular expression for a valid name (only letters and spaces)
                         let nameRegex = #"^[A-Za-z\s]+$"#
                         
-                        // Validation checks
                         if cardNumber.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Number is required.")
                             return
@@ -3106,22 +3418,17 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         } else if expiryDate.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Expiry Date is required.")
                             return
-                        }
-                        else if !expiryDate.matches(expiryDateRegex) {
+                        } else if !expiryDate.matches(expiryDateRegex) {
                             self.showAlert(title: "Invalid Expiry Date", message: "Expiry Date must be in format MM/yyyy (e.g., 02/2026).")
-                            return
-                        }
-                        else {
-                            // Check if expiry date is past tomorrow
+                            return
+                        } else {
                             let dateFormatter = DateFormatter()
                             dateFormatter.dateFormat = "MM/yyyy"
                             dateFormatter.timeZone = TimeZone.current
                             if let expDate = dateFormatter.date(from: expiryDate) {
                                 let calendar = Calendar.current
-                                // Get start of the month following expiry
                                 let expiryMonthStart = calendar.date(from: calendar.dateComponents([.year, .month], from: expDate))!
                                 let endOfMonth = calendar.date(byAdding: DateComponents(month: 1, day: -1), to: expiryMonthStart)!
-                                
                                 let tomorrow = calendar.date(byAdding: .day, value: 1, to: Date())!
                                 if endOfMonth < tomorrow {
                                     self.showAlert(title: "Expired Card", message: "Card is expired or please enter a valid expiry date.")
@@ -3145,9 +3452,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         } else if !cardName.matches(nameRegex) {
                             self.showAlert(title: "Invalid Name", message: "Name must contain only letters and spaces.")
                             return
+                        } else if email.isEmpty {
+                            self.showAlert(title: "Missing Information", message: "Please enter an email address.")
+                            return
+                        } else if !self.isValidEmail(email) {
+                            self.showAlert(title: "Invalid Email", message: "Please enter a valid email address.")
+                            return
                         }
                         
-                        // Recurring Plan + Date Validation (only if is_recurring is true)
+                        // Recurring plan validation
                         if let req = self.request, req.is_recurring == true {
                             if self.txtFieldChosePlanCard.text.isEmpty {
                                 self.showAlert(title: "Missing Information", message: "Please choose your plan.")
@@ -3162,22 +3475,51 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                         }
                         
-                        // Proceed to BillingInfoVC
-                        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-                        vc.billingInfoData = jsonDict
-                        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
-                        self.navigationController?.pushViewController(vc, animated: true)
+                        // Redirect based on billing visibility
+                        if fieldSection.visibility.billing {
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            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.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.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)
+                        }
                     }
                     else if self.selectedPaymentMethod == "Bank" {
                         // Bank Case
+                        let email = self.txtFieldEmailAccountView.text.trimmingCharacters(in: .whitespacesAndNewlines)
+                        
                         if self.txtFieldAccountName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Bank account name is required.")
                             return
@@ -3204,6 +3546,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
                             return
                         }
+                        else if email.isEmpty {
+                            self.showAlert(title: "Missing Information", message: "Please enter an email address.")
+                            return
+                        } else if !self.isValidEmail(email) {
+                            self.showAlert(title: "Invalid Email", message: "Please enter a valid email address.")
+                            return
+                        }
+                        
                         else if !self.agreeTermsAndCondtition {
                             self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                             return
@@ -3224,24 +3574,59 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                         }
                         
-                        // Proceed to BillingInfoVC
-                        let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-                        vc.accountName = self.txtFieldAccountName.text
-                        vc.routingNumber = self.txtFieldRoutingNumber.text
-                        vc.accountType = self.txtFieldAccountType.text
-                        vc.accountNumber = self.txtFieldAccountNumber.text
-                        vc.billingInfoData = jsonDict
-                        vc.selectedPaymentMethod = self.selectedPaymentMethod
-                        vc.isSavedForFuture = self.isSavedForFuture
-                        vc.isFrom = "NormalBankPayWithoutSave"
-                        vc.chosenPlan = self.txtFieldSelectPlanViewBankFields.text
-                        vc.startDate = self.txtFieldSelectDateViewBankFields.text
-                        vc.request = self.request
-                        self.navigationController?.pushViewController(vc, animated: true)
+                        // Redirect based on billing visibility
+                        if fieldSection.visibility.billing {
+                            // Proceed to BillingInfoVC
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            vc.accountName = self.txtFieldAccountName.text
+                            vc.routingNumber = self.txtFieldRoutingNumber.text
+                            vc.accountType = self.txtFieldAccountType.text
+                            vc.accountNumber = self.txtFieldAccountNumber.text
+                            //  vc.billingInfoData = jsonDict
+                            vc.billingInfoData = billingInfoData
+                            vc.selectedPaymentMethod = self.selectedPaymentMethod
+                            vc.isSavedForFuture = self.isSavedForFuture
+                            vc.isFrom = "NormalBankPayWithoutSave"
+                            vc.chosenPlan = self.txtFieldSelectPlanViewBankFields.text
+                            vc.startDate = self.txtFieldSelectDateViewBankFields.text
+                            vc.request = self.request
+                            vc.userEmail = self.txtFieldEmailAccountView.text
+                            vc.amount = self.amount
+                            vc.billingInfo = fieldSection.billing
+                            vc.additionalInfo = fieldSection.additional
+                            vc.visibility = fieldSection.visibility
+                            vc.easyPayDelegate = self.easyPayDelegate
+                            self.navigationController?.pushViewController(vc, animated: true)
+                        }
+                        else {
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            vc.accountName = self.txtFieldAccountName.text
+                            vc.routingNumber = self.txtFieldRoutingNumber.text
+                            vc.accountType = self.txtFieldAccountType.text
+                            vc.accountNumber = self.txtFieldAccountNumber.text
+                            //  vc.billingInfoData = jsonDict
+                            vc.billingInfoData = billingInfoData
+                            vc.selectedPaymentMethod = self.selectedPaymentMethod
+                            vc.isSavedForFuture = self.isSavedForFuture
+                            vc.isFrom = "NormalBankPayWithoutSave"
+                            vc.chosenPlan = self.txtFieldSelectPlanViewBankFields.text
+                            vc.startDate = self.txtFieldSelectDateViewBankFields.text
+                            vc.request = self.request
+                            vc.userEmail = self.txtFieldEmailAccountView.text
+                            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)
+                        }
                     }
                 }
+            } catch {
+                print("Failed to decode billingInfoData: \(error.localizedDescription)")
             }
-        } else {
+        }
+        else {
             // Billing info is nil or empty
             if selectedPaymentMethod == "Card" {
                 /// Card Case
@@ -3251,6 +3636,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 let expiryDate = self.cardExpiryTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                 let cvv = self.cardCvvTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                 let cardName = self.cardNameTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
+                let email = self.txtFieldEmailCardView.text.trimmingCharacters(in: .whitespacesAndNewlines)
                 
                 // Remove spaces from card number for validation
                 let sanitizedCardNumber = cardNumber.replacingOccurrences(of: " ", with: "")
@@ -3272,7 +3658,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.showAlert(title: "Missing Information", message: "Card Expiry Date is required.")
                     return
                 }
-                
                 else if !expiryDate.matches(expiryDateRegex) {
                     self.showAlert(title: "Invalid Expiry Date", message: "Expiry Date must be in format MM/yyyy (e.g., 02/2026).")
                     return
@@ -3312,6 +3697,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.showAlert(title: "Invalid Name", message: "Name must contain only letters and spaces.")
                     return
                 }
+                else if email.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please enter an email address.")
+                    return
+                } else if !self.isValidEmail(email) {
+                    self.showAlert(title: "Invalid Email", message: "Please enter a valid email address.")
+                    return
+                }
                 
                 // Recurring Plan + Date Validation (only if is_recurring is true)
                 if let req = self.request, req.is_recurring == true {
@@ -3332,7 +3724,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if isSavedForFuture {
                     navigateCardDataToEmailVerificationVC()
                 } else {
-                    if request.enable3DS == true {
+                    if request.secureAuthentication == true {
                         threeDSecurePaymentApi()
                     }
                     else {
@@ -3342,6 +3734,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             else if selectedPaymentMethod == "Bank" {
                 // Bank Case
+                let email = self.txtFieldEmailAccountView.text.trimmingCharacters(in: .whitespacesAndNewlines)
+                
                 if txtFieldAccountName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Bank account name is required.")
                     return
@@ -3370,6 +3764,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
                     return
                 }
+                else if email.isEmpty {
+                    self.showAlert(title: "Missing Information", message: "Please enter an email address.")
+                    return
+                } else if !self.isValidEmail(email) {
+                    self.showAlert(title: "Invalid Email", message: "Please enter a valid email address.")
+                    return
+                }
                 else if !agreeTermsAndCondtition {
                     showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                     return
@@ -3452,10 +3853,23 @@ 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
+            //            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
+                self.viewBtnShowSavedCardTopCon.constant = 0
+            }
+            else {
+                self.viewBtnShowSavedCards.isHidden = false
+                self.lblBtnShowSaveCard.text = "Show Saved Cards"
+                self.viewBtnShowSavedCardHeight.constant = 50
+                self.viewBtnShowSavedCardTopCon.constant = 20
+            }
+            
             self.OTPView.isHidden = true
             self.emailView.isHidden = true
             self.viewCardFields.isHidden = false
@@ -3471,10 +3885,23 @@ 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
+            //            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
+                self.viewBtnShowSavedCardTopCon.constant = 0
+            }
+            else {
+                self.viewBtnShowSavedCards.isHidden = false
+                self.lblBtnShowSaveCard.text = "Show Saved Accounts"
+                self.viewBtnShowSavedCardHeight.constant = 50
+                self.viewBtnShowSavedCardTopCon.constant = 20
+            }
+            
             self.OTPView.isHidden = true
             self.emailView.isHidden = true
             self.viewCardFields.isHidden = true
@@ -3547,6 +3974,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         btnPayNowSingleAccountView.isHidden = !isSelectForPayBank
         
         if isSelectForPayBank {
+            selectedBankIndex = 0
             // Show or hide recurring plan fields based on request.enableRecurring
             if request?.is_recurring == true {
                 txtFieldSelectPlanSingleSavedBankView.isHidden = false
@@ -3560,6 +3988,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 txtFieldSelectDateSingleSavedBankView.isHidden = true
             }
         } else {
+            selectedBankIndex = nil
             // Hide all related fields if not selected
             btnNext.isHidden = true
             btnNextHeight.constant = 0
@@ -3616,42 +4045,80 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             grailPayAaccountChargeSingleSavedAccountApi()
         } else {
             // Check if billingInfoData is not nil or empty
-            if let billingInfoData = request.billingInfoData,
-               let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
-               let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
-                
-                // Recurring Plan + Date Validation (only if is_recurring is true)
-                if let req = self.request, req.is_recurring == true {
-                    if txtFieldSelectPlanSingleSavedBankView.text.isEmpty {
-                        self.showAlert(title: "Missing Information", message: "Please choose your plan.")
-                        return
-                    }
+            if let billingInfoData = request.billingInfoData {
+                do {
+                    let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                     
-                    if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                        if txtFieldSelectDateSingleSavedBankView.text.isEmpty {
-                            self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
-                            return
+                    DispatchQueue.main.async {
+                        
+                        if let billingInfoData = self.request.billingInfoData,
+                           let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
+                           let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
+                            
+                            // Recurring Plan + Date Validation (only if is_recurring is true)
+                            if let req = self.request, req.is_recurring == true {
+                                if self.txtFieldSelectPlanSingleSavedBankView.text.isEmpty {
+                                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                                    return
+                                }
+                                
+                                if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                                    if self.txtFieldSelectDateSingleSavedBankView.text.isEmpty {
+                                        self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                                        return
+                                    }
+                                }
+                            }
+                            
+                            // Check if the terms and conditions are agreed
+                            if !self.agreeTermsAndCondtition {
+                                self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
+                                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)
+                            }
                         }
                     }
                 }
-                
-                // Check if the terms and conditions are agreed
-                if !agreeTermsAndCondtition {
-                    showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
-                    return
+                catch {
+                    print("Failed to decode billingInfoData: \(error.localizedDescription)")
                 }
-                // 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 = selectedbankAccounts?.customer_id
-                vc.accountID = selectedbankAccounts?.account_id
-                vc.billingInfoData = jsonDict
-                vc.isFrom = "SavedBank"
-                vc.selectedPaymentMethod = "Bank"
-                vc.chosenPlan = self.txtFieldSelectPlanSingleSavedBankView.text
-                vc.startDate = self.txtFieldSelectDateSingleSavedBankView.text
-                vc.request = self.request
-                self.navigationController?.pushViewController(vc, animated: true)
             }
             else {
                 //If Billing info is nil or empty
@@ -3699,72 +4166,115 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction func actionBtnPayNowNewAccountView(_ sender: UIButton) {
         // Check if billingInfoData is not nil or empty
-        if let billingInfoData = request.billingInfoData,
-           let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
-           let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
-            print("Billing Info Data: \(jsonDict)")
-            
-            // Retrieve and trim text field values (removing leading and trailing whitespace)
-            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) ?? ""
-            let confirmAccountNumber = txtFieldConfirmAccountNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-            
-            // Check if any field is empty
-            if accountName.isEmpty || routingNumber.isEmpty || accountType.isEmpty || accountNumber.isEmpty || confirmAccountNumber.isEmpty {
-                let alert = UIAlertController(title: "Missing Information", message: "Please fill in all bank details.", preferredStyle: .alert)
-                alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
-                self.present(alert, animated: true, completion: nil)
-                return
-            }
-            
-            // Check if routing number is exactly 9 digits and numeric
-            if routingNumber.count != 9 || !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: routingNumber)) {
-                self.showAlert(title: "Invalid Routing Number", message: "Routing number is not correct. It must be exactly 9 digits.")
-                return
-            }
-            
-            // Check if account number and confirmation match
-            if accountNumber != confirmAccountNumber {
-                self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
-                return
-            }
-            
-            // Recurring Plan + Date Validation (only if is_recurring is true)
-            if let req = self.request, req.is_recurring == true {
-                if txtFieldSelectPlanNewAccountView.text.isEmpty {
-                    self.showAlert(title: "Missing Information", message: "Please choose your plan.")
-                    return
-                }
+        if let billingInfoData = request.billingInfoData {
+            do {
+                let fieldSection = try JSONDecoder().decode(FieldSection.self, from: billingInfoData)
                 
-                if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                    if txtFieldSelectDateNewAccountView.text.isEmpty {
-                        self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
-                        return
+                DispatchQueue.main.async {
+                    
+                    if let billingInfoData = self.request.billingInfoData,
+                       let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
+                       let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
+                        print("Billing Info Data: \(jsonDict)")
+                        
+                        // Retrieve and trim text field values (removing leading and trailing whitespace)
+                        let accountName = self.txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        let routingNumber = self.txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        let accountType = self.txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        let accountNumber = self.txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        let confirmAccountNumber = self.txtFieldConfirmAccountNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+                        
+                        // Check if any field is empty
+                        if accountName.isEmpty || routingNumber.isEmpty || accountType.isEmpty || accountNumber.isEmpty || confirmAccountNumber.isEmpty {
+                            let alert = UIAlertController(title: "Missing Information", message: "Please fill in all bank details.", preferredStyle: .alert)
+                            alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
+                            self.present(alert, animated: true, completion: nil)
+                            return
+                        }
+                        
+                        // Check if routing number is exactly 9 digits and numeric
+                        if routingNumber.count != 9 || !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: routingNumber)) {
+                            self.showAlert(title: "Invalid Routing Number", message: "Routing number is not correct. It must be exactly 9 digits.")
+                            return
+                        }
+                        
+                        // Check if account number and confirmation match
+                        if accountNumber != confirmAccountNumber {
+                            self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
+                            return
+                        }
+                        
+                        // Recurring Plan + Date Validation (only if is_recurring is true)
+                        if let req = self.request, req.is_recurring == true {
+                            if self.txtFieldSelectPlanNewAccountView.text.isEmpty {
+                                self.showAlert(title: "Missing Information", message: "Please choose your plan.")
+                                return
+                            }
+                            
+                            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+                                if self.txtFieldSelectDateNewAccountView.text.isEmpty {
+                                    self.showAlert(title: "Missing Information", message: "Please select a plan start date.")
+                                    return
+                                }
+                            }
+                        }
+                        
+                        // Determine the vc.isFrom value based on isSavedNewAccount
+                        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 vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
+                            vc.accountName = accountName
+                            vc.routingNumber = routingNumber
+                            vc.accountType = accountType
+                            vc.accountNumber = accountNumber
+                            vc.billingInfoData = billingInfoData
+                            vc.selectedPaymentMethod = "Bank"
+                            vc.isFrom = isFromValue
+                            vc.isSavedNewAccount = isSavedNewAccount
+                            vc.delegate = self
+                            vc.chosenPlan = self.txtFieldSelectPlanNewAccountView.text
+                            vc.startDate = self.txtFieldSelectDateNewAccountView.text
+                            vc.request = self.request
+                            vc.selectedPaymentMethod = self.selectedPaymentMethod
+                            vc.amount = self.amount
+                            vc.billingInfo = fieldSection.billing
+                            vc.additionalInfo = fieldSection.additional
+                            vc.visibility = fieldSection.visibility
+                            vc.easyPayDelegate = self.easyPayDelegate
+                            self.navigationController?.pushViewController(vc, animated: true)
+                        }
+                        else {
+                            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
+                            vc.accountName = accountName
+                            vc.routingNumber = routingNumber
+                            vc.accountType = accountType
+                            vc.accountNumber = accountNumber
+                            vc.billingInfoData = billingInfoData
+                            vc.selectedPaymentMethod = "Bank"
+                            vc.isFrom = isFromValue
+                            vc.isSavedNewAccount = isSavedNewAccount
+                            // vc.delegate = self
+                            vc.chosenPlan = self.txtFieldSelectPlanNewAccountView.text
+                            vc.startDate = self.txtFieldSelectDateNewAccountView.text
+                            vc.request = self.request
+                            vc.selectedPaymentMethod = self.selectedPaymentMethod
+                            vc.amount = self.amount
+                            vc.billingInfo = fieldSection.billing
+                            vc.additionalInfo = fieldSection.additional
+                            vc.visibility = fieldSection.visibility
+                            vc.easyPayDelegate = self.easyPayDelegate
+                            self.navigationController?.pushViewController(vc, animated: true)
+                        }
                     }
                 }
             }
-            
-            // Determine the vc.isFrom value based on isSavedNewAccount
-            let isSavedNewAccount = isSavedNewAccount
-            let isFromValue = isSavedNewAccount ? "AddNewAccountWithSave" : "AddNewAccountWithoutSave"
-            
-            // Proceed with the Pay Now action
-            let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-            vc.accountName = accountName
-            vc.routingNumber = routingNumber
-            vc.accountType = accountType
-            vc.accountNumber = accountNumber
-            vc.billingInfoData = jsonDict
-            vc.selectedPaymentMethod = "Bank"
-            vc.isFrom = isFromValue
-            vc.isSavedNewAccount = isSavedNewAccount
-            vc.delegate = self
-            vc.chosenPlan = self.txtFieldSelectPlanNewAccountView.text
-            vc.startDate = self.txtFieldSelectDateNewAccountView.text
-            vc.request = self.request
-            self.navigationController?.pushViewController(vc, animated: true)
+            catch {
+                print("Failed to decode billingInfoData: \(error.localizedDescription)")
+            }
         }
         else {
             //If Billing info is nil or empty
@@ -4479,6 +4989,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         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)
                                     }
                                 }
@@ -4536,24 +5072,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
         
-        ///OLD Params
-        //        // Prepare parameters
-        //        let email = UserStoreSingleton.shared.verificationEmail ?? ""
-        //        let namePart = email.split(separator: "@").first.map(String.init) ?? ""
-        //
-        //        var params: [String: Any] = [
-        //            "name": namePart,
-        //            "email": email,
-        //            "description": "TestDescription",
-        //            "currency": "usd",
-        //            "payment_method": "card",
-        //            "save_card": 0,
-        //            "customer": selectedCard?.customerId ?? "",
-        //            "card_id": selectedCard?.cardId ?? "",
-        //            "cvc": txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
-        //            "customer_id": selectedCard?.customerId ?? ""
-        //        ]
-        
         var params: [String: Any] = [
             "description": "payment checkout",
             "currency": "usd",
@@ -4631,6 +5149,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         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)
                                     }
                                 }
@@ -4849,6 +5393,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         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)
                                     }
                                 }
@@ -5382,7 +5951,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
-                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        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)
                                     }
                                 }
@@ -5514,7 +6108,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
-                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        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)
                                     }
                                 }
@@ -5656,7 +6275,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
-                                        paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        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)
                                     }
                                 }
@@ -5809,6 +6453,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.chargeData = responseObject
                                         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)
                                     }
                                 }
@@ -6196,6 +6865,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             params["interval"] = txtFieldChosePlanCard.text.lowercased()
         }
         
+        print(params)
+        
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             uRLRequest.httpBody = jsonData
@@ -6243,7 +6914,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         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)
                                     }
                                 }
@@ -6453,7 +7148,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         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)
                                     }
                                 }
@@ -6580,10 +7299,23 @@ 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
+                //                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
+                    self.viewBtnShowSavedCardTopCon.constant = 0
+                }
+                else {
+                    self.viewBtnShowSavedCards.isHidden = false
+                    self.lblBtnShowSaveCard.text = "Show Saved Cards"
+                    self.viewBtnShowSavedCardHeight.constant = 50
+                    self.viewBtnShowSavedCardTopCon.constant = 20
+                }
+                
                 self.btnShowSavedCard.isHidden = false
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
@@ -6653,10 +7385,23 @@ 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
+                //                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
+                    self.viewBtnShowSavedCardTopCon.constant = 0
+                }
+                else {
+                    self.viewBtnShowSavedCards.isHidden = false
+                    self.lblBtnShowSaveCard.text = "Show Saved Cards"
+                    self.viewBtnShowSavedCardHeight.constant = 50
+                    self.viewBtnShowSavedCardTopCon.constant = 20
+                }
+                
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
                 self.viewCardFields.isHidden = true
@@ -7465,6 +8210,13 @@ extension PaymentInfoVC: UITextFieldDelegate {
             } else {
                 viewTxtFieldNameOnCard.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
             }
+        } else if textField == txtFieldEmailCardView.textField {
+            if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
+               let uiColor = UIColor(hex: primaryBtnFontColor) {
+                viewTxtFieldEmailCardView.layer.borderColor = uiColor.cgColor
+            } else {
+                viewTxtFieldEmailCardView.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
+            }
         }
         else if textField == txtFieldEmail {
             if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -7582,6 +8334,14 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewTextFieldConfirmAccount.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
             }
         }
+        else if textField == txtFieldEmailAccountView.textField {
+            if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
+               let uiColor = UIColor(hex: primaryBtnFontColor) {
+                viewTxtFieldEmailAccountView.layer.borderColor = uiColor.cgColor
+            } else {
+                viewTxtFieldEmailAccountView.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
+            }
+        }
         //New Bank Account View
         else if textField == txtFieldAccountNameNewAccountView {
             if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -7658,6 +8418,14 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewTxtFieldNameOnCard.layer.borderColor = UIColor.systemGray.cgColor
             }
         }
+        else if textField == txtFieldEmailCardView.textField {
+            if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,
+               let borderColor = UIColor(hex: bodyBackgroundColor) {
+                viewTxtFieldEmailCardView.layer.borderColor = borderColor.cgColor
+            } else {
+                viewTxtFieldEmailCardView.layer.borderColor = UIColor.systemGray.cgColor
+            }
+        }
         else if textField == txtFieldEmail {
             if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,
                let borderColor = UIColor(hex: bodyBackgroundColor) {
@@ -7773,6 +8541,14 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewTextFieldConfirmAccount.layer.borderColor = UIColor.systemGray.cgColor
             }
         }
+        else if textField == txtFieldEmailAccountView.textField {
+            if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,
+               let borderColor = UIColor(hex: bodyBackgroundColor) {
+                viewTxtFieldEmailAccountView.layer.borderColor = borderColor.cgColor
+            } else {
+                viewTxtFieldEmailAccountView.layer.borderColor = UIColor.systemGray.cgColor
+            }
+        }
         //New Bank Account View
         else if textField == txtFieldAccountNameNewAccountView {
             if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,