@jimrising/easymerchantsdk-react-native 1.3.0 → 1.3.2

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

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+//import BlinkCard
 
 struct PaymentsData {
     var name = String()
@@ -15,7 +16,7 @@ struct PaymentsData {
 let easymerchantsdk = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle)
 
 class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
-    
+
     @IBOutlet weak var btnShowSavedCard: UIButton!
     @IBOutlet weak var viewContainerBackground: UIView!
     @IBOutlet weak var lblChosePaymentMethod: UILabel!
@@ -36,25 +37,25 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var lblNewAccount: UILabel!
     @IBOutlet weak var lblCreateNewAccount: UILabel!
     @IBOutlet weak var lblSetting: UILabel!
-    
+
     @IBOutlet weak var viewBtnShowSavedCards: UIView!
     @IBOutlet weak var viewBtnShowSavedCardHeight: NSLayoutConstraint!
     @IBOutlet weak var viewBtnShowSavedCardTopCon: NSLayoutConstraint!
     @IBOutlet weak var lblBtnShowSaveCard: UILabel!
     @IBOutlet weak var iconShowSavedCard: UIImageView!
-    
+
     @IBOutlet weak var collVwPayment: UICollectionView!
-    
+
     @IBOutlet weak var viewCardFields: UIView!
-    
+
     @IBOutlet weak var btnNext: FilledButton!
     @IBOutlet weak var btnNextHeight: NSLayoutConstraint!
     @IBOutlet weak var btnNextTopCon: NSLayoutConstraint!
-    
+
     @IBOutlet weak var btnCheckBoxSavedCard: UIButton!
     @IBOutlet weak var lblEasyMerchantOne: UILabel!
     @IBOutlet weak var btnSettings: UIButton!
-    
+
     // Card
     @IBOutlet private var cardNumberTextField: TextFieldStackView!
     @IBOutlet private var cardExpiryTextField: TextFieldStackView!
@@ -64,14 +65,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var viewTxtFieldExpiryDate: UIView!
     @IBOutlet weak var viewTxtFieldCVV: UIView!
     @IBOutlet weak var viewTxtFieldNameOnCard: UIView!
-    
+
     @IBOutlet weak var btnScanCard: UIButton!
-    
+
     @IBOutlet weak var emailView: UIView!
     @IBOutlet weak var txtFieldEmail: UITextField!
     @IBOutlet weak var viewTxtFieldEmail: UIView!
     @IBOutlet weak var OTPView: UIView!
-    
+
     //OTP View
     @IBOutlet weak var viewTextOTP1: UIView!
     @IBOutlet weak var txtFieldOTPText1: UITextField!
@@ -89,9 +90,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var lblOtpTimer: UILabel!
     @IBOutlet weak var lblUntillResendOtp: UILabel!
     @IBOutlet weak var btnResendOTP: UIButton!
-    
+
     @IBOutlet private var buttonBottomConstraint: NSLayoutConstraint!
-    
+
     //Single Saved Card
     @IBOutlet weak var viewSingleSavedCard: UIView!
     @IBOutlet weak var viewSingleSavedCardHeight: NSLayoutConstraint!
@@ -103,16 +104,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var lblCardNumberSigleSavedCard: UILabel!
     @IBOutlet weak var lblExpireDateSingelSavedCard: UILabel!
     @IBOutlet weak var bgViewSingleSavedCard: UIView!
-    
+
     @IBOutlet weak var viewChangeCard: UIView!
     @IBOutlet weak var viewUpdateCard: UIView!
     @IBOutlet weak var viewAddNewCard: UIView!
     @IBOutlet weak var btnChangeSavedCard: UIButton!
     @IBOutlet weak var btnSelectSingleSavedCard: UIButton!
-    
+
     @IBOutlet weak var tblViewSavedCardsList: UITableView!
     @IBOutlet weak var tblViewSavedCardListHeight: NSLayoutConstraint!
-    
+
     //Update Card
     @IBOutlet weak var btnSelectUpdateCardView: UIButton!
     @IBOutlet weak var imgViewCardUpdateCardView: UIImageView!
@@ -126,7 +127,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var viewTxtFieldNameOnCardUpdateCardView: UIView!
     @IBOutlet weak var btnUpdateCard: FilledButton!
     @IBOutlet weak var bgViewUpdateCard: UIView!
-    
+
     //New Card
     @IBOutlet weak var txtFieldCardNumberNewCardView: UITextField!
     @IBOutlet weak var viewtxtFieldCardNumberNewCardView: UIView!
@@ -138,7 +139,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var viewtxtFieldNameOnCardNewCardView: UIView!
     @IBOutlet weak var btnPayNowNewCardView: FilledButton!
     @IBOutlet weak var btnSavedCardForFutureNewCardView: CheckboxButton!
-    
+
     //Bank
     @IBOutlet weak var viewBankFields: UIView!
     @IBOutlet weak var txtFieldAccountName: UITextField!
@@ -155,7 +156,9 @@ 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!
     @IBOutlet weak var viewGrailPaySavedBank: UIStackView!
@@ -172,7 +175,27 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var viewGrailPayAbandon: UIView!
     @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,14 +206,14 @@ 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!
     @IBOutlet weak var bankIconImgView: UIImageView!
     @IBOutlet weak var btnChangeSingleAccountView: UIButton!
     @IBOutlet weak var viewSingelBankAccount: UIView!
-    
+
     //New Bank
     @IBOutlet weak var viewNewBankAccount: UIView!
     @IBOutlet weak var txtFieldAccountNameNewAccountView: UITextField!
@@ -206,7 +229,9 @@ 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!
     @IBOutlet weak var viewCryptoTryAgain: UIView!
@@ -228,113 +253,118 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var subLblPriceChanged: UILabel!
     @IBOutlet weak var btnTryAgain: UIButton!
     @IBOutlet weak var lblTimerTryAgainView: UILabel!
-    
+
     //Setting View
     @IBOutlet weak var btnChangeLanguage: UIButton!
     @IBOutlet weak var btnLogout: UIButton!
     @IBOutlet weak var settingsView: UIView!
-    
+
     var chainInvoiceAddress: String?
     var lightningURI: String?
-    
+
     var cryptoTimer: DispatchSourceTimer?
     var totalTimeInSeconds = 300 // 5 minutes (300 seconds)
     var isTimerRunning = false
-    
+
     var chargeId: String?
     var cryptoInfoTimer: Timer?
-    
+
     var savedCards: [CardModel] = []
     var isSelectForPay: Bool = false
-    
+
     var selectedCardIndex: Int? = nil
-    
+
     private var request: Request!
     private weak var delegate: EasyPayViewControllerDelegate?
-    
+
     public var amount: Int?
-    
+
     var arrPaymentMethods: [PaymentsData] = []
-    
+
     private var selectedIndex: IndexPath?
     var selectedPaymentMethod: String?
-    
+
     private var timer: Timer?
     private var timeRemaining = 180 // 3 minutes
-    
+
     var isSavedForFuture: Bool = false
-    
+
     var selectedCard: CardModel?
-    
+
     var isSavedNewCardForFuture: Bool = false
-    
+
     var selectedCardID: String?
-    
+
     //Bank
     var bankAccounts: [Accounts] = []
     var selectedbankAccounts: Accounts?
     var selectedBank: BankAccountModel?
     var isSelectForPayBank: Bool = false
     var selectedBankIndex: Int? = nil
-    var arrAccountType = ["Saving","Current"]
-    
+    var arrAccountType = ["Saving", "Checking"]
+
     var agreeTermsAndCondtition: Bool = false
-    
+
     var isSavedNewAccount: Bool = false
     var selectedBankID: String?
-    
+
     public weak var easyPayDelegate: EasyPayViewControllerDelegate?
-    
+
     private let keyboardObserver = KeyboardObserver()
-    
+
     var isFrom = String()
-    
+
     //Blink Card
-  //  var blinkCardRecognizer: MBCBlinkCardRecognizer!
-    
+ //   var blinkCardRecognizer: MBCBlinkCardRecognizer!
+
     // Variables for Card Scanning Data Back
     var cardNumber: String?
     var expiryDate: String?
     var cvv: String?
     var nameOnCard: String?
-    
+
     private var grailPayChargeData: [String: Any]?
-    
+
     var grailPayAccount: [String: Any]?
-    
+
     var isBankAccountConnected = false
     var defaultBankAccountID: String?
-    
+
+//    var isNewBankAccountConnected = false
+    var defaultNewBankAccountID: String?
+
+    var isSavedNewGrailPayAccount: Bool = false
+
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+
         viewAppearanceOn()
-        
+
         uiFinishingTouchElements()
-        
+
         setUpTextFieldsDelegates()
-        
+
         collVwPayment.delegate = self
         collVwPayment.dataSource = self
-        
+
         loadPaymentMethods()
-        
+
         updateSaveButtons()
-        
+
         // Add tap gesture to hide the keyboard when tapping outside of text fields
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard))
         tapGesture.cancelsTouchesInView = false
         self.view.addGestureRecognizer(tapGesture)
-        
+
         //// Check if billingInfoData is available
         if let billingInfoData = request.billingInfoData,
            let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
            let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
-            
+
             // If `submitButtonText` is not empty, use it; otherwise, default to "Next (Billing Info)"
             let buttonText = (request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! + " (Billing Info)" : "Next (Billing Info)")
-            
+
             btnNext.setTitle(buttonText, for: .normal)
             btnPayNowNewCardView.setTitle(buttonText, for: .normal)
             btnPayNowNewAccountView.setTitle(buttonText, for: .normal)
@@ -343,29 +373,29 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         } else {
             let amountText = String(format: "$%.2f", amount ?? 0)
             let submitText = request?.submitButtonText
-            
+
             let defaultTitle = (submitText?.isEmpty == false)
             ? "\(submitText!) (\(amountText))"
             : "Pay Now (\(amountText))"
-            
+
             btnNext.setTitle(defaultTitle, for: .normal)
             btnPayNowNewCardView.setTitle(defaultTitle, for: .normal)
             btnPayNowNewAccountView.setTitle(defaultTitle, for: .normal)
             btnPayNowSingleCard.setTitle(defaultTitle, for: .normal)
             btnPayNowSingleAccountView.setTitle(defaultTitle, for: .normal)
         }
-        
+
         emailView.isHidden = true
         OTPView.isHidden = true
-        
+
         //OTP View
         btnResendOTP.isHidden = true
-        
+
         // Set delegate for txtFieldEmail to handle return key press
         txtFieldEmail.delegate = self
-        
+
         setupTextFields()
-        
+
         tblViewSavedCardsList.delegate = self
         tblViewSavedCardsList.dataSource = self
         let nib = UINib(nibName: "SavedCardsTVC", bundle: .easyPayBundle)
@@ -373,9 +403,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         tblViewSavedCardsList.showsVerticalScrollIndicator = false
         tblViewSavedCardsList.showsHorizontalScrollIndicator = false
         tblViewSavedCardsList.addObserver(self, forKeyPath: "contentSize", options: .new, context: nil)
-        
+
         viewChangeCard.isHidden = true
-        
+
         tblViewSavedBankAccounts.delegate = self
         tblViewSavedBankAccounts.dataSource = self
         let nib2 = UINib(nibName: "SavedAccountTVC", bundle: .easyPayBundle)
@@ -383,14 +413,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         tblViewSavedBankAccounts.showsVerticalScrollIndicator = false
         tblViewSavedBankAccounts.showsHorizontalScrollIndicator = false
         tblViewSavedBankAccounts.addObserver(self, forKeyPath: "contentSize", options: .new, context: nil)
-        
+
         viewChangedAccount.isHidden = true
-        
+
         tblViewAccountTypes.delegate = self
         tblViewAccountTypes.dataSource = self
         tblViewAccountTypes.showsVerticalScrollIndicator = false
         tblViewAccountTypes.showsHorizontalScrollIndicator = false
-        
+
         viewAccountType.clipsToBounds = false
         viewAccountType.layer.shadowColor = UIColor.black.cgColor
         viewAccountType.layer.shadowOpacity = 0.3
@@ -398,14 +428,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         viewAccountType.layer.shadowRadius = 4
         viewAccountType.layer.cornerRadius = 8
         viewAccountType.layer.cornerRadius = 8
-        
+
         viewAccountType.isHidden = true
-        
+
         tblViewAccountTypeNewAccountView.delegate = self
         tblViewAccountTypeNewAccountView.dataSource = self
         tblViewAccountTypeNewAccountView.showsVerticalScrollIndicator = false
         tblViewAccountTypeNewAccountView.showsHorizontalScrollIndicator = false
-        
+
         viewAccountTypeNewAccountView.clipsToBounds = false
         viewAccountTypeNewAccountView.layer.shadowColor = UIColor.black.cgColor
         viewAccountTypeNewAccountView.layer.shadowOpacity = 0.3
@@ -413,16 +443,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         viewAccountTypeNewAccountView.layer.shadowRadius = 4
         viewAccountTypeNewAccountView.layer.cornerRadius = 8
         viewAccountTypeNewAccountView.layer.cornerRadius = 8
