@jimrising/easymerchantsdk-react-native 2.2.9 → 2.3.1

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

@@ -82,6 +82,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var imgViewCalenderIconCard: UIImageView!
     @IBOutlet weak var txtFieldEmailCardView: TextFieldStackView!
     @IBOutlet weak var viewTxtFieldEmailCardView: UIView!
+    @IBOutlet weak var btnChosePlanCardView: UIButton!
     
     @IBOutlet weak var btnScanCard: UIButton!
     
@@ -90,6 +91,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var btnNextEmailView: FilledButton!
     @IBOutlet weak var viewTxtFieldEmail: UIView!
     @IBOutlet weak var OTPView: UIView!
+    @IBOutlet weak var btnSelectRecurringDateCardView: UIButton!
     
     //OTP View
     @IBOutlet weak var viewTextOTP1: UIView!
@@ -134,6 +136,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var txtFieldSelectPlanSingleSavedCard: TextFieldStackView!
     @IBOutlet weak var txtFieldSelectDateSingleSavedCard: TextFieldStackView!
     
+    @IBOutlet weak var DropDownIconSingleSavedCard: UIImageView!
+    @IBOutlet weak var btnChosePlanSingleSavedCard: UIButton!
+    
+    @IBOutlet weak var btnSelectRecurringDateSingleSavedCard: UIButton!
+    
     //Update Card
     @IBOutlet weak var btnSelectUpdateCardView: UIButton!
     @IBOutlet weak var imgViewCardUpdateCardView: UIImageView!
@@ -167,6 +174,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var txtFieldSelectDateNewCardView: TextFieldStackView!
     @IBOutlet weak var heightViewNewCardFields: NSLayoutConstraint!
     
+    @IBOutlet weak var btnSelectRecurringDateNewCardView: UIButton!
+    @IBOutlet weak var btnSelectPlanNewCardView: UIButton!
+    @IBOutlet weak var dropDownIconNewCardView: UIImageView!
+    
     //Bank
     @IBOutlet weak var viewBankFields: UIView!
     @IBOutlet weak var txtFieldAccountName: UITextField!
@@ -190,9 +201,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var txtFieldEmailAccountView: TextFieldStackView!
     @IBOutlet weak var viewTxtFieldEmailAccountView: UIView!
     
+    @IBOutlet weak var dropDownIconViewBankFields: UIImageView!
+    @IBOutlet weak var btnSelectPlanViewBankFields: UIButton!
+    
     @IBOutlet weak var viewSaveCardForFutureCardView: UIStackView!
     @IBOutlet weak var heightViewBankFields: NSLayoutConstraint!
     
+    @IBOutlet weak var btnSelectRecurringDateViewBankFields: UIButton!
+    
     //GrailPay
     @IBOutlet weak var grailPayBankLinkView: UIView!
     @IBOutlet weak var viewGrailPaySavedBank: UIStackView!
@@ -217,6 +233,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var txtFieldEmailGrailPayView: TextFieldStackView!
     @IBOutlet weak var viewTxtFieldEmailGrailPayView: UIView!
     
+    @IBOutlet weak var btnSelectPlanGrailPayBankView: UIButton!
+    @IBOutlet weak var dropDownIconGrailPayBankView: UIImageView!
+    @IBOutlet weak var btnSelectRecurringDateGrailPayView: UIButton!
+    
     //New GrailPay Account
     @IBOutlet weak var viewAddNewGrailPayAccount: UIView!
     @IBOutlet weak var lblGrailPayNewAccount: UILabel!
@@ -242,6 +262,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var imgViewBankIconGrailPayNewBank: UIImageView!
     @IBOutlet weak var viewSaveAccountForFututeNewGrailPayAccountView: UIStackView!
     
+    @IBOutlet weak var btnSelectPlanNewGrailPayBankView: UIButton!
+    @IBOutlet weak var dropDownIconNewGrailPayBankView: UIImageView!
+    @IBOutlet weak var btnSelectRecurringDateNewGrailPayView: UIButton!
+    
+    
     //SavedBank
     @IBOutlet weak var viewSingleSavedAccount: UIView!
     @IBOutlet weak var viewTermAndConditionsSingleAccountView: UIStackView!
@@ -261,6 +286,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var txtFieldSelectPlanSingleSavedBankView: TextFieldStackView!
     @IBOutlet weak var txtFieldSelectDateSingleSavedBankView: TextFieldStackView!
     
+    @IBOutlet weak var dropDownIconSingleSavedBankView: UIImageView!
+    @IBOutlet weak var btnSelectPlanSingleSavedBankView: UIButton!
+    
+    @IBOutlet weak var btnSelectRecurringDateSavedBankView: UIButton!
+    
     //New Bank
     @IBOutlet weak var viewNewBankAccount: UIView!
     @IBOutlet weak var txtFieldAccountNameNewAccountView: UITextField!
@@ -289,6 +319,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var lblAgreeToTheNewAccountView: UILabel!
     @IBOutlet weak var lblTermsAndConditionsNewAccountView: UILabel!
     
+    @IBOutlet weak var dropDownIconNewBankAccountView: UIImageView!
+    @IBOutlet weak var btnSelectPlanNewBankAccountView: UIButton!
+    @IBOutlet weak var btnSelectRecurringDateNewBankView: UIButton!
+    
     //Crypto
     @IBOutlet weak var viewCrypto: UIView!
     @IBOutlet weak var viewCryptoTryAgain: UIView!
@@ -413,30 +447,190 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     private var isErrorScreenPresented = false
     
+    // Add a loader property
+    private let loadingIndicator: UIActivityIndicatorView = {
+        let indicator = UIActivityIndicatorView(style: .large)
+        indicator.translatesAutoresizingMaskIntoConstraints = false
+        indicator.hidesWhenStopped = true
+        indicator.color = .white // Adjust based on theme if needed
+        return indicator
+    }()
+    
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
-        logOut()
         
