@jimrising/easymerchantsdk-react-native 1.3.3 → 1.3.4

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

@@ -66,10 +66,16 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet private var cardExpiryTextField: TextFieldStackView!
     @IBOutlet private var cardCvvTextField: TextFieldStackView!
     @IBOutlet private var cardNameTextField: TextFieldStackView!
+    @IBOutlet weak var txtFieldChosePlanCard: TextFieldStackView!
+    @IBOutlet weak var txtFieldStartDateCard: TextFieldStackView!
     @IBOutlet weak var viewTextFieldCardNumber: UIView!
     @IBOutlet weak var viewTxtFieldExpiryDate: UIView!
     @IBOutlet weak var viewTxtFieldCVV: UIView!
     @IBOutlet weak var viewTxtFieldNameOnCard: UIView!
+    @IBOutlet weak var viewTxtFieldChosePlanCard: UIView!
+    @IBOutlet weak var viewTxtFieldStartDateCard: UIView!
+    @IBOutlet weak var imgViewChosePlanCardDropIcon: UIImageView!
+    @IBOutlet weak var imgViewCalenderIconCard: UIImageView!
     
     @IBOutlet weak var btnScanCard: UIButton!
     
@@ -100,7 +106,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     //Single Saved Card
     @IBOutlet weak var viewSingleSavedCard: UIView!
-    @IBOutlet weak var viewSingleSavedCardHeight: NSLayoutConstraint!
     @IBOutlet weak var viewTxtFieldCVVSingleCard: TextFieldStackView!
     @IBOutlet weak var txtFieldCVVSingleSavedCard: UITextField!
     @IBOutlet weak var viewTxtFieldCVVSingleSavedCard: UIView!
@@ -119,6 +124,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var tblViewSavedCardsList: UITableView!
     @IBOutlet weak var tblViewSavedCardListHeight: NSLayoutConstraint!
     
+    @IBOutlet weak var txtFieldSelectPlanSingleSavedCard: TextFieldStackView!
+    @IBOutlet weak var txtFieldSelectDateSingleSavedCard: TextFieldStackView!
+    
     //Update Card
     @IBOutlet weak var btnSelectUpdateCardView: UIButton!
     @IBOutlet weak var imgViewCardUpdateCardView: UIImageView!
@@ -144,6 +152,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var viewtxtFieldNameOnCardNewCardView: UIView!
     @IBOutlet weak var btnPayNowNewCardView: FilledButton!
     @IBOutlet weak var btnSavedCardForFutureNewCardView: CheckboxButton!
+    @IBOutlet weak var txtFieldSelectPlanNewCardView: TextFieldStackView!
+    @IBOutlet weak var txtFieldSelectDateNewCardView: TextFieldStackView!
+    @IBOutlet weak var heightViewNewCardFields: NSLayoutConstraint!
     
     //Bank
     @IBOutlet weak var viewBankFields: UIView!
@@ -163,6 +174,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var btnCheckSavedAccountForFuture: UIButton!
     @IBOutlet weak var txtFieldConfirmBankAccount: UITextField!
     @IBOutlet weak var viewTextFieldConfirmAccount: UIView!
+    @IBOutlet weak var txtFieldSelectPlanViewBankFields: TextFieldStackView!
+    @IBOutlet weak var txtFieldSelectDateViewBankFields: TextFieldStackView!
+    
+    @IBOutlet weak var heightViewBankFields: NSLayoutConstraint!
     
     //GrailPay
     @IBOutlet weak var grailPayBankLinkView: UIView!
@@ -211,13 +226,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 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!
+    @IBOutlet weak var txtFieldSelectPlanSingleSavedBankView: TextFieldStackView!
+    @IBOutlet weak var txtFieldSelectDateSingleSavedBankView: TextFieldStackView!
     
     //New Bank
     @IBOutlet weak var viewNewBankAccount: UIView!
@@ -236,6 +252,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var lblSavedNewAccountForFuture: UILabel!
     @IBOutlet weak var txtFieldConfirmAccountNewAccountView: UITextField!
     @IBOutlet weak var viewTxtFieldConfirmNewAccountView: UIView!
+    @IBOutlet weak var txtFieldSelectPlanNewAccountView: TextFieldStackView!
+    @IBOutlet weak var txtFieldSelectDateNewAccountView: TextFieldStackView!
+    
+    @IBOutlet weak var heightViewNewAccountFields: NSLayoutConstraint!
+    @IBOutlet weak var heightSubViewNewAccountFields: NSLayoutConstraint!
     
     //Crypto
     @IBOutlet weak var viewCrypto: UIView!
@@ -264,6 +285,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBOutlet weak var btnLogout: UIButton!
     @IBOutlet weak var settingsView: UIView!
     
