@jimrising/easymerchantsdk-react-native 2.2.9 → 2.3.1

package/ios/Models/Request.swift

@@ -59,9 +59,9 @@ public struct ThemeConfiguration: Codable {
 public struct GrailPayRequest: Codable {
     // public let accessToken: String
     // public let vendorId: String
+    // public let isSandbox: Bool
     public let role: String
     public let timeout: Int
-    public let isSandbox: Bool
     public let brandingName: String
     public let finderSubtitle: String
     public let searchPlaceholder: String
@@ -69,18 +69,18 @@ public struct GrailPayRequest: Codable {
     public init(
         // accessToken: String,
         // vendorId: String,
+        // isSandbox: Bool,
         role: String,
         timeout: Int,
-        isSandbox: Bool,
         brandingName: String,
         finderSubtitle: String,
         searchPlaceholder: String
     ) {
         // self.accessToken = accessToken
         // self.vendorId = vendorId
+        // self.isSandbox = isSandbox
         self.role = role
         self.timeout = timeout
-        self.isSandbox = isSandbox
         self.brandingName = brandingName
         self.finderSubtitle = finderSubtitle
         self.searchPlaceholder = searchPlaceholder
@@ -146,11 +146,11 @@ public struct FieldSection: Codable {
 
 @objc
 public final class Request: NSObject {
-    public let amount: Double?
+    public var amount: Double?
     public let currency: String?
     public let fields: Data?
     public let appearanceSettings: ThemeConfiguration?
-    public let selectedPaymentMethods: [PaymentMethod]
+    public var selectedPaymentMethods: [PaymentMethod]
     public let tokenOnly: Bool?
     public let saveCard: Bool?
     public let saveAccount: Bool?
@@ -172,8 +172,11 @@ public final class Request: NSObject {
     public let email: String?
     public let name: String?
     
+    public let clientToken: String?
+    
     public var metadata: [String: Any]?
-        
+    public private(set) var initializationErrorMessage: String?
+    
     public init(
         amount: Double? = nil,
         currency: String? = nil,
@@ -200,28 +203,13 @@ public final class Request: NSObject {
         isEmail: Bool = false,
         email: String? = nil,
         name: String? = nil,
+        clientToken: String? = nil,
+        metadata: [String: Any]? = nil,
         
-        metadata: [String: Any]? = nil
+        environment: EnvironmentConfig.Environment? = nil,
+        apiKey: String? = nil,
+        apiSecret: String? = nil
     ) {
-        // Validate if amount is provided, must be ≥ 0.50
-        if let amt = amount, amt < 0.50 {
-            DispatchQueue.main.async {
-                if let topVC = UIApplication.topViewController() {
-                    let alert = UIAlertController(title: "Invalid Amount",
-                                                  message: "Amount must be at least $0.50.",
-                                                  preferredStyle: .alert)
-                    alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
-                        if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
-                            easyPayVC.dismiss(animated: true)
-                        } else {
-                            // fallback: dismiss topVC itself if it's presented modally
-                            topVC.dismiss(animated: true)
-                        }
-                    }))
-                    topVC.present(alert, animated: true)
-                }
-            }
-        }
         
         self.amount = amount
         self.currency = currency
@@ -248,8 +236,20 @@ public final class Request: NSObject {
         self.email = email
         self.name = name
         
+        self.clientToken = clientToken
+        
         self.metadata = metadata
         
+        // Configure environment if provided
+        if let environment = environment {
+            EnvironmentConfig.setEnvironment(environment)
+        }
+        
+        // Configure API credentials if provided
+        if let key = apiKey, let secret = apiSecret {
+            EnvironmentConfig.configure(apiKey: key, apiSecret: secret)
+        }
+        
         // Conditionally assign recurring fields only if is_recurring == true
         if is_recurring {
             self.is_recurring = true
@@ -289,21 +289,127 @@ public final class Request: NSObject {
         }
         
         super.init()
+      
+        // Environment must be set by host app
+//        if EnvironmentConfig.isEnvironmentSet == false {
+//            self.initializationErrorMessage = "environment not set"
+//            Request.notifyValidationError(self.initializationErrorMessage!)
+//            return
+//        }
+        
+        // ✅ Override amount if clientToken flow is used
+        if let token = clientToken, !token.isEmpty {
+            if let savedAmount = UserStoreSingleton.shared.amount,
+               let doubleAmount = Double(savedAmount) {
+                self.amount = doubleAmount
+            }
+        }
+        
+        // API keys presence validation for non-clientToken case
+        if clientToken == nil {
+            let hasKey = (EnvironmentConfig.apiKey?.isEmpty == false)
+            let hasSecret = (EnvironmentConfig.apiSecret?.isEmpty == false)
+            if !hasKey && !hasSecret {
+                self.initializationErrorMessage = "Api Key and Secret not found"
+                Request.notifyValidationError(self.initializationErrorMessage!)
+                return
+            }
+            if hasKey && !hasSecret {
+                self.initializationErrorMessage = "Secret Key not found"
+                Request.notifyValidationError(self.initializationErrorMessage!)
+                return
+            }
+            if !hasKey && hasSecret {
+                self.initializationErrorMessage = "Api Key not found"
+                Request.notifyValidationError(self.initializationErrorMessage!)
+                return
+            }
+        } else {
+            // Validate clientToken is not empty
+            if clientToken?.isEmpty ?? true {
+                self.initializationErrorMessage = "Client token cannot be empty"
+                Request.notifyValidationError(self.initializationErrorMessage!)
+                return
+            }
+        }
+        
+        // Payment methods: at least one required if provided
+        if let pm = paymentMethods, pm.isEmpty {
+            self.initializationErrorMessage = "paymentMethods param minimum one payment method required"
+            Request.notifyValidationError(self.initializationErrorMessage!)
+            return
+        }
+        
+        // Validate amount (must be ≥ 0.50)
+        if let amt = amount, amt < 0.50 {
+            self.initializationErrorMessage = "Amount must be at least $0.50."
+            Request.notifyValidationError(self.initializationErrorMessage!)
+            return
+        }
+        
+        // ✅ Use recurring details from HostedCheckout API only if clientToken is present
+        if let token = clientToken, !token.isEmpty {
+            if let savedIsRecurring = UserStoreSingleton.shared.isRecurring,
+               savedIsRecurring == "1" { // API returns "1" for true
+                self.is_recurring = true
+                
+                if let cycles = UserStoreSingleton.shared.allowCycles,
+                   let num = Int(cycles) {
+                    self.numOfCycle = num
+                }
+                
+                if let intervals = UserStoreSingleton.shared.interval {
+                    // API gives "daily,weekly,monthly" → split into array
+                    let parts = intervals.split(separator: ",").map { String($0).trimmingCharacters(in: .whitespaces) }
+                    self.recurringIntervals = parts.compactMap { RecurringIntervals(rawValue: $0) }
+                }
+                
+                if let startType = UserStoreSingleton.shared.startDateType {
+                    self.recurringStartDateType = RecurringStartDateType(rawValue: startType)
+                }
+                
+                if let startDate = UserStoreSingleton.shared.startDate {
+                    self.recurringStartDate = startDate
+                }
+            } else {
+                self.is_recurring = false
+            }
+        }
+        
+        // Validate recurring start date not in past
+        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 {
+                self.initializationErrorMessage = "The recurring start date cannot be in the past. Please select today or a future date."
+                Request.notifyValidationError(self.initializationErrorMessage!)
+                return
+            }
+        } else if recurringStartDate != nil {
+            // Provided but invalid format
+            self.initializationErrorMessage = "Recurring date format should be dd/MM/yyyy"
+            Request.notifyValidationError(self.initializationErrorMessage!)
+            return
+        }
         
         // Validate metadata limits
         if let metadata = metadata {
             if metadata.count > 50 {
-                Request.showErrorAndDismissForMetaData(message: "Metadata must contain no more than 50 keys.")
+                self.initializationErrorMessage = "Metadata must contain no more than 50 keys."
+                Request.notifyValidationError(self.initializationErrorMessage!)
                 return
             }
             
             for (key, value) in metadata {
                 if key.count > 40 {
-                    Request.showErrorAndDismissForMetaData(message: "Metadata key '\(key)' exceeds 40 characters.")
+                    self.initializationErrorMessage = "Metadata key '\(key)' exceeds 40 characters."
+                    Request.notifyValidationError(self.initializationErrorMessage!)
                     return
                 }
                 if let stringValue = value as? String, stringValue.count > 500 {
-                    Request.showErrorAndDismissForMetaData(message: "Value for key '\(key)' exceeds 500 characters.")
+                    self.initializationErrorMessage = "Value for key '\(key)' exceeds 500 characters."
+                    Request.notifyValidationError(self.initializationErrorMessage!)
                     return
                 }
             }
@@ -313,50 +419,49 @@ public final class Request: NSObject {
             self.metadata = nil
         }
         
-        // Validate recurring intervals
+        // Validate recurring intervals and required recurring params
         if is_recurring == true {
-            let intervals = recurringIntervals ?? []
+            // if numOfCycle == nil { self.initializationErrorMessage = "numOfCycle object not defined"; Request.notifyValidationError(self.initializationErrorMessage!); return }
             
-            if intervals.count < 2 {
-                DispatchQueue.main.async {
-                    if let topVC = UIApplication.topViewController() {
-                        let alert = UIAlertController(
-                            title: "Recurring Interval Required",
-                            message: "Please add minimum two intervals for recurring.",
-                            preferredStyle: .alert
-                        )
-                        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
-                            if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
-                                easyPayVC.dismiss(animated: true)
-                            } else {
-                                topVC.dismiss(animated: true)
-                            }
-                        }))
-                        topVC.present(alert, animated: true)
-                    }
+            // ✅ Skip numOfCycle validation if clientToken is provided and not empty
+            if (clientToken == nil || clientToken?.isEmpty == true) {
+                if numOfCycle == nil {
+                    self.initializationErrorMessage = "numOfCycle object not defined"
+                    Request.notifyValidationError(self.initializationErrorMessage!)
+                    return
                 }
+            }
+            
+            if recurringIntervals == nil { self.initializationErrorMessage = "recurringIntervals object not defined"; Request.notifyValidationError(self.initializationErrorMessage!); return }
+            if recurringStartDateType == nil { self.initializationErrorMessage = "recurringStartDateType object not defined"; Request.notifyValidationError(self.initializationErrorMessage!); return }
+            if recurringStartDate == nil { self.initializationErrorMessage = "recurringStartDate object not defined"; Request.notifyValidationError(self.initializationErrorMessage!); return }
+            // Check cycle count
+            if let cycles = numOfCycle, cycles < 2 {
+                self.initializationErrorMessage = "Number of cycle count for recurring must be minimum 2."
+                Request.notifyValidationError(self.initializationErrorMessage!)
                 return
             }
-
+            
+            let intervals = recurringIntervals ?? []
+            //            if intervals.count < 2 {
+            //                self.initializationErrorMessage = "Please add minimum two intervals for recurring."
+            //                Request.notifyValidationError(self.initializationErrorMessage!)
+            //                return
+            //            }
+            
             let uniqueIntervals = Set(intervals)
             if uniqueIntervals.count < intervals.count {
-                DispatchQueue.main.async {
-                    if let topVC = UIApplication.topViewController() {
-                        let alert = UIAlertController(
-                            title: "Duplicate Intervals",
-                            message: "Duplicate interval values",
-                            preferredStyle: .alert
-                        )
-                        alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
-                            if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
-                                easyPayVC.dismiss(animated: true)
-                            } else {
-                                topVC.dismiss(animated: true)
-                            }
-                        }))
-                        topVC.present(alert, animated: true)
-                    }
-                }
+                self.initializationErrorMessage = "Duplicate interval values"
+                Request.notifyValidationError(self.initializationErrorMessage!)
+                return
+            }
+        }
+        
+        // GrailPay validations when authenticatedACH is true
+        if authenticatedACH == true {
+            if grailPayParams == nil {
+                self.initializationErrorMessage = "grailPayParams should be json object"
+                Request.notifyValidationError(self.initializationErrorMessage!)
                 return
             }
         }
@@ -372,12 +477,27 @@ public final class Request: NSObject {
             }
         }
         else {
-            // Proceed with normal payment flow
-            self.paymentIntentApi { success in
-                if success {
-                    print("Payment Intent API call succeeded")
-                    UserStoreSingleton.shared.price = String(self.amount ?? 0)
-                    print("Saved amount: \(UserStoreSingleton.shared.price ?? "No amount")")
+            if clientToken == nil {
+                // Proceed with normal payment flow for API key/secret case
+                self.paymentIntentApi { success in
+                    if success {
+                        print("Payment Intent API call succeeded")
+                        UserStoreSingleton.shared.price = String(self.amount ?? 0)
+                        print("Saved amount: \(UserStoreSingleton.shared.price ?? "No amount")")
+                    } else {
+                        print("Payment Intent API call failed")
+                    }
+                }
+            } else {
+                // For clientToken case, directly call hostedCheckoutsApi
+                UserStoreSingleton.shared.clientToken = clientToken
+                self.hostedCheckoutsApi { success in
+                    if success {
+                        print("Hosted Checkout API call succeeded")
+                        UserStoreSingleton.shared.price = String(self.amount ?? 0)
+                    } else {
+                        print("Hosted Checkout API call failed")
+                    }
                 }
             }
         }
@@ -394,7 +514,8 @@ public final class Request: NSObject {
     //MARK: - Payment Intent Api
     func paymentIntentApi(completion: @escaping (Bool) -> Void) {
         guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
-            showErrorAndDismiss(message: "Invalid payment URL.")
+            Request.notifyValidationError("Invalid payment URL.")
+            print("Invalid payment URL for Payment Intent API")
             completion(false)
             return
         }
@@ -412,10 +533,16 @@ public final class Request: NSObject {
             let startDay = Calendar.current.startOfDay(for: startDate)
             
             if startDay < today {
-                showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
+                Request.notifyValidationError("The recurring start date cannot be in the past. Please select today or a future date.")
+                print("Recurring start date validation failed")
                 completion(false)
                 return
             }
+        } else if recurringStartDate != nil {
+            Request.notifyValidationError("Recurring date format should be dd/MM/yyyy")
+            print("Invalid recurring date format")
+            completion(false)
+            return
         }
         
         let params: [String: Any] = [
@@ -427,94 +554,102 @@ public final class Request: NSObject {
             "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
         ]
         
-        print(params)
+        print("Payment Intent API Request Params: \(params)")
         
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
-            showErrorAndDismiss(message: "Failed to encode payment data.")
+            Request.notifyValidationError("Failed to encode Payment Intent API data: \(error.localizedDescription)")
+            print("Error encoding Payment Intent API data: \(error)")
             completion(false)
             return
         }
         
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
-            guard let httpResponse = response as? HTTPURLResponse, error == nil else {
-                self.showErrorAndDismiss(message: error?.localizedDescription ?? "An unknown error occurred.")
+            if let error = error {
+                Request.notifyValidationError("Payment Intent API error: \(error.localizedDescription)")
+                print("Payment Intent API error: \(error)")
                 completion(false)
                 return
             }
             
+            guard let httpResponse = response as? HTTPURLResponse else {
+                Request.notifyValidationError("Invalid response from Payment Intent API")
+                print("Invalid response from Payment Intent API")
+                completion(false)
+                return
+            }
+            
+            print("Payment Intent API Response Status Code: \(httpResponse.statusCode)")
+            
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = data {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+                            print("Payment Intent API Response: \(responseObject)")
                             if let clientToken = responseObject["client_token"] as? String {
                                 UserStoreSingleton.shared.clientToken = clientToken
-                                // print(clientToken)
+                                print("Received clientToken: \(clientToken)")
+                            } else {
+                                Request.notifyValidationError("No client_token in Payment Intent API response")
+                                print("No client_token in Payment Intent API response")
+                                completion(false)
+                                return
                             }
                             if let paymentIntent = responseObject["payment_intent"] as? String {
                                 UserStoreSingleton.shared.paymentIntent = paymentIntent
+                                print("Received paymentIntent: \(paymentIntent)")
                             }
                             self.hostedCheckoutsApi { success in
                                 completion(success)
                             }
                             return
                         } else {
-                            self.showErrorAndDismiss(message: "Invalid response format.")
+                            Request.notifyValidationError("Invalid response format from Payment Intent API")
+                            print("Invalid response format from Payment Intent API")
+                            completion(false)
                         }
                     } catch {
-                        self.showErrorAndDismiss(message: "Failed to parse response.")
+                        Request.notifyValidationError("Failed to parse Payment Intent API response: \(error.localizedDescription)")
+                        print("Error parsing Payment Intent API response: \(error)")
+                        completion(false)
                     }
                 } else {
-                    self.showErrorAndDismiss(message: "No response data received.")
+                    Request.notifyValidationError("No response data received from Payment Intent API")
+                    print("No response data received from Payment Intent API")
+                    completion(false)
                 }
             } else {
-                var message = "Payment request failed with status code: \(httpResponse.statusCode)"
+                var message = "Payment Intent API failed with status code: \(httpResponse.statusCode)"
                 if let data = data,
                    let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
-                   let msg = responseObj["message"] as? String {
+                   let msg = responseObj["message"] as? String, !msg.isEmpty {
                     message = msg
                 }
-                self.showErrorAndDismiss(message: message)
+                Request.notifyValidationError(message)
+                print("Payment Intent API error: \(message)")
+                completion(false)
             }
-            completion(false)
         }
         task.resume()
     }