-        
+
         viewAccountTypeNewAccountView.isHidden = true
-        
+
         // Generate and set the QR code image
         qrImageView.image = generateQRCode(from: "CryptoQR")
-        
+
         setUpTermAndConditionsButton()
         setUpTermAndConditionsForSingleSavedAccountButton()
         setUpTermAndConditionsForGrailPaySavedAccountButton()
-        
+
         settingsView.clipsToBounds = false
         settingsView.layer.shadowColor = UIColor.black.cgColor
         settingsView.layer.shadowOpacity = 0.3
@@ -430,57 +460,64 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         settingsView.layer.shadowRadius = 4
         settingsView.layer.cornerRadius = 8
         settingsView.layer.cornerRadius = 8
-        
+
         settingsView.isHidden = true
-        
+
         if UserStoreSingleton.shared.isLoggedIn == true {
             btnSettings.isHidden = false
         }
         else {
             btnSettings.isHidden = true
         }
-        
+
     }
-    
+
     //MARK: - View Wiil Appear
     override func viewWillAppear(_ animated: Bool) {
         uiFinishingTouchElements()
-        
+
         viewAppearanceOn()
-        
+
         keyboardObserver.animateChanges({ [self] height in
             let newConstant = CGFloat.maximum(height - self.view.safeAreaInsets.bottom + 8, 8)
             buttonBottomConstraint.constant = newConstant
             self.view.setNeedsLayout()
             self.view.layoutIfNeeded()
         })
-        
+
         //CRYPTO
         setOnChainSelected()
     }
-    
+
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         keyboardObserver.invalidate()
         resetTimer()
     }