+    @IBOutlet weak var viewTblViewRecurring: UIView!
+    @IBOutlet weak var heightViewTblViewRecurring: NSLayoutConstraint!
+    @IBOutlet weak var tblViewRecurring: UITableView!
+    
     var chainInvoiceAddress: String?
     var lightningURI: String?
     
@@ -320,7 +345,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     var isFrom = String()
     
     //Blink Card
-  //  var blinkCardRecognizer: MBCBlinkCardRecognizer!
+//    var blinkCardRecognizer: MBCBlinkCardRecognizer!
     
     // Variables for Card Scanning Data Back
     var cardNumber: String?
@@ -353,6 +378,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     var selectedNewGrailPayAccountName: String?
     var grailPayNewAccountCustomerID: String?
     
+    //    let planOptions = ["Weekly", "Monthly"]
+    
+    var startDatePickerHandler: DatePickerHandler?
+    
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -379,7 +408,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         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)")
             
@@ -389,7 +417,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnPayNowSingleCard.setTitle(buttonText, for: .normal)
             btnPayNowSingleAccountView.setTitle(buttonText, for: .normal)
         } else {
-            let amountText = String(format: "$%.2f", amount ?? 0)
+            let amountValue = request?.amount ?? 0
+            let amountText = String(format: "$%.2f", amountValue)
             let submitText = request?.submitButtonText
             
             let defaultTitle = (submitText?.isEmpty == false)
@@ -434,36 +463,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         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
-        viewAccountType.layer.shadowOffset = CGSize(width: 0, height: 2)
-        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
-        viewAccountTypeNewAccountView.layer.shadowOffset = CGSize(width: 0, height: 2)
-        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")
         
@@ -489,6 +488,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnSettings.isHidden = true
         }
         
+        setupPlanTableView()
     }
     
     //MARK: - View Wiil Appear
@@ -524,12 +524,47 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         viewTxtFieldCVVSingleCard.isHidden = true
         btnPayNowSingleCard.isHidden = true
-        viewSingleSavedCardHeight.constant = 60
         
         self.viewCrypto.isHidden = true
         
-        //        self.viewAddNewGrailPayAccount.isHidden = true
-        //        self.viewAbandonGrailPayNewAccountView.isHidden = true
+        if request.enableRecurring == true {
+            self.txtFieldChosePlanCard.isHidden = false
+            self.txtFieldStartDateCard.isHidden = false
+            self.txtFieldSelectPlanSingleSavedCard.isHidden = false
+            self.txtFieldSelectDateSingleSavedCard.isHidden = false
+            self.txtFieldSelectPlanNewCardView.isHidden = false
+            self.txtFieldSelectDateNewCardView.isHidden = false
+            self.txtFieldSelectPlanViewBankFields.isHidden = false
+            self.txtFieldSelectDateViewBankFields.isHidden = false
+            self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
+            self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+            self.txtFieldSelectPlanNewAccountView.isHidden = false
+            self.txtFieldSelectDateNewAccountView.isHidden = false
+            
+            self.heightViewBankFields.constant = 696
+            self.heightViewNewCardFields.constant = 624
+            self.heightViewNewAccountFields.constant = 808
+            self.heightSubViewNewAccountFields.constant = 738
+        }
+        else {
+            self.txtFieldChosePlanCard.isHidden = true
+            self.txtFieldStartDateCard.isHidden = true
+            self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+            self.txtFieldSelectDateSingleSavedCard.isHidden = true
+            self.txtFieldSelectPlanNewCardView.isHidden = true
+            self.txtFieldSelectDateNewCardView.isHidden = true
+            self.txtFieldSelectPlanViewBankFields.isHidden = true
+            self.txtFieldSelectDateViewBankFields.isHidden = true
+            self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+            self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+            self.txtFieldSelectPlanNewAccountView.isHidden = true
+            self.txtFieldSelectDateNewAccountView.isHidden = true
+            
+            self.heightViewBankFields.constant = 506
+            self.heightViewNewCardFields.constant = 434
+            self.heightViewNewAccountFields.constant = 628
+            self.heightSubViewNewAccountFields.constant = 558
+        }
         
         if selectedPaymentMethod == "Card" {
             self.grailPayBankLinkView.isHidden = true
@@ -562,7 +597,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     
                     self.viewTxtFieldCVVSingleCard.isHidden = true
                     self.btnPayNowSingleCard.isHidden = true
-                    self.viewSingleSavedCardHeight.constant = 60
                     self.btnNext.isHidden = true
                     self.btnNextHeight.constant = 0
                     self.btnNextTopCon.constant = 8
@@ -575,17 +609,25 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     if isSelectForPay {
                         viewTxtFieldCVVSingleCard.isHidden = false
                         btnPayNowSingleCard.isHidden = false
-                        viewSingleSavedCardHeight.constant = 220
                         btnNext.isHidden = true
                         btnNextHeight.constant = 0
                         btnNextTopCon.constant = 0
+                        if request.enableRecurring == true {
+                            txtFieldSelectPlanSingleSavedCard.isHidden = false
+                            txtFieldSelectDateSingleSavedCard.isHidden = false
+                        }
+                        else {
+                            txtFieldSelectPlanSingleSavedCard.isHidden = true
+                            txtFieldSelectDateSingleSavedCard.isHidden = true
+                        }
                     } else {
                         viewTxtFieldCVVSingleCard.isHidden = true
                         btnPayNowSingleCard.isHidden = true
-                        viewSingleSavedCardHeight.constant = 60
                         btnNext.isHidden = true
                         btnNextHeight.constant = 0
                         btnNextTopCon.constant = 8
+                        txtFieldSelectPlanSingleSavedCard.isHidden = true
+                        txtFieldSelectDateSingleSavedCard.isHidden = true
                     }
                 }
             }