-        
+    
     private static func showErrorAndDismissForMetaData(message: String) {
-        DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
-                let alert = UIAlertController(title: "Payment Error",
-                                              message: message,
-                                              preferredStyle: .alert)
-                alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
-                    if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
-                        easyPayVC.dismiss(animated: true)
-                    } else {
-                        topVC.dismiss(animated: true)
-                    }
-                }))
-                topVC.present(alert, animated: true)
-            }
-        }
+        Request.notifyValidationError(message)
+    }
+    
+    private func showErrorAndDismiss(message: String) {
+        Request.notifyValidationError(message)
     }
     
-   private func showErrorAndDismiss(message: String) {
+    private static func notifyValidationError(_ message: String) {
         DispatchQueue.main.async {
-            if let topVC = UIApplication.topViewController() {
-                let alert = UIAlertController(title: "Payment Error",
-                                              message: message,
-                                              preferredStyle: .alert)
-                alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
-                    if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
-                        easyPayVC.dismiss(animated: true)
-                    } else {
-                        topVC.dismiss(animated: true)
-                    }
-                }))
-                topVC.present(alert, animated: true)
-            }
+            let chargeData: [String: Any] = [
+                "status": false,
+                "message": message
+            ]
+            let result = SDKResult(type: .error, chargeData: chargeData, billingInfo: nil, additionalInfo: nil)
+            NotificationCenter.default.post(name: NSNotification.Name("EasyPayResult"), object: result)
         }
     }
     