-    
+
     //MARK: - View Appearances on clicks
     func viewAppearanceOn() {
         viewTermAndConditionsSingleAccountView.isHidden = true
         btnPayNowSingleAccountView.isHidden = true
-        viewSingleAccountViewHeight.constant = 68
-        
+        //  viewSingleAccountViewHeight.constant = 68
+
         viewNewBankAccount.isHidden = true
-        
+
         viewTxtFieldCVVSingleCard.isHidden = true
         btnPayNowSingleCard.isHidden = true
         viewSingleSavedCardHeight.constant = 60
-        
+
         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
@@ -503,19 +540,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.viewChangeCard.isHidden = true
                     self.viewUpdateCard.isHidden = true
                     self.viewAddNewCard.isHidden = true
-                    
+
                     self.viewTxtFieldCVVSingleCard.isHidden = true
                     self.btnPayNowSingleCard.isHidden = true
                     self.viewSingleSavedCardHeight.constant = 60
                     self.btnNext.isHidden = true
                     self.btnNextHeight.constant = 0
                     self.btnNextTopCon.constant = 8
-                    
+
                     self.viewSingleSavedAccount.isHidden = true
-                    
+
                     self.viewBankFields.isHidden = true
                     self.viewTermsAndConditions.isHidden = true
-                    
+
                     if isSelectForPay {
                         viewTxtFieldCVVSingleCard.isHidden = false
                         btnPayNowSingleCard.isHidden = false
@@ -556,13 +593,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         else if selectedPaymentMethod == "Bank" {
             if UserStoreSingleton.shared.isLoggedIn == true {
-                
+
                 if isFrom == "NewAccount" {
                     viewNewBankAccount.isHidden = false
                 } else {
                     viewSingleSavedAccount.isHidden = false
                 }
-                
+
                 self.viewSingleSavedAccount.isHidden = false
                 self.viewBankFields.isHidden = true
                 self.viewBtnShowSavedCards.isHidden = true
@@ -578,41 +615,45 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.btnNext.isHidden = true
                 self.btnNextHeight.constant = 0
                 self.btnNextTopCon.constant = 8
-                
+
                 self.viewNewBankAccount.isHidden = true
                 self.viewCrypto.isHidden = true
-                
+
                 self.viewTermsAndConditions.isHidden = true
-                
+
                 self.viewChangedAccount.isHidden = true
-                
+
                 if self.isSelectForPayBank {
                     self.viewTermAndConditionsSingleAccountView.isHidden = false
                     self.btnPayNowSingleAccountView.isHidden = false
-                    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
+                        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 {
@@ -620,6 +661,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.viewTermsAndConditions.isHidden = false
                     self.grailPayBankLinkView.isHidden = true
                 }
+
+//                if isFrom == "NewGrailPayAccount" {
+//                        updateUIForNewGrailPayAccount()
+//                    }
+
             }
             else {
                 // self.viewBankFields.isHidden = false
@@ -641,7 +687,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.viewCrypto.isHidden = true
                 self.viewSingleSavedAccount.isHidden = true
                 self.viewChangedAccount.isHidden = true
-                
+
                 if request?.authenticatedACH == false {
                     self.viewBankFields.isHidden = false
                     self.viewTermsAndConditions.isHidden = false
@@ -656,13 +702,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             }
         }
-        
+
         DispatchQueue.main.async {
             self.view.setNeedsLayout()
             self.view.layoutIfNeeded()
         }
     }
-    
+
+    func updateUIForNewGrailPayAccount() {
+        self.viewAddNewGrailPayAccount.isHidden = false
+        self.viewAbandonGrailPayNewAccountView.isHidden = false
+        self.viewSingleSavedAccount.isHidden = true
+        self.grailPayBankLinkView.isHidden = true
+    }
+
     //MARK: - Ui Colors Setup.
     func uiFinishingTouchElements() {
         // Set background color for the main view
@@ -673,7 +726,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             viewAccountType.backgroundColor = uiColor
             tblViewAccountTypes.backgroundColor = uiColor
         }
-        
+
         if let bodyBackGroundColor = UserStoreSingleton.shared.body_bg_col,
            let uiColor = UIColor(hex: bodyBackGroundColor) {
             viewBtnShowSavedCards.backgroundColor = uiColor
@@ -682,8 +735,11 @@ 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,
            let uiColor = UIColor(hex: primaryBtnBackGroundColor) {
             iconShowSavedCard.tintColor = uiColor
@@ -691,6 +747,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,14 +765,19 @@ 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
             if let image = btnScanCard.imageView?.image {
                 let coloredImage = image.withRenderingMode(.alwaysTemplate) // Ensure the image uses tintColor
                 btnScanCard.setImage(coloredImage, for: .normal)
             }
-            
+
             txtFieldEmail.tintColor = uiColor
             txtFieldOTPText1.tintColor = uiColor
             txtFieldOTPText2.tintColor = uiColor
@@ -727,6 +789,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,13 +806,14 @@ 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,
            let secondaryUIColor = UIColor(hex: secondaryBtnBackgroundColor) {
             btnTryAgain.setTitleColor(secondaryUIColor, for: .normal)
         }
-        
+
         if let borderRadiusString = UserStoreSingleton.shared.border_radious,
            let borderRadius = Double(borderRadiusString) { // Convert String to Double
             viewBtnShowSavedCards.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
@@ -763,7 +827,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             viewCryptoQRCode.layer.cornerRadius = CGFloat(borderRadius)
             viewGrailPaySavedAccount.layer.cornerRadius = CGFloat(borderRadius)
             viewGrailPayAbandon.layer.cornerRadius = CGFloat(borderRadius)
-            
+
             viewTextOTP1.layer.cornerRadius = CGFloat(borderRadius)
             viewTextOTP2.layer.cornerRadius = CGFloat(borderRadius)
             viewTextOTP3.layer.cornerRadius = CGFloat(borderRadius)
@@ -792,19 +856,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         btnTryAgain.layer.masksToBounds = true
         viewCryptoTryAgain.layer.masksToBounds = true
         viewCryptoQRCode.layer.masksToBounds = true
-        
+
         if let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
            let placeholderColor = UIColor(hex: secondaryFontColor) {
             txtFieldEmail?.attributedPlaceholder = NSAttributedString(
                 string: txtFieldEmail?.placeholder ?? "",
                 attributes: [.foregroundColor: placeholderColor]
             )
-            
+
             txtFieldCVVSingleSavedCard?.attributedPlaceholder = NSAttributedString(
                 string: txtFieldCVVSingleSavedCard?.placeholder ?? "",
                 attributes: [.foregroundColor: placeholderColor]
             )
-            
+
             lblSaveAccountForFuture.textColor = placeholderColor
             lblAgreeToThe.textColor = placeholderColor
             lblAccountTypeSingleAccountView.textColor = placeholderColor
@@ -820,11 +884,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,9 +920,11 @@ 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
             txtFieldOTPText2.textColor = uiColor
@@ -863,7 +933,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             txtFieldOTPText5.textColor = uiColor
             txtFieldOTPText6.textColor = uiColor
         }
-        
+
         if let viewBorderColor = UserStoreSingleton.shared.secondary_font_col,
            let borderColor = UIColor(hex: viewBorderColor) {
             viewTextFieldCardNumber.layer.borderColor = borderColor.cgColor
@@ -881,12 +951,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             viewCryptoQRCode.layer.borderColor = UIColor.systemGray.cgColor
             viewCryptoQRCode.layer.borderWidth = 1.0
         }
-        
+
         if let viewOtpPrimaryBackgroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
            let primaryUIColor = UIColor(hex: viewOtpPrimaryBackgroundColor),
            let viewOtpSecondaryColor = UserStoreSingleton.shared.secondary_font_col,
            let secondaryUIColor = UIColor(hex: viewOtpSecondaryColor) {
-            
+
             viewTextOTP1.layer.borderWidth = 1.0
             viewTextOTP1.layer.borderColor = txtFieldOTPText1.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
             viewTextOTP2.layer.borderWidth = 1.0
@@ -900,7 +970,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             viewTextOTP6.layer.borderWidth = 1.0
             viewTextOTP6.layer.borderColor = txtFieldOTPText6.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
         }
-        
+
         if let fontSizeString = UserStoreSingleton.shared.fontSize,
            let fontSizeDouble = Double(fontSizeString) { // Convert String to Double
             let fontSize = CGFloat(fontSizeDouble) // Convert Double to CGFloat
@@ -937,9 +1007,17 @@ 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)
-            
+
             btnShowSavedCard.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
             btnResendOTP.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
             btnChangeSavedCard.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
@@ -956,61 +1034,62 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnSavedCardForFutureNewCardView.titleLabel?.font = UIFont.systemFont(ofSize: fontSize)
         }
     }
-    
+
     func setUpTextFieldsDelegates() {
         cardNumberTextField.textField.delegate = self
         cardExpiryTextField.textField.delegate = self
         cardCvvTextField.textField.delegate = self
         cardNameTextField.textField.delegate = self
-        
+
         txtFieldEmail.delegate = self
-        
+
         txtFieldCVVSingleSavedCard.delegate = self
         txtFieldExpireDateUpdateCardView.delegate = self
         txtFieldCVVUpdateCardView.delegate = self
         txtFieldNameOnCardUpdateCardView.delegate = self
-        
+
         txtFieldCardNumberNewCardView.delegate = self
         txtFieldExpiryDateNewCardView.delegate = self
         txtFieldCVVNewCardView.delegate = self
         txtFieldNameOnCardNewCardView.delegate = self
-        
+
         txtFieldAccountName.delegate = self
         txtFieldRoutingNumber.delegate = self
         txtFieldAccountType.delegate = self
         txtFieldAccountNumber.delegate = self
-        
+
         txtFieldAccountNameNewAccountView.delegate = self
         txtFieldRoutingNumberNewAccountView.delegate = self
         txtFieldAccountTypeNewAccountView.delegate = self
         txtFieldAccountNumber.delegate = self
+        txtFieldConfirmBankAccount.delegate = self
     }
-    
+
     private func updateSaveButtons() {
         let isSavedCard = request?.saveCard ?? false
         let isSavedAccount = request?.saveAccount ?? false
-        
+
         let cardImageName = isSavedCard ? "checkmark.square.fill" : "square"
         let accountImageName = isSavedAccount ? "checkmark.square.fill" : "square"
-        
+
         btnCheckBoxSavedCard.setImage(UIImage(systemName: cardImageName), for: .normal)
         btnSavedCardForFutureNewCardView.setImage(UIImage(systemName: cardImageName), for: .normal)
-        
+
         btnCheckSavedAccountForFuture.setImage(UIImage(systemName: accountImageName), for: .normal)
         btnSavedNewAccountForFuture.setImage(UIImage(systemName: accountImageName), for: .normal)
     }
-    
+
     //MARK: - Term & Conditions setup for normal bank fields view
     func setUpTermAndConditionsButton() {
         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
         lblTermsAndConditions.attributedText = attributedString
         lblTermsAndConditions.isUserInteractionEnabled = true
@@ -1018,7 +1097,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let tap = UITapGestureRecognizer(target: self, action: #selector(aboutTerms))
         lblTermsAndConditions.addGestureRecognizer(tap)
     }
-    
+
     @objc func aboutTerms(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.")
@@ -1027,18 +1106,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         vc.modalPresentationStyle = .overFullScreen
         present(vc, animated: true, completion: nil)
     }
-    
+
     //MARK: - Term & Conditions setup for Single saved bank account view
     func setUpTermAndConditionsForSingleSavedAccountButton() {
         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
         lblTermsAndCondtionsSingleAccount.attributedText = attributedString
         lblTermsAndCondtionsSingleAccount.isUserInteractionEnabled = true
@@ -1046,7 +1125,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let tap = UITapGestureRecognizer(target: self, action: #selector(aboutTermsAndConditions))
         lblTermsAndCondtionsSingleAccount.addGestureRecognizer(tap)
     }
-    
+
     @objc func aboutTermsAndConditions(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.")
@@ -1055,18 +1134,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         vc.modalPresentationStyle = .overFullScreen
         present(vc, animated: true, completion: nil)
     }
-    
+
     //MARK: - Term & Conditions setup for GrailPay saved bank account view
     func setUpTermAndConditionsForGrailPaySavedAccountButton() {
         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
         lblGrailPayTermsAndCondition.attributedText = attributedString
         lblGrailPayTermsAndCondition.isUserInteractionEnabled = true
@@ -1074,7 +1153,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let tap = UITapGestureRecognizer(target: self, action: #selector(aboutTermsAndGrailPayConditions))
         lblGrailPayTermsAndCondition.addGestureRecognizer(tap)
     }
-    
+
     @objc func aboutTermsAndGrailPayConditions(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.")
@@ -1083,12 +1162,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         vc.modalPresentationStyle = .overFullScreen
         present(vc, animated: true, completion: nil)
     }
-    
+
     func didPassTextBack(_ text: String) {
         print("Received text: \(text)")
         isFrom = text
     }
-    
+
     override func observeValue(forKeyPath keyPath: String?, of object: Any?, change: [NSKeyValueChangeKey : Any]?, context: UnsafeMutableRawPointer?) {
         guard keyPath == "contentSize" else {
             super.observeValue(forKeyPath: keyPath, of: object, change: change, context: context)
@@ -1102,42 +1181,42 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         else if let tableView = object as? UITableView, tableView == tblViewSavedBankAccounts {
             tblViewSavedBankAccountsHeight.constant = tblViewSavedBankAccounts.contentSize.height
         }
-        
+
         UIView.animate(withDuration: 0.5) {
             self.updateViewConstraints()
         }
     }
-    
+
     private func setupTextFields() {
         let textFields = [txtFieldOTPText1, txtFieldOTPText2, txtFieldOTPText3, txtFieldOTPText4, txtFieldOTPText5, txtFieldOTPText6]
-        
+
         for textField in textFields {
             textField?.delegate = self
             textField?.textContentType = .oneTimeCode
             textField?.addTarget(self, action: #selector(textFieldDidChange(_:)), for: .editingChanged)
         }
     }
-    
+
     func configureWith(request: Request, delegate: EasyPayViewControllerDelegate?) {
         self.request = request
         self.delegate = delegate
     }
-    
+
     @objc func dismissKeyboard() {
         self.view.endEditing(true)
     }
-    
+
     private func startTimer() {
         timeRemaining = 180 // 3 minutes
         lblOtpTimer.text = formatTime(timeRemaining)
         timer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(updateTimer), userInfo: nil, repeats: true)
     }
-    
+
     private func stopTimer() {
         timer?.invalidate()
         timer = nil
     }
-    
+
     @objc private func updateTimer() {
         if timeRemaining > 0 {
             timeRemaining -= 1
@@ -1150,68 +1229,68 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             lblUntillResendOtp.isHidden = true
         }
     }
-    
+
     private func formatTime(_ seconds: Int) -> String {
         let minutes = seconds / 60
         let seconds = seconds % 60
         return String(format: "%02d:%02d", minutes, seconds)
     }
-    
+
     //MARK: - Crypto Functions
     private func generateQRCode(from string: String) -> UIImage? {
         // Convert string to data
         guard let data = string.data(using: .ascii) else { return nil }
-        
+
         // Create QR Code filter
         guard let qrFilter = CIFilter(name: "CIQRCodeGenerator") else { return nil }
         qrFilter.setValue(data, forKey: "inputMessage")
-        
+
         // Get QR Code output image
         guard let qrImage = qrFilter.outputImage else { return nil }
-        
+
         // Scale QR Code for better quality
         let transform = CGAffineTransform(scaleX: 10, y: 10)
         let scaledQRImage = qrImage.transformed(by: transform)
-        
+
         // Get the primary font color from UserStoreSingleton
         guard let primaryFontHex = UserStoreSingleton.shared.primary_font_col else {
             return UIImage(ciImage: scaledQRImage) // Return default black QR
         }
-        
+
         guard let primaryUIColor = UIColor(hex: primaryFontHex) else {
             return UIImage(ciImage: scaledQRImage)
         }
-        
+
         // Convert UIColor to CIColor
         let primaryCIColor = CIColor(color: primaryUIColor)
         let backgroundCIColor = CIColor(color: .clear) // Transparent background
-        
+
         // Apply color filter to QR code
         guard let colorFilter = CIFilter(name: "CIFalseColor") else { return nil }
         colorFilter.setValue(scaledQRImage, forKey: "inputImage")
         colorFilter.setValue(primaryCIColor, forKey: "inputColor0") // QR Code color
         colorFilter.setValue(backgroundCIColor, forKey: "inputColor1") // Background color
-        
+
         // Get the colored QR output
         guard let coloredQRImage = colorFilter.outputImage else { return nil }
-        
+
         // Convert CIImage to UIImage
         let context = CIContext()
         guard let cgImage = context.createCGImage(coloredQRImage, from: coloredQRImage.extent) else { return nil }
-        
+
         return UIImage(cgImage: cgImage)
     }
-    
+
     func startCryptoTimer() {
         resetTimer()
-        
+
         lblTimerCrypto.text = formatTime(seconds: totalTimeInSeconds)
-        
+
         cryptoTimer = DispatchSource.makeTimerSource()
         cryptoTimer?.schedule(deadline: .now(), repeating: 1.0)
         cryptoTimer?.setEventHandler { [weak self] in
             guard let self = self else { return }
-            
+
             DispatchQueue.main.async {
                 if self.totalTimeInSeconds > 0 {
                     self.totalTimeInSeconds -= 1
@@ -1226,30 +1305,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             }
         }
-        
+
         cryptoTimer?.resume()
         isTimerRunning = true
-        
+
         // Start the 30-second interval timer
         startCryptoInfoTimer()
     }
-    
+
     func resetTimer() {
         cryptoTimer?.cancel()
         cryptoTimer = nil
         totalTimeInSeconds = 300
         isTimerRunning = false
-        
+
         // Stop the 30-second interval timer
         stopCryptoInfoTimer()
     }
-    
+
     func formatTime(seconds: Int) -> String {
         let minutes = seconds / 60
         let remainingSeconds = seconds % 60
         return String(format: "%02d:%02d", minutes, remainingSeconds)
     }
-    
+
     func startCryptoInfoTimer() {
         // Invalidate any existing timer
         cryptoInfoTimer?.invalidate()
@@ -1261,43 +1340,43 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
     }
-    
+
     func stopCryptoInfoTimer() {
         cryptoInfoTimer?.invalidate()
         cryptoInfoTimer = nil
     }
-    
+
     @IBAction func actionBtnClose(_ sender: UIButton) {
         UserStoreSingleton.shared.clearUserData()
         UserStoreSingleton.shared.isLoggedIn = false
         self.dismiss(animated: true)
     }
-    
+
     @IBAction func actionBtnShowSavedCards(_ sender: UIButton) {
         emailView.isHidden = false
         OTPView.isHidden = true
     }
-    
+
     @IBAction func actionBtnCloseEmailView(_ sender: UIButton) {
         emailView.isHidden = true
     }
-    
+
     @IBAction func actionBtnCloseOTPView(_ sender: UIButton) {
         stopTimer()
         OTPView.isHidden = true
     }
-    
+
     @IBAction func actionBtnResendOTP(_ sender: UIButton) {
         startTimer()
         btnResendOTP.isHidden = true
         imgEsclamationMark.isHidden = false
         lblOtpTimer.isHidden = false
         lblUntillResendOtp.isHidden = false
-        
+
         //Call email verification APi
         emailVerificationApi()
     }
-    
+
     @IBAction func actionBtnSelectSingleSavedCard(_ sender: UIButton) {
         // Toggle the boolean property
         isSelectForPay.toggle()
@@ -1325,7 +1404,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnNextTopCon.constant = 8
         }
     }
-    
+
     @IBAction func actionBtnChangeSavedCard(_ sender: UIButton) {
         self.viewChangeCard.isHidden = false
         self.viewCardFields.isHidden = true
@@ -1336,7 +1415,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.viewUpdateCard.isHidden = true
         self.viewAddNewCard.isHidden = true
     }
-    
+
     @IBAction func actionBtnCloseChangedCardView(_ sender: UIButton) {
         self.viewChangeCard.isHidden = true
         self.viewSingleSavedCard.isHidden = false
@@ -1347,45 +1426,45 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.viewUpdateCard.isHidden = true
         self.viewAddNewCard.isHidden = true
     }
-    
+
     @IBAction func actionBtnPayNowSingleSavedCard(_ sender: UIButton) {
         // Check if billingInfoData is not nil or empty
         if let billingInfoData = request.billingInfoData,
            let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
            let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
             print("Billing Info Data: \(jsonDict)")
-            
+
             let cvvText = txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-            
+
             if cvvText.isEmpty {
                 self.showAlert(title: "Missing CVV", message: "Please enter the CVV to proceed.")
             } else if cvvText.count < 3 {
                 self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
             }
-            
+
             // Instantiate BillingInfoVC and pass the selected card data and CVV text
             let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-            
+
             billingInfoVC.isFrom = "SavedCards"
             billingInfoVC.selectedCard = selectedCard // Passing the selected card data
             billingInfoVC.cvvText = cvvText // Passing the CVV text
             billingInfoVC.amount = Int(request.amount)
             billingInfoVC.selectedPaymentMethod = selectedPaymentMethod
-            
+
             // Pass the billing info data and auth token
             if let billingInfoData = request.billingInfoData,
                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                let jsonDict = json as? [String: Any] {
                 billingInfoVC.billingInfoData = jsonDict
             }
-            
+
             // Navigate to BillingInfoVC
             self.navigationController?.pushViewController(billingInfoVC, animated: true)
         }
         else {
             // If billingInfoData is nil or empty, set the button title to "Pay Now"
             let cvvText = txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-            
+
             if cvvText.isEmpty {
                 self.showAlert(title: "Missing CVV", message: "Please enter the CVV to proceed.")
             }
@@ -1397,11 +1476,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
     }
-    
+
     @IBAction func actionBtnSelectUpdateCardView(_ sender: UIButton) {
-        
+
     }
-    
+
     @IBAction func actionBtnUpdateCard(_ sender: UIButton) {
         // Check if a card ID is selected
         guard let cardID = selectedCardID else {
@@ -1410,11 +1489,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.present(alert, animated: true, completion: nil)
             return
         }
-        
+
         // Call the updateCardApi with the selected card's ID
         updateCardApi(cardID: cardID)
     }
-    
+
     @IBAction func actionBtnCloseUpdateCardView(_ sender: UIButton) {
         self.viewChangeCard.isHidden = false
         self.viewSingleSavedCard.isHidden = true
@@ -1425,7 +1504,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.viewUpdateCard.isHidden = true
         self.viewAddNewCard.isHidden = true
     }
-    
+
     @IBAction func actionBtnCloseNewCardView(_ sender: UIButton) {
         self.viewChangeCard.isHidden = false
         self.viewSingleSavedCard.isHidden = true
@@ -1436,7 +1515,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.viewUpdateCard.isHidden = true
         self.viewAddNewCard.isHidden = true
     }
-    
+
     @IBAction func actionBtnPayNowNewCardView(_ sender: UIButton) {
         if UserStoreSingleton.shared.isLoggedIn == true {
             //if billing info is availbale
@@ -1444,13 +1523,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
                 print("Billing Info Data: \(jsonDict)")
-                
+
                 // Retrieve and trim text field values (removing leading and trailing whitespace)
                 let cardNumber = txtFieldCardNumberNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
                 let expiryDate = txtFieldExpiryDateNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
                 let cvv = txtFieldCVVNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
                 let nameOnCard = txtFieldNameOnCardNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-                
+
                 // Check if any field is empty
                 if cardNumber.isEmpty || expiryDate.isEmpty || cvv.isEmpty || nameOnCard.isEmpty {
                     let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
@@ -1458,13 +1537,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.present(alert, animated: true, completion: nil)
                     return
                 }
-                
+
                 // Validate expiry date format
                 let expiryDateFormat = "MM/yyyy"
                 let dateFormatter = DateFormatter()
                 dateFormatter.dateFormat = expiryDateFormat
                 dateFormatter.locale = Locale(identifier: "en_US_POSIX")
-                
+
                 // Split the expiry date and validate its format
                 let exp = expiryDate.split(separator: "/")
                 if exp.count != 2 || exp[0].count != 2 || exp[1].count != 4 {
@@ -1473,7 +1552,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.present(alert, animated: true, completion: nil)
                     return
                 }
-                
+
                 // Check if the expiry date is valid
                 if let expiryDateObj = dateFormatter.date(from: expiryDate) {
                     // Check if the expiry date is in the past
@@ -1492,28 +1571,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.present(alert, animated: true, completion: nil)
                     return
                 }
-                
+
                 // Instantiate BillingInfoVC and pass the card details
                 let billingInfoVC = UIStoryboard(name: "easymerchantsdk", bundle: .easyPayBundle).instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
-                
+
                 // Pass the card details
                 billingInfoVC.cardNumber = cardNumber
                 billingInfoVC.expiryDate = expiryDate
                 billingInfoVC.cvv = cvv
                 billingInfoVC.nameOnCard = nameOnCard
                 billingInfoVC.isSavedNewCard = isSavedNewCardForFuture
-                
+
                 billingInfoVC.isFrom = "AddNewCard"
                 billingInfoVC.amount = Int(request.amount)
                 billingInfoVC.selectedPaymentMethod = selectedPaymentMethod
-                
+
                 // Pass the billing info data and auth token
                 if let billingInfoData = request.billingInfoData,
                    let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
                    let jsonDict = json as? [String: Any] {
                     billingInfoVC.billingInfoData = jsonDict
                 }
-                
+
                 // Navigate to BillingInfoVC
                 self.navigationController?.pushViewController(billingInfoVC, animated: true)
             }
@@ -1522,68 +1601,81 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
     }
-    
+
     @IBAction func actionBtnSaveCardForFutureNewCardView(_ sender: UIButton) {
         isSavedNewCardForFuture.toggle()
         // Change the image based on the state
         let imageName = isSavedNewCardForFuture ? "checkmark.square.fill" : "square"
         btnSavedCardForFutureNewCardView.setImage(UIImage(systemName: imageName), for: .normal)
     }
-    
+
     @IBAction func actionBtnSaveCardForFuture(_ sender: UIButton) {
         isSavedForFuture.toggle()
         // Change the image based on the state
         let imageName = isSavedForFuture ? "checkmark.square.fill" : "square"
         btnCheckBoxSavedCard.setImage(UIImage(systemName: imageName), for: .normal)
     }
-    
+
     @IBAction func actionBtnGrailPayCheckBoxSaveAccountForFuture(_ sender: UIButton) {
-        
+
     }
-    
+
     @IBAction func actionBtnGrailPayCheckAgreeTerms(_ sender: UIButton) {
-        
+
+    }
+
+    @IBAction func actinBtnChangeGrailPayNewAccount(_ sender: UIButton) {
+
     }
-    
+
+    @IBAction func actionBtnCheckBoxGrailPayNewAccountSavedForFuture(_ sender: UIButton) {
+
+    }
+
+    @IBAction func actionBtnCheckBoxTermsGrailPayNewAccount(_ sender: UIButton) {
+
+    }
+
     @IBAction private func actionBtnLinkGrailPayBankAccount(_ sender: UIButton) {
         if isBankAccountConnected {
-            print("Proceed with bank-connected actions.")
-        } else {
+            print("Proceed payment with GrailPay Bank Account")
+        }
+        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")
@@ -1605,30 +1697,90 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
     }
-    
+
+    @IBAction func actionLinkNewGrailPayAccount(_ sender: UIButton) {
+        if isBankAccountConnected {
+            print("Proceed payment with GrailPay Bank Account")
+        }
+        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.newGrailPayAccountConnectApi(account: firstAccount)
+                    //  ✅ Optional UI updates
+                    self.lblAbandonGrailPayNewAccountView.text = "Default account successfully set"
+                    self.viewAbandonGrailPayNewAccountView.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))"
+
+                    btnLinkGrailPayAddNewAccount.setTitle(defaultTitle, for: .normal)
+                } else {
+                    print("⚠️ chargeData does not contain valid account data")
+                    self.lblAbandonGrailPayNewAccountView.text = "Failed to retrieve account info"
+                    self.lblAbandonGrailPayNewAccountView.textColor = .systemRed
+                    self.viewAbandonGrailPayNewAccountView.isHidden = false
+                }
+            case .cancelled:
+                print("⚠️ GrailPay cancelled")
+                self.viewAbandonGrailPayNewAccountView.isHidden = false
+                self.lblAbandonGrailPayNewAccountView.text = "User has abandoned the action"
+            case .error:
+                if let error = result.error {
+                    print("❌ GrailPay error: \(error.localizedDescription)")
+                } else {
+                    print("❌ GrailPay unknown error")
+                }
+            }
+        }
+    }
+
     //MARK: - Account Connect Api
     func accountConnectApi(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")
         }
-        
+
         // Prepare parameters
         let params: [String: Any] = [
             "account_uuid": account["account_uuid"] ?? "",
@@ -1646,11 +1798,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "account_status": account["account_status"] ?? "",
             "customer_id": "" // 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)")
             }
@@ -1659,30 +1811,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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 {
                             self.isBankAccountConnected = true
                             self.defaultBankAccountID = responseObject["default_account"] as? String
@@ -1690,27 +1842,156 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.isBankAccountConnected = false
                             self.defaultBankAccountID = nil
                         }
-                        
+
                         DispatchQueue.main.async {
                             // ✅ Show saved bank UI
                             self.viewGrailPaySavedBank.isHidden = false
                             self.viewGrailPaySavedAccount.isHidden = false
-                            
+
                             if let accountNumber = account["account_number"] as? String {
                                 let last4 = String(accountNumber.suffix(4))
                                 self.lblGrailPaySavedAccountNumber.text = "****\(last4)"
                             } else {
                                 self.lblGrailPaySavedAccountNumber.text = "****----" // Default/fallback text
                             }
-                            
+
                             // ✅ Set account type
                             if let accountType = account["account_type"] as? String {
                                 self.lblGrailPaySavedAccountType.text = "Type: \(accountType.capitalized)"
                             }
-                            
+
                             // ✅ Optionally hide abandon view if visible
                             self.viewGrailPayAbandon.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()
+    }
+
+    //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")
+        }
+
+        // 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": "" // 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.isBankAccountConnected = true
+                                self.defaultNewBankAccountID = responseObject["default_account"] as? String
+                                self.isSavedNewGrailPayAccount = true
+                                self.updateUIForNewGrailPayAccount()
+                            }
+                        }
+
+                        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
@@ -1719,7 +2000,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             }
                         }
                     }