-//        // Then: safely start new API call
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
-            self.request?.paymentIntentApi { success in
-                if success {
-                    print("Payment Intent completed")
+        // Add and center the loader
+        view.addSubview(loadingIndicator)
+        NSLayoutConstraint.activate([
+            loadingIndicator.centerXAnchor.constraint(equalTo: view.centerXAnchor),
+            loadingIndicator.centerYAnchor.constraint(equalTo: view.centerYAnchor)
+        ])
+        
+        // Start loader
+        loadingIndicator.startAnimating()
+        
+        // Avoid clearing persisted Hosted Checkout values on first open
+        // logOut()
+        
+//        ///  Check if paymentIntent and clientToken are available
+//        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+//            if let clientToken = self.request.clientToken,
+//               !clientToken.isEmpty {
+//
+//                // Save clientToken in singleton
+//                UserStoreSingleton.shared.clientToken = clientToken
+//                print("Saved clientToken in UserStoreSingleton: \(clientToken)")
+//
+//                // Case 1: Already exist → Directly call hostedCheckout
+//                print("Skipping paymentIntentApi, using existing values")
+//                self.request.hostedCheckoutsApi { success in
+//                    DispatchQueue.main.async {
+//                        if success {
+//                            self.setupUI()
+//                        } else {
+//                            print("Hosted Checkout failed. Blocking SDK UI.")
+//
+//                            // Stop flow and notify failure
+//                            let result = SDKResult(
+//                                type: .error,
+//                                chargeData: ["status": false, "message": "Hosted Checkout failed"],
+//                                billingInfo: nil,
+//                                additionalInfo: nil
+//                            )
+//                            NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
+//                            self.dismiss(animated: true)
+//                        }
+//                    }
+//                }
+//            }
+//            else {
+//                // Case 2: No values → Call paymentIntentApi first
+//                print("Calling paymentIntentApi")
+//                self.request.paymentIntentApi { success in
+//                    DispatchQueue.main.async {
+//                        if success {
+//                            print("Payment Intent completed")
+//                            self.setupUI()
+//                        } else {
+//                            print("Payment Intent failed. Blocking SDK UI.")
+//
+//                            // Stop flow and notify failure
+//                            let result = SDKResult(
+//                                type: .error,
+//                                chargeData: ["status": false, "message": "Payment Intent failed"],
+//                                billingInfo: nil,
+//                                additionalInfo: nil
+//                            )
+//                            NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
+//                            self.dismiss(animated: true)
+//                        }
+//                    }
+//                }
+//            }
+//        }
+        
+        
+        // Re-save theme and client token after logOut to preserve them
+        if let themeConfiguration = request.appearanceSettings {
+            UserStoreSingleton.shared.updateThemeConfiguration(with: themeConfiguration)
+        }
+        if let clientToken = request.clientToken {
+            UserStoreSingleton.shared.clientToken = clientToken
+        }
+        
+        // Perform API call
+        DispatchQueue.main.async {
+            if let clientToken = self.request.clientToken, !clientToken.isEmpty {
+                // Case 1: Client token exists → Call hostedCheckoutsApi
+                print("Calling hostedCheckoutsApi")
+                self.request.hostedCheckoutsApi { success in
                     DispatchQueue.main.async {
-                        self.lblEasyMerchantOne.text = "POWERED BY \(UserStoreSingleton.shared.companyName?.uppercased() ?? "")"
+                        // Stop loader
+                        self.loadingIndicator.stopAnimating()
+                        
+                        if success {
+                            print("Hosted Checkout completed")
+                            // Hydrate fresh values saved by hostedCheckoutsApi before building UI
+                            if let savedAmount = UserStoreSingleton.shared.amount,
+                               let parsedAmount = Double(savedAmount) {
+                                self.amount = parsedAmount
+                                self.request.amount = parsedAmount
+                            }
+                            // Hydrate recurring and payment method data saved by Hosted Checkout
+                            if let savedIsRecurring = UserStoreSingleton.shared.isRecurring,
+                               savedIsRecurring == "1" {
+                                self.request.is_recurring = true
+                                if let cycles = UserStoreSingleton.shared.allowCycles,
+                                   let num = Int(cycles) {
+                                    self.request.numOfCycle = num
+                                }
+                                if let intervals = UserStoreSingleton.shared.interval {
+                                    let parts = intervals
+                                        .split(separator: ",")
+                                        .map { String($0).trimmingCharacters(in: .whitespaces) }
+                                    self.request.recurringIntervals = parts.compactMap { RecurringIntervals(rawValue: $0) }
+                                }
+                                if let startType = UserStoreSingleton.shared.startDateType {
+                                    self.request.recurringStartDateType = RecurringStartDateType(rawValue: startType)
+                                }
+                                if let startDate = UserStoreSingleton.shared.startDate {
+                                    self.request.recurringStartDate = startDate
+                                }
+                            } else {
+                                self.request.is_recurring = false
+                                self.request.numOfCycle = nil
+                                self.request.recurringIntervals = nil
+                                self.request.recurringStartDateType = nil
+                                self.request.recurringStartDate = nil
+                            }
+                            // Hydrate selectable payment methods
+                            if let savedMethods = UserStoreSingleton.shared.paymentMethods {
+                                self.request.selectedPaymentMethods = savedMethods.compactMap { PaymentMethod(rawValue: $0) }
+                            }
+                            self.setupUI()
+                        } else {
+                            print("Hosted Checkout failed. Blocking SDK UI.")
+                            // Notify failure
+                            let result = SDKResult(
+                                type: .error,
+                                chargeData: ["status": false, "message": "Hosted Checkout failed"],
+                                billingInfo: nil,
+                                additionalInfo: nil
+                            )
+                            NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
+                            self.dismiss(animated: true)
+                        }
+                    }
+                }
+            } else {
+                // Case 2: No client token → Call paymentIntentApi
+                print("Calling paymentIntentApi")
+                self.request.paymentIntentApi { success in
+                    DispatchQueue.main.async {
+                        // Stop loader
+                        self.loadingIndicator.stopAnimating()
+                        
+                        if success {
+                            print("Payment Intent completed")
+                            self.setupUI()
+                        } else {
+                            print("Payment Intent failed. Blocking SDK UI.")
+                            // Notify failure
+                            let result = SDKResult(
+                                type: .error,
+                                chargeData: ["status": false, "message": "Payment Intent failed"],
+                                billingInfo: nil,
+                                additionalInfo: nil
+                            )
+                            NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
+                            self.dismiss(animated: true)
+                        }
                     }
-                    // Continue flow
-                } else {
-                    print("Payment Intent failed")
-                    // Handle failure
                 }
             }
         }
         
-        
-
-        
         viewAppearanceOn()
         
         uiFinishingTouchElements()
@@ -618,6 +812,23 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
     }
     
+    private func setupUI() {
+        // Update merchant label
+        lblEasyMerchantOne.text = "POWERED BY \(UserStoreSingleton.shared.companyName?.uppercased() ?? "")"
+        
+        // Apply visibility and layout settings
+        viewAppearanceOn()
+        
+        // Apply theme settings
+        uiFinishingTouchElements()
+        
+        // Force layout update
+        DispatchQueue.main.async {
+            self.view.setNeedsLayout()
+            self.view.layoutIfNeeded()
+        }
+    }
+    
     //MARK: - View Wiil Appear
     override func viewWillAppear(_ animated: Bool) {
         uiFinishingTouchElements()
@@ -651,59 +862,270 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.viewCrypto.isHidden = true
         
         if request.is_recurring == true {
-            self.txtFieldChosePlanCard.isHidden = false
-            if request.recurringStartDateType == .custom {
-                self.txtFieldStartDateCard.isHidden = false
-                self.txtFieldSelectDateSingleSavedCard.isHidden = false
-                self.txtFieldSelectDateNewCardView.isHidden = false
-                self.txtFieldSelectDateViewBankFields.isHidden = false
-                self.txtFieldSelectDateSingleSavedBankView.isHidden = false
-                self.txtFieldSelectDateNewAccountView.isHidden = false
-                self.txtFieldSelectDateGrailPayBankView.isHidden = false
-                self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
+            
+            // Check if there is only one recurring interval
+            if let intervals = request.recurringIntervals, intervals.count == 1, let singleInterval = intervals.first {
+                // Set the text field to the single interval's display name
+                self.txtFieldChosePlanCard.text = singleInterval.displayName
+                self.txtFieldChosePlanCard.isUserInteractionEnabled = false
+                self.txtFieldChosePlanCard.isEnabled = false
+                self.btnChosePlanCardView.isEnabled = false
+                self.imgViewChosePlanCardDropIcon.isHidden = true
                 
-                if request.saveAccount == false {
-                    self.heightViewBankFields.constant = 802
-                    self.heightViewNewAccountFields.constant = 852
-                } else {
-                    self.heightViewBankFields.constant = 848
-                    self.heightViewNewAccountFields.constant = 902
-                }
+                self.txtFieldSelectPlanSingleSavedCard.text = singleInterval.displayName
+                self.txtFieldSelectPlanSingleSavedCard.isUserInteractionEnabled = false
+                self.txtFieldSelectPlanSingleSavedCard.isEnabled = false
+                self.btnChosePlanSingleSavedCard.isEnabled = false
+                self.DropDownIconSingleSavedCard.isHidden = true
                 
-                if request.saveCard == false {
-                    self.heightViewNewCardFields.constant = 595
-                } else {
-                    self.heightViewNewCardFields.constant = 648
-                }
+                self.txtFieldSelectPlanNewCardView.text = singleInterval.displayName
+                self.txtFieldSelectPlanNewCardView.isUserInteractionEnabled = false
+                self.txtFieldSelectPlanNewCardView.isEnabled = false
+                self.btnSelectPlanNewCardView.isEnabled = false
+                self.dropDownIconNewCardView.isHidden = true
+                
+                self.txtFieldSelectPlanViewBankFields.text = singleInterval.displayName
+                self.txtFieldSelectPlanViewBankFields.isUserInteractionEnabled = false
+                self.txtFieldSelectPlanViewBankFields.isEnabled = false
+                self.btnSelectPlanViewBankFields.isEnabled = false
+                self.dropDownIconViewBankFields.isHidden = true
+                
+                self.txtFieldChosePlanGrailPayBankView.text = singleInterval.displayName
+                self.txtFieldChosePlanGrailPayBankView.isUserInteractionEnabled = false
+                self.txtFieldChosePlanGrailPayBankView.isEnabled = false
+                self.btnSelectPlanGrailPayBankView.isEnabled = false
+                self.dropDownIconGrailPayBankView.isHidden = true
                 
-                self.heightSubViewNewAccountFields.constant = 872
+                self.txtFieldChosePlanNewGrailPayBankView.text = singleInterval.displayName
+                self.txtFieldChosePlanNewGrailPayBankView.isUserInteractionEnabled = false
+                self.txtFieldChosePlanNewGrailPayBankView.isEnabled = false
+                self.btnSelectPlanNewGrailPayBankView.isEnabled = false
+                self.dropDownIconNewGrailPayBankView.isHidden = true
+                
+                self.txtFieldSelectPlanSingleSavedBankView.text = singleInterval.displayName
+                self.txtFieldSelectPlanSingleSavedBankView.isUserInteractionEnabled = false
+                self.txtFieldSelectPlanSingleSavedBankView.isEnabled = false
+                self.btnSelectPlanSingleSavedBankView.isEnabled = false
+                self.dropDownIconSingleSavedBankView.isHidden = true
+                
+                self.txtFieldSelectPlanNewAccountView.text = singleInterval.displayName
+                self.txtFieldSelectPlanNewAccountView.isUserInteractionEnabled = false
+                self.txtFieldSelectPlanNewAccountView.isEnabled = false
+                self.btnSelectPlanNewBankAccountView.isEnabled = false
+                self.dropDownIconNewBankAccountView.isHidden = true
             } else {
-                self.txtFieldStartDateCard.isHidden = true
-                self.txtFieldSelectDateSingleSavedCard.isHidden = true
-                self.txtFieldSelectDateNewCardView.isHidden = true
-                self.txtFieldSelectDateViewBankFields.isHidden = true
-                self.txtFieldSelectDateSingleSavedBankView.isHidden = true
-                self.txtFieldSelectDateNewAccountView.isHidden = true
-                self.txtFieldSelectDateGrailPayBankView.isHidden = true
-                self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
+                // For multiple intervals, keep the button enabled and text field editable
+                self.btnChosePlanCardView.isEnabled = true
+                self.txtFieldChosePlanCard.isUserInteractionEnabled = true
+                self.txtFieldChosePlanCard.isEnabled = true
+                self.txtFieldChosePlanCard.text = ""
+                self.imgViewChosePlanCardDropIcon.isHidden = false
                 
-                if request.saveAccount == false {
-                    self.heightViewBankFields.constant = 712
-                    self.heightViewNewAccountFields.constant = 754
-                } else {
-                    self.heightViewBankFields.constant = 752
-                    self.heightViewNewAccountFields.constant = 808
-                }
+                self.btnChosePlanSingleSavedCard.isEnabled = true
+                self.txtFieldSelectPlanSingleSavedCard.isUserInteractionEnabled = true
+                self.txtFieldSelectPlanSingleSavedCard.isEnabled = true
+                self.txtFieldSelectPlanSingleSavedCard.text = ""
+                self.DropDownIconSingleSavedCard.isHidden = false
                 
-                if request.saveCard == false {
-                    self.heightViewNewCardFields.constant = 500
-                } else {
-                    self.heightViewNewCardFields.constant = 553
-                }
+                self.btnSelectPlanNewCardView.isEnabled = true
+                self.txtFieldSelectPlanNewCardView.isUserInteractionEnabled = true
+                self.txtFieldSelectPlanNewCardView.isEnabled = true
+                self.txtFieldSelectPlanNewCardView.text = ""
+                self.dropDownIconNewCardView.isHidden = false
+                
+                self.btnSelectPlanViewBankFields.isEnabled = true
+                self.txtFieldSelectPlanViewBankFields.isUserInteractionEnabled = true
+                self.txtFieldSelectPlanViewBankFields.isEnabled = true
+                self.txtFieldSelectPlanViewBankFields.text = ""
+                self.dropDownIconViewBankFields.isHidden = false
+                
+                self.btnSelectPlanGrailPayBankView.isEnabled = true
+                self.txtFieldChosePlanGrailPayBankView.isUserInteractionEnabled = true
+                self.txtFieldChosePlanGrailPayBankView.isEnabled = true
+                self.txtFieldChosePlanGrailPayBankView.text = ""
+                self.dropDownIconGrailPayBankView.isHidden = false
+                
+                self.btnSelectPlanNewGrailPayBankView.isEnabled = true
+                self.txtFieldChosePlanNewGrailPayBankView.isUserInteractionEnabled = true
+                self.txtFieldChosePlanNewGrailPayBankView.isEnabled = true
+                self.txtFieldChosePlanNewGrailPayBankView.text = ""
+                self.dropDownIconNewGrailPayBankView.isHidden = false
+                
+                self.btnSelectPlanSingleSavedBankView.isEnabled = true
+                self.txtFieldSelectPlanSingleSavedBankView.isUserInteractionEnabled = true
+                self.txtFieldSelectPlanSingleSavedBankView.isEnabled = true
+                self.txtFieldSelectPlanSingleSavedBankView.text = ""
+                self.dropDownIconSingleSavedBankView.isHidden = false
+                
+                self.btnSelectPlanNewBankAccountView.isEnabled = true
+                self.txtFieldSelectPlanNewAccountView.isUserInteractionEnabled = true
+                self.txtFieldSelectPlanNewAccountView.isEnabled = true
+                self.txtFieldSelectPlanNewAccountView.text = ""
+                self.dropDownIconNewBankAccountView.isHidden = false
+            }
+            
+            // Set the start date for txtFieldStartDateCard
+            if let startDate = UserStoreSingleton.shared.startDate {
+                let dateFormatter = DateFormatter()
+                dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss" // input format
+                if let date = dateFormatter.date(from: startDate) {
+                    dateFormatter.dateFormat = "dd/MM/yyyy" // output format
+                    self.txtFieldStartDateCard.text = dateFormatter.string(from: date)
+                    self.txtFieldSelectDateSingleSavedCard.text = dateFormatter.string(from: date)
+                    self.txtFieldSelectDateNewCardView.text = dateFormatter.string(from: date)
+                    self.txtFieldSelectDateViewBankFields.text = dateFormatter.string(from: date)
+                    self.txtFieldSelectDateSingleSavedBankView.text = dateFormatter.string(from: date)
+                    self.txtFieldSelectDateNewAccountView.text = dateFormatter.string(from: date)
+                    self.txtFieldSelectDateGrailPayBankView.text = dateFormatter.string(from: date)
+                    self.txtFieldSelectDateNewGrailPayBankView.text = dateFormatter.string(from: date)
+                }
+            }
+            
+            if request.recurringStartDateType == .fixed {
+                self.btnSelectRecurringDateCardView.isEnabled = false
+                self.txtFieldStartDateCard.isUserInteractionEnabled = false
+                self.txtFieldStartDateCard.isEnabled = false
+                
+                self.btnSelectRecurringDateSingleSavedCard.isEnabled = false
+                self.txtFieldSelectDateSingleSavedCard.isUserInteractionEnabled = false
+                self.txtFieldSelectDateSingleSavedCard.isEnabled = false
+                
+                self.btnSelectRecurringDateNewCardView.isEnabled = false
+                self.txtFieldSelectDateNewCardView.isUserInteractionEnabled = false
+                self.txtFieldSelectDateNewCardView.isEnabled = false
+                
+                self.btnSelectRecurringDateViewBankFields.isEnabled = false
+                self.txtFieldSelectDateViewBankFields.isUserInteractionEnabled = false
+                self.txtFieldSelectDateViewBankFields.isEnabled = false
+                
+                self.btnSelectRecurringDateGrailPayView.isEnabled = false
+                self.txtFieldSelectDateGrailPayBankView.isUserInteractionEnabled = false
+                self.txtFieldSelectDateGrailPayBankView.isEnabled = false
+                
+                self.btnSelectRecurringDateNewGrailPayView.isEnabled = false
+                self.txtFieldSelectDateNewGrailPayBankView.isUserInteractionEnabled = false
+                self.txtFieldSelectDateNewGrailPayBankView.isEnabled = false
+                
+                self.btnSelectRecurringDateSavedBankView.isEnabled = false
+                self.txtFieldSelectDateSingleSavedBankView.isUserInteractionEnabled = false
+                self.txtFieldSelectDateSingleSavedBankView.isEnabled = false
+                
+                self.btnSelectRecurringDateNewBankView.isEnabled = false
+                self.txtFieldSelectDateNewAccountView.isUserInteractionEnabled = false
+                self.txtFieldSelectDateNewAccountView.isEnabled = false
+            }
+            else {
+                self.btnSelectRecurringDateCardView.isEnabled = true
+                self.txtFieldStartDateCard.isUserInteractionEnabled = true
+                self.txtFieldStartDateCard.isEnabled = true
+                
+                self.btnSelectRecurringDateSingleSavedCard.isEnabled = true
+                self.txtFieldSelectDateSingleSavedCard.isUserInteractionEnabled = true
+                self.txtFieldSelectDateSingleSavedCard.isEnabled = true
+                
+                self.btnSelectRecurringDateNewCardView.isEnabled = true
+                self.txtFieldSelectDateNewCardView.isUserInteractionEnabled = true
+                self.txtFieldSelectDateNewCardView.isEnabled = true
+                
+                self.btnSelectRecurringDateViewBankFields.isEnabled = true
+                self.txtFieldSelectDateViewBankFields.isUserInteractionEnabled = true
+                self.txtFieldSelectDateViewBankFields.isEnabled = true
+                
+                self.btnSelectRecurringDateGrailPayView.isEnabled = true
+                self.txtFieldSelectDateGrailPayBankView.isUserInteractionEnabled = true
+                self.txtFieldSelectDateGrailPayBankView.isEnabled = true
+                
+                self.btnSelectRecurringDateNewGrailPayView.isEnabled = true
+                self.txtFieldSelectDateNewGrailPayBankView.isUserInteractionEnabled = true
+                self.txtFieldSelectDateNewGrailPayBankView.isEnabled = true
+                
+                self.btnSelectRecurringDateSavedBankView.isEnabled = true
+                self.txtFieldSelectDateSingleSavedBankView.isUserInteractionEnabled = true
+                self.txtFieldSelectDateSingleSavedBankView.isEnabled = true
                 
-                self.heightSubViewNewAccountFields.constant = 757
+                self.btnSelectRecurringDateNewBankView.isEnabled = true
+                self.txtFieldSelectDateNewAccountView.isUserInteractionEnabled = true
+                self.txtFieldSelectDateNewAccountView.isEnabled = true
             }
             
+            self.txtFieldStartDateCard.isHidden = false
+            self.txtFieldSelectDateSingleSavedCard.isHidden = false
+            self.txtFieldSelectDateNewCardView.isHidden = false
+            self.txtFieldSelectDateViewBankFields.isHidden = false
+            self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+            self.txtFieldSelectDateNewAccountView.isHidden = false
+            self.txtFieldSelectDateGrailPayBankView.isHidden = false
+            self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
+            
+            if request.saveAccount == false {
+                self.heightViewBankFields.constant = 802
+                self.heightViewNewAccountFields.constant = 852
+            } else {
+                self.heightViewBankFields.constant = 848
+                self.heightViewNewAccountFields.constant = 902
+            }
+            
+            if request.saveCard == false {
+                self.heightViewNewCardFields.constant = 595
+            } else {
+                self.heightViewNewCardFields.constant = 648
+            }
+            
+            self.heightSubViewNewAccountFields.constant = 872
+            
+            //            if request.recurringStartDateType == .custom {
+            //                self.txtFieldStartDateCard.isHidden = false
+            //                self.txtFieldSelectDateSingleSavedCard.isHidden = false
+            //                self.txtFieldSelectDateNewCardView.isHidden = false
+            //                self.txtFieldSelectDateViewBankFields.isHidden = false
+            //                self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+            //                self.txtFieldSelectDateNewAccountView.isHidden = false
+            //                self.txtFieldSelectDateGrailPayBankView.isHidden = false
+            //                self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
+            //
+            //                if request.saveAccount == false {
+            //                    self.heightViewBankFields.constant = 790
+            //                    self.heightViewNewAccountFields.constant = 840
+            //                } else {
+            //                    self.heightViewBankFields.constant = 836
+            //                    self.heightViewNewAccountFields.constant = 890
+            //                }
+            //
+            //                if request.saveCard == false {
+            //                    self.heightViewNewCardFields.constant = 595
+            //                } else {
+            //                    self.heightViewNewCardFields.constant = 648
+            //                }
+            //
+            //                self.heightSubViewNewAccountFields.constant = 860
+            //            } else {
+            //                self.txtFieldStartDateCard.isHidden = true
+            //                self.txtFieldSelectDateSingleSavedCard.isHidden = true
+            //                self.txtFieldSelectDateNewCardView.isHidden = true
+            //                self.txtFieldSelectDateViewBankFields.isHidden = true
+            //                self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+            //                self.txtFieldSelectDateNewAccountView.isHidden = true
+            //                self.txtFieldSelectDateGrailPayBankView.isHidden = true
+            //                self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
+            //
+            //                if request.saveAccount == false {
+            //                    self.heightViewBankFields.constant = 700
+            //                    self.heightViewNewAccountFields.constant = 742
+            //                } else {
+            //                    self.heightViewBankFields.constant = 740
+            //                    self.heightViewNewAccountFields.constant = 796
+            //                }
+            //
+            //                if request.saveCard == false {
+            //                    self.heightViewNewCardFields.constant = 500
+            //                } else {
+            //                    self.heightViewNewCardFields.constant = 553
+            //                }
+            //
+            //                self.heightSubViewNewAccountFields.constant = 745
+            //            }
+            
+            self.txtFieldChosePlanCard.isHidden = false
             self.txtFieldSelectPlanSingleSavedCard.isHidden = false
             self.txtFieldSelectPlanNewCardView.isHidden = false
             self.txtFieldSelectPlanViewBankFields.isHidden = false
@@ -795,12 +1217,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         btnNextTopCon.constant = 0
                         if request.is_recurring == true {
                             txtFieldSelectPlanSingleSavedCard.isHidden = false
-                            if request.recurringStartDateType == .custom {
-                                txtFieldSelectDateSingleSavedCard.isHidden = false
-                            }
-                            else {
-                                txtFieldSelectDateSingleSavedCard.isHidden = true
-                            }
+                            txtFieldSelectDateSingleSavedCard.isHidden = false
+                            //                            if request.recurringStartDateType == .custom {
+                            //                                txtFieldSelectDateSingleSavedCard.isHidden = false
+                            //                            }
+                            //                            else {
+                            //                                txtFieldSelectDateSingleSavedCard.isHidden = true
+                            //                            }
                         }
                         else {
                             txtFieldSelectPlanSingleSavedCard.isHidden = true
@@ -885,12 +1308,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.btnPayNowSingleAccountView.isHidden = false
                     if request.is_recurring == true {
                         self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
-                        if request.recurringStartDateType == .custom {
-                            self.txtFieldSelectDateSingleSavedBankView.isHidden = false
-                        }
-                        else {
-                            self.txtFieldSelectDateSingleSavedBankView.isHidden = true
-                        }
+                        self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                        //                        if request.recurringStartDateType == .custom {
+                        //                            self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                        //                        }
+                        //                        else {
+                        //                            self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+                        //                        }
                     }
                     else {
                         self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
@@ -944,12 +1368,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.viewBtnShowSavedCardHeight.constant = 0
                     self.viewBtnShowSavedCardTopCon.constant = 0
                 }
-//                else {
-//                    self.viewBtnShowSavedCards.isHidden = false
-//                    self.lblBtnShowSaveCard.text = "Show Saved Accounts"
-//                    self.viewBtnShowSavedCardHeight.constant = 50
-//                    self.viewBtnShowSavedCardTopCon.constant = 20
-//                }
+                //                else {
+                //                    self.viewBtnShowSavedCards.isHidden = false
+                //                    self.lblBtnShowSaveCard.text = "Show Saved Accounts"
+                //                    self.viewBtnShowSavedCardHeight.constant = 50
+                //                    self.viewBtnShowSavedCardTopCon.constant = 20
+                //                }
                 
                 self.OTPView.isHidden = true
                 self.emailView.isHidden = true
@@ -1818,16 +2242,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanViewBankFields(_ sender: UIButton) {
-        guard var plans = request?.recurringIntervals, !plans.isEmpty else {
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
             print("No recurring intervals available.")
             return
         }
         
-        // Check if current payment method is only Bank
-        if request?.selectedPaymentMethods.contains(.Bank) == true {
-            // Remove 'daily' from plans
-            plans.removeAll { $0 == .daily }
-        }
+        //        // Check if current payment method is only Bank
+        //        if request?.selectedPaymentMethods.contains(.Bank) == true {
+        //            // Remove 'daily' from plans
+        //            plans.removeAll { $0 == .daily }
+        //        }
         
         // Now present the filtered plans
         PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
@@ -1844,16 +2268,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanSingleSavedAccount(_ sender: UIButton) {
-        guard var plans = request?.recurringIntervals, !plans.isEmpty else {
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
             print("No recurring intervals available.")
             return
         }
         
-        // Check if current payment method is only Bank
-        if request?.selectedPaymentMethods.contains(.Bank) == true {
-            // Remove 'daily' from plans
-            plans.removeAll { $0 == .daily }
-        }
+        //        // Check if current payment method is only Bank
+        //        if request?.selectedPaymentMethods.contains(.Bank) == true {
+        //            // Remove 'daily' from plans
+        //            plans.removeAll { $0 == .daily }
+        //        }
         
         PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldSelectPlanSingleSavedBankView.text = selectedPlan
@@ -1869,16 +2293,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanNewAccountView(_ sender: UIButton) {
-        guard var plans = request?.recurringIntervals, !plans.isEmpty else {
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
             print("No recurring intervals available.")
             return
         }
         
-        // Check if current payment method is only Bank
-        if request?.selectedPaymentMethods.contains(.Bank) == true {
-            // Remove 'daily' from plans
-            plans.removeAll { $0 == .daily }
-        }
+        //        // Check if current payment method is only Bank
+        //        if request?.selectedPaymentMethods.contains(.Bank) == true {
+        //            // Remove 'daily' from plans
+        //            plans.removeAll { $0 == .daily }
+        //        }
         
         PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldSelectPlanNewAccountView.text = selectedPlan
@@ -1971,11 +2395,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         btnNextHeight.constant = 0
         btnNextTopCon.constant = isSelectForPay ? 0 : 8
         
+        //        // Handle recurring fields visibility
+        //        let showRecurringFields = isSelectForPay && request.is_recurring == true
+        //        let isCustomRecurring = request.recurringStartDateType == .custom
+        //        txtFieldSelectPlanSingleSavedCard.isHidden = !showRecurringFields
+        //        txtFieldSelectDateSingleSavedCard.isHidden = !(showRecurringFields && isCustomRecurring)
+        
         // Handle recurring fields visibility
         let showRecurringFields = isSelectForPay && request.is_recurring == true
-        let isCustomRecurring = request.recurringStartDateType == .custom
         txtFieldSelectPlanSingleSavedCard.isHidden = !showRecurringFields
-        txtFieldSelectDateSingleSavedCard.isHidden = !(showRecurringFields && isCustomRecurring)
+        txtFieldSelectDateSingleSavedCard.isHidden = !showRecurringFields // Show for both .custom and .fixed
         
         // Set selected card based on tapped index
         if isSelectForPay, index < savedCards.count {
@@ -2382,16 +2811,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnChosePlanGrailPayBankView(_ sender: UIButton) {
-        guard var plans = request?.recurringIntervals, !plans.isEmpty else {
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
             print("No recurring intervals available.")
             return
         }
         
-        // Check if current payment method is only Bank
-        if request?.selectedPaymentMethods.contains(.Bank) == true {
-            // Remove 'daily' from plans
-            plans.removeAll { $0 == .daily }
-        }
+        //        // Check if current payment method is only Bank
+        //        if request?.selectedPaymentMethods.contains(.Bank) == true {
+        //            // Remove 'daily' from plans
+        //            plans.removeAll { $0 == .daily }
+        //        }
         
         PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldChosePlanGrailPayBankView.text = selectedPlan
@@ -2407,16 +2836,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectPlanNewGrailPayBankView(_ sender: UIButton) {
-        guard var plans = request?.recurringIntervals, !plans.isEmpty else {
+        guard let plans = request?.recurringIntervals, !plans.isEmpty else {
             print("No recurring intervals available.")
             return
         }
         
-        // Check if current payment method is only Bank
-        if request?.selectedPaymentMethods.contains(.Bank) == true {
-            // Remove 'daily' from plans
-            plans.removeAll { $0 == .daily }
-        }
+        //        // Check if current payment method is only Bank
+        //        if request?.selectedPaymentMethods.contains(.Bank) == true {
+        //            // Remove 'daily' from plans
+        //            plans.removeAll { $0 == .daily }
+        //        }
         
         PlanSelector.presentPlanOptions(from: self, sourceView: sender, allowedPlans: plans) { selectedPlan in
             self.txtFieldChosePlanNewGrailPayBankView.text = selectedPlan
@@ -2447,12 +2876,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
+        let token = UserStoreSingleton.shared.clientToken ?? ""
+        uRLRequest.addValue(token, forHTTPHeaderField: "clientToken")
         
         // Prepare parameters
         let params: [String: Any] = [
@@ -2525,12 +2950,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             
                             if self.request.is_recurring == true {
                                 self.txtFieldChosePlanGrailPayBankView.isHidden = false
-                                if self.request.recurringStartDateType == .custom {
-                                    self.txtFieldSelectDateGrailPayBankView.isHidden = false
-                                }
-                                else {
-                                    self.txtFieldSelectDateGrailPayBankView.isHidden = true
-                                }
+                                self.txtFieldSelectDateGrailPayBankView.isHidden = false
+                                //                                if self.request.recurringStartDateType == .custom {
+                                //                                    self.txtFieldSelectDateGrailPayBankView.isHidden = false
+                                //                                }
+                                //                                else {
+                                //                                    self.txtFieldSelectDateGrailPayBankView.isHidden = true
+                                //                                }
                             }
                             
                             if let accountNumber = account["account_number"] as? String {
@@ -2593,12 +3019,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         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")
-        }
+        let token = UserStoreSingleton.shared.clientToken ?? ""
+        request.addValue(token, forHTTPHeaderField: "clientToken")
         
         // Save customer_id for use in charge API
         let customerID = UserStoreSingleton.shared.customerId ?? ""
@@ -2680,12 +3102,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             
                             if self.request.is_recurring == true {
                                 self.txtFieldChosePlanNewGrailPayBankView.isHidden = false
-                                if self.request.recurringStartDateType == .custom {
-                                    self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
-                                }
-                                else {
-                                    self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
-                                }
+                                self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
+                                //                                if self.request.recurringStartDateType == .custom {
+                                //                                    self.txtFieldSelectDateNewGrailPayBankView.isHidden = false
+                                //                                }
+                                //                                else {
+                                //                                    self.txtFieldSelectDateNewGrailPayBankView.isHidden = true
+                                //                                }
                             }
                             
                             if let accountNumber = account["account_number"] as? String {
@@ -3119,71 +3542,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
     }
     
-    //    func launchGrailPay() {
-    //        guard let grailPayParams = request.grailPayParams else {
-    //            print("GrailPay parameters not available in request")
-    //            return
-    //        }
-    //
-    //        GrailPayHelper.presentGrailPay(from: self, request: grailPayParams) { [weak self] result in
-    //            guard let self = self else { return }
-    //
-    //            switch result.type {
-    //            case .success:
-    //                if let chargeData = result.chargeData,
-    //                   let dataArray = chargeData["data"] as? [[String: Any]],
-    //                   let selectedAccount = dataArray.first {
-    //
-    //                    print("✅ Bank connected: \(selectedAccount)")
-    //                    self.selectedGrailPayAccountType = selectedAccount["account_type"] as? String
-    //                    self.selectedGrailPayAccountName = selectedAccount["name"] as? String
-    //
-    //                    if self.grailPaySource == .existingAccount {
-    //                        self.accountConnectApi(account: selectedAccount)
-    //                        self.lblGrailPayAabandonError.text = "Default account successfully set"
-    //                        self.viewGrailPayAbandon.isHidden = false
-    //                    } else if self.grailPaySource == .newAccount {
-    //                        self.newGrailPayAccountConnectApi(account: selectedAccount)
-    //                        self.lblAbandonGrailPayNewAccountView.text = "Default account successfully set"
-    //                        self.viewAbandonGrailPayNewAccountView.isHidden = false
-    //
-    //                        self.selectedNewGrailPayAccountType = selectedAccount["account_type"] as? String
-    //                        self.selectedNewGrailPayAccountName = selectedAccount["name"] as? String
-    //                    }
-    //
-    //                    if self.selectedPaymentMethod == "Bank" {
-    //                        self.viewBtnShowSavedCards.isHidden = true
-    //                    }
-    //
-    //                    let amountText = String(format: "$%.2f", self.request.amount ?? 0)
-    //                    let submitText = self.request.submitButtonText
-    //                    let defaultTitle = (submitText?.isEmpty == false)
-    //                    ? "\(submitText!) (\(amountText))"
-    //                    : "Pay Now (\(amountText))"
-    //
-    //                    if self.grailPaySource == .existingAccount {
-    //                        self.btnLinkBankAccount.setTitle(defaultTitle, for: .normal)
-    //                    } else if self.grailPaySource == .newAccount {
-    //                        self.btnLinkGrailPayAddNewAccount.setTitle(defaultTitle, for: .normal)
-    //                    }
-    //
-    //                } else {
-    //                    print("⚠️ chargeData does not contain valid account data")
-    //                    self.showGrailPayError(message: "Failed to retrieve account info")
-    //                }
-    //
-    //            case .cancelled:
-    //                print("⚠️ GrailPay cancelled")
-    //                self.showGrailPayError(message: "User has abandoned the action")
-    //
-    //            case .error:
-    //                let errorMsg = result.error?.localizedDescription ?? "Unknown error"
-    //                print("❌ GrailPay error: \(errorMsg)")
-    //                self.showGrailPayError(message: errorMsg)
-    //            }
-    //        }
-    //    }
-    
     func launchGrailPay() {
         guard let grailPayParams = request.grailPayParams else {
             print("GrailPay parameters not available in request")
@@ -3307,13 +3665,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
         var params: [String: Any] = [
             "account_id": self.grailPayAccountID ?? "",
             "account_type": self.selectedGrailPayAccountType ?? "",
@@ -3520,13 +3871,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
         let emailText = txtFieldEmailGrailPayView.text
         let emailPrefix = emailText.components(separatedBy: "@").first ?? ""
         
@@ -3750,13 +4094,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
         var params: [String: Any] = [
             "account_id": self.newGrailPayAccountID ?? "",
             "account_type": self.selectedNewGrailPayAccountType ?? "",
@@ -3972,13 +4309,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
         var params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
@@ -4842,7 +5172,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
         }
     }
-    
+        
     @IBAction func actionBtnCloseSettingView(_ sender: UIButton) {
         settingsView.isHidden = true
     }
@@ -5422,13 +5752,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         // Define the parameters for the request
         let params: [String: Any] = [
             "card_search_value": txtFieldEmail.text ?? "",
@@ -5509,13 +5832,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            urlRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            urlRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         // Safe access from main thread (assumes you call this from main thread)
         let email = self.txtFieldEmail.text ?? ""
         let otp = getCombinedOTP()
@@ -5667,13 +5983,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("🔑 Setting customerToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         let session = URLSession.shared
         let task = session.dataTask(with: uRLRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
@@ -5769,9 +6078,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             
                             if self.request.is_recurring == true {
                                 self.txtFieldSelectPlanSingleSavedCard.isHidden = false
-                                if self.request.recurringStartDateType == .custom {
-                                    self.txtFieldSelectDateSingleSavedCard.isHidden = false
-                                }
+                                self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                                //                                if self.request.recurringStartDateType == .custom {
+                                //                                    self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                                //                                }
                             } else {
                                 self.txtFieldSelectPlanSingleSavedCard.isHidden = true
                                 self.txtFieldSelectDateSingleSavedCard.isHidden = true
@@ -6531,13 +6841,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
@@ -6950,13 +7253,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         // Get the text fields from the selected cell and trim whitespace
         let nameText = txtFieldNameOnCardUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let cvvText = txtFieldCVVUpdateCardView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -7117,14 +7413,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             print("Customer-Token is nil")
         }
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] data, response, error in
             guard let self = self else { return }
@@ -7312,11 +7600,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             
                             if self.request.is_recurring == true {
                                 self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
-                                if self.request.recurringStartDateType == .custom {
-                                    self.txtFieldSelectDateSingleSavedBankView.isHidden = false
-                                } else {
-                                    self.txtFieldSelectDateSingleSavedBankView.isHidden = true
-                                }
+                                self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                                //                                if self.request.recurringStartDateType == .custom {
+                                //                                    self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                                //                                } else {
+                                //                                    self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+                                //                                }
                             }
                             else {
                                 self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
@@ -7371,13 +7660,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "name": txtFieldAccountName.text ?? "",
             "email": txtFieldEmailAccountView.text,
@@ -7387,7 +7669,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "routing_number": txtFieldRoutingNumber.text?.replacingOccurrences(of: " ", with: "") ?? "",
             "account_number":  txtFieldAccountNumber.text?.replacingOccurrences(of: " ", with: "") ?? "",
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
             "payment_method": "ach"
         ]
@@ -7558,13 +7839,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "name": !(request.name?.isEmpty ?? true) ? request.name! : (txtFieldAccountName.text ?? ""),
             "email": txtFieldEmailAccountView.text,
@@ -7574,7 +7848,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "routing_number": txtFieldRoutingNumber.text?.replacingOccurrences(of: " ", with: "") ?? "",
             "account_number":  txtFieldAccountNumber.text?.replacingOccurrences(of: " ", with: "") ?? "",
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
             "payment_method": "ach"
         ]
@@ -7801,13 +8074,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
@@ -7966,13 +8232,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "account_id": selectedbankAccounts?.account_id ?? "",
             "customer": selectedbankAccounts?.customer_id ?? "",
@@ -8186,13 +8445,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -8208,7 +8460,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "routing_number": routingNumber,
             "account_number": accountNumber,
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
         ]
         
@@ -8361,13 +8612,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         let accountName = txtFieldAccountNameNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let routingNumber = txtFieldRoutingNumberNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let accountType = txtFieldAccountTypeNewAccountView.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
@@ -8382,7 +8626,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "routing_number": routingNumber,
             "account_number": accountNumber,
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
         ]
         
@@ -8590,13 +8833,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         // 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) ?? ""
@@ -8614,7 +8850,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             "routing_number": routingNumber,
             "account_number": accountNumber,
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
             "save_account": 1,
             "payment_method": "ach"
@@ -8774,13 +9009,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (serviceData, serviceResponse, error) in
             guard let self = self else { return }
@@ -8856,13 +9084,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            urlRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            urlRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "name": UserStoreSingleton.shared.merchantName ?? "",
             "email": UserStoreSingleton.shared.merchantEmail ?? "",
@@ -9009,13 +9230,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (data, response, error) in
             guard let self = self else { return }
@@ -9075,13 +9289,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "name": cardNameTextField.text,
             "email": txtFieldEmailCardView.text,
@@ -9390,13 +9597,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "name": nameText,
             "email": UserStoreSingleton.shared.verificationEmail ?? "",
@@ -9765,9 +9965,10 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                     self.btnNextTopCon.constant = 0
                     if self.request.is_recurring == true {
                         self.txtFieldSelectPlanSingleSavedCard.isHidden = false
-                        if request.recurringStartDateType == .custom {
-                            self.txtFieldSelectDateSingleSavedCard.isHidden = false
-                        }
+                        self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                        //                        if request.recurringStartDateType == .custom {
+                        //                            self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                        //                        }
                     }
                     else {
                         self.txtFieldSelectPlanSingleSavedCard.isHidden = true
@@ -11024,3 +11225,4 @@ extension PaymentInfoVC: UITextFieldDelegate {
     }
     
 }
+