@@ -522,7 +657,8 @@ public final class Request: NSObject {
     func hostedCheckoutsApi(completion: @escaping (Bool) -> Void) {
         // Build the URL using EnvironmentConfig
         guard let baseURL = URL(string: EnvironmentConfig.baseURL) else {
-            print("Invalid base URL")
+            Request.notifyValidationError("Invalid base URL for Hosted Checkout API")
+            print("Invalid base URL for Hosted Checkout API")
             completion(false)
             return
         }
@@ -533,36 +669,47 @@ public final class Request: NSObject {
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
-        request.addValue(UserStoreSingleton.shared.clientToken ?? "", forHTTPHeaderField: "clientToken")
         
-        let params: [String: Any] = [
-            "amount": ((amount ?? 0) * 100).rounded() / 100,
-        ]
-        
-        print(params)
-        
-        do {
-            request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
-        } catch {
-            print("Error creating JSON data: \(error)")
+        let token = clientToken ?? UserStoreSingleton.shared.clientToken ?? ""
+        if token.isEmpty {
+            Request.notifyValidationError("No valid client token provided for Hosted Checkout API")
+            print("No valid client token provided for Hosted Checkout API")
             completion(false)
             return
         }
+        request.addValue(token, forHTTPHeaderField: "clientToken")
+        
+//        print("➡️ Hosted Checkout API Request URL: \(serviceURL.absoluteString)")
+//        print("➡️ Hosted Checkout API clientToken: \(token)")
+//        print("➡️ Headers: \(request.allHTTPHeaderFields ?? [:])")
         
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
+            if let error = error {
+                Request.notifyValidationError("Hosted Checkout API error: \(error.localizedDescription)")
+                print("Hosted Checkout API error: \(error)")
+                completion(false)
+                return
+            }
             
-            guard let httpResponse = response as? HTTPURLResponse, error == nil else {
-                print("Error: \(error?.localizedDescription ?? "Unknown error")")
+            guard let httpResponse = response as? HTTPURLResponse else {
+                Request.notifyValidationError("Invalid response from Hosted Checkout API")
+                print("Invalid response from Hosted Checkout API")
                 completion(false)
                 return
             }
             
+            print("Hosted Checkout API Response Status Code: \(httpResponse.statusCode)")
+            
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
                 if let data = data {
                     do {
                         if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                            let dataObject = responseObject["data"] as? [String: Any] {
-                            print(dataObject)
+                            print("Hosted Checkout API Response: \(dataObject)")
+                            
+                            // Persist the exact token used for the request (header value),
+                            // not self.clientToken which may be nil on first-run flows.
+                            UserStoreSingleton.shared.clientToken = token
                             
                             // Save merchant details
                             if let merchantEmail = dataObject["merchant_email"] as? String {
@@ -624,6 +771,40 @@ public final class Request: NSObject {
                                 print("Saved payment methods: \(paymentMethodNames)")
                             }
                             
+                            // Save payment intent amount
+                            if let paymentAmount = dataObject["payment_intent_amount"] {
+                                UserStoreSingleton.shared.amount = "\(paymentAmount)"
+                                print("Saved payment_intent_amount: \(paymentAmount)")
+                            }
+                            
+                            // Save recurring details
+                            if let recurringDetails = dataObject["recurring_details"] as? [String: Any] {
+                                if let allowedCycles = recurringDetails["allowed_cycles"] {
+                                    UserStoreSingleton.shared.allowCycles = "\(allowedCycles)"
+                                    print("Saved allowed_cycles: \(allowedCycles)")
+                                }
+                                if let interval = recurringDetails["interval"] {
+                                    UserStoreSingleton.shared.interval = "\(interval)"
+                                    print("Saved interval: \(interval)")
+                                }
+                                if let isRecurring = recurringDetails["is_recurring"] {
+                                    UserStoreSingleton.shared.isRecurring = "\(isRecurring)"
+                                    print("Saved is_recurring: \(isRecurring)")
+                                }
+                                if let paymentIntentId = recurringDetails["payment_intent_id"] {
+                                    UserStoreSingleton.shared.paymentIntentId = "\(paymentIntentId)"
+                                    print("Saved payment_intent_id: \(paymentIntentId)")
+                                }
+                                if let startDate = recurringDetails["start_date"] {
+                                    UserStoreSingleton.shared.startDate = "\(startDate)"
+                                    print("Saved start_date: \(startDate)")
+                                }
+                                if let startDateType = recurringDetails["start_date_type"] {
+                                    UserStoreSingleton.shared.startDateType = "\(startDateType)"
+                                    print("Saved start_date_type: \(startDateType)")
+                                }
+                            }
+                            
                             if self.appearanceSettings == nil, let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
                                 UserStoreSingleton.shared.body_bg_col = appearanceSettings["body_bg_col"] as? String
                                 UserStoreSingleton.shared.border_radious = appearanceSettings["border_radious"] as? String
@@ -637,26 +818,34 @@ public final class Request: NSObject {
                                 UserStoreSingleton.shared.secondary_btn_hover_col = appearanceSettings["secondary_btn_hover_col"] as? String
                                 UserStoreSingleton.shared.secondary_font_col = appearanceSettings["secondary_font_col"] as? String
                                 
-                                // Clearing the font size value
                                 UserStoreSingleton.shared.fontSize = nil
                             }
                             
                             completion(true)
-                            
                         } else {
-                            print("Invalid JSON format or 'data' key is missing")
+                            Request.notifyValidationError("Invalid JSON format or 'data' key missing in Hosted Checkout API response")
+                            print("Invalid JSON format or 'data' key missing in Hosted Checkout API response")
                             completion(false)
                         }
                     } catch {
-                        print("Error parsing JSON: \(error)")
+                        Request.notifyValidationError("Failed to parse Hosted Checkout API response: \(error.localizedDescription)")
+                        print("Error parsing Hosted Checkout API response: \(error)")
                         completion(false)
                     }
                 } else {
-                    print("No data received")
+                    Request.notifyValidationError("No response data received from Hosted Checkout API")
+                    print("No response data received from Hosted Checkout API")
                     completion(false)
                 }
             } else {
-                print("HTTP Status Code: \(httpResponse.statusCode)")
+                var message = "Hosted Checkout API failed with status code: \(httpResponse.statusCode)"
+                if let data = data,
+                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let msg = responseObj["message"] as? String, !msg.isEmpty {
+                    message = msg
+                }
+                Request.notifyValidationError(message)
+                print("Hosted Checkout API error: \(message)")
                 completion(false)
             }
         }
@@ -678,9 +867,12 @@ public final class Request: NSObject {
         uRLRequest.httpMethod = "GET"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
         
-        let token = UserStoreSingleton.shared.customerToken
-        print("Setting customerToken header: \(token ?? "None")")
-        uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Customer-Token")
+        //        let tokenn = UserStoreSingleton.shared.customerToken
+        //        print("Setting customerToken header: \(tokenn ?? "None")")
+        //        uRLRequest.addValue(tokenn ?? "", forHTTPHeaderField: "Customer-Token")
+        
+        let token = clientToken ?? UserStoreSingleton.shared.clientToken ?? ""
+        uRLRequest.addValue(token, forHTTPHeaderField: "clientToken")
         
         // Add API key/secret headers
         if let apiKey = EnvironmentConfig.apiKey,
@@ -722,41 +914,43 @@ public final class Request: NSObject {
 extension DateFormatter {
     static let recurringDateFormatter: DateFormatter = {
         let formatter = DateFormatter()
-        formatter.dateFormat = "MM/dd/yyyy"
+        formatter.dateFormat = "dd/MM/yyyy"
         formatter.timeZone = .current
         return formatter
     }()
 }
 
-extension UIApplication {
-    static func topViewController(base: UIViewController? = UIApplication.shared.connectedScenes
-        .compactMap { ($0 as? UIWindowScene)?.windows.first(where: \.isKeyWindow) }
-        .first?.rootViewController) -> UIViewController? {
-            if let nav = base as? UINavigationController {
-                return topViewController(base: nav.visibleViewController)
-            }
-            if let tab = base as? UITabBarController {
-                if let selected = tab.selectedViewController {
-                    return topViewController(base: selected)
-                }
-            }
-            if let presented = base?.presentedViewController {
-                return topViewController(base: presented)
-            }
-            return base
-        }
-}
 
-extension UIApplication {
-    // Recursively find the presented EasyPayViewController (if any)
-    static func findEasyPayViewController(from vc: UIViewController?) -> EasyPayViewController? {
-        if let easyPayVC = vc as? EasyPayViewController {
-            return easyPayVC
-        }
-        if let presented = vc?.presentedViewController {
-            return findEasyPayViewController(from: presented)
-        }
-        return nil
-    }
-}
+
+//extension UIApplication {
+//    static func topViewController(base: UIViewController? = UIApplication.shared.connectedScenes
+//        .compactMap { ($0 as? UIWindowScene)?.windows.first(where: \.isKeyWindow) }
+//        .first?.rootViewController) -> UIViewController? {
+//            if let nav = base as? UINavigationController {
+//                return topViewController(base: nav.visibleViewController)
+//            }
+//            if let tab = base as? UITabBarController {
+//                if let selected = tab.selectedViewController {
+//                    return topViewController(base: selected)
+//                }
+//            }
+//            if let presented = base?.presentedViewController {
+//                return topViewController(base: presented)
+//            }
+//            return base
+//        }
+//}
+
+//extension UIApplication {
+//    // Recursively find the presented EasyPayViewController (if any)
+//    static func findEasyPayViewController(from vc: UIViewController?) -> EasyPayViewController? {
+//        if let easyPayVC = vc as? EasyPayViewController {
+//            return easyPayVC
+//        }
+//        if let presented = vc?.presentedViewController {
+//            return findEasyPayViewController(from: presented)
+//        }
+//        return nil
+//    }
+//}