-                    
+
                     else {
                         print("❌ Invalid JSON format")
                     }
@@ -1730,10 +2011,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 print("❌ HTTP Status Code: \(httpResponse.statusCode)")
             }
         }
-        
+
         task.resume()
     }
-    
+
+
     // MARK: - Action Button Next
     @IBAction func actionBtnNext(_ sender: UIButton) {
         // Check if billing info data exists and is valid JSON
@@ -1744,27 +2026,27 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                       let jsonDict = json as? [String: Any], !jsonDict.isEmpty else {
                     return
                 }
-                
+
                 DispatchQueue.main.async {
                     // Ensure UI updates happen on the main thread
                     guard let self = self else { return }
-                    
+
                     if self.selectedPaymentMethod == "Card" {
                         // Trim whitespace and newlines
                         let cardNumber = self.cardNumberTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                         let expiryDate = self.cardExpiryTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                         let cvv = self.cardCvvTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                         let cardName = self.cardNameTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
-                        
+
                         // Remove spaces from card number for validation
                         let sanitizedCardNumber = cardNumber.replacingOccurrences(of: " ", with: "")
-                        
+
                         // Regular expression for expiry date format MM/yyyy
                         let expiryDateRegex = #"^(0[1-9]|1[0-2])\/\d{4}$"#
-                        
+
                         // Regular expression for a valid name (only letters and spaces)
                         let nameRegex = #"^[A-Za-z\s]+$"#
-                        
+
                         // Validation checks
                         if cardNumber.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Number is required.")
@@ -1801,11 +2083,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
@@ -1830,22 +2122,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             // Billing info is nil or empty
             if selectedPaymentMethod == "Card" {
                 /// Card Case
-                
+
                 // Trim whitespace and newlines
                 let cardNumber = self.cardNumberTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                 let expiryDate = self.cardExpiryTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                 let cvv = self.cardCvvTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
                 let cardName = self.cardNameTextField.text.trimmingCharacters(in: .whitespacesAndNewlines)
-                
+
                 // Remove spaces from card number for validation
                 let sanitizedCardNumber = cardNumber.replacingOccurrences(of: " ", with: "")
-                
+
                 // Regular expression for expiry date format MM/yyyy
                 let expiryDateRegex = #"^(0[1-9]|1[0-2])\/\d{4}$"#
-                
+
                 // Regular expression for a valid name (only letters and spaces)
                 let nameRegex = #"^[A-Za-z\s]+$"#
-                
+
                 // Validation checks
                 if cardNumber.isEmpty {
                     self.showAlert(title: "Missing Information", message: "Card Number is required.")
@@ -1877,13 +2169,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
@@ -1898,7 +2202,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
     }
-    
+
     // Function to navigate to EmailVerificationVC
     func navigateCardDataToEmailVerificationVC() {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
@@ -1912,7 +2216,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
         }
     }
-    
+
     func navigateBankDataToEmailVerificationVC() {
         if let emailVerificationVC = storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
             emailVerificationVC.accountName = txtFieldAccountName.text
@@ -1925,11 +2229,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.navigationController?.pushViewController(emailVerificationVC, animated: true)
         }
     }
-    
+
     @IBAction func actionBtnSettings(_ sender: UIButton) {
         settingsView.isHidden = false
     }
-    
+
     @IBAction func actionBtnLogout(_ sender: UIButton) {
         UserStoreSingleton.shared.clearUserData()
         UserStoreSingleton.shared.isLoggedIn = false
@@ -1942,7 +2246,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         txtFieldOTPText4.text = ""
         txtFieldOTPText5.text = ""
         txtFieldOTPText6.text = ""
-        
+
         if selectedPaymentMethod == "Card" {
             self.viewSingleSavedAccount.isHidden = true
             self.viewBankFields.isHidden = true
@@ -1985,32 +2289,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.viewChangedAccount.isHidden = true
         }
     }
-    
+
     @IBAction func actionBtnCloseSettingView(_ sender: UIButton) {
         settingsView.isHidden = true
     }
-    
+
     //MARK: - Bank View Buttons Actions
     @IBAction func actionBtnSelectAccountType(_ sender: UIButton) {
         UIView.animate(withDuration: 0.3) {
             self.viewAccountType.isHidden.toggle()
         }
     }
-    
+
     @IBAction func actionBtnSaveAccountForFuture(_ sender: UIButton) {
         isSavedForFuture.toggle()
         // Change the image based on the state
         let imageName = isSavedForFuture ? "checkmark.square.fill" : "square"
         btnCheckSavedAccountForFuture.setImage(UIImage(systemName: imageName), for: .normal)
     }
-    
+
     @IBAction func actionBtnCheckAgreeTermsConditions(_ sender: UIButton) {
         agreeTermsAndCondtition.toggle()
         // Change the image based on the state
         let imageName = agreeTermsAndCondtition ? "checkmark.square.fill" : "square"
         btnAgreeTermsConditions.setImage(UIImage(systemName: imageName), for: .normal)
     }
-    
+
     @IBAction func actionBtnSelectSingleAccountView(_ sender: UIButton) {
         // Toggle the boolean property
         isSelectForPayBank.toggle()
@@ -2021,42 +2325,42 @@ 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
         }
     }
-    
+
     @IBAction func actionBtnChangeSingleAccountView(_ sender: UIButton) {
         self.viewChangedAccount.isHidden = false
         self.viewBankFields.isHidden = true
         self.viewSingleSavedAccount.isHidden = true
     }
-    
+
     @IBAction func actionBtnAgreeTermsConditionsSingleAccountView(_ sender: UIButton) {
         agreeTermsAndCondtition.toggle()
         // Change the image based on the state
         let imageName = agreeTermsAndCondtition ? "checkmark.square.fill" : "square"
         btnCheckAgreeTermsAndConditionsSingleAccount.setImage(UIImage(systemName: imageName), for: .normal)
     }
-    
+
     @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
             }
-            
+
             // Proceed with the Pay Now action
             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
             // Pass the customer_id and account_id to BillingInfoVC
@@ -2073,54 +2377,67 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
                 return
             }
-            
+
             accountChargeSavedBankAccountApi()
         }
     }
-    
+
     @IBAction func actionBtnCloseChangeAccountView(_ sender: UIButton) {
         viewChangedAccount.isHidden = true
         viewSingleSavedAccount.isHidden = false
     }
-    
+
     @IBAction func actionBtnSaveAccountNewAccountView(_ sender: UIButton) {
         isSavedNewAccount.toggle()
         // Change the image based on the state
         let imageName = isSavedNewAccount ? "checkmark.square.fill" : "square"
         btnSavedNewAccountForFuture.setImage(UIImage(systemName: imageName), for: .normal)
     }
-    
+
     @IBAction func actionBtnAccontTypeNewAccountView(_ sender: UIButton) {
         UIView.animate(withDuration: 0.3) {
             self.viewAccountTypeNewAccountView.isHidden.toggle()
         }
     }
