@jimrising/easymerchantsdk-react-native 1.3.1 → 1.3.3

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

@@ -6,12 +6,18 @@
 //
 
 import UIKit
+//import BlinkCard
 
 struct PaymentsData {
     var name = String()
     var image = String()
 }
 
+enum GrailPaySource {
+    case existingAccount
+    case newAccount
+}
+
 let easymerchantsdk = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle)
 
 class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
@@ -155,6 +161,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var viewAccountType: UIView!
     @IBOutlet weak var tblViewAccountTypes: UITableView!
     @IBOutlet weak var btnCheckSavedAccountForFuture: UIButton!
+    @IBOutlet weak var txtFieldConfirmBankAccount: UITextField!
+    @IBOutlet weak var viewTextFieldConfirmAccount: UIView!
     
     //GrailPay
     @IBOutlet weak var grailPayBankLinkView: UIView!
@@ -173,6 +181,26 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var imgGrailPayAbandonError: UIImageView!
     @IBOutlet weak var lblGrailPayAabandonError: UILabel!
     
+    //New GrailPay Account
+    @IBOutlet weak var viewAddNewGrailPayAccount: UIView!
+    @IBOutlet weak var lblGrailPayNewAccount: UILabel!
+    @IBOutlet weak var subLblGrailPayNewAccount: UILabel!
+    @IBOutlet weak var btnCloseGrailPayNewAccountView: UIButton!
+    @IBOutlet weak var btnLinkGrailPayAddNewAccount: FilledButton!
+    @IBOutlet weak var viewAbandonGrailPayNewAccountView: UIView!
+    @IBOutlet weak var lblAbandonGrailPayNewAccountView: UILabel!
+    @IBOutlet weak var grailPayNewSavedAccountView: UIStackView!
+    @IBOutlet weak var viewGrailPayNewAccountDetail: UIView!
+    @IBOutlet weak var btnSelectGrailPayNewAccount: UIButton!
+    @IBOutlet weak var lblGrailPayNewAccountNumber: UILabel!
+    @IBOutlet weak var lblGrailPayNewAccountType: UILabel!
+    @IBOutlet weak var btnCheckBoxGrailPayNewAccountSaveAccount: UIButton!
+    @IBOutlet weak var lblGrailPayNewAccountSaveForFuture: UILabel!
+    @IBOutlet weak var btnCheckBoxGrailPayNewAccountTerms: UIButton!
+    @IBOutlet weak var lblIagreeGrailPayNewAccountView: UILabel!
+    @IBOutlet weak var lblTermsAndConditionNewGrailPayAccountView: UILabel!
+    @IBOutlet weak var btnChangeNewGrailPayAccountView: UIButton!
+    
     //SavedBank
     @IBOutlet weak var viewSingleSavedAccount: UIView!
     @IBOutlet weak var viewTermAndConditionsSingleAccountView: UIStackView!
@@ -183,7 +211,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var lblAccountNumberSingleAccountView: UILabel!
     @IBOutlet weak var lblAccountTypeSingleAccountView: UILabel!
     @IBOutlet weak var btnPayNowSingleAccountView: FilledButton!
-    @IBOutlet weak var viewSingleAccountViewHeight: NSLayoutConstraint!
+    //    @IBOutlet weak var viewSingleAccountViewHeight: NSLayoutConstraint!
     @IBOutlet weak var viewChangedAccount: UIView!
     @IBOutlet weak var tblViewSavedBankAccounts: UITableView!
     @IBOutlet weak var tblViewSavedBankAccountsHeight: NSLayoutConstraint!
@@ -206,6 +234,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var tblViewAccountTypeNewAccountView: UITableView!
     @IBOutlet weak var btnPayNowNewAccountView: FilledButton!
     @IBOutlet weak var lblSavedNewAccountForFuture: UILabel!
+    @IBOutlet weak var txtFieldConfirmAccountNewAccountView: UITextField!
+    @IBOutlet weak var viewTxtFieldConfirmNewAccountView: UIView!
     
     //Crypto
     @IBOutlet weak var viewCrypto: UIView!
@@ -276,7 +306,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     var selectedBank: BankAccountModel?
     var isSelectForPayBank: Bool = false
     var selectedBankIndex: Int? = nil
-    var arrAccountType = ["Saving","Current"]
+    var arrAccountType = ["Saving", "Checking"]
     
     var agreeTermsAndCondtition: Bool = false
     
@@ -305,6 +335,24 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     var isBankAccountConnected = false
     var defaultBankAccountID: String?
     
+    var isNewBankAccountConnected = false
+    var defaultNewBankAccountID: String?
+    
+    var isSavedNewGrailPayAccount: Bool = false
+    
+    var grailPaySource: GrailPaySource?
+    
+    //GrailPay Params
+    var grailPayAccountID: String?
+    var selectedGrailPayAccountType: String?
+    var selectedGrailPayAccountName: String?
+    
+    //New GrailPay Account Params
+    var newGrailPayAccountID: String?
+    var selectedNewGrailPayAccountType: String?
+    var selectedNewGrailPayAccountName: String?
+    var grailPayNewAccountCustomerID: String?
+    
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -422,6 +470,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         setUpTermAndConditionsButton()
         setUpTermAndConditionsForSingleSavedAccountButton()
         setUpTermAndConditionsForGrailPaySavedAccountButton()
+        setUpTermAndConditionsForGrailPayNewAccountButton()
         
         settingsView.clipsToBounds = false
         settingsView.layer.shadowColor = UIColor.black.cgColor