@@ -645,14 +687,23 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if self.isSelectForPayBank {
                     self.viewTermAndConditionsSingleAccountView.isHidden = false
                     self.btnPayNowSingleAccountView.isHidden = false
-                    //  self.viewSingleAccountViewHeight.constant = 170
+                    if request.enableRecurring == true {
+                        self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
+                        self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                    }
+                    else {
+                        self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+                        self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+                    }
                 } else {
                     self.viewTermAndConditionsSingleAccountView.isHidden = true
                     self.btnPayNowSingleAccountView.isHidden = true
-                    //   self.viewSingleAccountViewHeight.constant =  68
                     self.btnNext.isHidden = true
                     self.btnNextHeight.constant = 0
                     self.btnNextTopCon.constant = 0
+                    
+                    self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+                    self.txtFieldSelectDateSingleSavedBankView.isHidden = true
                 }
                 
                 if request?.authenticatedACH == true {
@@ -683,8 +734,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     }
                 }
                 else {
-                    self.viewBankFields.isHidden = false
-                    self.viewTermsAndConditions.isHidden = false
+//                    self.viewBankFields.isHidden = false
+//                    self.viewTermsAndConditions.isHidden = false
                     self.grailPayBankLinkView.isHidden = true
                 }
             }
@@ -746,6 +797,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             viewContainerBackground.backgroundColor = uiColor
             viewAccountType.backgroundColor = uiColor
             tblViewAccountTypes.backgroundColor = uiColor
+            viewAccountTypeNewAccountView.backgroundColor = uiColor
+            tblViewAccountTypeNewAccountView.backgroundColor = uiColor
+            //            viewTblViewRecurring.backgroundColor = uiColor
+            //            tblViewRecurring.backgroundColor = uiColor
         }
         
         if let bodyBackGroundColor = UserStoreSingleton.shared.body_bg_col,
@@ -907,6 +962,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             lblGrailPayAgreeTo.textColor = placeholderColor
             lblGrailPayNewAccountSaveForFuture.textColor = placeholderColor
             lblIagreeGrailPayNewAccountView.textColor = placeholderColor
+            
+            imgViewChosePlanCardDropIcon.tintColor = placeholderColor
+            imgViewCalenderIconCard.tintColor = placeholderColor
         }
         
         if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
@@ -999,9 +1057,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             subLblSavedInfoOTPView.font = UIFont.systemFont(ofSize: fontSize)
             subLblChangeCard.font = UIFont.systemFont(ofSize: fontSize)
             subLblUpdateCard.font = UIFont.systemFont(ofSize: fontSize)
-            lblCreateNewCard.font = UIFont.systemFont(ofSize: fontSize)
+            lblCreateNewCard.font = UIFont.systemFont(ofSize: fontSize, weight: .semibold)
             subLblChangeAccount.font = UIFont.systemFont(ofSize: fontSize)
-            lblCreateNewAccount.font = UIFont.systemFont(ofSize: fontSize)
+            lblCreateNewAccount.font = UIFont.systemFont(ofSize: fontSize, weight: .semibold)
             lblEasyMerchantOne.font = UIFont.systemFont(ofSize: fontSize)
             lblTimerCrypto.font = UIFont.systemFont(ofSize: fontSize)
             lblUntillPriceChange.font = UIFont.systemFont(ofSize: fontSize)
@@ -1395,6 +1453,141 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         cryptoInfoTimer = nil
     }
     