-    
+
     @IBAction func actionBtnPayNowNewAccountView(_ sender: UIButton) {
         // Check if billingInfoData is not nil or empty
         if let billingInfoData = request.billingInfoData,
            let json = try? JSONSerialization.jsonObject(with: billingInfoData, options: []),
            let jsonDict = json as? [String: Any], !jsonDict.isEmpty {
             print("Billing Info Data: \(jsonDict)")
-            
+
             // Retrieve and trim text field values (removing leading and trailing whitespace)
             let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
             let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
             let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
             let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-            
+            let confirmAccountNumber = txtFieldConfirmAccountNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
+
             // Check if any field is empty
-            if accountName.isEmpty || routingNumber.isEmpty || accountType.isEmpty || accountNumber.isEmpty {
+            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"
-            
+
             // Proceed with the Pay Now action
             let vc = easymerchantsdk.instantiateViewController(withIdentifier: "BillingInfoVC") as! BillingInfoVC
             vc.accountName = accountName
@@ -2147,7 +2464,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
     }
-    
+
     @IBAction func actionBtnCloseNewAccountView(_ sender: UIButton) {
         self.viewNewBankAccount.isHidden = true
         self.viewSingleSavedAccount.isHidden = true
@@ -2167,7 +2484,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.btnNextTopCon.constant = 8
         self.viewChangedAccount.isHidden = false
     }
-    
+
     //MARK: - Crypto View Buttons Actions
     @IBAction func actionBtnTryAgain(_ sender: UIButton) {
         // Call the crypto charge API again
@@ -2182,18 +2499,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.startCryptoTimer()
         }
     }
-    
+
     func setOnChainSelected() {
         // Retrieve primary and secondary button colors
         if let primaryBtnBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
            let primaryUIColor = UIColor(hex: primaryBtnBackGroundColor),
            let secondaryBtnBackgroundColor = UserStoreSingleton.shared.primary_btn_font_col,
            let secondaryUIColor = UIColor(hex: secondaryBtnBackgroundColor) {
-            
+
             // Set the selected state for OnChain button
             btnOnChain.backgroundColor = primaryUIColor
             btnOnChain.setTitleColor(secondaryUIColor, for: .normal)
-            
+
             // Reset the state for Lightning button
             btnLightning.backgroundColor = .clear
             btnLightning.setTitleColor(primaryUIColor, for: .normal)
@@ -2207,7 +2524,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnLightning.setTitleColor(.systemBlue, for: .normal)
         }
     }
-    
+
     @IBAction func actionBtnOnChain(_ sender: UIButton) {
         // Set the selected state for OnChain button
         setOnChainSelected()
@@ -2217,18 +2534,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             lblBTCAddress.text = "BTC Address: \(address)" // Update lblBTCAddress with the Chain Invoice Address
         }
     }
-    
+
     @IBAction func actionBtnLightning(_ sender: UIButton) {
         // Retrieve primary and secondary button colors
         if let primaryBtnBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
            let primaryUIColor = UIColor(hex: primaryBtnBackGroundColor),
            let secondaryBtnBackgroundColor = UserStoreSingleton.shared.primary_btn_font_col,
            let secondaryUIColor = UIColor(hex: secondaryBtnBackgroundColor) {
-            
+
             // Set the selected state for OnChain button
             btnLightning.backgroundColor = primaryUIColor
             btnLightning.setTitleColor(secondaryUIColor, for: .normal)
-            
+
             // Reset the state for Lightning button
             btnOnChain.backgroundColor = .clear
             btnOnChain.setTitleColor(primaryUIColor, for: .normal)
@@ -2241,37 +2558,37 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnOnChain.backgroundColor = .clear
             btnOnChain.setTitleColor(.systemBlue, for: .normal)
         }
-        
+
         // Generate QR code for Lightning URI
         if let uri = lightningURI {
             qrImageView.image = generateQRCode(from: uri)
             lblBTCAddress.text = "BTC Address: \(uri)" // Update lblBTCAddress with the Lightning URI
         }
     }
-    
+
     @IBAction func actionBtnCopyBTCAddress(_ sender: UIButton) {
         // Check if there is text to copy
         guard let btcAddressText = lblBTCAddress.text, !btcAddressText.isEmpty else {
             print("No address to copy")
             return
         }
-        
+
         // Extract the actual BTC address from the label text
         let components = btcAddressText.components(separatedBy: "BTC Address: ")
         if components.count > 1 {
             let btcAddress = components[1]
-            
+
             // Copy the address to the clipboard
             UIPasteboard.general.string = btcAddress
-            
+
             // Print success message to the console
             print("Address copied to clipboard successfully: \(btcAddress)")
-            
+
             // Optionally, show a toast message to the user
             showToast(message: "BTC Address copied to clipboard")
         }
     }
-    
+
     //MARK: - Card Scan Button Action
     @IBAction func actionButtonScanCard(_ sender: UIButton) {
 //        // Validate BlinkCard License
@@ -2281,66 +2598,66 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
 //            showLicenseErrorAlert(message: licenseErrorMessage)
 //            return
 //        }
-//        
+//
 //        // Proceed with card scanning if the license is valid
 //        blinkCardRecognizer = MBCBlinkCardRecognizer()
 //        blinkCardRecognizer.returnFullDocumentImage = true
-//        
+//
 //        let recognizerList = [blinkCardRecognizer!]
 //        let recognizerCollection = MBCRecognizerCollection(recognizers: recognizerList)
-//        
+//
 //        let customOverlayViewController: CustomOverlay = CustomOverlay.initFromStoryboard()
-//        
+//
 //        // Reconfigure recognizers with the overlay
 //        customOverlayViewController.reconfigureRecognizers(recognizerCollection)
-//        
+//
 //        // Create the recognizer runner view controller with custom overlay
 //        guard let recognizerRunnerViewController =
 //                MBCViewControllerFactory.recognizerRunnerViewController(withOverlayViewController: customOverlayViewController) else {
 //            showLicenseErrorAlert(message: "Failed to initialize the recognizer view controller.")
 //            return
 //        }
-//        
+//
 //        customOverlayViewController.delegate = self
 //        recognizerRunnerViewController.modalPresentationStyle = .fullScreen
-//        
+//
 //        // Present the recognizer runner view controller
 //        self.present(recognizerRunnerViewController, animated: true, completion: nil)
     }
-    
+
     private func showLicenseErrorAlert(message: String) {
         let alert = UIAlertController(title: "License Error", message: message, preferredStyle: .alert)
         alert.addAction(UIAlertAction(title: "OK", style: .default, handler: nil))
         self.present(alert, animated: true, completion: nil)
     }
-    
+
     //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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-        
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
+
         // Use the clientToken from your singleton
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-        
+
         // Define the parameters for the request
         let params: [String: Any] = [
             "card_search_value": txtFieldEmail.text ?? "",
             "card_search_key": "email"
         ]
-        
+
         do {
             // Convert the dictionary to JSON
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
@@ -2353,24 +2670,24 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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 {
@@ -2394,37 +2711,37 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - OTP Verification Api
     func otpVerificationApi() {
         showLoadingIndicator()
-        
+
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.verifyOtp.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")
-        
+
         // ✅ Safe access from main thread (assumes you call this from main thread)
         let email = self.txtFieldEmail.text ?? ""
         let otp = getCombinedOTP()
-        
+
         let params: [String: Any] = [
             "card_search_value": email,
             "card_search_key": "email",
             "otp": otp
         ]
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -2436,54 +2753,54 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             hideLoadingIndicator()
             return
         }
-        
+
         let task = URLSession.shared.dataTask(with: request) { serviceData, serviceResponse, error in
-            
+
             DispatchQueue.main.async {
                 self.hideLoadingIndicator()
             }
-            
+
             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 {
                 guard let data = serviceData else {
                     print("No data received")
                     return
                 }
-                
+
                 do {
                     if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                         print("Response Data: \(responseObject)")
-                        
+
                         guard let responseData = responseObject["data"] as? [String: Any],
                               let nestedData = responseData["data"] as? [String: Any] else {
                             print("Invalid response structure or missing keys")
                             return
                         }
-                        
+
                         let customerId = nestedData["customer_id"] as? String ?? ""
                         let customerToken = nestedData["customer_token"] as? String ?? ""
-                        
+
                         DispatchQueue.main.async {
                             UserStoreSingleton.shared.customerId = customerId
                             UserStoreSingleton.shared.customerToken = customerToken
                             UserStoreSingleton.shared.verificationEmail = email
                             UserStoreSingleton.shared.isLoggedIn = true
-                            
+
                             print("Saved Customer ID: \(UserStoreSingleton.shared.customerId ?? "nil")")
                             print("Saved Customer Token: \(UserStoreSingleton.shared.customerToken ?? "nil")")
                             print("Saved Verification Email: \(UserStoreSingleton.shared.verificationEmail ?? "nil")")
-                            
+
                             self.btnSettings.isHidden = false
-                            
+
                             if self.selectedPaymentMethod == "Card" {
                                 if customerId.isEmpty {
                                     self.OTPView.isHidden = true
@@ -2506,7 +2823,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.viewChangeCard.isHidden = true
                                     self.viewUpdateCard.isHidden = true
                                     self.viewAddNewCard.isHidden = true
-                                    
+
                                     self.viewTxtFieldCVVSingleCard.isHidden = true
                                     self.btnPayNowSingleCard.isHidden = true
                                     self.viewSingleSavedCardHeight.constant = 60
@@ -2518,73 +2835,61 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 self.getShowBankAccountsApi()
                             }
                         }
-                        
+
                     } else {
                         print("Invalid JSON format")
                     }
                 } catch {
                     print("Error parsing JSON: \(error)")
                 }
-                
+
             } else {
                 print("HTTP Status Code: \(httpResponse.statusCode)")
             }
         }
-        
+
         task.resume()
     }
-    
+
     //MARK: - GET Show Cards API
     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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-        
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "GET"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
+
         let token = UserStoreSingleton.shared.customerToken
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
-        
+
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (data, response, error) in
             guard let self = self else { return }
-            
+
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
             }
-            
+
             if let error = error {
                 print("Error: \(error.localizedDescription)")
                 return
             }
-            
+
             guard let data = data else { return }
