@jimrising/easymerchantsdk-react-native 1.8.2 → 1.8.5

package/ios/Models/Request.swift

@@ -171,7 +171,7 @@ public final class Request: NSObject {
     public let isEmail: Bool?
     public let email: String?
     public let name: String?
-    
+        
     public init(
         amount: Double? = nil,
         currency: String? = nil,
@@ -351,6 +351,8 @@ public final class Request: NSObject {
             "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
         ]
         
+        print(params)
+        
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
@@ -372,6 +374,7 @@ public final class Request: NSObject {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
                             if let clientToken = responseObject["client_token"] as? String {
                                 UserStoreSingleton.shared.clientToken = clientToken
+                                print(clientToken)
                             }
                             if let paymentIntent = responseObject["payment_intent"] as? String {
                                 UserStoreSingleton.shared.paymentIntent = paymentIntent
@@ -404,6 +407,149 @@ public final class Request: NSObject {
         task.resume()
     }
     
+    // MARK: - Payment Intent Api
+//    func paymentIntentApi(completion: @escaping (Bool) -> Void) {
+//        // ✅ Show Loader
+//        DispatchQueue.main.async {
+//            UIApplication.topViewController()?.ep_showLoadingIndicator()
+//        }
+//
+//        guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
+//            DispatchQueue.main.async {
+//                UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                self.showErrorAndDismiss(message: "Invalid payment URL.")
+//            }
+//            completion(false)
+//            return
+//        }
+//
+//        var request = URLRequest(url: serviceURL)
+//        request.httpMethod = "POST"
+//        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+//        request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
+//        request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
+//
+//        // Validate recurring start date
+//        if let startDateString = recurringStartDate,
+//           let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
+//            let today = Calendar.current.startOfDay(for: Date())
+//            let startDay = Calendar.current.startOfDay(for: startDate)
+//
+//            if startDay < today {
+//                DispatchQueue.main.async {
+//                    UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                    self.showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
+//                }
+//                completion(false)
+//                return
+//            }
+//        }
+//
+//        let params: [String: Any] = [
+//            "amount": amount ?? 0,
+//            "allowed_cycles": numOfCycle ?? 0,
+//            "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
+//            "is_recurring": self.is_recurring ?? false,
+//            "recurring_start_date": recurringStartDate ?? "",
+//            "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
+//        ]
+//
+//        do {
+//            request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+//        } catch {
+//            DispatchQueue.main.async {
+//                UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                self.showErrorAndDismiss(message: "Failed to encode payment data.")
+//            }
+//            completion(false)
+//            return
+//        }
+//
+//        URLSession.shared.dataTask(with: request) { data, response, error in
+//            defer {
+//                DispatchQueue.main.async {
+//                    UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                }
+//            }
+//
+//            if let error = error {
+//                DispatchQueue.main.async {
+//                    self.showErrorAndDismiss(message: error.localizedDescription)
+//                }
+//                completion(false)
+//                return
+//            }
+//
+//            guard let httpResponse = response as? HTTPURLResponse else {
+//                DispatchQueue.main.async {
+//                    self.showErrorAndDismiss(message: "Invalid response.")
+//                }
+//                completion(false)
+//                return
+//            }
+//
+//            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+//                guard let data = data else {
+//                    DispatchQueue.main.async {
+//                        self.showErrorAndDismiss(message: "No response data received.")
+//                    }
+//                    completion(false)
+//                    return
+//                }
+//
+//                do {
+//                    guard let responseObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+//                        DispatchQueue.main.async {
+//                            self.showErrorAndDismiss(message: "Invalid response format.")
+//                        }
+//                        completion(false)
+//                        return
+//                    }
+//
+//                    // ✅ Save values into UserStoreSingleton
+//                    if let clientToken = responseObject["client_token"] as? String {
+//                        UserStoreSingleton.shared.clientToken = clientToken
+//                        print("✅ Saved Client Token: \(clientToken)")
+//                    }
+//                    if let paymentIntent = responseObject["payment_intent"] as? String {
+//                        UserStoreSingleton.shared.paymentIntent = paymentIntent
+//                        print("✅ Saved Payment Intent: \(paymentIntent)")
+//                    }
+//
+//                    // ✅ Proceed to next step only after saving
+//                    self.hostedCheckoutsApi { success in
+//                        DispatchQueue.main.async {
+//                            UIApplication.topViewController()?.ep_hideLoadingIndicator()
+//                        }
+//                        completion(success)
+//                    }
+//                    return
+//
+//                } catch {
+//                    DispatchQueue.main.async {
+//                        self.showErrorAndDismiss(message: "Failed to parse response.")
+//                    }
+//                    completion(false)
+//                    return
+//                }
+//
+//            } else {
+//                var message = "Payment request failed with status code: \(httpResponse.statusCode)"
+//                if let data = data,
+//                   let responseObj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
+//                   let msg = responseObj["message"] as? String {
+//                    message = msg
+//                }
+//                DispatchQueue.main.async {
+//                    self.showErrorAndDismiss(message: message)
+//                }
+//            }
+//
+//            completion(false)
+//
+//        }.resume()
+//    }
+    
     private func showErrorAndDismiss(message: String) {
         DispatchQueue.main.async {
             if let topVC = UIApplication.topViewController() {
@@ -443,6 +589,8 @@ public final class Request: NSObject {
             "amount": amount ?? 0,
         ]
         
+        print(params)
+        
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
@@ -663,3 +811,35 @@ extension UIApplication {
     }
 }
 
+
+//extension UIViewController {
+//    
+//    func ep_showLoadingIndicator() {
+//        let tag = 99999 // A unique tag so we can identify and remove the loader later
+//        if self.view.viewWithTag(tag) == nil {
+//            let loader = UIActivityIndicatorView(style: .large)
+//            loader.center = self.view.center
+//            loader.tag = tag
+//            loader.startAnimating()
+//            loader.color = .gray
+//            loader.hidesWhenStopped = true
+//            loader.translatesAutoresizingMaskIntoConstraints = false
+//            self.view.addSubview(loader)
+//            
+//            // Optional: center constraints
+//            NSLayoutConstraint.activate([
+//                loader.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
+//                loader.centerYAnchor.constraint(equalTo: self.view.centerYAnchor)
+//            ])
+//        }
+//    }
+//    
+//    func ep_hideLoadingIndicator() {
+//        let tag = 99999
+//        if let loader = self.view.viewWithTag(tag) as? UIActivityIndicatorView {
+//            loader.stopAnimating()
+//            loader.removeFromSuperview()
+//        }
+//    }
+//}
+

package/ios/Pods/UserDefaults/UserStoreSingleton.swift

@@ -234,12 +234,6 @@ class UserStoreSingleton: NSObject {
         }
     }
     
-//    func updateThemeConfiguration(with json: [String: Any]) {
-//        json.forEach { key, value in
-//            UserDefaults.standard.set(value, forKey: key)
-//        }
-//    }
-    
     func updateThemeConfiguration(with themeConfiguration: ThemeConfiguration) {
         self.body_bg_col = themeConfiguration.bodyBackgroundColor
         self.container_bg_col = themeConfiguration.containerBackgroundColor
@@ -256,13 +250,38 @@ class UserStoreSingleton: NSObject {
     }
 
     // Method to clear user data from UserDefaults
+//    func clearUserData() {
+//        UserDefaults.standard.removeObject(forKey: "customer_id")
+//        UserDefaults.standard.removeObject(forKey: "verificationEmail")
+//        UserDefaults.standard.removeObject(forKey: "customer_token")
+//        UserDefaults.standard.removeObject(forKey: "client_token")
+//        UserDefaults.standard.synchronize() // Optional, but can help ensure the changes are applied immediately
+//    }
+    
     func clearUserData() {
-        UserDefaults.standard.removeObject(forKey: "customer_id")
-        UserDefaults.standard.removeObject(forKey: "verificationEmail")
-        UserDefaults.standard.removeObject(forKey: "customer_token")
-        UserDefaults.standard.synchronize() // Optional, but can help ensure the changes are applied immediately
+        let keysToRemove = [
+            "client_token",
+            "payment_intent",
+            "merchant_email",
+            "merchant_name",
+            "payment_account",
+            "price",
+            "isLoggedIn",
+            "customer_id",
+            "customer_token",
+            "verificationEmail",
+            "payment_methods",
+            "bank_widget_key",
+            "vendor_id",
+        ]
+
+        for key in keysToRemove {
+            UserDefaults.standard.removeObject(forKey: key)
+        }
+
+        UserDefaults.standard.synchronize()
     }
-    
+        
     @objc private func handleAppTermination() {
         print("App is terminating. Clearing user data...")
         clearUserData()
@@ -273,3 +292,13 @@ class UserStoreSingleton: NSObject {
     }
     
 }
+
+
+
+
+
+
+
+
+
+

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -49,7 +49,8 @@ class AdditionalInfoVC: BaseVC {
     var isSavedForFuture: Bool = false
     
     var selectedCard: CardModel?
-    var amount: Int?
+//    var amount: Int?
+    var amount: Double?
     var cvvText: String?
     var isFrom = String()
     var isFromm = String()
@@ -324,7 +325,8 @@ class AdditionalInfoVC: BaseVC {
                 grailPayAccountChargeApi(customerId: UserStoreSingleton.shared.customerId)
             } else {
                 // Navigate to EmailVerificationVC for all other payment methods
-                if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+                // if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+                if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
                     
                     emailVerificationVC.billingInfoData = billingInfoData
                     emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
@@ -337,6 +339,7 @@ class AdditionalInfoVC: BaseVC {
                     emailVerificationVC.additionalInfo = fieldSection?.additional
                     emailVerificationVC.visibility = fieldSection?.visibility
                     emailVerificationVC.amount = amount
+                    emailVerificationVC.email = userEmail
                     
                     // Payment method-specific data
                     switch selectedPaymentMethod {
@@ -1710,6 +1713,7 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.visibility = self.visibility
                                         paymentDoneVC.amount = self.amount
                                         paymentDoneVC.cardApiParams = params
+                                        
                                        // if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
                                             var billingDict: [String: Any] = [:]
@@ -1907,6 +1911,7 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.visibility = self.visibility
                                         paymentDoneVC.amount = self.amount
                                         paymentDoneVC.cardApiParams = params
+                                        
                                       //  if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
                                             var billingDict: [String: Any] = [:]

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

@@ -75,7 +75,8 @@ class BillingInfoVC: BaseVC {
     
     var request: Request!
     var selectedCard: CardModel?
-    var amount: Int?
+//    var amount: Int?
+    var amount: Double?
     var cvvText: String?
     
     var isFrom = String()
@@ -666,7 +667,7 @@ class BillingInfoVC: BaseVC {
                 vc.visibility = updatedFieldSection.visibility
                 vc.selectedPaymentMethod = selectedPaymentMethod
                 vc.isSavedForFuture = isSavedForFuture
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
@@ -682,7 +683,8 @@ class BillingInfoVC: BaseVC {
                 
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                 vc.cardNumber = cardNumber
                 vc.expiryDate = expiryDate
                 vc.cvv = cvv
@@ -744,7 +746,7 @@ class BillingInfoVC: BaseVC {
                 vc.accountID = accountID
                 vc.isFrom = isFrom
                 vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
@@ -754,7 +756,8 @@ class BillingInfoVC: BaseVC {
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+               // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                 vc.accountName = accountName
                 vc.routingNumber = routingNumber
                 vc.accountType = accountType
@@ -764,7 +767,7 @@ class BillingInfoVC: BaseVC {
                 vc.fieldSection = updatedFieldSection
                 vc.selectedPaymentMethod = selectedPaymentMethod
                 vc.easyPayDelegate = easyPayDelegate
-                vc.request = request
+                vc.request = self.request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
                 vc.billingInfo = updatedFieldSection.billing
@@ -776,6 +779,7 @@ class BillingInfoVC: BaseVC {
                 vc.grailPayAccountID = grailPayAccountID
                 vc.selectedGrailPayAccountType = selectedGrailPayAccountType
                 vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                vc.email = userEmail
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if isFrom == "SavedBank" {
@@ -804,7 +808,7 @@ class BillingInfoVC: BaseVC {
                 vc.isSavedForFuture = isSavedForFuture
                 vc.isFrom = isFrom
                 vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
@@ -815,7 +819,8 @@ class BillingInfoVC: BaseVC {
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                 vc.billingInfoData = updatedBillingData
                 vc.fieldSection = updatedFieldSection
                 vc.billingInfo = updatedFieldSection.billing
@@ -825,7 +830,7 @@ class BillingInfoVC: BaseVC {
                 vc.isSavedForFuture = isSavedForFuture
                 vc.isFrom = isFrom
                 vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
@@ -833,6 +838,11 @@ class BillingInfoVC: BaseVC {
                 vc.selectedGrailPayAccountType = selectedGrailPayAccountType
                 vc.selectedGrailPayAccountName = selectedGrailPayAccountName
                 vc.userEmail = userEmail
+                vc.email = userEmail
+                
+                vc.grailPayAccountID = self.grailPayAccountID
+                vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+                vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
                 navigationController?.pushViewController(vc, animated: true)
             }
             else {
@@ -852,7 +862,7 @@ class BillingInfoVC: BaseVC {
                 vc.isSavedForFuture = isSavedForFuture
                 vc.isFrom = isFrom
                 vc.isSavedNewAccount = isSavedNewAccount
-                vc.amount = Int(request.amount ?? 0)
+                vc.amount = Double(self.request.amount ?? 0)
                 vc.request = request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -72,13 +72,17 @@ class OTPVerificationVC: BaseVC {
     var billingInfo: [FieldItem]?
     var visibility: FieldsVisibility?
     
-    var amount: Int?
+//    var amount: Int?
+    var amount: Double?
     
     var isSavedNewCard: Bool = false
     
+    var isSavedNewAccount: Bool?
+    var isFrom = String()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        emailVerificationApi()
+        // emailVerificationApi()
         
         uiFinishingTouchElements()
         
@@ -111,6 +115,7 @@ class OTPVerificationVC: BaseVC {
     }
     
     override func viewWillAppear(_ animated: Bool) {
+        emailVerificationApi()
         startTimer()
         uiFinishingTouchElements()
     }
@@ -291,7 +296,7 @@ class OTPVerificationVC: BaseVC {
         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 {
@@ -1813,6 +1818,7 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.visibility = self.visibility
                                         paymentDoneVC.amount = self.amount
                                         paymentDoneVC.cardApiParams = params
+                                        
                                       //  if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
                                             var billingDict: [String: Any] = [:]

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

@@ -331,8 +331,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     private var request: Request!
     private weak var delegate: EasyPayViewControllerDelegate?
     
-    public var amount: Int?
-    
+//    public var amount: Int?
+    public var amount: Double?
+        
     var arrPaymentMethods: [PaymentsData] = []
     
     private var selectedIndex: IndexPath?
@@ -406,7 +407,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
-       // logOut()
+        logOut()
+        
+        // Then: safely start new API call
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            self.request?.paymentIntentApi { success in
+                if success {
+                    print("Payment Intent completed")
+                    // Continue flow
+                } else {
+                    print("Payment Intent failed")
+                    // Handle failure
+                }
+            }
+        }
         
         viewAppearanceOn()
         
@@ -432,7 +446,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let billingVisible = fieldSection.visibility.billing
             let additionalVisible = fieldSection.visibility.additional
             let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
-            let amountText = String(format: "$%.2f", request?.amount ?? 0)
+           // let amountText = String(format: "$%.2f", request?.amount ?? 0)
+        
+            let rawAmount = Double(request?.amount ?? 0)
+            let amountText = String(format: "$%.2f", rawAmount)
             
             var buttonText: String
             
@@ -454,8 +471,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnPayNowSingleCard.setTitle(buttonText, for: .normal)
             btnPayNowSingleAccountView.setTitle(buttonText, for: .normal)
         } else {
-            // When no billingInfoData present
-            let amountText = String(format: "$%.2f", request?.amount ?? 0)
+            /// When no billingInfoData present
+           // let amountText = String(format: "$%.2f", request?.amount ?? 0)
+            
+            let rawAmount = Double(request?.amount ?? 0)
+            let amountText = String(format: "$%.2f", rawAmount)
+
             let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
             let defaultTitle = "\(submitText) (\(amountText))"
             
@@ -730,9 +751,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.viewAddNewCard.isHidden = true
                 }
                 else {
-                    self.getShowCardsApi()
+                   // self.getShowCardsApi()
                     self.viewCardFields.isHidden = true
-                    self.viewSingleSavedCard.isHidden = false
+                   // self.viewSingleSavedCard.isHidden = false
                     self.viewBtnShowSavedCards.isHidden = true
                     self.viewBtnShowSavedCardHeight.constant = 0
                     self.viewBtnShowSavedCardTopCon.constant = 0
@@ -1991,7 +2012,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         billingInfoVC.isFrom = "SavedCards"
                         billingInfoVC.selectedCard = self.selectedCard // Passing the selected card data
                         billingInfoVC.cvvText = cvvText // Passing the CVV text
-                        billingInfoVC.amount = Int(self.request.amount ?? 0)
+//                        billingInfoVC.amount = Int(self.request.amount ?? 0)
+                        billingInfoVC.amount = Double(self.request.amount ?? 0)
                         billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                         
                         if let billingInfoData = self.request.billingInfoData {
@@ -2015,7 +2037,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         additionalInfoVC.isFrom = "SavedCards"
                         additionalInfoVC.selectedCard = self.selectedCard // Passing the selected card data
                         additionalInfoVC.cvvText = cvvText // Passing the CVV text
-                        additionalInfoVC.amount = Int(self.request.amount ?? 0)
+                        additionalInfoVC.amount = Double(self.request.amount ?? 0)
                         additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                         
                         if let billingInfoData = self.request.billingInfoData {
@@ -2204,7 +2226,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             billingInfoVC.isSavedNewCard = self.isSavedNewCardForFuture
                             
                             billingInfoVC.isFrom = "AddNewCard"
-                            billingInfoVC.amount = Int(self.request.amount ?? 0)
+                            billingInfoVC.amount = Double(self.request.amount ?? 0)
                             billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                             
                             if let billingInfoData = self.request.billingInfoData {
@@ -2231,7 +2253,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             additionalInfoVC.isSavedNewCard = self.isSavedNewCardForFuture
                             
                             additionalInfoVC.isFrom = "AddNewCard"
-                            additionalInfoVC.amount = Int(self.request.amount ?? 0)
+                            additionalInfoVC.amount = Double(self.request.amount ?? 0)
                             additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                             
                             if let billingInfoData = self.request.billingInfoData {
@@ -5207,13 +5229,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     // MARK: - GET Show Cards API
     func getShowCardsApi() {
-        showLoadingIndicator()
+      //  showLoadingIndicator()
         
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()
         
         guard let serviceURL = URL(string: fullURL) else {
             print("❌ Invalid URL: \(fullURL)")
-            hideLoadingIndicator()
+           // hideLoadingIndicator()
             return
         }
         
@@ -5236,11 +5258,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let task = session.dataTask(with: uRLRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
             
-            defer {
-                DispatchQueue.main.async {
-                    self.hideLoadingIndicator()
-                }
-            }
+//            defer {
+//                DispatchQueue.main.async {
+//                    self.hideLoadingIndicator()
+//                }
+//            }
             
             if let error = error {
                 print("❌ Error in getShowCardsApi: \(error.localizedDescription)")
@@ -7201,13 +7223,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - Bank Api's
     // MARK: - GET Show Bank Accounts API
     func getShowBankAccountsApi() {
-        showLoadingIndicator()
+      //  showLoadingIndicator()
         
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.account.path()
         
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
-            hideLoadingIndicator()
+          //  hideLoadingIndicator()
             return
         }
         
@@ -7218,7 +7240,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         // Retrieve and validate customer token
         guard let token = UserStoreSingleton.shared.customerToken, !token.isEmpty else {
             print("Customer token is missing or empty")
-            hideLoadingIndicator()
+          //  hideLoadingIndicator()
             showAlert(message: "Session expired. Please log in again.")
             return
         }
@@ -7230,9 +7252,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let task = session.dataTask(with: urlRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
             
-            DispatchQueue.main.async {
-                self.hideLoadingIndicator()
-            }
+//            DispatchQueue.main.async {
+//                self.hideLoadingIndicator()
+//            }
             
             if let error = error {
                 print("Error: \(error.localizedDescription)")