+    func setupPlanTableView() {
+        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
+        viewAccountType.layer.shadowOffset = CGSize(width: 0, height: 2)
+        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
+        viewAccountTypeNewAccountView.layer.shadowOffset = CGSize(width: 0, height: 2)
+        viewAccountTypeNewAccountView.layer.shadowRadius = 4
+        viewAccountTypeNewAccountView.layer.cornerRadius = 8
+        viewAccountTypeNewAccountView.layer.cornerRadius = 8
+        
+        viewAccountTypeNewAccountView.isHidden = true
+        
+        //        tblViewRecurring.delegate = self
+        //        tblViewRecurring.dataSource = self
+        //        tblViewRecurring.showsVerticalScrollIndicator = false
+        //        tblViewRecurring.showsHorizontalScrollIndicator = false
+        //
+        //        viewTblViewRecurring.clipsToBounds = false
+        //        viewTblViewRecurring.layer.shadowColor = UIColor.black.cgColor
+        //        viewTblViewRecurring.layer.shadowOpacity = 0.3
+        //        viewTblViewRecurring.layer.shadowOffset = CGSize(width: 0, height: 2)
+        //        viewTblViewRecurring.layer.shadowRadius = 4
+        //        viewTblViewRecurring.layer.cornerRadius = 8
+        //        viewTblViewRecurring.layer.cornerRadius = 8
+        //
+        //        viewTblViewRecurring.isHidden = true
+    }
+    
+    @IBAction func actionBtnChosePlanCardField(_ sender: UIButton) {
+        //        UIView.animate(withDuration: 0.3) {
+        //            self.viewTblViewRecurring.isHidden.toggle()
+        //        }
+        
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+            self.txtFieldChosePlanCard.text = selectedPlan
+        }
+    }
+    
+    @IBAction func actionBtnStartDateCardField(_ sender: UIButton) {
+        startDatePickerHandler = DatePickerHandler(textField: txtFieldStartDateCard.textField)
+        startDatePickerHandler?.onDateSelected = { selectedDate in
+            
+        }
+        txtFieldStartDateCard.textField.becomeFirstResponder()
+    }
+    
+    @IBAction func actionBtnSelectPlanSingleSavedCard(_ sender: UIButton) {
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+            self.txtFieldSelectPlanSingleSavedCard.text = selectedPlan
+        }
+    }
+    
+    @IBAction func actionBtnSelectDateSingleSavedCard(_ sender: UIButton) {
+        startDatePickerHandler = DatePickerHandler(textField: txtFieldSelectDateSingleSavedCard.textField)
+        startDatePickerHandler?.onDateSelected = { selectedDate in
+            
+        }
+        txtFieldSelectDateSingleSavedCard.textField.becomeFirstResponder()
+    }
+    
+    @IBAction func actionBtnSelectPlanNewCardView(_ sender: UIButton) {
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+            self.txtFieldSelectPlanNewCardView.text = selectedPlan
+        }
+    }
+    
+    @IBAction func actionBtnSelectDateNewCardView(_ sender: UIButton) {
+        startDatePickerHandler = DatePickerHandler(textField: txtFieldSelectDateNewCardView.textField)
+        startDatePickerHandler?.onDateSelected = { selectedDate in
+            
+        }
+        txtFieldSelectDateNewCardView.textField.becomeFirstResponder()
+    }
+    
+    @IBAction func actionBtnSelectPlanViewBankFields(_ sender: UIButton) {
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+            self.txtFieldSelectPlanViewBankFields.text = selectedPlan
+        }
+    }
+    
+    @IBAction func actionBtnSelectDateViewBankFields(_ sender: UIButton) {
+        startDatePickerHandler = DatePickerHandler(textField: txtFieldSelectDateViewBankFields.textField)
+        startDatePickerHandler?.onDateSelected = { selectedDate in
+            
+        }
+        txtFieldSelectDateViewBankFields.textField.becomeFirstResponder()
+    }
+    
+    @IBAction func actionBtnSelectPlanSingleSavedAccount(_ sender: UIButton) {
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+            self.txtFieldSelectPlanSingleSavedBankView.text = selectedPlan
+        }
+    }
+    
+    @IBAction func actionBtnSelectDateSingleSavedAccount(_ sender: UIButton) {
+        startDatePickerHandler = DatePickerHandler(textField: txtFieldSelectDateSingleSavedBankView.textField)
+        startDatePickerHandler?.onDateSelected = { selectedDate in
+            
+        }
+        txtFieldSelectDateSingleSavedBankView.textField.becomeFirstResponder()
+    }
+    
+    @IBAction func actionBtnSelectPlanNewAccountView(_ sender: UIButton) {
+        PlanSelector.presentPlanOptions(from: self, sourceView: sender) { selectedPlan in
+            self.txtFieldSelectPlanNewAccountView.text = selectedPlan
+        }
+    }
+    
+    @IBAction func actionBtnSelectDateNewAccountView(_ sender: UIButton) {
+        startDatePickerHandler = DatePickerHandler(textField: txtFieldSelectDateNewAccountView.textField)
+        startDatePickerHandler?.onDateSelected = { selectedDate in
+            
+        }
+        txtFieldSelectDateNewAccountView.textField.becomeFirstResponder()
+    }
+    
     @IBAction func actionBtnClose(_ sender: UIButton) {
         UserStoreSingleton.shared.clearUserData()
         UserStoreSingleton.shared.isLoggedIn = false
@@ -1427,30 +1620,28 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     @IBAction func actionBtnSelectSingleSavedCard(_ sender: UIButton) {
-        // Toggle the boolean property
+        // Toggle selection state
         isSelectForPay.toggle()
-        // Update the button image based on the state
+        
+        // Update button image
         let imageName = isSelectForPay ? "circle.inset.filled" : "circle"
         sender.setImage(UIImage(systemName: imageName), for: .normal)
-        // Show or hide the view based on the state
-        if isSelectForPay {
-            viewTxtFieldCVVSingleCard.isHidden = false
-            btnPayNowSingleCard.isHidden = false
-            viewSingleSavedCardHeight.constant = 220
-            btnNext.isHidden = true
-            btnNextHeight.constant = 0
-            btnNextTopCon.constant = 0
-            if let firstCard = savedCards.first {
-                // Update the selectedCard to the firstCard or the card that is currently selected
-                selectedCard = firstCard
-            }
-        } else {
-            viewTxtFieldCVVSingleCard.isHidden = true
-            btnPayNowSingleCard.isHidden = true
-            viewSingleSavedCardHeight.constant = 60
-            btnNext.isHidden = true
-            btnNextHeight.constant = 0
-            btnNextTopCon.constant = 8
+        
+        // Show/hide UI based on selection
+        viewTxtFieldCVVSingleCard.isHidden = !isSelectForPay
+        btnPayNowSingleCard.isHidden = !isSelectForPay
+        btnNext.isHidden = true
+        btnNextHeight.constant = 0
+        btnNextTopCon.constant = isSelectForPay ? 0 : 8
+        
+        // Handle recurring fields visibility
+        let showRecurringFields = isSelectForPay && request.enableRecurring == true
+        txtFieldSelectPlanSingleSavedCard.isHidden = !showRecurringFields
+        txtFieldSelectDateSingleSavedCard.isHidden = !showRecurringFields
+        
+        // Set selected card
+        if isSelectForPay, let firstCard = savedCards.first {
+            selectedCard = firstCard
         }
     }
     
@@ -1826,7 +2017,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     print("❌ JSON Parsing Error: \(error)")
                 }
             } else {
-                print("❌ HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = data,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         
@@ -1965,7 +2162,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     print("❌ JSON Parsing Error: \(error)")
                 }
             } else {
-                print("❌ HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = data,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         
@@ -2198,7 +2401,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -2300,7 +2509,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -2404,7 +2619,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -2506,7 +2727,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -2814,21 +3041,31 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     @IBAction func actionBtnSelectSingleAccountView(_ sender: UIButton) {
         // Toggle the boolean property
         isSelectForPayBank.toggle()
-        // Update the button image based on the state
+        
+        // Update the button image based on the toggle state
         let imageName = isSelectForPayBank ? "circle.inset.filled" : "circle"
         sender.setImage(UIImage(systemName: imageName), for: .normal)
-        // Show or hide the view based on the state
+        
+        // Update UI based on selection
+        viewTermAndConditionsSingleAccountView.isHidden = !isSelectForPayBank
+        btnPayNowSingleAccountView.isHidden = !isSelectForPayBank
+        
         if isSelectForPayBank {
-            viewTermAndConditionsSingleAccountView.isHidden = false
-            btnPayNowSingleAccountView.isHidden = false
-            //   viewSingleAccountViewHeight.constant = 170
+            // Show or hide recurring plan fields based on request.enableRecurring
+            if request?.enableRecurring == true {
+                txtFieldSelectPlanSingleSavedBankView.isHidden = false
+                txtFieldSelectDateSingleSavedBankView.isHidden = false
+            } else {
+                txtFieldSelectPlanSingleSavedBankView.isHidden = true
+                txtFieldSelectDateSingleSavedBankView.isHidden = true
+            }
         } else {
-            viewTermAndConditionsSingleAccountView.isHidden = true
-            btnPayNowSingleAccountView.isHidden = true
-            //   viewSingleAccountViewHeight.constant =  68
+            // Hide all related fields if not selected
             btnNext.isHidden = true
             btnNextHeight.constant = 0
             btnNextTopCon.constant = 0
+            txtFieldSelectPlanSingleSavedBankView.isHidden = true
+            txtFieldSelectDateSingleSavedBankView.isHidden = true
         }
     }
     
@@ -2847,6 +3084,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     @IBAction func actionBtnPayNowSingleAccountView(_ sender: UIButton) {
         if request.authenticatedACH == true {
+            // Check if the terms and conditions are agreed
+            if !agreeTermsAndCondtition {
+                showAlert(title: "Terms and Conditions", message: "Please agree to the terms and conditions")
+                return
+            }
             grailPayAaccountChargeSingleSavedAccountApi()
         } else {
             // Check if billingInfoData is not nil or empty
@@ -3040,11 +3282,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
            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)
@@ -3057,7 +3297,6 @@ 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)
@@ -3071,18 +3310,14 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             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")
         }
@@ -3230,19 +3465,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "POST"
-        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        var urlRequest = URLRequest(url: serviceURL)
+        urlRequest.httpMethod = "POST"
+        urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
-        request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
+        urlRequest.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")
+            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)
@@ -3257,7 +3492,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-            request.httpBody = jsonData
+            urlRequest.httpBody = jsonData
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
@@ -3267,7 +3502,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             return
         }
         