-            
+
             do {
                 if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let cards = jsonResponse["Cards"] as? [[String: Any]] {
-                    
+
                     // Map JSON response to CardModel array
                     self.savedCards = cards.compactMap { cardDict in
                         return CardModel(
@@ -2597,13 +2902,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             isDefault: (cardDict["is_default"] as? Int ?? 0) == 1
                         )
                     }
-                    
+
                     DispatchQueue.main.async {
                         if let firstCard = self.savedCards.first {
                             self.lblCardNumberSigleSavedCard.text = "****\(firstCard.ccLast4)"
                             self.lblExpireDateSingelSavedCard.text = "Expiry: \(firstCard.ccValidThru)"
                         }
-                        
+
                         self.tblViewSavedCardsList.reloadData()
                     }
                 }
@@ -2613,39 +2918,27 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     // MARK: - Credit Card Charge Api If Billing info is nil and Without Login.
     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 {
             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")
-        
+
         let params: [String: Any] = [
             "name": cardNameTextField.text,
             "email": "test@gmail.com",
@@ -2658,7 +2951,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "currency": "usd",
             "payment_method": "card"
         ]
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -2670,30 +2963,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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"
@@ -2723,39 +3016,27 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     // MARK: - Credit Card Charge Api from Saved cards If Billing info is nil and if Logged in.
     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 {
             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")
-        
+
         // Prepare parameters for the API request
         let params: [String: Any] = [
             "name": UserStoreSingleton.shared.verificationEmail?.split(separator: "@").first ?? "",
@@ -2769,9 +3050,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "cvc": txtFieldCVVSingleSavedCard.text ?? "",
             "customer_id": selectedCard?.customerId ?? ""
         ]
-        
+
         print(params)
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -2783,30 +3064,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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"
@@ -2836,46 +3117,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - Credit Card Charge Api from Add new cards If Billing info is nil and Logged in.
     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 {
             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")
-        
+
         // 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) ?? ""
         let cardNumberText = (txtFieldCardNumberNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "").replacingOccurrences(of: " ", with: "")
         let expiryText = txtFieldExpiryDateNewCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        
-        
+
+
         // Check if any field is empty
         if cardNumberText.isEmpty || expiryText.isEmpty || cvvText.isEmpty || nameText.isEmpty {
             let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
@@ -2883,13 +3152,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.present(alert, animated: true, completion: nil)
             return
         }
-        
+
         // Validate expiry date format
         let expiryDateFormat = "MM/yyyy"
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = expiryDateFormat
         dateFormatter.locale = Locale(identifier: "en_US_POSIX")
-        
+
         // Split the expiry date and validate its format
         let exp = expiryText.split(separator: "/")
         if exp.count != 2 || exp[0].count != 2 || exp[1].count != 4 {
@@ -2898,7 +3167,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.present(alert, animated: true, completion: nil)
             return
         }
-        
+
         // Check if the expiry date is valid
         if let expiryDateObj = dateFormatter.date(from: expiryText) {
             // Check if the expiry date is in the past
@@ -2917,10 +3186,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.present(alert, animated: true, completion: nil)
             return
         }
-        
-        
+
+
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
-        
+
         var params: [String: Any] = [
             "name": nameText,
             "card_number": cardNumberText,
@@ -2934,21 +3203,21 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "save_card": isSavedNewCardForFuture ? 1 : 0,
             "email" : UserStoreSingleton.shared.verificationEmail ?? ""
         ]
-        
+
         // Add is_default parameter if save_card is 1
         if isSavedNewCardForFuture {
             params["is_default"] = "1"
         }
-        
+
         if let customerId = customerId {
             params["customer"] = customerId
             params["customer_id"] = customerId
         } else {
             params["username"] = emailPrefix
         }
-        
+
         print(params)
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -2960,30 +3229,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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 {
                 self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
                 return
             }
-            
+
             guard let httpResponse = serviceResponse as? HTTPURLResponse else {
                 self.presentPaymentErrorVC(errorMessage: "Invalid response")
                 return
             }
-            
+
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = serviceData {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
-                            
+
                             // 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"
@@ -3013,44 +3282,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - Update Cards Api.
     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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-        
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "PUT"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
+
         let token = UserStoreSingleton.shared.customerToken
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
-        
+
         // Get the text fields from the selected cell and trim whitespace
         let nameText = txtFieldNameOnCardUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let cvvText = txtFieldCVVUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let expiryText = txtFieldExpireDateUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        
+
         // Check if any field is empty
         if expiryText.isEmpty || cvvText.isEmpty || nameText.isEmpty {
             let alert = UIAlertController(title: "Missing Information", message: "Please fill in all card details.", preferredStyle: .alert)
@@ -3058,13 +3315,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.present(alert, animated: true, completion: nil)
             return
         }
-        
+
         // Validate expiry date format
         let expiryDateFormat = "MM/yyyy"
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = expiryDateFormat
         dateFormatter.locale = Locale(identifier: "en_US_POSIX")
-        
+
         // Split the expiry date and validate its format
         let exp = expiryText.split(separator: "/")
         if exp.count != 2 || exp[0].count != 2 || exp[1].count != 4 {
@@ -3073,7 +3330,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.present(alert, animated: true, completion: nil)
             return
         }
-        
+
         // Check if the expiry date is valid
         if let expiryDateObj = dateFormatter.date(from: expiryText) {
             // Check if the expiry date is in the past
@@ -3092,7 +3349,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.present(alert, animated: true, completion: nil)
             return
         }
-        
+
         // Set up parameters with selected card details
         let params: [String: Any] = [
             "card_id": cardID,
@@ -3101,9 +3358,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "exp_month": expiryText.components(separatedBy: "/").first ?? "",
             "exp_year": expiryText.components(separatedBy: "/").last ?? "",
         ]
-        
+
         print(params)
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -3115,31 +3372,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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 {
                 self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
                 return
             }
-            
+
             guard let httpResponse = serviceResponse as? HTTPURLResponse else {
                 self.presentPaymentErrorVC(errorMessage: "Invalid response")
                 return
             }
-            
+
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = serviceData {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
                             DispatchQueue.main.async {
-                                
+
                                 self.viewUpdateCard.isHidden = true
                                 self.viewChangeCard.isHidden = false
                                 self.OTPView.isHidden = true
@@ -3153,9 +3410,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 self.btnNext.isHidden = true
                                 self.btnNextHeight.constant = 0
                                 self.btnNextTopCon.constant = 8
-                                
+
                                 self.getShowCardsApi()
-                                
+
                                 self.txtFieldNameOnCardUpdateCardView.text = ""
                                 self.txtFieldExpireDateUpdateCardView.text = ""
                                 self.txtFieldCVVUpdateCardView.text = ""
@@ -3175,63 +3432,51 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - Delete Cards Api.
     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 {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-        
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "DELETE"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
+
         let token = UserStoreSingleton.shared.customerToken
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
-        
+
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
             guard let self = self else { return }
-            
+
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
             }
-            
+
             if let error = error {
                 DispatchQueue.main.async {
                     self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
                 }
                 return
             }
-            
+
             guard let httpResponse = serviceResponse as? HTTPURLResponse else {
                 DispatchQueue.main.async {
                     self.presentPaymentErrorVC(errorMessage: "Invalid response")
                 }
                 return
             }
-            
+
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-                
+
                 if let data = serviceData {
                     do {
                         // Try to parse the data as JSON
@@ -3255,7 +3500,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     func presentPaymentErrorVC(errorMessage: String) {
         DispatchQueue.main.async {
             if let paymentErrorVC = self.storyboard?.instantiateViewController(withIdentifier: "PaymentErrorVC") as? PaymentErrorVC {
@@ -3265,24 +3510,24 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
     }
-    
+
     //MARK: - Bank Api's
     // MARK: - GET Show Bank Accounts API
     func getShowBankAccountsApi() {
         showLoadingIndicator()
-        
+
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.account.path()
-        
+
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             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 {
             print("Customer token is missing or empty")
@@ -3290,66 +3535,66 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             showAlert(message: "Session expired. Please log in again.")
             return
         }
-        
+
         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 {
                 self.hideLoadingIndicator()
             }
-            
+
             if let error = error {
                 print("Error: \(error.localizedDescription)")
                 return
             }
-            
+
             if let httpResponse = response as? HTTPURLResponse {
                 print("Status Code: \(httpResponse.statusCode)")
                 print("Headers: \(httpResponse.allHeaderFields)")
             }
-            
+
             guard let data = data else {
                 print("No data received")
                 return
             }
-            
+
             if let responseString = String(data: data, encoding: .utf8) {
                 print("Response Body: \(responseString)")
             }
-            
+
             do {
                 let decoder = JSONDecoder()
                 let bankAccountModel = try decoder.decode(BankAccountModel.self, from: data)
-                
+
                 if bankAccountModel.status == true {
                     DispatchQueue.main.async {
                         self.bankAccounts = bankAccountModel.accounts ?? []
                         print("Number of bank accounts: \(self.bankAccounts.count)")
-                        
+
                         if self.bankAccounts.isEmpty {
                             print("No bank accounts found. Please add a new one.")
                             return
                         }
-                        
+
                         if let firstAccount = self.bankAccounts.first {
                             self.selectedbankAccounts = firstAccount
                             self.lblAccountNumberSingleAccountView.text = "****\(firstAccount.account_number_last_4 ?? "")"
                             self.lblAccountTypeSingleAccountView.text = "Type: \(firstAccount.account_type ?? "")"
                         }
-                        
+
                         self.tblViewSavedBankAccounts.reloadData()
-                        
+
                         self.viewSingleSavedAccount.isHidden = false
                         self.viewBankFields.isHidden = true
-                        
+
                         self.viewBtnShowSavedCards.isHidden = true
                         self.viewBtnShowSavedCardHeight.constant = 0
                         self.viewBtnShowSavedCardTopCon.constant = 0
-                        
+
                         self.OTPView.isHidden = true
                         self.emailView.isHidden = true
                         self.viewCardFields.isHidden = true
@@ -3360,24 +3605,26 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         self.btnNext.isHidden = true
                         self.btnNextHeight.constant = 0
                         self.btnNextTopCon.constant = 8
-                        
+
                         self.viewNewBankAccount.isHidden = true
                         self.viewCrypto.isHidden = true
                         self.viewTermsAndConditions.isHidden = true
                         self.viewChangedAccount.isHidden = true
-                        
+
                         if self.isSelectForPayBank {
                             self.viewTermAndConditionsSingleAccountView.isHidden = false
                             self.btnPayNowSingleAccountView.isHidden = false
-                            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")")
@@ -3389,29 +3636,29 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 print("Failed to parse response: \(error.localizedDescription)")
             }
         }
-        
+
         task.resume()
     }
-    
+
     //MARK: - Banking Account Charge Api If Billing info is nil and without Login
     func accountChargeApi() {
         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")
-        
+
         let params: [String: Any] = [
             "name": txtFieldAccountName.text ?? "",
             "email": "test@gmail.com",
@@ -3424,7 +3671,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
         ]
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -3436,30 +3683,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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"
@@ -3490,27 +3737,27 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - Banking Account Charge Api from Regular saved bank account if Billing info is nil
     func accountChargeSavedBankAccountApi() {
         showLoadingIndicator()
-        
+
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
-        
+
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-        
+
         var 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")
-        
+
         let params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
@@ -3518,9 +3765,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "description": "Test Description",
             "currency": "usd",
         ]
-        
+
         print(params)
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -3532,30 +3779,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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"
@@ -3586,32 +3833,32 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - Banking Account Charge Api from add new account if billing info is nil and user not saved the account
     func accountChargeAddNewAccountApi() {
         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")
-        
+
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        
+
         let params: [String: Any] = [
             "name": accountName,
             "email": UserStoreSingleton.shared.verificationEmail ?? "",
@@ -3624,9 +3871,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
         ]
-        
+
         print(params)
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -3638,30 +3885,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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"
@@ -3692,35 +3939,35 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - Account Charge Api if user saved the account.
     func accountChargeApi(customerId: String?) {
         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")
-        
+
         // Retrieve and trim text field values (removing leading and trailing whitespace)
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountNumber = txtFieldAccountNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
-        
+
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
-        
+
         var params: [String: Any] = [
             "name": accountName,
             "email": UserStoreSingleton.shared.verificationEmail ?? "",
@@ -3735,15 +3982,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "save_account": 1,
             "payment_method": "ach"
         ]
-        
+
         if let customerId = customerId {
             params["customer"] = customerId
         } else {
             params["username"] = emailPrefix
         }
-        
+
         print(params)
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -3755,30 +4002,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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 {
                 self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
                 return
             }
-            
+
             guard let httpResponse = serviceResponse as? HTTPURLResponse else {
                 self.presentPaymentErrorVC(errorMessage: "Invalid response")
                 return
             }
-            
+
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = serviceData {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
-                            
+
                             // 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"
@@ -3808,51 +4055,51 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - Delete Bank Account Api.
     func deleteAccountApi(accountID: String, at index: Int) {
         showLoadingIndicator()
-        
+
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()+"/\(accountID)"
-        
+
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-        
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "DELETE"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
+
         let token = UserStoreSingleton.shared.customerToken
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
-        
+
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
             guard let self = self else { return }
-            
+
             DispatchQueue.main.async {
                 self.hideLoadingIndicator() // Stop loader when response is received
             }
-            
+
             if let error = error {
                 DispatchQueue.main.async {
                     self.presentPaymentErrorVC(errorMessage: error.localizedDescription)
                 }
                 return
             }
-            
+
             guard let httpResponse = serviceResponse as? HTTPURLResponse else {
                 DispatchQueue.main.async {
                     self.presentPaymentErrorVC(errorMessage: "Invalid response")
                 }
                 return
             }
-            
+
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-                
+
                 if let data = serviceData {
                     do {
                         // Try to parse the data as JSON
@@ -3877,27 +4124,27 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     // MARK: - Crypto Charge API
     func cryptoChargeApi() {
         showLoadingIndicator()
-        
+
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.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")
-        
+
         let params: [String: Any] = [
             "name": UserStoreSingleton.shared.merchantName ?? "",
             "email": UserStoreSingleton.shared.merchantEmail ?? "",
@@ -3908,9 +4155,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "success_url": "https://stage-api.stage-easymerchant.io/webhook/crypto",
             "callback_url": "https://stage-api.stage-easymerchant.io/webhook/crypto"
         ]
-        
+
         print(params)
-        
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
@@ -3922,30 +4169,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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"
@@ -3956,18 +4203,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.chargeId = chargeId
                                     print("Charge ID: \(chargeId)")
                                 }
-                                
+
                                 // Extract chain_invoice address and lightning invoice fields
                                 if let data = responseObject["data"] as? [String: Any] {
                                     self.chainInvoiceAddress = (data["chain_invoice"] as? [String: Any])?["address"] as? String
                                     self.lightningURI = (data["lightning_invoice"] as? [String: Any])?["payreq"] as? String
-                                    
+
                                     // Default to OnChain QR code initially
                                     DispatchQueue.main.async {
                                         if let address = self.chainInvoiceAddress {
                                             self.qrImageView.image = self.generateQRCode(from: address)
                                             self.lblBTCAddress.text = "BTC Address: \(address)"
-                                            
+
                                             // Extract the amount from the URI
                                             if let uri = data["uri"] as? String {
                                                 if let amountString = self.extractAmount(from: uri) {
@@ -3979,7 +4226,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                                 }
                                             }
                                         }
-                                        
+
                                         self.viewCryptoQRCode.isHidden = false
                                         self.viewCryptoTryAgain.isHidden = true
                                     }
@@ -4002,60 +4249,60 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     // Helper function to extract the amount from the URI
     func extractAmount(from uri: String) -> String? {
         let regex = try? NSRegularExpression(pattern: "amount=([\\d.]+)", options: [])
         let matches = regex?.matches(in: uri, options: [], range: NSRange(location: 0, length: uri.count))
-        
+
         if let match = matches?.first, let amountRange = Range(match.range(at: 1), in: uri) {
             return String(uri[amountRange])
         }
         return nil
     }
-    
+
     //MARK: - GET Crypto Payment Info API
     func getCryptoPaymentInfoApi(chargeId: String) {
-        
+
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()+"/\(chargeId)"
-        
+
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
             hideLoadingIndicator()
             return
         }
-        
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "GET"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        
+
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-        
+
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (data, response, error) in
             guard let self = self else { return }
-            
+
             if let error = error {
                 print("Error: \(error.localizedDescription)")
                 return
             }
-            
+
             guard let data = data else { return }
-            
+
             do {
                 if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let responseData = jsonResponse["data"] as? [String: Any] {
-                    
+
                     // Extract required data
                     let amount = responseData["amount"] as? String ?? ""
                     let dateCreated = responseData["date_created"] as? String ?? ""
                     let status = responseData["status"] as? String ?? ""
                     let transactionId = responseData["transaction_id"] as? String ?? ""
-                    
+
                     print("Amount: \(amount), Date Created: \(dateCreated), Status: \(status), Transaction ID: \(transactionId)")
-                    
+
                     // Check if the status is "completed"
                     if status.lowercased() == "completed" {
                         DispatchQueue.main.async {
@@ -4070,7 +4317,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+
     //MARK: - Navigation to PaymentDoneVC
     func navigateToPaymentDoneVC(amount: String, dateCreated: String, transactionId: String) {
         if let paymentDoneVC = storyboard?.instantiateViewController(withIdentifier: "PaymentDoneVC") as? PaymentDoneVC {
@@ -4082,22 +4329,22 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             self.navigationController?.pushViewController(paymentDoneVC, animated: true)
         }
     }
-    
+
 }
 
 //MARK: - Collection View.
 extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
-    
+
     public func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return arrPaymentMethods.count
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
         let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "PaymentInformationCVC", for: indexPath) as! PaymentInformationCVC
         cell.setUI()
         cell.imgVwPayments.image = UIImage.init(systemName: arrPaymentMethods[indexPath.row].image)
         cell.lblPayment.text = arrPaymentMethods[indexPath.row].name
-        
+
         // Update border color based on selection
         if selectedIndex == indexPath {
             if let primaryBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -4111,10 +4358,10 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
             cell.imgVwPayments.tintColor = .systemGray
             cell.lblPayment.textColor = .systemGray
         }
-        
+
         return cell
     }
-    
+
     func loadPaymentMethods() {
         if let savedMethods = UserStoreSingleton.shared.paymentMethods {
             arrPaymentMethods = savedMethods.map { method in
@@ -4134,7 +4381,7 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                 return PaymentsData(name: method, image: imageName)
             }
         }
-        
+
         DispatchQueue.main.async {
             if !self.arrPaymentMethods.isEmpty {
                 self.selectedIndex = IndexPath(row: 0, section: 0)
@@ -4145,19 +4392,19 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
             self.collVwPayment.reloadData()
             self.collVwPayment.layoutIfNeeded()
         }
-        
+
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         selectedIndex = indexPath
         let method = arrPaymentMethods[indexPath.row].name
         updatePaymentMethodUI(for: method)
         collectionView.reloadData()
     }
-    
+
     func updatePaymentMethodUI(for method: String) {
         selectedPaymentMethod = method
-        
+
         switch method {
         case "Card":
             if UserStoreSingleton.shared.isLoggedIn == false {
@@ -4181,6 +4428,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,8 +4451,9 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                 self.viewNewBankAccount.isHidden = true
                 self.viewCrypto.isHidden = true
                 self.grailPayBankLinkView.isHidden = true
+                self.viewAddNewGrailPayAccount.isHidden = true
             }
-            
+
         case "Bank":
             if UserStoreSingleton.shared.isLoggedIn == false {
                 //  self.viewBankFields.isHidden = false
@@ -4225,12 +4474,13 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                 //   self.viewTermsAndConditions.isHidden = false
                 self.viewCrypto.isHidden = true
                 self.viewSingleSavedAccount.isHidden = true
-                
+
                 if request?.authenticatedACH == false {
                     self.viewBankFields.isHidden = false
                     self.viewTermsAndConditions.isHidden = false
                     self.grailPayBankLinkView.isHidden = true
                     self.viewGrailPayAbandon.isHidden = true
+
                 } else {
                     self.viewBankFields.isHidden = true
                     self.viewTermsAndConditions.isHidden = true
@@ -4239,15 +4489,16 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                     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 {
                 if request?.authenticatedACH == true {
                     self.viewBankFields.isHidden = true
@@ -4257,7 +4508,7 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                     self.btnNextHeight.constant = 0
                     self.btnNextTopCon.constant = 0
                     self.viewGrailPayAbandon.isHidden = true
-                    
+
                     if isBankAccountConnected {
                         self.viewBtnShowSavedCards.isHidden = true
                         self.btnShowSavedCard.isHidden = true
@@ -4265,15 +4516,15 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                         self.viewBtnShowSavedCardTopCon.constant = 0
                     }
                 }
-                
+
                 getShowBankAccountsApi()
             }
-            
+
         case "Crypto":
             self.cryptoChargeApi()
             self.startCryptoTimer()
             self.totalTimeInSeconds = 300
-            
+
             self.viewCrypto.isHidden = false
             self.viewQrCodeHeight.constant = 440
             self.viewCryptoHeight.constant = 440
@@ -4295,18 +4546,20 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
             self.viewTermsAndConditions.isHidden = true
             self.viewChangedAccount.isHidden = true
             self.viewNewBankAccount.isHidden = true
-            
+
             self.grailPayBankLinkView.isHidden = true
-            
+            self.viewAddNewGrailPayAccount.isHidden = true
+            self.viewAbandonGrailPayNewAccountView.isHidden = true
+
         default:
             break
         }
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
         return CGSize(width: 100, height: 70)
     }
-    
+
 }
 
 //MARK: - Table View
@@ -4316,7 +4569,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 {
@@ -4327,7 +4579,7 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         }
         return 0
     }
-    
+
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if tableView == tblViewSavedCardsList {
             let cell = tableView.dequeueReusableCell(withIdentifier: "SavedCardsTVC", for: indexPath) as! SavedCardsTVC
@@ -4336,14 +4588,14 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             cell.btnThreeDot.removeTarget(nil, action: nil, for: .allEvents)
             cell.btnRemoveCard.removeTarget(nil, action: nil, for: .allEvents)
             cell.btnUpdateCard.removeTarget(nil, action: nil, for: .allEvents)
-            
+
             // Check if it's the "Add New Card" cell
             if indexPath.row == savedCards.count {
                 configureAddNewCardCell(cell)
             } else {
                 configureSavedCardCell(cell, at: indexPath)
             }
-            
+
             return cell
         }
         else if tableView == tblViewSavedBankAccounts {
@@ -4352,7 +4604,7 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             cell.btnSelectAccount.removeTarget(nil, action: nil, for: .allEvents)
             cell.btnThreeDotBank.removeTarget(nil, action: nil, for: .allEvents)
             cell.btnRemoveBankAccount.removeTarget(nil, action: nil, for: .allEvents)
-            
+
             if indexPath.row == bankAccounts.count {
                 print("Showing 'Add New Account' cell")
                 configureAddNewAccountCell(cell)
@@ -4360,7 +4612,7 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
                 print("Configuring saved account cell at row: \(indexPath.row)")
                 configureSavedAccountCell(cell, at: indexPath)
             }
-            
+
             return cell
         }
         else if tableView == tblViewAccountTypes {
@@ -4373,10 +4625,10 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             cell.lblAccountType.text = arrAccountType[indexPath.row]
             return cell
         }
-        
+
         return UITableViewCell()
     }
-    
+
     //Card
     func configureAddNewCardCell(_ cell: SavedCardsTVC) {
         cell.lblCardNumber.text = "New Card"
@@ -4387,11 +4639,11 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         cell.btnSelectCard.tag = savedCards.count
         cell.btnSelectCard.addTarget(self, action: #selector(addNewCardTapped(_:)), for: .touchUpInside)
         cell.viewBtnRemoveUpdate.isHidden = true
-        
+
         cell.imgViewCardWidth.constant = 0
         cell.imgViewCardRightCon.constant = 0
     }
-    
+
     func configureSavedCardCell(_ cell: SavedCardsTVC, at indexPath: IndexPath) {
         let card = savedCards[indexPath.row]
         cell.lblCardNumber.text = "****\(card.ccLast4)"
@@ -4399,33 +4651,33 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         cell.lblExpireDate.text = "Expiry: \(card.ccValidThru)"
         cell.btnThreeDot.isHidden = false
         cell.imgViewCard.isHidden = false
-        
+
         // Reset constraints for regular saved card cells
         cell.imgViewCardWidth.constant = 40 // Set to the original width constraint value
         cell.imgViewCardRightCon.constant = 16 // Set to the original right constraint value
-        
+
         // Update button image based on the selected state
         let isSelected = (selectedCardIndex == indexPath.row)
         let imageName = isSelected ? "circle.inset.filled" : "circle"
         cell.btnSelectCard.setImage(UIImage(systemName: imageName), for: .normal)
-        
+
         // Set up actions for buttons
         cell.btnSelectCard.tag = indexPath.row
         cell.btnSelectCard.addTarget(self, action: #selector(btnSelectCardTapped(_:)), for: .touchUpInside)
-        
+
         cell.btnThreeDot.tag = indexPath.row
         cell.btnThreeDot.addTarget(self, action: #selector(btnThreeDotTapped(_:)), for: .touchUpInside)
-        
+
         cell.btnRemoveCard.tag = indexPath.row
         cell.btnRemoveCard.addTarget(self, action: #selector(btnRemoveCardTapped(_:)), for: .touchUpInside)
-        
+
         cell.btnUpdateCard.tag = indexPath.row
         cell.btnUpdateCard.addTarget(self, action: #selector(btnUpdateCardTapped(_:)), for: .touchUpInside)
-        
+
         // Hide or show the remove/update view based on cell state
         cell.viewBtnRemoveUpdate.isHidden = !cell.isRemoveUpdateViewVisible
     }
-    
+
     //Bank
     func configureAddNewAccountCell(_ cell: SavedAccountTVC) {
         cell.lblAccountNumber.text = "New Account"
@@ -4436,11 +4688,11 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         cell.btnSelectAccount.tag = bankAccounts.count
         cell.btnSelectAccount.addTarget(self, action: #selector(addNewBankAccountTapped(_:)), for: .touchUpInside)
         cell.viewBtnRemove.isHidden = true
-        
+
         cell.imgViewBankWidth.constant = 0
         cell.imgViewBankRightCon.constant = 0
     }
-    
+
     func configureSavedAccountCell(_ cell: SavedAccountTVC, at indexPath: IndexPath) {
         let bank = bankAccounts[indexPath.row]
         cell.lblAccountNumber.text = "****\(bank.account_number_last_4 ?? "")"
@@ -4448,30 +4700,30 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         cell.lblAccountType.text = "Type: \(bank.account_type ?? "")"
         cell.btnThreeDotBank.isHidden = false
         cell.imgViewBank.isHidden = false
-        
+
         // Reset constraints for regular saved card cells
         cell.imgViewBankWidth.constant = 40 // Set to the original width constraint value
         cell.imgViewBankRightCon.constant = 16 // Set to the original right constraint value
-        
+
         // Update button image based on the selected state
         let isSelected = (selectedBankIndex == indexPath.row)
         let imageName = isSelected ? "circle.inset.filled" : "circle"
         cell.btnSelectAccount.setImage(UIImage(systemName: imageName), for: .normal)
-        
+
         // Set up actions for buttons
         cell.btnSelectAccount.tag = indexPath.row
         cell.btnSelectAccount.addTarget(self, action: #selector(btnSelectAccountTapped(_:)), for: .touchUpInside)
-        
+
         cell.btnThreeDotBank.tag = indexPath.row
         cell.btnThreeDotBank.addTarget(self, action: #selector(btnThreeDotBankTapped(_:)), for: .touchUpInside)
-        
+
         cell.btnRemoveBankAccount.tag = indexPath.row
         cell.btnRemoveBankAccount.addTarget(self, action: #selector(btnRemoveBankAccountTapped(_:)), for: .touchUpInside)
-        
+
         // Hide or show the remove/update view based on cell state
         cell.viewBtnRemove.isHidden = !cell.isRemoveUpdateViewVisible
     }
-    
+
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if tableView == tblViewAccountTypes {
             return 45
@@ -4483,7 +4735,7 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             return 80
         }
     }
-    
+
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         if tableView == tblViewAccountTypes {
             let selectedAccountType = arrAccountType[indexPath.row]
@@ -4496,7 +4748,7 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             viewAccountTypeNewAccountView.isHidden = true // Hide the table view after selection
         }
     }
-    
+
     @objc func btnSelectCardTapped(_ sender: UIButton) {
         let index = sender.tag
         // Store the index of the previously selected card
@@ -4518,12 +4770,12 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         // Reload the newly selected row to update its state
         tblViewSavedCardsList.reloadRows(at: [IndexPath(row: index, section: 0)], with: .automatic)
     }
-    
+
     private func updateSingleCardView(for index: Int) {
         let selectedCard = savedCards[index]
         lblCardNumberSigleSavedCard.text = "****\(selectedCard.ccLast4)"
         lblExpireDateSingelSavedCard.text = "Expiry: \(selectedCard.ccValidThru)"
-        
+
         if isSelectForPay {
             viewTxtFieldCVVSingleCard.isHidden = false
             btnPayNowSingleCard.isHidden = false
@@ -4534,7 +4786,7 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             viewSingleSavedCardHeight.constant = 60
         }
     }
-    
+
     @objc func btnThreeDotTapped(_ sender: UIButton) {
         let index = sender.tag
         guard let cell = tblViewSavedCardsList.cellForRow(at: IndexPath(row: index, section: 0)) as? SavedCardsTVC else {
@@ -4544,13 +4796,13 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         cell.isRemoveUpdateViewVisible.toggle()
         cell.viewBtnRemoveUpdate.isHidden = !cell.isRemoveUpdateViewVisible
     }
-    
+
     @objc func btnRemoveCardTapped(_ sender: UIButton) {
         let index = sender.tag
-        
+
         let selectedCard = savedCards[index]
         selectedCardID = selectedCard.cardId
-        
+
         let alertController = UIAlertController(
             title: "Confirm Deletion",
             message: "Are you sure you want to delete this card?",
@@ -4566,15 +4818,15 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         alertController.addAction(yesAction)
         present(alertController, animated: true, completion: nil)
     }
-    
+
     @objc func btnUpdateCardTapped(_ sender: UIButton) {
         let index = sender.tag
         let selectedCard = savedCards[index]
         lblCardNumberUpdateCardView.text = "****\(selectedCard.ccLast4)"
         lblExpireDateUpdateCardView.text = "Expiry: \(selectedCard.ccValidThru)"
-        
+
         selectedCardID = selectedCard.cardId
-        
+
         viewUpdateCard.isHidden = false
         // Adjust view visibility
         viewBtnShowSavedCards.isHidden = true
@@ -4588,17 +4840,17 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         viewAddNewCard.isHidden = true
         viewSingleSavedCard.isHidden = true
     }
-    
+
     @objc func addNewCardTapped(_ sender: UIButton) {
         // Make the Add New Card view visible
         viewAddNewCard.isHidden = false
-        
+
         // Hide other conflicting views to prevent UI overlap
         viewSingleSavedCard.isHidden = true
         viewChangeCard.isHidden = true
         viewUpdateCard.isHidden = true
         viewCardFields.isHidden = true
-        
+
         // Adjust visibility of any other related views if necessary
         viewBtnShowSavedCards.isHidden = true
         viewBtnShowSavedCardHeight.constant = 0
@@ -4607,36 +4859,62 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         btnNextHeight.constant = 0
         btnNextTopCon.constant = 8
     }
-    
+
     //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) {
         let index = sender.tag
         // Store the index of the previously selected card
         let previousSelectedIndex = selectedBankIndex
-        
+
         // Toggle the selection state: if the same card is selected, deselect it; otherwise, select the new one
         selectedBankIndex = (selectedBankIndex == index) ? nil : index
-        
+
         // Update the single card view
         if let selectedIndex = selectedBankIndex {
             updateSingleBankView(for: selectedIndex)
@@ -4645,35 +4923,35 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         } else {
             viewSingleSavedAccount.isHidden = true
         }
-        
+
         // Reload the previously selected row to update its state
         if let previousIndex = previousSelectedIndex {
             tblViewSavedBankAccounts.reloadRows(at: [IndexPath(row: previousIndex, section: 0)], with: .automatic)
         }
-        
+
         // Reload the newly selected row to update its state
         tblViewSavedBankAccounts.reloadRows(at: [IndexPath(row: index, section: 0)], with: .automatic)
     }
-    
+
     private func updateSingleBankView(for index: Int) {
         let selectedCard = bankAccounts[index]
         lblAccountNumberSingleAccountView.text = "****\(selectedCard.account_number_last_4 ?? "")"
         lblAccountTypeSingleAccountView.text = "Type: \(selectedCard.account_type ?? "")"
-        
+
         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
         }
     }
-    
+
     @objc func btnThreeDotBankTapped(_ sender: UIButton) {
         let index = sender.tag
         guard let cell = tblViewSavedBankAccounts.cellForRow(at: IndexPath(row: index, section: 0)) as? SavedAccountTVC else {
@@ -4683,13 +4961,13 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         cell.isRemoveUpdateViewVisible.toggle()
         cell.viewBtnRemove.isHidden = !cell.isRemoveUpdateViewVisible
     }
-    
+
     @objc func btnRemoveBankAccountTapped(_ sender: UIButton) {
         let index = sender.tag
-        
+
         let selectedAccount = bankAccounts[index]
         selectedBankID = selectedAccount.account_id
-        
+
         let alertController = UIAlertController(
             title: "Confirm Deletion",
             message: "Are you sure you want to delete this account?",
@@ -4705,12 +4983,12 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         alertController.addAction(yesAction)
         present(alertController, animated: true, completion: nil)
     }
-    
+
 }
 
 // MARK: - Text Field Delegate Methods
 extension PaymentInfoVC: UITextFieldDelegate {
-    
+
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         if textField == txtFieldEmail {
             // Check if the email field is empty
@@ -4735,7 +5013,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
         textField.resignFirstResponder()
         return true
     }
-    
+
     func textFieldDidChangeSelection(_ textField: UITextField) {
         guard let otpCode = textField.text, otpCode.count >= 6, textField.textContentType == .oneTimeCode else { return }
         txtFieldOTPText1.text = String(otpCode[otpCode.index(otpCode.startIndex, offsetBy: 0)])
@@ -4746,7 +5024,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
         txtFieldOTPText6.text = String(otpCode[otpCode.index(otpCode.startIndex, offsetBy: 5)])
         txtFieldOTPText6.becomeFirstResponder()
     }
-    
+
     func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         // Handle card number input for both old and new card fields
         if textField == cardNumberTextField.textField || textField == txtFieldCardNumberNewCardView {
@@ -4755,20 +5033,20 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 textField.text = formatCardNumber(modifiedText)
                 return false
             }
-            
+
             let text = (textField.text ?? "") + string
             if text.filter({ $0.isNumber }).count > 16 {
                 return false
             }
-            
+
             textField.text = formatCardNumber(text)
             if let lastCharacter = text.last, lastCharacter == " " {
                 textField.text = String(text.dropLast())
             }
-            
+
             return false
         }
-        
+
         // Handle card CVV input for both old and new card fields
         else if textField == cardCvvTextField.textField || textField == txtFieldCVVNewCardView || textField == txtFieldCVVUpdateCardView {
             let maxLength = 3
@@ -4776,7 +5054,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
             let newString = currentString.replacingCharacters(in: range, with: string)
             return newString.count <= maxLength
         }
-        
+
         // Handle card expiry date input for both old and new card fields
         else if textField == cardExpiryTextField.textField || textField == txtFieldExpiryDateNewCardView || textField == txtFieldExpireDateUpdateCardView  {
             if range.length > 0 {
@@ -4788,24 +5066,24 @@ extension PaymentInfoVC: UITextFieldDelegate {
             if range.location > 6 {
                 return false
             }
-            
+
             var originalText = textField.text ?? ""
             let replacementText = string.replacingOccurrences(of: " ", with: "")
-            
+
             // Ensure only digits are allowed
             if !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: replacementText)) {
                 return false
             }
-            
+
             // Insert "/" after MM
             if range.location == 2 {
                 originalText.append("/")
             }
-            
+
             textField.text = originalText + replacementText
             return false
         }
-        
+
         // Handle OTP input fields
         else if [txtFieldOTPText1, txtFieldOTPText2, txtFieldOTPText3, txtFieldOTPText4, txtFieldOTPText5, txtFieldOTPText6].contains(textField) {
             if string.count == 1 {
@@ -4855,10 +5133,29 @@ 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
     }
-    
+
     // Helper method to format the card number with spaces
     func formatCardNumber(_ input: String) -> String {
         var formattedString = ""
@@ -4872,14 +5169,14 @@ extension PaymentInfoVC: UITextFieldDelegate {
         }
         return formattedString
     }
-    
+
     // Update the view colors based on text presence in OTP fields
     private func updateViewColors() {
         if let primaryBtnBackgroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
            let primaryUIColor = UIColor(hex: primaryBtnBackgroundColor),
            let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
            let secondaryUIColor = UIColor(hex: secondaryFontColor) {
-            
+
             viewTextOTP1.layer.borderWidth = 1.0
             viewTextOTP1.layer.borderColor = txtFieldOTPText1.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
             viewTextOTP2.layer.borderWidth = 1.0
@@ -4908,7 +5205,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
             viewTextOTP6.layer.borderColor = (txtFieldOTPText6.text?.isEmpty == false ? UIColor.systemBlue : UIColor.systemGray).cgColor
         }
     }
-    
+
     @objc func textFieldDidChange(_ textField: UITextField) {
         guard let otpCode = textField.text, otpCode.count >= 6, textField.textContentType == .oneTimeCode else { return }
         // Split the OTP into each text field
@@ -4921,7 +5218,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
         // Automatically move to the last text field
         txtFieldOTPText6.becomeFirstResponder()
     }
-    
+
     func getCombinedOTP() -> String {
         let otp1 = txtFieldOTPText1.text ?? ""
         let otp2 = txtFieldOTPText2.text ?? ""
@@ -4929,11 +5226,11 @@ extension PaymentInfoVC: UITextFieldDelegate {
         let otp4 = txtFieldOTPText4.text ?? ""
         let otp5 = txtFieldOTPText5.text ?? ""
         let otp6 = txtFieldOTPText6.text ?? ""
-        
+
         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 +5370,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,8 +5411,16 @@ 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) {
         if textField == cardNumberTextField.textField {
             if let bodyBackgroundColor = UserStoreSingleton.shared.secondary_font_col,
@@ -5248,6 +5561,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,36 +5602,43 @@ 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 */
 //        blinkCardOverlayViewController.recognizerRunnerViewController?.pauseScanning()
-//        
+//
 //        var message: String = ""
 //        var title: String = ""
-//        
+//
 //        if blinkCardRecognizer.result.resultState == .valid {
 //            title = "Payment card"
-//            
+//
 //            let fullDocumentImage: UIImage! = blinkCardRecognizer.result.firstSideFullDocumentImage?.image
 //            print("Got payment card image with width: \(fullDocumentImage.size.width), height: \(fullDocumentImage.size.height)")
-//            
+//
 //            // Save the string representation of the code
 //            message = blinkCardRecognizer.result.description
 //        }
-//        
+//
 //        /** Needs to be called on main thread beacuse everything prior is on background thread */
 //        DispatchQueue.main.async {
 //            // present the alert view with scanned results
-//            
+//
 //            let alertController: UIAlertController = UIAlertController.init(title: title, message: message, preferredStyle: .alert)
-//            
+//
 //            let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: .default,
 //                                                             handler: { (action) -> Void in
 //                self.dismiss(animated: true, completion: nil)
@@ -5319,20 +5647,20 @@ extension PaymentInfoVC: UITextFieldDelegate {
 //            blinkCardOverlayViewController.present(alertController, animated: true, completion: nil)
 //        }
 //    }
-//    
+//
 //    func blinkCardOverlayViewControllerDidTapClose(_ blinkCardOverlayViewController: MBCBlinkCardOverlayViewController) {
 //        self.dismiss(animated: true, completion: nil)
 //    }
-//    
+//
 //    func blinkCardOverlayViewControllerDidFinishEditing(_ blinkCardOverlayViewController: MBCBlinkCardOverlayViewController, editResult: MBCBlinkCardEditResult) {
 //        blinkCardOverlayViewController.recognizerRunnerViewController?.pauseScanning()
-//        
+//
 //        /** Needs to be called on main thread beacuse everything prior is on background thread */
 //        DispatchQueue.main.async {
 //            // present the alert view with scanned results
-//            
+//
 //            let alertController: UIAlertController = UIAlertController.init(title: "BlinkCard Edit Results", message: editResult.description, preferredStyle: .alert)
-//            
+//
 //            let okAction: UIAlertAction = UIAlertAction.init(title: "OK", style: .default,
 //                                                             handler: { (action) -> Void in
 //                self.dismiss(animated: true, completion: nil)
@@ -5341,7 +5669,7 @@ extension PaymentInfoVC: UITextFieldDelegate {
 //            blinkCardOverlayViewController.blinkCardEditViewController?.present(alertController, animated: true, completion: nil)
 //        }
 //    }
-//    
+//
 //}
 
 //extension PaymentInfoVC: CustomOverlayDelegate {
@@ -5352,5 +5680,5 @@ extension PaymentInfoVC: UITextFieldDelegate {
 //        cardCvvTextField.text = cvv
 //        cardNameTextField.text = nameOnCard
 //    }
-//    
+//
 //}