@jimrising/easymerchantsdk-react-native 1.0.6 → 1.0.8

package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift

@@ -7,14 +7,12 @@
 
 import UIKit
 
-@available(iOS 16.0, *)
-
 protocol BillingInfoVCDelegate: AnyObject {
     func didPassTextBack(_ text: String)
 }
 
 class BillingInfoVC: BaseVC {
-    
+
     @IBOutlet weak var viewBillingInfo: UIView!
     @IBOutlet weak var btnPrevious: UIButton!
     @IBOutlet weak var viewCountryList: UIView!
@@ -28,123 +26,116 @@ class BillingInfoVC: BaseVC {
     @IBOutlet weak var tblViewCityList: UITableView!
     @IBOutlet weak var txtFieldCity: UITextField!
     @IBOutlet weak var txtFieldPostalCode: UITextField!
-    
+
     @IBOutlet weak var buttonBottomConstraint: NSLayoutConstraint!
-    
+
     // Variable to store the auth token
     var authToken: String?
-    
+
     var countryList: [[String: Any]] = []
     var stateList: [[String: Any]] = []
     var cityList: [[String: Any]] = []
-    
+
     var billingInfoData: [String: Any]?
-    
+
     var cardNumber: String?
     var expiryDate: String?
     var cvv: String?
     var nameOnCard: String?
-    
+
     //Banking Params
     var accountName: String?
     var routingNumber: String?
     var accountType: String?
     var accountNumber: String?
-    
+
     var selectedPaymentMethod: String?
-    
+
     private let keyboardObserver = KeyboardObserver()
-    
+
     var isSavedForFuture: Bool = false
     var isSavedNewCard: Bool = false
-    
+
     private var request: Request!
     var selectedCard: CardModel?
     var amount: Int?
     var cvvText: String?
-    
+
     var isFrom = String()
-    
+
     //From Regular Saved Bank Accounts
     var customerID: String?
     var accountID: String?
-    
+
     var isSavedNewAccount: Bool?
-    
+
     weak var delegate: BillingInfoVCDelegate?
-    
+
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+
         viewBillingInfo.layer.borderColor = UIColor.systemGray.cgColor
         viewBillingInfo.layer.borderWidth = 1
         viewBillingInfo.layer.cornerRadius = 8
-        
+
         btnPrevious.layer.borderColor = UIColor.systemBlue.cgColor
         btnPrevious.layer.borderWidth = 1
         btnPrevious.layer.cornerRadius = 8
-        
+
         setupShadowForListViews()
-        
+
         tblViewCountryList.delegate = self
         tblViewCountryList.dataSource = self
         viewCountryList.isHidden = true
-        
+
         tblViewStateList.delegate = self
         tblViewStateList.dataSource = self
         viewStateList.isHidden = true
-        
+
         tblViewCityList.delegate = self
         tblViewCityList.dataSource = self
         viewCityList.isHidden = true
-        
+
         txtFieldCity.delegate = self
         txtFieldState.delegate = self
         txtFieldAddress.delegate = self
         txtFieldCountry.delegate = self
         txtFieldPostalCode.delegate = self
-        
-        getTokenApi()
-        
+
+        getCountryListApi()
+
         // Add tap gesture to hide the views and dismiss the keyboard
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(didTapOutside))
         tapGesture.cancelsTouchesInView = false
         self.view.addGestureRecognizer(tapGesture)
-        
+
         // Print data for verification
         if let billingInfoData = billingInfoData {
             print("Billing Info Data: \(billingInfoData)")
-            
+
             if let address = billingInfoData["address"] as? String {
                 txtFieldAddress.text = address
             }
-            
+
             if let country = billingInfoData["country"] as? String {
                 txtFieldCountry.text = country
             }
-            
+
             if let state = billingInfoData["state"] as? String {
                 txtFieldState.text = state
             }
-            
+
             if let city = billingInfoData["city"] as? String {
                 txtFieldCity.text = city
             }
-            
+
             if let postalCode = billingInfoData["postal_code"] as? String {
                 txtFieldPostalCode.text = postalCode
             }
         }
-        
-        print(accountName ?? "")
-        print(routingNumber ?? "")
-        print(accountType ?? "")
-        print(accountNumber ?? "")
-        print(billingInfoData ?? "")
-        print(selectedPaymentMethod ?? "")
-        print(isSavedForFuture)
+
     }