-        let task = URLSession.shared.dataTask(with: request) { serviceData, serviceResponse, error in
+        let task = URLSession.shared.dataTask(with: urlRequest) { serviceData, serviceResponse, error in
             
             DispatchQueue.main.async {
                 self.hideLoadingIndicator()
@@ -3339,11 +3574,17 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     
                                     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.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                                self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                                
+                                self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+                                self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+                                
                             } else if self.selectedPaymentMethod == "Bank" {
                                 self.getShowBankAccountsApi()
                             }
@@ -3357,59 +3598,78 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
                 
             } else {
-                print("HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         
         task.resume()
     }
     
-    //MARK: - GET Show Cards API
+    // MARK: - GET Show Cards API
     func getShowCardsApi() {
         showLoadingIndicator()
-        
+
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()
-        
+
         guard let serviceURL = URL(string: fullURL) else {
-            print("Invalid URL")
+            print("❌ Invalid URL: \(fullURL)")
             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")")
+        print("🔑 Setting customerToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
-        
+
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
             request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
             request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
-        
+
         let session = URLSession.shared
         let task = session.dataTask(with: request) { [weak self] (data, response, error) in
             guard let self = self else { return }
-            
+
             DispatchQueue.main.async {
-                self.hideLoadingIndicator() // Stop loader when response is received
+                self.hideLoadingIndicator()
             }
-            
+
             if let error = error {
-                print("Error: \(error.localizedDescription)")
+                print("❌ Error in getShowCardsApi: \(error.localizedDescription)")
+                if let httpResponse = response as? HTTPURLResponse {
+                    print("📡 HTTP Status Code: \(httpResponse.statusCode)")
+                }
                 return
             }
-            
-            guard let data = data else { return }
-            
+
+            guard let data = data else {
+                print("❌ No data received in getShowCardsApi.")
+                return
+            }
+
             do {
+                // Print raw JSON string for inspection
+                if let rawJSON = String(data: data, encoding: .utf8) {
+                    print("📦 Raw JSON Response:\n\(rawJSON)")
+                }
+
                 if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let cards = jsonResponse["Cards"] as? [[String: Any]] {
-                    
+
+                    print("✅ Parsed JSON Response:\n\(jsonResponse)")
+
                     // Map JSON response to CardModel array
                     self.savedCards = cards.compactMap { cardDict in
                         return CardModel(
@@ -3423,17 +3683,58 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         )
                     }
                     
+                    print("💳 Saved Cards:")
+                    self.savedCards.forEach { card in
+                        print("""
+                        --------------------------
+                        Card Brand: \(card.cardBrandName)
+                        Card ID: \(card.cardId)
+                        Card Type: \(card.cardType)
+                        Last 4: ****\(card.ccLast4)
+                        Expiry: \(card.ccValidThru)
+                        Customer ID: \(card.customerId)
+                        Is Default: \(card.isDefault)
+                        --------------------------
+                        """)
+                    }
+
                     DispatchQueue.main.async {
                         if let firstCard = self.savedCards.first {
                             self.lblCardNumberSigleSavedCard.text = "****\(firstCard.ccLast4)"
                             self.lblExpireDateSingelSavedCard.text = "Expiry: \(firstCard.ccValidThru)"
                         }
-                        
+
                         self.tblViewSavedCardsList.reloadData()
+
+                        if self.isSelectForPay {
+                            self.viewTxtFieldCVVSingleCard.isHidden = false
+                            self.btnPayNowSingleCard.isHidden = false
+                            self.btnNext.isHidden = true
+                            self.btnNextHeight.constant = 0
+                            self.btnNextTopCon.constant = 0
+
+                            if self.request.enableRecurring == true {
+                                self.txtFieldSelectPlanSingleSavedCard.isHidden = false
+                                self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                            } else {
+                                self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                                self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                            }
+                        } else {
+                            self.viewTxtFieldCVVSingleCard.isHidden = true
+                            self.btnPayNowSingleCard.isHidden = true
+                            self.btnNext.isHidden = true
+                            self.btnNextHeight.constant = 0
+                            self.btnNextTopCon.constant = 8
+                            self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                            self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                        }
                     }
+                } else {
+                    print("⚠️ JSON structure unexpected or 'Cards' key missing")
                 }
             } catch {
-                print("Failed to parse response: \(error.localizedDescription)")
+                print("❌ JSON parsing failed: \(error.localizedDescription)")
             }
         }
         task.resume()
@@ -3538,91 +3839,100 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
     }
     
-    // MARK: - Credit Card Charge Api from Saved cards If Billing info is nil and if Logged in.
+    // MARK: - Credit Card Charge API (Saved Cards, No Billing Info, Logged In)
     func paymentIntentFromShowSavedCardApi() {
         showLoadingIndicator()
-        
+
         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")
-        
+
+        // Add client token
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-        
+
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
             request.addValue(apiKey, forHTTPHeaderField: "x-api-key")
             request.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
-        
-        // Prepare parameters for the API request
+
+        // Prepare parameters
+        let email = UserStoreSingleton.shared.verificationEmail ?? ""
+        let namePart = email.split(separator: "@").first.map(String.init) ?? ""
+
         let params: [String: Any] = [
-            "name": UserStoreSingleton.shared.verificationEmail?.split(separator: "@").first ?? "",
-            "email": UserStoreSingleton.shared.verificationEmail ?? "",
+            "name": namePart,
+            "email": email,
             "description": "TestDescription",
             "currency": "usd",
             "payment_method": "card",
             "save_card": 0,
-            "customer": selectedCard?.customerId ?? "", // Use the selectedCard's customerId
-            "card_id": selectedCard?.cardId ?? "",     // Use the selectedCard's cardId
-            "cvc": txtFieldCVVSingleSavedCard.text ?? "",
+            "customer": selectedCard?.customerId ?? "",
+            "card_id": selectedCard?.cardId ?? "",
+            "cvc": txtFieldCVVSingleSavedCard.text?.trimmingCharacters(in: .whitespacesAndNewlines) ?? "",
             "customer_id": selectedCard?.customerId ?? ""
         ]
-        
-        print(params)
-        
+
+        print("Request Params: \(params)")
+
         do {
             let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
             request.httpBody = jsonData
+
             if let jsonString = String(data: jsonData, encoding: .utf8) {
                 print("JSON Payload: \(jsonString)")
             }
-        } catch let error {
+        } catch {
             print("Error creating JSON data: \(error)")
             hideLoadingIndicator()
             return
         }
-        
-        let session = URLSession.shared
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
-            
+
+        // API Call
+        let task = URLSession.shared.dataTask(with: request) { (data, response, error) in
             DispatchQueue.main.async {
-                self.hideLoadingIndicator() // Stop loader when response is received
+                self.hideLoadingIndicator()
             }
-            
+
             if let error = error {
                 print("Error: \(error.localizedDescription)")
                 return
             }
-            
-            guard let httpResponse = serviceResponse as? HTTPURLResponse else {
+
+            guard let httpResponse = response as? HTTPURLResponse else {
                 print("Invalid response")
                 return
             }
-            
+
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-                if let data = serviceData {
+                if let data = data {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             print("Response Data: \(responseObject)")
-                            
-                            // Check if status is 0 and handle the error
+
                             if let status = responseObject["status"] as? Int, status == 0 {
                                 let errorMessage = responseObject["message"] as? String ?? "Unknown error"
                                 self.presentPaymentErrorVC(errorMessage: errorMessage)
@@ -3639,14 +3949,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         } else {
                             self.presentPaymentErrorVC(errorMessage: "Invalid JSON format")
                         }
-                    } catch let jsonError {
-                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(jsonError)")
+                    } catch {
+                        self.presentPaymentErrorVC(errorMessage: "Error parsing JSON: \(error)")
                     }
                 } else {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = data,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -3818,7 +4134,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -3975,7 +4297,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -4049,7 +4377,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             } else {
                 DispatchQueue.main.async {
-                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                    if let data = serviceData,
+                       let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                       let message = responseObj["message"] as? String {
+                        self.presentPaymentErrorVC(errorMessage: message)
+                    } else {
+                        self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                    }
                 }
             }
         }
@@ -4169,17 +4503,30 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if self.isSelectForPayBank {
                             self.viewTermAndConditionsSingleAccountView.isHidden = false
                             self.btnPayNowSingleAccountView.isHidden = false
-                            //   self.viewSingleAccountViewHeight.constant = 170
+                            
+                            if self.request.enableRecurring == true {
+                                self.txtFieldSelectPlanSingleSavedBankView.isHidden = false
+                                self.txtFieldSelectDateSingleSavedBankView.isHidden = false
+                            }
+                            else {
+                                self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+                                self.txtFieldSelectDateSingleSavedBankView.isHidden = true
+                            }
                         } else {
                             self.viewTermAndConditionsSingleAccountView.isHidden = true
                             self.btnPayNowSingleAccountView.isHidden = true
-                            //   self.viewSingleAccountViewHeight.constant = 68
                             self.btnNext.isHidden = true
                             self.btnNextHeight.constant = 0
                             self.btnNextTopCon.constant = 0
+                            
+                            self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
+                            self.txtFieldSelectDateSingleSavedBankView.isHidden = true
                         }
                         
                         self.grailPayBankLinkView.isHidden = true
+                        
+                        self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                        self.txtFieldSelectDateSingleSavedCard.isHidden = true
                     }
                 } else {
                     print("Error from server: \(bankAccountModel.message ?? "Unknown error")")
@@ -4294,7 +4641,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -4397,7 +4750,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -4510,7 +4869,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -4633,7 +4998,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -4708,7 +5079,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             } else {
                 DispatchQueue.main.async {
-                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                    if let data = serviceData,
+                       let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                       let message = responseObj["message"] as? String {
+                        self.presentPaymentErrorVC(errorMessage: message)
+                    } else {
+                        self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                    }
                 }
             }
         }
@@ -4841,7 +5218,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.presentPaymentErrorVC(errorMessage: "No data received")
                 }
             } else {
-                self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                if let data = serviceData,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let message = responseObj["message"] as? String {
+                    self.presentPaymentErrorVC(errorMessage: message)
+                } else {
+                    self.presentPaymentErrorVC(errorMessage: "HTTP Status Code: \(httpResponse.statusCode)")
+                }
             }
         }
         task.resume()