@@ -469,7 +518,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func viewAppearanceOn() {
         viewTermAndConditionsSingleAccountView.isHidden = true
         btnPayNowSingleAccountView.isHidden = true
-        viewSingleAccountViewHeight.constant = 68
+        //  viewSingleAccountViewHeight.constant = 68
         
         viewNewBankAccount.isHidden = true
         
@@ -479,8 +528,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         self.viewCrypto.isHidden = true
         
+        //        self.viewAddNewGrailPayAccount.isHidden = true
+        //        self.viewAbandonGrailPayNewAccountView.isHidden = true
+        
         if selectedPaymentMethod == "Card" {
             self.grailPayBankLinkView.isHidden = true
+            
+            self.viewAddNewGrailPayAccount.isHidden = true
+            self.viewAbandonGrailPayNewAccountView.isHidden = true
+            
             if UserStoreSingleton.shared.isLoggedIn == true {
                 if UserStoreSingleton.shared.customerId == nil {
                     self.OTPView.isHidden = true
@@ -589,30 +645,41 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if self.isSelectForPayBank {
                     self.viewTermAndConditionsSingleAccountView.isHidden = false
                     self.btnPayNowSingleAccountView.isHidden = false
-                    self.viewSingleAccountViewHeight.constant = 170
+                    //  self.viewSingleAccountViewHeight.constant = 170
                 } else {
                     self.viewTermAndConditionsSingleAccountView.isHidden = true
                     self.btnPayNowSingleAccountView.isHidden = true
-                    self.viewSingleAccountViewHeight.constant =  68
+                    //   self.viewSingleAccountViewHeight.constant =  68
                     self.btnNext.isHidden = true
                     self.btnNextHeight.constant = 0
                     self.btnNextTopCon.constant = 0
                 }
                 
                 if request?.authenticatedACH == true {
-                    self.viewBankFields.isHidden = true
-                    self.viewTermsAndConditions.isHidden = true
-                    self.grailPayBankLinkView.isHidden = false
-                    self.btnNext.isHidden = true
-                    self.btnNextHeight.constant = 0
-                    self.btnNextTopCon.constant = 0
-                    self.viewGrailPayAbandon.isHidden = true
-                    
-                    if isBankAccountConnected {
-                        self.viewBtnShowSavedCards.isHidden = true
-                        self.btnShowSavedCard.isHidden = true
-                        self.viewBtnShowSavedCardHeight.constant = 0
-                        self.viewBtnShowSavedCardTopCon.constant = 0
+                    if isSavedNewGrailPayAccount == true {
+                        updateUIForNewGrailPayAccount()
+                    } else {
+                        self.viewBankFields.isHidden = true
+                        self.viewTermsAndConditions.isHidden = true
+                        
+                        if self.grailPaySource == .existingAccount {
+                            self.grailPayBankLinkView.isHidden = false
+                        } else if self.grailPaySource == .newAccount {
+                            self.grailPayBankLinkView.isHidden = true
+                            self.viewSingleSavedAccount.isHidden = true
+                        }
+                        //                        self.grailPayBankLinkView.isHidden = false
+                        self.btnNext.isHidden = true
+                        self.btnNextHeight.constant = 0
+                        self.btnNextTopCon.constant = 0
+                        self.viewGrailPayAbandon.isHidden = true
+                        
+                        if isBankAccountConnected {
+                            self.viewBtnShowSavedCards.isHidden = true
+                            self.btnShowSavedCard.isHidden = true
+                            self.viewBtnShowSavedCardHeight.constant = 0
+                            self.viewBtnShowSavedCardTopCon.constant = 0
+                        }
                     }
                 }
                 else {
@@ -649,7 +716,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 } else {
                     self.viewBankFields.isHidden = true
                     self.viewTermsAndConditions.isHidden = true
-                    self.grailPayBankLinkView.isHidden = false
+                    
+                    if self.grailPaySource == .existingAccount {
+                        self.grailPayBankLinkView.isHidden = false
+                    } else if self.grailPaySource == .newAccount {
+                        self.grailPayBankLinkView.isHidden = true
+                        self.viewSingleSavedAccount.isHidden = true
+                    }
+                    //  self.grailPayBankLinkView.isHidden = false
                     self.btnNext.isHidden = true
                     self.btnNextHeight.constant = 0
                     self.btnNextTopCon.constant = 0
@@ -682,6 +756,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             viewSingelBankAccount.backgroundColor = uiColor
             viewGrailPaySavedAccount.backgroundColor = uiColor
             viewGrailPayAbandon.backgroundColor = uiColor
+            settingsView.backgroundColor = uiColor
+            viewAbandonGrailPayNewAccountView.backgroundColor = uiColor
+            viewGrailPayNewAccountDetail.backgroundColor = uiColor
         }
         
         if let primaryBtnBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -691,6 +768,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnResendOTP.tintColor = uiColor
             btnSelectSingleSavedCard.tintColor = uiColor
             btnChangeSavedCard.tintColor = uiColor
+            btnChangeNewGrailPayAccountView.tintColor = uiColor
             btnSelectUpdateCardView.tintColor = uiColor
             btnCheckSavedAccountForFuture.tintColor = uiColor
             btnAgreeTermsConditions.tintColor = uiColor
@@ -708,6 +786,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnCheckBoxGrailPayAgreeTerms.tintColor = uiColor
             lblGrailPayTermsAndCondition.textColor = uiColor
             lblGrailPayAabandonError.textColor = uiColor
+            btnSelectGrailPayNewAccount.tintColor = uiColor
+            btnCheckBoxGrailPayNewAccountSaveAccount.tintColor = uiColor
+            btnCheckBoxGrailPayNewAccountTerms.tintColor = uiColor
+            lblAbandonGrailPayNewAccountView.textColor = uiColor
+            lblTermsAndConditionNewGrailPayAccountView.textColor = uiColor
             
             btnScanCard.tintColor = uiColor  // Set color for the image
             btnScanCard.setTitleColor(uiColor, for: .normal)  // Set color for the text
@@ -727,6 +810,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             txtFieldAccountType.tintColor = uiColor
             txtFieldAccountNumber.tintColor = uiColor
             txtFieldRoutingNumber.tintColor = uiColor
+            txtFieldConfirmBankAccount.tintColor = uiColor
             txtFieldCVVNewCardView.tintColor = uiColor
             txtFieldCVVUpdateCardView.tintColor = uiColor
             txtFieldCVVSingleSavedCard.tintColor = uiColor
@@ -743,6 +827,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             cardExpiryTextField.tintColor = uiColor
             cardCvvTextField.tintColor = uiColor
             cardNameTextField.tintColor = uiColor
+            txtFieldConfirmAccountNewAccountView.tintColor = uiColor
         }
         
         if let secondaryBtnBackgroundColor = UserStoreSingleton.shared.primary_btn_font_col,
@@ -820,11 +905,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnSettings.tintColor = placeholderColor
             lblGrailPaySaveAccountForFuture.textColor = placeholderColor
             lblGrailPayAgreeTo.textColor = placeholderColor
+            lblGrailPayNewAccountSaveForFuture.textColor = placeholderColor
+            lblIagreeGrailPayNewAccountView.textColor = placeholderColor
         }
         
         if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
            let uiColor = UIColor(hex: primaryFontColor) {
             lblChosePaymentMethod.textColor = uiColor
+            lblGrailPayNewAccount.tintColor = uiColor
+            subLblGrailPayNewAccount.textColor = uiColor
             lblSavedInfoEmailView.textColor = uiColor
             subLblSavedEmailInfo.textColor = uiColor
             lblSavedInfoOTPView.textColor = uiColor
@@ -852,8 +941,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             lblSetting.textColor = uiColor
             btnChangeLanguage.tintColor = uiColor
             btnLogout.tintColor = uiColor
-            lblGrailPaySavedAccountNumber.tintColor = uiColor
-            lblGrailPaySavedAccountType.tintColor = uiColor
+            lblGrailPaySavedAccountNumber.textColor = uiColor
+            lblGrailPaySavedAccountType.textColor = uiColor
+            lblGrailPayNewAccountNumber.textColor = uiColor
+            lblGrailPayNewAccountType.textColor = uiColor
             
             txtFieldEmail.textColor = uiColor
             txtFieldOTPText1.textColor = uiColor
@@ -937,6 +1028,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             lblGrailPayTermsAndCondition.font = UIFont.systemFont(ofSize: fontSize)
             lblGrailPayAgreeTo.font = UIFont.systemFont(ofSize: fontSize)
             lblGrailPaySaveAccountForFuture.font = UIFont.systemFont(ofSize: fontSize)
+            lblIagreeGrailPayNewAccountView.font = UIFont.systemFont(ofSize: fontSize)
+            lblGrailPayNewAccountSaveForFuture.font = UIFont.systemFont(ofSize: fontSize)
+            lblTermsAndConditionNewGrailPayAccountView.font = UIFont.systemFont(ofSize: fontSize)
+            subLblGrailPayNewAccount.font = UIFont.systemFont(ofSize: fontSize)
+            lblAbandonGrailPayNewAccountView.font = UIFont.systemFont(ofSize: fontSize)
+            lblGrailPayNewAccountNumber.font = UIFont.systemFont(ofSize: fontSize)
+            lblGrailPayNewAccountType.font = UIFont.systemFont(ofSize: fontSize)
+            
             lblGrailPaySavedAccountType.font = UIFont.systemFont(ofSize: fontSize)
             lblGrailPaySavedAccountNumber.font = UIFont.systemFont(ofSize: fontSize)
             
@@ -984,6 +1083,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         txtFieldRoutingNumberNewAccountView.delegate = self
         txtFieldAccountTypeNewAccountView.delegate = self
         txtFieldAccountNumber.delegate = self
+        txtFieldConfirmBankAccount.delegate = self
     }
     
     private func updateSaveButtons() {
@@ -1071,11 +1171,39 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         lblGrailPayTermsAndCondition.attributedText = attributedString
         lblGrailPayTermsAndCondition.isUserInteractionEnabled = true
         // Add tap gesture recognizer
-        let tap = UITapGestureRecognizer(target: self, action: #selector(aboutTermsAndGrailPayConditions))
+        let tap = UITapGestureRecognizer(target: self, action: #selector(aboutTermsGrailPayConditions))
         lblGrailPayTermsAndCondition.addGestureRecognizer(tap)
     }
     
-    @objc func aboutTermsAndGrailPayConditions(sender: UITapGestureRecognizer) {
+    @objc func aboutTermsGrailPayConditions(sender: UITapGestureRecognizer) {
+        guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
+            print("Error: Could not find TermAndConditionsVC in easymerchantsdk storyboard.")
+            return
+        }
+        vc.modalPresentationStyle = .overFullScreen
+        present(vc, animated: true, completion: nil)
+    }
+    
+    //MARK: - Term & Conditions setup for GrailPay saved bank account view
+    func setUpTermAndConditionsForGrailPayNewAccountButton() {
+        let string = "TERMS & CONDITIONS"
+        let attributedString = NSMutableAttributedString(string: string)
+        
+        attributedString.addAttribute(
+            .font,
+            value: UIFont.systemFont(ofSize: 12, weight: .medium),
+            range: NSRange(location: 0, length: string.count)
+        )
+        
+        // Assign the attributed string to the label
+        lblTermsAndConditionNewGrailPayAccountView.attributedText = attributedString
+        lblTermsAndConditionNewGrailPayAccountView.isUserInteractionEnabled = true
+        // Add tap gesture recognizer
+        let tap = UITapGestureRecognizer(target: self, action: #selector(aboutTermsGrailPayNewAccountConditions))
+        lblTermsAndConditionNewGrailPayAccountView.addGestureRecognizer(tap)
+    }
+    
+    @objc func aboutTermsGrailPayNewAccountConditions(sender: UITapGestureRecognizer) {
         guard let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "TermAndConditionsVC") as? TermAndConditionsVC else {
             print("Error: Could not find TermAndConditionsVC in easymerchantsdk storyboard.")
             return
@@ -1538,72 +1666,41 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnGrailPayCheckBoxSaveAccountForFuture(_ sender: UIButton) {
-        
+        isSavedForFuture.toggle()
+        // Change the image based on the state
+        let imageName = isSavedForFuture ? "checkmark.square.fill" : "square"
+        btnCheckBoxGrailPaySaveAccount.setImage(UIImage(systemName: imageName), for: .normal)
     }
     
     @IBAction func actionBtnGrailPayCheckAgreeTerms(_ sender: UIButton) {
-        
+        agreeTermsAndCondtition.toggle()
+        // Change the image based on the state
+        let imageName = agreeTermsAndCondtition ? "checkmark.square.fill" : "square"
+        btnCheckBoxGrailPayAgreeTerms.setImage(UIImage(systemName: imageName), for: .normal)
     }
     
-    @IBAction private func actionBtnLinkGrailPayBankAccount(_ sender: UIButton) {
-        if isBankAccountConnected {
-            print("Proceed with bank-connected actions.")
-        } else {
-            guard let grailPayParams = request.grailPayParams else {
-                print("GrailPay parameters not available in request")
-                return
-            }
-            
-            GrailPayHelper.presentGrailPay(from: self, request: grailPayParams) { [weak self] result in
-                guard let self = self else { return }
-                
-                switch result.type {
-                case .success:
-                    print("📦 Raw chargeData type: \(type(of: result.chargeData)) — value: \(String(describing: result.chargeData))")
-                    
-                    // Safely unwrap the chargeData dictionary
-                    if let chargeData = result.chargeData,
-                       let dataArray = chargeData["data"] as? [[String: Any]],
-                       let firstAccount = dataArray.first {
-                        
-                        print("✅ Bank connected: \(firstAccount)")
-                        // 🚀 Call Account Connect API
-                        self.accountConnectApi(account: firstAccount)
-                        // ✅ Optional UI updates
-                        self.lblGrailPayAabandonError.text = "Default account successfully set"
-                        self.viewGrailPayAbandon.isHidden = false
-                        
-                        if selectedPaymentMethod == "Bank" {
-                            self.viewBtnShowSavedCards.isHidden = true
-                        }
-                        
-                        let amountText = String(format: "$%.2f", request.amount)
-                        let submitText = request.submitButtonText
-                        
-                        let defaultTitle = (submitText?.isEmpty == false)
-                        ? "\(submitText!) (\(amountText))"
-                        : "Pay Now (\(amountText))"
-                        
-                        btnLinkBankAccount.setTitle(defaultTitle, for: .normal)
-                    } else {
-                        print("⚠️ chargeData does not contain valid account data")
-                        self.lblGrailPayAabandonError.text = "Failed to retrieve account info"
-                        self.lblGrailPayAabandonError.textColor = .systemRed
-                        self.viewGrailPayAbandon.isHidden = false
-                    }
-                case .cancelled:
-                    print("⚠️ GrailPay cancelled")
-                    self.viewGrailPayAbandon.isHidden = false
-                    self.lblGrailPayAabandonError.text = "User has abandoned the action"
-                case .error:
-                    if let error = result.error {
-                        print("❌ GrailPay error: \(error.localizedDescription)")
-                    } else {
-                        print("❌ GrailPay unknown error")
-                    }
-                }
-            }
-        }
+    @IBAction func actionBtnChangeGrailPayNewAccount(_ sender: UIButton) {
+        self.viewChangedAccount.isHidden = false
+        self.viewAddNewGrailPayAccount.isHidden = true
+    }
+    
+    @IBAction func actionBtnCheckBoxGrailPayNewAccountSavedForFuture(_ sender: UIButton) {
+        isSavedForFuture.toggle()
+        // Change the image based on the state
+        let imageName = isSavedForFuture ? "checkmark.square.fill" : "square"
+        btnCheckBoxGrailPayNewAccountSaveAccount.setImage(UIImage(systemName: imageName), for: .normal)
+    }
+    
+    @IBAction func actionBtnCheckBoxTermsGrailPayNewAccount(_ sender: UIButton) {
+        agreeTermsAndCondtition.toggle()
+        // Change the image based on the state
+        let imageName = agreeTermsAndCondtition ? "checkmark.square.fill" : "square"
+        btnCheckBoxGrailPayNewAccountTerms.setImage(UIImage(systemName: imageName), for: .normal)
+    }
+    
+    @IBAction func actionBtnCloseGrailPayNewAccountView(_ sender: UIButton) {
+        self.viewAddNewGrailPayAccount.isHidden = true
+        self.viewSingleSavedAccount.isHidden = false
     }
     
     //MARK: - Account Connect Api
@@ -1686,9 +1783,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if let status = responseObject["status"] as? Int, status == 1 {
                             self.isBankAccountConnected = true
                             self.defaultBankAccountID = responseObject["default_account"] as? String
+                            self.grailPayAccountID = responseObject["account_id"] as? String
                         } else {
                             self.isBankAccountConnected = false
                             self.defaultBankAccountID = nil
+                            self.grailPayAccountID = nil
                         }
                         
                         DispatchQueue.main.async {
@@ -1723,14 +1822,693 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     else {
                         print("❌ Invalid JSON format")
                     }
-                } catch {
-                    print("❌ JSON Parsing Error: \(error)")
+                } catch {
+                    print("❌ JSON Parsing Error: \(error)")
+                }
+            } else {
+                print("❌ HTTP Status Code: \(httpResponse.statusCode)")
+            }
+        }
+        
+        task.resume()
+    }
+    
+    //MARK: - Account Connect Api New GrailPay Account Add
+    func newGrailPayAccountConnectApi(account: [String: Any]) {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.accountConnect.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "POST"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
+        // Save customer_id for use in charge API
+        let customerID = UserStoreSingleton.shared.customerId ?? ""
+        self.grailPayNewAccountCustomerID = customerID
+        
+        // Prepare parameters
+        let params: [String: Any] = [
+            "account_uuid": account["account_uuid"] ?? "",
+            "user_uuid": account["user_uuid"] ?? "",
+            "aggregator_type": account["aggregator_type"] ?? "bank_link",
+            "vendor_id": account["vendor_id"] ?? "",
+            "created_at": account["created_at"] ?? "",
+            "updated_at": account["updated_at"] ?? "",
+            "account_id": account["account_id"] ?? "",
+            "account_number": account["account_number"] ?? "",
+            "provider_name": account["provider_name"] ?? "",
+            "routing_number": account["routing_number"] ?? "",
+            "name": account["name"] ?? "",
+            "account_type": account["account_type"] ?? "",
+            "account_status": account["account_status"] ?? "",
+            "customer_id": customerID // add if needed
+        ]
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.httpBody = jsonData
+            
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("🔍 JSON Payload:\n\(jsonString)")
+            }
+        } catch {
+            print("❌ JSON Serialization Error: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+            DispatchQueue.main.async { self.hideLoadingIndicator() }
+            
+            if let error = error {
+                print("❌ Request Error: \(error.localizedDescription)")
+                return
+            }
+            
+            guard let httpResponse = response as? HTTPURLResponse else {
+                print("❌ Invalid response")
+                return
+            }
+            
+            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+                guard let data = data else {
+                    print("❌ No data received")
+                    return
+                }
+                
+                do {
+                    if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                        print("✅ Account Connected Successfully: \(responseObject)")
+                        
+                        if let status = responseObject["status"] as? Int, status == 1 {
+                            DispatchQueue.main.async {
+                                self.isNewBankAccountConnected = true
+                                self.defaultNewBankAccountID = responseObject["default_account"] as? String
+                                self.newGrailPayAccountID = responseObject["account_id"] as? String
+                                self.isSavedNewGrailPayAccount = true
+                                self.updateUIForNewGrailPayAccount()
+                            }
+                        }
+                        else {
+                            self.isNewBankAccountConnected = false
+                            self.defaultNewBankAccountID = nil
+                            self.newGrailPayAccountID = nil
+                        }
+                        
+                        DispatchQueue.main.async {
+                            // ✅ Show saved bank UI
+                            self.grailPayNewSavedAccountView.isHidden = false
+                            self.viewGrailPayNewAccountDetail.isHidden = false
+                            
+                            if let accountNumber = account["account_number"] as? String {
+                                let last4 = String(accountNumber.suffix(4))
+                                self.lblGrailPayNewAccountNumber.text = "****\(last4)"
+                            } else {
+                                self.lblGrailPayNewAccountNumber.text = "****----" // Default/fallback text
+                            }
+                            
+                            // ✅ Set account type
+                            if let accountType = account["account_type"] as? String {
+                                self.lblGrailPayNewAccountType.text = "Type: \(accountType.capitalized)"
+                            }
+                            
+                            // ✅ Optionally hide abandon view if visible
+                            self.viewAbandonGrailPayNewAccountView.isHidden = true
+                            
+                            if self.selectedPaymentMethod == "Bank" {
+                                self.viewBtnShowSavedCards.isHidden = true
+                                self.btnShowSavedCard.isHidden = true
+                                self.viewBtnShowSavedCardHeight.constant = 0
+                                self.viewBtnShowSavedCardTopCon.constant = 0
+                            }
+                        }
+                    }
+                    
+                    else {
+                        print("❌ Invalid JSON format")
+                    }
+                } catch {
+                    print("❌ JSON Parsing Error: \(error)")
+                }
+            } else {
+                print("❌ HTTP Status Code: \(httpResponse.statusCode)")
+            }
+        }
+        
+        task.resume()
+    }
+    
+    @IBAction private func actionBtnLinkGrailPayBankAccount(_ sender: UIButton) {
+        if isBankAccountConnected {
+            guard agreeTermsAndCondtition else {
+                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)
+            } else {
+                // Proceed to call API if not saving for future
+                grailPayAccountChargeApi()
+            }
+        } else {
+            grailPaySource = .existingAccount
+            launchGrailPay()
+        }
+    }
+    
+    @IBAction func actionLinkNewGrailPayAccount(_ sender: UIButton) {
+        if isNewBankAccountConnected {
+            guard agreeTermsAndCondtition else {
+                self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
+                return
+            }
+            
+            if isSavedForFuture {
+                grailPayNewAccountSavingChargeApi()
+            }
+            else {
+                grailPayNewAccountChargeApi()
+            }
+        } else {
+            grailPaySource = .newAccount
+            launchGrailPay()
+        }
+    }
+    
+    func launchGrailPay() {
+        guard let grailPayParams = request.grailPayParams else {
+            print("GrailPay parameters not available in request")
+            return
+        }
+        
+        GrailPayHelper.presentGrailPay(from: self, request: grailPayParams) { [weak self] result in
+            guard let self = self else { return }
+            
+            switch result.type {
+            case .success:
+                if let chargeData = result.chargeData,
+                   let dataArray = chargeData["data"] as? [[String: Any]],
+                   let firstAccount = dataArray.first {
+                    
+                    print("✅ Bank connected: \(firstAccount)")
+                    self.selectedGrailPayAccountType = firstAccount["account_type"] as? String
+                    self.selectedGrailPayAccountName = firstAccount["name"] as? String
+                    
+                    if self.grailPaySource == .existingAccount {
+                        self.accountConnectApi(account: firstAccount)
+                        self.lblGrailPayAabandonError.text = "Default account successfully set"
+                        self.viewGrailPayAbandon.isHidden = false
+                    } else if self.grailPaySource == .newAccount {
+                        self.newGrailPayAccountConnectApi(account: firstAccount)
+                        self.lblAbandonGrailPayNewAccountView.text = "Default account successfully set"
+                        self.viewAbandonGrailPayNewAccountView.isHidden = false
+                        
+                        self.selectedNewGrailPayAccountType = firstAccount["account_type"] as? String
+                        self.selectedNewGrailPayAccountName = firstAccount["name"] as? String
+                    }
+                    
+                    if self.selectedPaymentMethod == "Bank" {
+                        self.viewBtnShowSavedCards.isHidden = true
+                    }
+                    
+                    let amountText = String(format: "$%.2f", self.request.amount)
+                    let submitText = self.request.submitButtonText
+                    let defaultTitle = (submitText?.isEmpty == false)
+                    ? "\(submitText!) (\(amountText))"
+                    : "Pay Now (\(amountText))"
+                    
+                    if self.grailPaySource == .existingAccount {
+                        self.btnLinkBankAccount.setTitle(defaultTitle, for: .normal)
+                    } else if self.grailPaySource == .newAccount {
+                        self.btnLinkGrailPayAddNewAccount.setTitle(defaultTitle, for: .normal)
+                    }
+                    
+                } else {
+                    print("⚠️ chargeData does not contain valid account data")
+                    self.showGrailPayError(message: "Failed to retrieve account info")
+                }
+                
+            case .cancelled:
+                print("⚠️ GrailPay cancelled")
+                self.showGrailPayError(message: "User has abandoned the action")
+                
+            case .error:
+                let errorMsg = result.error?.localizedDescription ?? "Unknown error"
+                print("❌ GrailPay error: \(errorMsg)")
+                self.showGrailPayError(message: errorMsg)
+            }
+        }
+    }
+    
+    func updateUIForNewGrailPayAccount() {
+        self.viewAddNewGrailPayAccount.isHidden = false
+        self.viewAbandonGrailPayNewAccountView.isHidden = false
+        self.viewSingleSavedAccount.isHidden = true
+        self.grailPayBankLinkView.isHidden = true
+    }
+    
+    func showGrailPayError(message: String) {
+        if grailPaySource == .existingAccount {
+            lblGrailPayAabandonError.text = message
+            lblGrailPayAabandonError.textColor = .systemRed
+            viewGrailPayAbandon.isHidden = false
+        }
+        else if grailPaySource == .newAccount {
+            lblAbandonGrailPayNewAccountView.text = message
+            lblAbandonGrailPayNewAccountView.textColor = .systemRed
+            viewAbandonGrailPayNewAccountView.isHidden = false
+        }
+    }
+    
+    //MARK: - Grail Pay Banking Payment Charge Api without saving bank and without Login
+    func grailPayAccountChargeApi() {
+        showLoadingIndicator()
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "POST"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        if let apiKey = EnvironmentConfig.apiKey {
+            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+        }
+        if let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+        }
+        
+        let params: [String: Any] = [
+            "account_id": self.grailPayAccountID ?? "",
+            "account_type": self.selectedGrailPayAccountType ?? "",
+            "name": self.selectedGrailPayAccountName ?? "",
+            "description": "payment checkout",
+            "email": "newmerchantadminuser12@test.com"
+        ]
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+            
+            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
+                                        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 {
+                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - GrailPay New Account Banking Payment Charge Api without saving bank.
+    func grailPayNewAccountChargeApi() {
+        showLoadingIndicator()
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "POST"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        if let apiKey = EnvironmentConfig.apiKey {
+            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+        }
+        if let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+        }
+        
+        let params: [String: Any] = [
+            "account_id": self.newGrailPayAccountID ?? "",
+            "account_type": self.selectedNewGrailPayAccountType ?? "",
+            "name": self.selectedNewGrailPayAccountName ?? "",
+            "description": "payment checkout",
+            "customer_id": self.grailPayNewAccountCustomerID ?? ""
+        ]
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+            
+            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
+                                        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 {
+                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 request = URLRequest(url: serviceURL)
+        request.httpMethod = "POST"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        if let apiKey = EnvironmentConfig.apiKey {
+            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+        }
+        if let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+        }
+        
+        let 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
+        ]
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+            
+            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
+                                        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 {
+                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+            }
+        }
+        task.resume()
+    }
+    
+    //MARK: - GrailPay Banking Account Charge Api from single saved bank account.
+    func grailPayAaccountChargeSingleSavedAccountApi() {
+        showLoadingIndicator()
+        
+        let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
+        
+        guard let serviceURL = URL(string: fullURL) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
+            return
+        }
+        
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "POST"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        
+        let token = UserStoreSingleton.shared.clientToken
+        print("Setting clientToken header: \(token ?? "None")")
+        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        
+        if let apiKey = EnvironmentConfig.apiKey {
+            request.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
+        }
+        if let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
+        }
+        
+        let params: [String: Any] = [
+            "account_id": selectedbankAccounts?.account_id ?? "",
+            "customer": selectedbankAccounts?.customer_id ?? "",
+            "description": "payment checkout",
+            "currency": "usd",
+        ]
+        
+        print(params)
+        
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.httpBody = jsonData
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                print("JSON Payload: \(jsonString)")
+            }
+        } catch let error {
+            print("Error creating JSON data: \(error)")
+            hideLoadingIndicator()
+            return
+        }
+        
+        let session = URLSession.shared
+        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+            
+            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
+                                        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 {
-                print("❌ HTTP Status Code: \(httpResponse.statusCode)")
+                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
             }
         }