-    
+
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         keyboardObserver.animateChanges({ [self] height in
@@ -154,32 +145,32 @@ class BillingInfoVC: BaseVC {
             self.view.layoutIfNeeded()
         })
     }
-    
+
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         keyboardObserver.invalidate()
     }
-    
+
     @objc func didTapOutside() {
         // Dismiss the keyboard
         self.view.endEditing(true)
-        
+
         // Hide the country list view if it is visible
         if !viewCountryList.isHidden {
             viewCountryList.isHidden = true
         }
-        
+
         // Hide the state list view if it is visible
         if !viewStateList.isHidden {
             viewStateList.isHidden = true
         }
-        
+
         // Hide the city list view if it is visible
         if !viewCityList.isHidden {
             viewCityList.isHidden = true
         }
     }
-    
+
     func setupShadowForListViews() {
         // Ensure the view does not clip its content or shadows
         viewCountryList.clipsToBounds = false
@@ -191,7 +182,7 @@ class BillingInfoVC: BaseVC {
         // Optionally, you might want to set a corner radius to the view as well
         viewCountryList.layer.cornerRadius = 8
         tblViewCountryList.layer.cornerRadius = 8
-        
+
         // Ensure the view does not clip its content or shadows
         viewStateList.clipsToBounds = false
         // Apply shadow properties
@@ -202,7 +193,7 @@ class BillingInfoVC: BaseVC {
         // Optionally, you might want to set a corner radius to the view as well
         viewStateList.layer.cornerRadius = 8
         tblViewStateList.layer.cornerRadius = 8
-        
+
         // Ensure the view does not clip its content or shadows
         viewCityList.clipsToBounds = false
         // Apply shadow properties
@@ -214,222 +205,344 @@ class BillingInfoVC: BaseVC {
         viewCityList.layer.cornerRadius = 8
         tblViewCityList.layer.cornerRadius = 8
     }
-    
-    //MARK: Get Auth Token
-    func getTokenApi() {
-        showLoadingIndicator()
-        let session = URLSession.shared
-        let serviceURL = URL(string: "https://www.universal-tutorial.com/api/getaccesstoken")!
-        
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "GET"
-        
-        // Add the headers
-        request.addValue("nL1j-qXjd2cH3N4ZZ7SeL5TCI2mKhXdxFYh52DjahJyrSxAmQXeDJQADwkRO0fZSy84", forHTTPHeaderField: "api-token")
-        request.addValue("bright.developer7@gmail.com", forHTTPHeaderField: "user-email")
-        
-        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
-            
-            if error == nil {
-                if let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 {
-                    if let data = serviceData {
-                        do {
-                            self.hideLoadingIndicator()
-                            if let jsonData = try JSONSerialization.jsonObject(with: data, options: .mutableContainers) as? [String: Any],
-                               let authToken = jsonData["auth_token"] as? String {
-                                // Save the auth token to the variable
-                                self.authToken = authToken
-                                print("Auth Token: \(authToken)")
-                                self.getCountryListApi()
-                            } else {
-                                self.hideLoadingIndicator()
-                                print("Error: Unable to parse JSON or find auth_token")
-                            }
-                        } catch {
-                            self.hideLoadingIndicator()
-                            print("Error parsing JSON: \(error.localizedDescription)")
-                        }
-                    }
-                } else {
-                    self.hideLoadingIndicator()
-                    print("Error: HTTP Status Code \(String(describing: (serviceResponse as? HTTPURLResponse)?.statusCode))")
-                }
-            } else {
-                self.hideLoadingIndicator()
-                print("Error: \(error?.localizedDescription ?? "Unknown error")")
-            }
-        }
-        task.resume()
-    }
-    
+
     //MARK: Get Country List
     func getCountryListApi() {
-        guard let authToken = authToken else {
-            print("Auth token is missing")
-            return
-        }
-        
         let session = URLSession.shared
-        let serviceURL = URL(string: "https://www.universal-tutorial.com/api/countries")!
-        
+        let serviceURL = URL(string: "https://countriesnow.space/api/v0.1/countries/iso")!
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "GET"
-        
-        request.addValue("Bearer \(authToken)", forHTTPHeaderField: "Authorization")
-        
+
         let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
-            
-            if error == nil {
-                if let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 {
-                    if let data = serviceData {
-                        do {
-                            if let jsonData = try JSONSerialization.jsonObject(with: data, options: .mutableContainers) as? [[String: Any]] {
-                                self.countryList = jsonData
-                                DispatchQueue.main.async {
-                                    self.tblViewCountryList.reloadData()
-                                }
-                            } else {
-                                self.hideLoadingIndicator()
-                                print("Error: Unable to parse JSON or find country data")
-                            }
-                        } catch {
-                            self.hideLoadingIndicator()
-                            print("Error parsing JSON: \(error.localizedDescription)")
-                        }
+            if let error = error {
+                self.hideLoadingIndicator()
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+
+            guard let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 else {
+                self.hideLoadingIndicator()
+                print("Error: HTTP Status Code \(String(describing: (serviceResponse as? HTTPURLResponse)?.statusCode))")
+                return
+            }
+
+            guard let data = serviceData else {
+                self.hideLoadingIndicator()
+                print("Error: No data received")
+                return
+            }
+
+            do {
+                if let jsonResponse = try JSONSerialization.jsonObject(with: data, options: .mutableContainers) as? [String: Any],
+                   let countryData = jsonResponse["data"] as? [[String: Any]] {
+
+                    self.countryList = countryData // Store the list of countries
+
+                    DispatchQueue.main.async {
+                        self.tblViewCountryList.reloadData() // Reload the table view
                     }
                 } else {
                     self.hideLoadingIndicator()
-                    print("Error: HTTP Status Code \(String(describing: (serviceResponse as? HTTPURLResponse)?.statusCode))")
+                    print("Error: Unable to parse JSON or find country data")
                 }
-            } else {
+            } catch {
                 self.hideLoadingIndicator()
-                print("Error: \(error?.localizedDescription ?? "Unknown error")")
+                print("Error parsing JSON: \(error.localizedDescription)")
             }
         }
         task.resume()
     }
-    
-    //MARK: Get State List
+
+    ///** Normal Case
+    //    //MARK: Get State List
+    //    func getStateListApi(for country: String) {
+    //        let urlString = "https://countriesnow.space/api/v0.1/countries/states"
+    //        guard let serviceURL = URL(string: urlString) else {
+    //            print("Invalid URL")
+    //            hideLoadingIndicator()
+    //            return
+    //        }
+    //
+    //        var request = URLRequest(url: serviceURL)
+    //        request.httpMethod = "POST"
+    //        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+    //
+    //        let params: [String: Any] = [
+    //            "country": country
+    //        ]
+    //
+    //        do {
+    //            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+    //            request.httpBody = jsonData
+    //        } catch {
+    //            print("Error creating JSON data: \(error)")
+    //            return
+    //        }
+    //
+    //        let session = URLSession.shared
+    //        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+    //            if let error = error {
+    //                print("Error: \(error.localizedDescription)")
+    //                return
+    //            }
+    //
+    //            guard let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 else {
+    //                print("Invalid response or status code")
+    //                return
+    //            }
+    //
+    //            if let data = serviceData {
+    //                do {
+    //                    if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+    //                       let dataObject = responseObject["data"] as? [String: Any],
+    //                       let statesArray = dataObject["states"] as? [[String: Any]] {
+    //
+    //                        DispatchQueue.main.async {
+    //                            self.stateList = statesArray
+    //                            self.tblViewStateList.reloadData()
+    //
+    //                            // Pick a random state and set it in txtFieldState
+    //                            if let randomState = statesArray.randomElement(),
+    //                               let stateName = randomState["name"] as? String {
+    //                                self.txtFieldState.text = stateName
+    //
+    //                                // Fetch cities for the randomly selected state and country
+    //                                if let country = self.txtFieldCountry.text {
+    //                                    self.getCityListListApi(for: country, state: stateName)
+    //                                }
+    //                            } else {
+    //                                self.txtFieldState.text = "" // No state available
+    //                            }
+    //                        }
+    //                    } else {
+    //                        print("Error: Invalid JSON structure")
+    //                    }
+    //                } catch {
+    //                    print("Error parsing JSON: \(error)")
+    //                }
+    //            } else {
+    //                print("No data received")
+    //            }
+    //        }
+    //        task.resume()
+    //    }
+    //
+
+    ///** Normal Case
+    //    //MARK: Get City List
+    //    func getCityListListApi(for country: String, state: String) {
+    //        let urlString = "https://countriesnow.space/api/v0.1/countries/state/cities"
+    //        guard let serviceURL = URL(string: urlString) else {
+    //            print("Invalid URL")
+    //            hideLoadingIndicator()
+    //            return
+    //        }
+    //
+    //        var request = URLRequest(url: serviceURL)
+    //        request.httpMethod = "POST"
+    //        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+    //
+    //        let params: [String: Any] = [
+    //            "country": country,
+    //            "state": state
+    //        ]
+    //
+    //        do {
+    //            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+    //            request.httpBody = jsonData
+    //        } catch {
+    //            print("Error creating JSON data: \(error)")
+    //            return
+    //        }
+    //
+    //        let session = URLSession.shared
+    //        let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
+    //            if let error = error {
+    //                print("Error: \(error.localizedDescription)")
+    //                return
+    //            }
+    //
+    //            guard let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 else {
+    //                print("Invalid response or status code")
+    //                return
+    //            }
+    //
+    //            if let data = serviceData {
+    //                do {
+    //                    if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+    //                       let citiesArray = responseObject["data"] as? [String] {  // Directly accessing city list array
+    //
+    //                        DispatchQueue.main.async {
+    //                            self.cityList = citiesArray.map { ["city_name": $0] }  // Converting to expected format
+    //                            self.tblViewCityList.reloadData()
+    //
+    //                            // Pick a random city and set it in txtFieldCity
+    //                            if let randomCity = citiesArray.randomElement() {
+    //                                self.txtFieldCity.text = randomCity
+    //                            } else {
+    //                                self.txtFieldCity.text = "" // No city available
+    //                            }
+    //                        }
+    //                    } else {
+    //                        print("Error: Invalid JSON structure")
+    //                    }
+    //                } catch {
+    //                    print("Error parsing JSON: \(error)")
+    //                }
+    //            } else {
+    //                print("No data received")
+    //            }
+    //        }
+    //        task.resume()
+    //    }
+
+
+    ///**In case of state and city name not found
     func getStateListApi(for country: String) {
-        guard let authToken = authToken else {
-            print("Auth token is missing")
+        let urlString = "https://countriesnow.space/api/v0.1/countries/states"
+        guard let serviceURL = URL(string: urlString) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
             return
         }
-        
-        let session = URLSession.shared
-        let serviceURLString = "https://www.universal-tutorial.com/api/states/\(country.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)"
-        
-        guard let serviceURL = URL(string: serviceURLString) else {
-            print("Error: Invalid URL")
+
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "POST"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+
+        let params: [String: Any] = [
+            "country": country
+        ]
+
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.httpBody = jsonData
+        } catch {
+            print("Error creating JSON data: \(error)")
             return
         }
-        
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "GET"
-        request.addValue("Bearer \(authToken)", forHTTPHeaderField: "Authorization")
-        
+
+        let session = URLSession.shared
         let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
-            
-            if error == nil {
-                if let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 {
-                    if let data = serviceData {
-                        do {
-                            if let jsonData = try JSONSerialization.jsonObject(with: data, options: .mutableContainers) as? [[String: Any]] {
-                                self.stateList = jsonData
-                                
-                                // Automatically select the first state
-                                if let firstState = self.stateList.first?["state_name"] as? String {
-                                    DispatchQueue.main.async {
-                                        self.txtFieldState.text = firstState
-                                        // Fetch cities for the first state
-                                        self.getCityListListApi(for: firstState)
-                                    }
-                                }
-                                
-                                DispatchQueue.main.async {
-                                    self.tblViewStateList.reloadData()
-                                }
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+
+            guard let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 else {
+                print("Invalid response or status code")
+                return
+            }
+
+            if let data = serviceData {
+                do {
+                    if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                       let dataObject = responseObject["data"] as? [String: Any],
+                       let statesArray = dataObject["states"] as? [[String: Any]] {
+
+                        DispatchQueue.main.async {
+                            self.stateList = statesArray
+                            self.tblViewStateList.reloadData()
+
+                            // If no state is found, clear the state and city fields and fill country in both
+                            if statesArray.isEmpty {
+                                self.txtFieldState.text = country
+                                self.txtFieldCity.text = country
                             } else {
-                                self.hideLoadingIndicator()
-                                print("Error: Unable to parse JSON or find state data")
+                                // Pick a random state and set it in txtFieldState
+                                if let randomState = statesArray.randomElement(),
+                                   let stateName = randomState["name"] as? String {
+                                    self.txtFieldState.text = stateName
+
+                                    // Fetch cities for the randomly selected state and country
+                                    self.getCityListListApi(for: country, state: stateName)
+                                }
                             }
-                        } catch {
-                            self.hideLoadingIndicator()
-                            print("Error parsing JSON: \(error.localizedDescription)")
                         }
+                    } else {
+                        print("Error: Invalid JSON structure")
                     }
-                } else {
-                    self.hideLoadingIndicator()
-                    print("Error: HTTP Status Code \(String(describing: (serviceResponse as? HTTPURLResponse)?.statusCode))")
+                } catch {
+                    print("Error parsing JSON: \(error)")
                 }
             } else {
-                self.hideLoadingIndicator()
-                print("Error: \(error?.localizedDescription ?? "Unknown error")")
+                print("No data received")
             }
         }
         task.resume()
     }
-    
-    //MARK: Get City List
-    func getCityListListApi(for state: String) {
-        guard let authToken = authToken else {
-            print("Auth token is missing")
+
+    ///**In case of state and city name not found
+    func getCityListListApi(for country: String, state: String) {
+        let urlString = "https://countriesnow.space/api/v0.1/countries/state/cities"
+        guard let serviceURL = URL(string: urlString) else {
+            print("Invalid URL")
+            hideLoadingIndicator()
             return
         }
-        
-        let session = URLSession.shared
-        let serviceURLString = "https://www.universal-tutorial.com/api/cities/\(state.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed)!)"
-        
-        guard let serviceURL = URL(string: serviceURLString) else {
-            print("Error: Invalid URL")
+
+        var request = URLRequest(url: serviceURL)
+        request.httpMethod = "POST"
+        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+
+        let params: [String: Any] = [
+            "country": country,
+            "state": state
+        ]
+
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+            request.httpBody = jsonData
+        } catch {
+            print("Error creating JSON data: \(error)")
             return
         }
-        
-        var request = URLRequest(url: serviceURL)
-        request.httpMethod = "GET"
-        request.addValue("Bearer \(authToken)", forHTTPHeaderField: "Authorization")
-        
+
+        let session = URLSession.shared
         let task = session.dataTask(with: request) { (serviceData, serviceResponse, error) in
-            
-            if error == nil {
-                if let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 {
-                    if let data = serviceData {
-                        do {
-                            if let jsonData = try JSONSerialization.jsonObject(with: data, options: .mutableContainers) as? [[String: Any]] {
-                                self.cityList = jsonData
-                                
-                                DispatchQueue.main.async {
-                                    if self.cityList.isEmpty {
-                                        self.txtFieldCity.text = "" // Clear the city field if no cities are available
-                                    } else {
-                                        // Automatically select the first city if available
-                                        if let firstCity = self.cityList.first?["city_name"] as? String {
-                                            self.txtFieldCity.text = firstCity
-                                        }
-                                    }
-                                    self.tblViewCityList.reloadData()
-                                }
+            if let error = error {
+                print("Error: \(error.localizedDescription)")
+                return
+            }
+
+            guard let httpResponse = serviceResponse as? HTTPURLResponse, httpResponse.statusCode == 200 else {
+                print("Invalid response or status code")
+                return
+            }
+
+            if let data = serviceData {
+                do {
+                    if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                       let citiesArray = responseObject["data"] as? [String] {  // Directly accessing city list array
+
+                        DispatchQueue.main.async {
+                            self.cityList = citiesArray.map { ["city_name": $0] }  // Converting to expected format
+                            self.tblViewCityList.reloadData()
+
+                            // If no cities found, set state name in city field
+                            if citiesArray.isEmpty {
+                                self.txtFieldCity.text = self.txtFieldState.text
                             } else {
-                                self.hideLoadingIndicator()
-                                print("Error: Unable to parse JSON or find city data")
+                                // Pick a random city and set it in txtFieldCity
+                                if let randomCity = citiesArray.randomElement() {
+                                    self.txtFieldCity.text = randomCity
+                                }
                             }
-                        } catch {
-                            self.hideLoadingIndicator()
-                            print("Error parsing JSON: \(error.localizedDescription)")
                         }
+                    } else {
+                        print("Error: Invalid JSON structure")
                     }
-                } else {
-                    self.hideLoadingIndicator()
-                    print("Error: HTTP Status Code \(String(describing: (serviceResponse as? HTTPURLResponse)?.statusCode))")
+                } catch {
+                    print("Error parsing JSON: \(error)")
                 }
             } else {
-                self.hideLoadingIndicator()
-                print("Error: \(error?.localizedDescription ?? "Unknown error")")
+                print("No data received")
             }
         }
         task.resume()
     }
-    
+
     func updateBillingInfoData() {
         billingInfoData?["address"] = txtFieldAddress.text
         billingInfoData?["country"] = txtFieldCountry.text
@@ -437,31 +550,31 @@ class BillingInfoVC: BaseVC {
         billingInfoData?["city"] = txtFieldCity.text
         billingInfoData?["postal_code"] = txtFieldPostalCode.text
     }
-    
+
     @IBAction func actionBtnSelectCountry(_ sender: UIButton) {
         UIView.animate(withDuration: 0.3) {
             self.viewCountryList.isHidden.toggle()
         }
     }
-    
+
     @IBAction func actionBtnSelectState(_ sender: UIButton) {
         UIView.animate(withDuration: 0.3) {
             self.viewStateList.isHidden.toggle()
         }
     }
-    
+
     @IBAction func actionBtnSelectCity(_ sender: UIButton) {
         UIView.animate(withDuration: 0.3) {
             self.viewCityList.isHidden.toggle()
         }
     }
-    
+
     @IBAction func actionBtnPrevious(_ sender: UIButton) {
         // Pass the text back to the previous screen
         delegate?.didPassTextBack("NewAccount")
         self.navigationController?.popViewController(animated: true)
     }
-    
+
     @IBAction func actionBtnNext(_ sender: UIButton) {
         let vc = EasyPaySdk.instantiateViewController(withIdentifier: "AdditionalInfoVC") as! AdditionalInfoVC
         // Set properties on AdditionalInfoVC
@@ -474,39 +587,39 @@ class BillingInfoVC: BaseVC {
         // Pass the selected payment method
         vc.selectedPaymentMethod = selectedPaymentMethod
         vc.isSavedForFuture = isSavedForFuture
-        
+
         //Banking Case
         vc.accountName = accountName
         vc.routingNumber = routingNumber
         vc.accountType = accountType
         vc.accountNumber = accountNumber
-        
+
         vc.customerID = customerID
         vc.accountID = accountID
         vc.isFrom = isFrom
-        
+
         vc.isSavedNewAccount = isSavedNewAccount
         vc.amount = amount
-        
+
         if isFrom == "SavedCards" {
             vc.isFrom = "SavedCards"
             vc.selectedCard = selectedCard // Passing the selected card data
             vc.cvvText = cvvText // Passing the CVV text
             vc.amount = amount
         }
-        
+
         if isFrom == "AddNewCard" {
             vc.isFrom = "AddNewCard"
             vc.amount = amount
             vc.isSavedNewCard = isSavedNewCard
         }
-        
+
         self.navigationController?.pushViewController(vc, animated: true)
     }
-    
+
 }
 
-@available(iOS 16.0, *)
+//MARK: - Table View
 extension BillingInfoVC: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if tableView == tblViewCountryList {
@@ -522,70 +635,74 @@ extension BillingInfoVC: UITableViewDelegate, UITableViewDataSource {
             return 0
         }
     }
-    
-    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if tableView == tblViewCountryList {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "CountryListTVC") as! CountryListTVC
-            let country = countryList[indexPath.row]
-            cell.lblCountryName.text = country["country_name"] as? String
-            return cell
-        } else if tableView == tblViewStateList {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "StateListTVC") as! StateListTVC
-            let state = stateList[indexPath.row]
-            cell.lblStateName.text = state["state_name"] as? String
-            return cell
-        } else if tableView == tblViewCityList {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "CityListTVC") as! CityListTVC
-            let city = cityList[indexPath.row]
-            cell.lblCityName.text = city["city_name"] as? String
-            return cell
-        } else {
-            return UITableViewCell()
-        }
-    }
-    
-    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        if tableView == tblViewCountryList {
-            let selectedCountry = countryList[indexPath.row]["country_name"] as? String
-            txtFieldCountry.text = selectedCountry
-            viewCountryList.isHidden = true
-            
-            // Fetch states for the selected country
-            if let country = selectedCountry {
-                getStateListApi(for: country)
+
+     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+            if tableView == tblViewCountryList {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "CountryListTVC") as! CountryListTVC
+                let country = countryList[indexPath.row]
+                cell.lblCountryName.text = country["name"] as? String
+                return cell
+            } else if tableView == tblViewStateList {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "StateListTVC") as! StateListTVC
+                let state = stateList[indexPath.row]
+                cell.lblStateName.text = state["name"] as? String
+                return cell
+            } else if tableView == tblViewCityList {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "CityListTVC") as! CityListTVC
+                let city = cityList[indexPath.row]
+                cell.lblCityName.text = city["city_name"] as? String
+                return cell
+            } else {
+                return UITableViewCell()
             }
-        } else if tableView == tblViewStateList {
-            let selectedState = stateList[indexPath.row]["state_name"] as? String
-            txtFieldState.text = selectedState
-            viewStateList.isHidden = true
-            
-            // Fetch cities for the selected state
-            if let state = selectedState {
-                getCityListListApi(for: state)
+        }
+
+        func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+            if tableView == tblViewCountryList {
+                let selectedCountry = countryList[indexPath.row]["name"] as? String
+                txtFieldCountry.text = selectedCountry
+                viewCountryList.isHidden = true
+
+                // Fetch states for the selected country
+                if let country = selectedCountry {
+                    getStateListApi(for: country)
+                }
+            } else if tableView == tblViewStateList {
+                let selectedState = stateList[indexPath.row]["name"] as? String
+                txtFieldState.text = selectedState
+                viewStateList.isHidden = true
+
+                // Fetch cities for the selected state and country
+                if let state = selectedState, let country = txtFieldCountry.text {
+                    getCityListListApi(for: country, state: state)
+                }
+            } else if tableView == tblViewCityList {
+                let selectedCity = cityList[indexPath.row]["city_name"] as? String
+                txtFieldCity.text = selectedCity
+                viewCityList.isHidden = true
+
+                // Fetch the city list again based on selected state & country
+                if let state = txtFieldState.text, let country = txtFieldCountry.text {
+                    getCityListListApi(for: country, state: state)
+                }
             }
-        } else if tableView == tblViewCityList {
-            let selectedCity = cityList[indexPath.row]["city_name"] as? String
-            txtFieldCity.text = selectedCity
-            viewCityList.isHidden = true
+
+            updateBillingInfoData()
         }
-        
-        updateBillingInfoData()
-    }
-    
-    
+
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return 50
     }
-    
+
 }
 
-@available(iOS 16.0, *)
+
 extension BillingInfoVC: UITextFieldDelegate {
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         textField.resignFirstResponder() // Dismiss the keyboard
         return true
     }
-    
+
     // Update billingInfoData when user finishes editing a field
     func textFieldDidEndEditing(_ textField: UITextField) {
         switch textField {
@@ -603,14 +720,4 @@ extension BillingInfoVC: UITextFieldDelegate {
             break
         }
     }
-}
-
-
-
-
-
-
-
-
-
-
+}