@@ -5056,6 +5439,30 @@ extension PaymentInfoVC: UICollectionViewDelegate, UICollectionViewDataSource, U
                 self.viewCrypto.isHidden = true
                 self.grailPayBankLinkView.isHidden = true
                 self.viewAddNewGrailPayAccount.isHidden = true
+                
+                if self.isSelectForPay {
+                    self.viewTxtFieldCVVSingleCard.isHidden = false
+                    self.btnPayNowSingleCard.isHidden = false
+                    self.btnNext.isHidden = true
+                    self.btnNextHeight.constant = 0
+                    self.btnNextTopCon.constant = 0
+                    if self.request.enableRecurring == true {
+                        self.txtFieldSelectPlanSingleSavedCard.isHidden = false
+                        self.txtFieldSelectDateSingleSavedCard.isHidden = false
+                    }
+                    else {
+                        self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                        self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                    }
+                } else {
+                    self.viewTxtFieldCVVSingleCard.isHidden = true
+                    self.btnPayNowSingleCard.isHidden = true
+                    self.btnNext.isHidden = true
+                    self.btnNextHeight.constant = 0
+                    self.btnNextTopCon.constant = 8
+                    self.txtFieldSelectPlanSingleSavedCard.isHidden = true
+                    self.txtFieldSelectDateSingleSavedCard.isHidden = true
+                }
             }
             
         case "Bank":