-        
         task.resume()
     }
     
@@ -1801,11 +2579,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.showAlert(title: "Missing Information", message: "Bank account name is required.")
                         } else if self.txtFieldRoutingNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Routing number is required.")
-                        } else if self.txtFieldAccountType.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+                        }
+                        else if let routingNumber = self.txtFieldRoutingNumber.text?.replacingOccurrences(of: " ", with: ""), 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.")
+                        }
+                        else if self.txtFieldAccountType.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Bank account type is required.")
                         } else if self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Bank account number is required.")
                         }
+                        else if self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+                            self.showAlert(title: "Missing Information", message: "Please confirm your bank account number.")
+                        }
+                        else if self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines) != self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines) {
+                            self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
+                        }
                         else if !self.agreeTermsAndCondtition {
                             self.showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                             return
@@ -1877,13 +2665,25 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 // Bank Case
                 if txtFieldAccountName.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Bank account name is required.")
-                } else if txtFieldRoutingNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+                }
+                else if txtFieldRoutingNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Routing number is required.")
-                } else if txtFieldAccountType.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+                }
+                else if let routingNumber = self.txtFieldRoutingNumber.text?.replacingOccurrences(of: " ", with: ""), 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.")
+                }
+                else if txtFieldAccountType.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Bank account type is required.")
-                } else if txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+                }
+                else if txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                     showAlert(title: "Missing Information", message: "Bank account number is required.")
                 }
+                else if self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
+                    self.showAlert(title: "Missing Information", message: "Please confirm your bank account number.")
+                }
+                else if self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines) != self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines) {
+                    self.showAlert(title: "Account Mismatch", message: "Bank account number and confirmation do not match.")
+                }
                 else if !agreeTermsAndCondtition {
                     showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                     return
@@ -2021,11 +2821,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         if isSelectForPayBank {
             viewTermAndConditionsSingleAccountView.isHidden = false
             btnPayNowSingleAccountView.isHidden = false
-            viewSingleAccountViewHeight.constant = 170
+            //   viewSingleAccountViewHeight.constant = 170
         } else {
             viewTermAndConditionsSingleAccountView.isHidden = true
             btnPayNowSingleAccountView.isHidden = true
-            viewSingleAccountViewHeight.constant =  68
+            //   viewSingleAccountViewHeight.constant =  68
             btnNext.isHidden = true
             btnNextHeight.constant = 0
             btnNextTopCon.constant = 0
@@ -2046,35 +2846,38 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnPayNowSingleAccountView(_ 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 {
-            
-            // Check if the terms and conditions are agreed
-            if !agreeTermsAndCondtition {
-                showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
-                return
+        if request.authenticatedACH == true {
+            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 {
+                
+                // Check if the terms and conditions are agreed
+                if !agreeTermsAndCondtition {
+                    showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
+                    return
+                }
+                
+                // 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"
+                self.navigationController?.pushViewController(vc, animated: true)
             }
-            
-            // 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"
-            self.navigationController?.pushViewController(vc, animated: true)
-        }
-        else {
-            //If Billing info is nil or empty
-            if !agreeTermsAndCondtition {
-                showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
-                return
+            else {
+                //If Billing info is nil or empty
+                if !agreeTermsAndCondtition {
+                    showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
+                    return
+                }
+                accountChargeSavedBankAccountApi()
             }
-            
-            accountChargeSavedBankAccountApi()
         }
     }
     
@@ -2108,15 +2911,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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 {
+            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
+            }
+            
             // Determine the vc.isFrom value based on isSavedNewAccount
             let isSavedNewAccount = isSavedNewAccount
             let isFromValue = isSavedNewAccount ? "AddNewAccountWithSave" : "AddNewAccountWithoutSave"
@@ -2317,7 +3133,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - Send OTP Email Verification Api
     func emailVerificationApi() {
         showLoadingIndicator()
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
+        
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -2335,6 +3151,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         // Define the parameters for the request
         let params: [String: Any] = [
             "card_search_value": txtFieldEmail.text ?? "",
@@ -2415,6 +3238,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         // ✅ Safe access from main thread (assumes you call this from main thread)
         let email = self.txtFieldEmail.text ?? ""
         let otp = getCombinedOTP()
@@ -2538,18 +3368,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func getShowCardsApi() {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/card"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -2566,6 +3384,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (data, response, error) in
             guard let self = self else { return }
@@ -2618,18 +3443,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentApi() {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/charges"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -2646,6 +3459,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "name": cardNameTextField.text,
             "email": "test@gmail.com",
@@ -2728,18 +3548,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentFromShowSavedCardApi() {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/charges"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -2756,6 +3564,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         // Prepare parameters for the API request
         let params: [String: Any] = [
             "name": UserStoreSingleton.shared.verificationEmail?.split(separator: "@").first ?? "",
@@ -2841,18 +3656,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func paymentIntentFromAddNewCardApi(customerId: String?) {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/charges"
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.creditCharges.path()
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -2869,6 +3672,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         // Get the text fields from the selected cell and trim whitespace
         let nameText = txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let cvvText = txtFieldCVVNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -3018,18 +3828,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func updateCardApi(cardID: String) {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()+"/\(cardID)"
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -3046,6 +3844,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         // Get the text fields from the selected cell and trim whitespace
         let nameText = txtFieldNameOnCardUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let cvvText = txtFieldCVVUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -3180,18 +3985,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     func deleteCardApi(cardID: String, at index: Int) {
         showLoadingIndicator()
         
-        //        var components = URLComponents()
-        //        components.scheme = "https"
-        //        components.host = "stage-api.stage-easymerchant.io"
-        //        components.path = "/api/v1/card/\(cardID)" // Append the card_id to the path
-        //
-        //        guard let serviceURL = components.url else {
-        //            print("Invalid URL")
-        //            hideLoadingIndicator()
-        //            return
-        //        }
-        
-        // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()+"/\(cardID)"
         
         guard let serviceURL = URL(string: fullURL) else {
@@ -3208,6 +4001,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
             guard let self = self else { return }
@@ -3279,9 +4079,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "GET"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var urlRequest = URLRequest(url: serviceURL)
+        urlRequest.httpMethod = "GET"
+        urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         // Retrieve and validate customer token
         guard let token = UserStoreSingleton.shared.customerToken, !token.isEmpty else {
@@ -3292,10 +4092,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         
         print("Setting customerToken header: \(token)")
-        request.addValue(token, forHTTPHeaderField: "Customer-Token")
+        urlRequest.addValue(token, forHTTPHeaderField: "Customer-Token")
         
         let session = URLSession.shared
-        let task = session.dataTask(with: request) { [weak self] (data, response, error) in
+        let task = session.dataTask(with: urlRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
             
             DispatchQueue.main.async {
@@ -3369,15 +4169,17 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if self.isSelectForPayBank {
                             self.viewTermAndConditionsSingleAccountView.isHidden = false
                             self.btnPayNowSingleAccountView.isHidden = false
-                            self.viewSingleAccountViewHeight.constant = 170
+                            //   self.viewSingleAccountViewHeight.constant = 170
                         } else {
                             self.viewTermAndConditionsSingleAccountView.isHidden = true
                             self.btnPayNowSingleAccountView.isHidden = true
-                            self.viewSingleAccountViewHeight.constant = 68
+                            //   self.viewSingleAccountViewHeight.constant = 68
                             self.btnNext.isHidden = true
                             self.btnNextHeight.constant = 0
                             self.btnNextTopCon.constant = 0
                         }
+                        
+                        self.grailPayBankLinkView.isHidden = true
                     }
                 } else {
                     print("Error from server: \(bankAccountModel.message ?? "Unknown error")")
@@ -3412,6 +4214,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "name": txtFieldAccountName.text ?? "",
             "email": "test@gmail.com",
@@ -3511,6 +4320,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
@@ -3607,6 +4423,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -3713,6 +4536,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         // 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) ?? ""
@@ -3829,6 +4659,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
             guard let self = self else { return }
@@ -3898,6 +4735,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let params: [String: Any] = [
             "name": UserStoreSingleton.shared.merchantName ?? "",
             "email": UserStoreSingleton.shared.merchantEmail ?? "",
@@ -4033,6 +4877,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
+        // Add API headers
+        if let apiKey = EnvironmentConfig.apiKey,
+           let apiSecret = EnvironmentConfig.apiSecret {
+            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
+            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
+        }
+        
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (data, response, error) in
             guard let self = self else { return }
@@ -4126,10 +4977,10 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                     imageName = "creditcard"
                 case "Crypto":
                     imageName = "bitcoinsign.circle.fill"
-                    //                case "Wallet":
-                    //                    imageName = "Wallet"
+                case "Wallet":
+                    imageName = "wallet.bifold"
                 default:
-                    imageName = "Wallet"
+                    imageName = ""
                 }
                 return PaymentsData(name: method, image: imageName)
             }
@@ -4181,6 +5032,7 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                 self.viewTermsAndConditions.isHidden = true
                 self.viewCrypto.isHidden = true
                 self.grailPayBankLinkView.isHidden = true
+                self.viewAddNewGrailPayAccount.isHidden = true
             } else {
                 getShowCardsApi()
                 self.viewSingleSavedAccount.isHidden = true
@@ -4203,6 +5055,7 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                 self.viewNewBankAccount.isHidden = true
                 self.viewCrypto.isHidden = true
                 self.grailPayBankLinkView.isHidden = true
+                self.viewAddNewGrailPayAccount.isHidden = true
             }
             
         case "Bank":
@@ -4231,6 +5084,7 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                     self.viewTermsAndConditions.isHidden = false
                     self.grailPayBankLinkView.isHidden = true
                     self.viewGrailPayAbandon.isHidden = true
+                    
                 } else {
                     self.viewBankFields.isHidden = true
                     self.viewTermsAndConditions.isHidden = true
@@ -4246,6 +5100,7 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                         self.viewBtnShowSavedCardHeight.constant = 0
                         self.viewBtnShowSavedCardTopCon.constant = 0
                     }
+                    
                 }
                 
             } else {
@@ -4297,6 +5152,8 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
             self.viewNewBankAccount.isHidden = true
             
             self.grailPayBankLinkView.isHidden = true
+            self.viewAddNewGrailPayAccount.isHidden = true
+            self.viewAbandonGrailPayNewAccountView.isHidden = true
             
         default:
             break
@@ -4316,7 +5173,6 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             return savedCards.count + 1
         }
         else if tableView == tblViewSavedBankAccounts {
-            print("Number of bank accounts: \(bankAccounts.count)")
             return bankAccounts.count + 1
         }
         else if tableView == tblViewAccountTypes {
@@ -4610,23 +5466,49 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
     
     //Bank Cell
     @objc func addNewBankAccountTapped(_ sender: UIButton) {
-        self.viewNewBankAccount.isHidden = false
-        self.viewSingleSavedAccount.isHidden = true
-        self.viewBankFields.isHidden = true
-        self.viewBtnShowSavedCards.isHidden = true
-        self.viewBtnShowSavedCardHeight.constant = 0
-        self.viewBtnShowSavedCardTopCon.constant = 0
-        self.OTPView.isHidden = true
-        self.emailView.isHidden = true
-        self.viewCardFields.isHidden = true
-        self.viewSingleSavedCard.isHidden = true
-        self.viewChangeCard.isHidden = true
-        self.viewUpdateCard.isHidden = true
-        self.viewAddNewCard.isHidden = true
-        self.btnNext.isHidden = true
-        self.btnNextHeight.constant = 0
-        self.btnNextTopCon.constant = 8
-        self.viewChangedAccount.isHidden = true
+        if request.authenticatedACH == true {
+            self.viewAddNewGrailPayAccount.isHidden = false
+            
+            self.viewNewBankAccount.isHidden = true
+            self.viewSingleSavedAccount.isHidden = true
+            self.viewBankFields.isHidden = true
+            self.viewBtnShowSavedCards.isHidden = true
+            self.viewBtnShowSavedCardHeight.constant = 0
+            self.viewBtnShowSavedCardTopCon.constant = 0
+            self.OTPView.isHidden = true
+            self.emailView.isHidden = true
+            self.viewCardFields.isHidden = true
+            self.viewSingleSavedCard.isHidden = true
+            self.viewChangeCard.isHidden = true
+            self.viewUpdateCard.isHidden = true
+            self.viewAddNewCard.isHidden = true
+            self.btnNext.isHidden = true
+            self.btnNextHeight.constant = 0
+            self.btnNextTopCon.constant = 8
+            self.viewChangedAccount.isHidden = true
+        }
+        else {
+            self.viewAddNewGrailPayAccount.isHidden = true
+            
+            self.viewNewBankAccount.isHidden = false
+            self.viewSingleSavedAccount.isHidden = true
+            self.viewBankFields.isHidden = true
+            self.viewBtnShowSavedCards.isHidden = true
+            self.viewBtnShowSavedCardHeight.constant = 0
+            self.viewBtnShowSavedCardTopCon.constant = 0
+            self.OTPView.isHidden = true
+            self.emailView.isHidden = true
+            self.viewCardFields.isHidden = true
+            self.viewSingleSavedCard.isHidden = true
+            self.viewChangeCard.isHidden = true
+            self.viewUpdateCard.isHidden = true
+            self.viewAddNewCard.isHidden = true
+            self.btnNext.isHidden = true
+            self.btnNextHeight.constant = 0
+            self.btnNextTopCon.constant = 8
+            self.viewChangedAccount.isHidden = true
+        }
+        
     }
     
     @objc func btnSelectAccountTapped(_ sender: UIButton) {
@@ -4663,11 +5545,11 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         if isSelectForPayBank {
             viewTermAndConditionsSingleAccountView.isHidden = false
             btnPayNowSingleAccountView.isHidden = false
-            viewSingleAccountViewHeight.constant = 170
+            //   viewSingleAccountViewHeight.constant = 170
         } else {
             viewTermAndConditionsSingleAccountView.isHidden = true
             btnPayNowSingleAccountView.isHidden = true
-            viewSingleAccountViewHeight.constant = 68
+            //   viewSingleAccountViewHeight.constant = 68
             btnNext.isHidden = true
             btnNextHeight.constant = 0
             btnNextTopCon.constant = 0
@@ -4856,6 +5738,25 @@ extension PaymentInfoVC: UITextFieldDelegate {
             return textField.text?.count == 0
         }
         
+        else if textField == txtFieldRoutingNumber {
+            let allowedCharacters = CharacterSet.decimalDigits
+            let characterSet = CharacterSet(charactersIn: string)
+            
+            let currentText = textField.text ?? ""
+            let newLength = (currentText as NSString).replacingCharacters(in: range, with: string).count
+            
+            return allowedCharacters.isSuperset(of: characterSet) && newLength <= 9
+        }
+        else if textField == txtFieldRoutingNumberNewAccountView {
+            let allowedCharacters = CharacterSet.decimalDigits
+            let characterSet = CharacterSet(charactersIn: string)
+            
+            let currentText = textField.text ?? ""
+            let newLength = (currentText as NSString).replacingCharacters(in: range, with: string).count
+            
+            return allowedCharacters.isSuperset(of: characterSet) && newLength <= 9
+        }
+        
         return true
     }
     
@@ -4933,7 +5834,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
         return otp1 + otp2 + otp3 + otp4 + otp5 + otp6
     }
     
-    // UITextFieldDelegate methods
+    //MARK: - UITextFieldDelegate methods
     func textFieldDidBeginEditing(_ textField: UITextField) {
         if textField == cardNumberTextField.textField {
             if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -5073,6 +5974,14 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewtxtFieldAccountNumber.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
             }
         }
+        else if textField == txtFieldConfirmBankAccount {
+            if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
+               let uiColor = UIColor(hex: primaryBtnFontColor) {
+                viewTextFieldConfirmAccount.layer.borderColor = uiColor.cgColor
+            } else {
+                viewTextFieldConfirmAccount.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
+            }
+        }
         //New Bank Account View
         else if textField == txtFieldAccountNameNewAccountView {
             if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -5106,6 +6015,14 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewtxtFieldAccountNumberNewAccountView.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
             }
         }
+        else if textField == txtFieldConfirmAccountNewAccountView {
+            if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
+               let uiColor = UIColor(hex: primaryBtnFontColor) {
+                viewTxtFieldConfirmNewAccountView.layer.borderColor = uiColor.cgColor
+            } else {
+                viewTxtFieldConfirmNewAccountView.layer.borderColor = UIColor._1757D9.withAlphaComponent(1).cgColor
+            }
+        }
     }
     
     func textFieldDidEndEditing(_ textField: UITextField) {
@@ -5248,6 +6165,14 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewtxtFieldAccountNumber.layer.borderColor = UIColor.systemGray.cgColor
             }
         }
+        else if textField == txtFieldConfirmBankAccount {
+            if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,
+               let borderColor = UIColor(hex: bodyBackgroundColor) {
+                viewTextFieldConfirmAccount.layer.borderColor = borderColor.cgColor
+            } else {
+                viewTextFieldConfirmAccount.layer.borderColor = UIColor.systemGray.cgColor
+            }
+        }
         //New Bank Account View
         else if textField == txtFieldAccountNameNewAccountView {
             if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,
@@ -5281,12 +6206,19 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 viewtxtFieldAccountNumberNewAccountView.layer.borderColor = UIColor.systemGray.cgColor
             }
         }
+        else if textField == txtFieldConfirmAccountNewAccountView {
+            if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,
+               let borderColor = UIColor(hex: bodyBackgroundColor) {
+                viewTxtFieldConfirmNewAccountView.layer.borderColor = borderColor.cgColor
+            } else {
+                viewTxtFieldConfirmNewAccountView.layer.borderColor = UIColor.systemGray.cgColor
+            }
+        }
     }
     
 }
 
 //MARK: - BlinkCard
-
 //extension PaymentInfoVC: MBCBlinkCardOverlayViewControllerDelegate {
 //    func blinkCardOverlayViewControllerDidFinishScanning(_ blinkCardOverlayViewController: MBCBlinkCardOverlayViewController, state: MBCRecognizerResultState) {
 //        /** This is done on background thread */
@@ -5343,7 +6275,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
 //    }
 //    
 //}
-
+//
 //extension PaymentInfoVC: CustomOverlayDelegate {
 //    func didFinishScanningCard(cardNumber: String, expiryDate: String, cvv: String, nameOnCard: String) {
 //        // Update the text fields with scanned details