@@ -5181,6 +5588,9 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         else if tableView == tblViewAccountTypeNewAccountView {
             return arrAccountType.count
         }
+        //        else if tableView == tblViewRecurring {
+        //            return planOptions.count
+        //        }
         return 0
     }
     
@@ -5229,6 +5639,11 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             cell.lblAccountType.text = arrAccountType[indexPath.row]
             return cell
         }
+        //        else if tableView == tblViewRecurring {
+        //            let cell = tableView.dequeueReusableCell(withIdentifier: "RecurringTVC", for: indexPath) as! RecurringTVC
+        //            cell.lblRecurringDuration.text = planOptions[indexPath.row]
+        //            return cell
+        //        }
         
         return UITableViewCell()
     }
@@ -5335,6 +5750,9 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         else if tableView == tblViewAccountTypeNewAccountView {
             return 45
         }
+        //        else if tableView == tblViewRecurring {
+        //            return 45
+        //        }
         else {
             return 80
         }
@@ -5351,6 +5769,11 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
             txtFieldAccountTypeNewAccountView.text = selectedAccountType // Fill the selected account type into the text field
             viewAccountTypeNewAccountView.isHidden = true // Hide the table view after selection
         }
+        //        else if tableView == tblViewRecurring {
+        //            let selectedAccountType = planOptions[indexPath.row]
+        //            txtFieldChosePlanCard.text = selectedAccountType // Fill the selected account type into the text field
+        //            viewTblViewRecurring.isHidden = true
+        //        }
     }
     
     @objc func btnSelectCardTapped(_ sender: UIButton) {
@@ -5383,11 +5806,9 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         if isSelectForPay {
             viewTxtFieldCVVSingleCard.isHidden = false
             btnPayNowSingleCard.isHidden = false
-            viewSingleSavedCardHeight.constant = 220
         } else {
             viewTxtFieldCVVSingleCard.isHidden = true
             btnPayNowSingleCard.isHidden = true
-            viewSingleSavedCardHeight.constant = 60
         }
     }
     
@@ -5515,10 +5936,8 @@ extension PaymentInfoVC: UITableViewDelegate, UITableViewDataSource {
         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)
@@ -5527,12 +5946,10 @@ 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)
     }