@jimrising/easymerchantsdk-react-native 1.2.8 → 1.3.0

package/ios/Example/ViewController.swift

@@ -1,4 +1,7 @@
+//
+//
 //import UIKit
+//import EasyPay
 //
 //class ViewController: UIViewController {
 //
@@ -8,36 +11,48 @@
 //    override func viewDidLoad() {
 //        super.viewDidLoad()
 //
-//        /// Developer selects the environment
-//        EnvironmentConfig.setEnvironment(.staging) /// Or .sandbox, .production
+//        // Select environment
+//        EasyPay.EnvironmentConfig.setEnvironment(.staging)
+//
+//        // Blink Card License Setup
+//        let licenseErrorMessage = BlinkCardHelper.setupLicense()
+//        if !licenseErrorMessage.isEmpty {
+//            showLicenseErrorAlert(message: licenseErrorMessage)
+//        }
+//    }
+//
+//    private func showLicenseErrorAlert(message: String) {
+//        let alert = UIAlertController(title: "License Error", message: message, preferredStyle: .alert)
+//        alert.addAction(UIAlertAction(title: "OK", style: .default))
+//        self.present(alert, animated: true, completion: nil)
 //    }
 //
 //    @IBAction private func payAction() {
-////        let apiKey = "mobilesdk1980IUuCzwWl"
-////        let apiSecret = "mobilesdk1980LVHnN0Oh"
-//
-//        let apiKey = "mobilesdk1980IUuCzwWl"
-//        let apiSecret = "mobilesdk1980LVHnN0Oh"
-//
-//        EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
-//
-//        /// Theme configuration dictionary
-//        let themeConfiguration: [String: Any] = [
-//            "bodyBackgroundColor": "#EEEFF2",
-//            "containerBackgroundColor": "#FFFF00",
-//            "primaryFontColor": "#000000",
-//            "secondaryFontColor": "#666666",
-//            "primaryButtonBackgroundColor": "#1757D9",
-//            "primaryButtonHoverColor": "#3A70DF",
-//            "primaryButtonFontColor": "#FFFFFF",
-//            "secondaryButtonBackgroundColor": "#FFFFFF",
-//            "secondaryButtonHoverColor": "#1757D9",
-//            "secondaryButtonFontColor": "#1757D9",
-//            "borderRadius": "8",
-//            "fontSize": "16"
-//        ]
+////        let apiKey = "f149cf5afc3a67c79e0aa87e7"
+////        let apiSecret = "22b9dd1e588146077ca77da82"
+//
+//         let apiKey = "14fbf8a186091763e59c289c1"
+//         let apiSecret = "f90863e7a853539f8ace8d6de"
+//
+//        EasyPay.EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
+//
+//        // Theme Configuration
+//        let themeConfiguration = ThemeConfiguration(
+//            bodyBackgroundColor: "#EBF8FF",
+//            containerBackgroundColor: "#FFFFFF",
+//            primaryFontColor: "#1E3A8A",
+//            secondaryFontColor: "#696969",
+//            primaryButtonBackgroundColor: "#1D4ED8",
+//            primaryButtonHoverColor: "#2563EB",
+//            primaryButtonFontColor: "#FFFFFF",
+//            secondaryButtonBackgroundColor: "#FFFFFF",
+//            secondaryButtonHoverColor: "#BFDBFE",
+//            secondaryButtonFontColor: "#1E40AF",
+//            borderRadius: "8",
+//            fontSize: "14"
+//        )
 //
-//        let additionalInfoRequest = [
+//        let additionalInfoRequest: [String: Any] = [
 //            "name": "Test User",
 //            "email": "test@gmail.com",
 //            "phone_number": "9465351125",
@@ -59,18 +74,32 @@
 //            return
 //        }
 //
-//        let request = Request(
+//        let authenticatedACH = true
+//
+//        let grailPayParams = GrailPayRequest(
+//            accessToken: "251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF",
+//            vendorId: "251",
+//            role: "business",
+//            timeout: 10,
+//            isSandbox: true,
+//            brandingName: "Lyfecycle Payments",
+//            finderSubtitle: "Search for your bank",
+//            searchPlaceholder: "Enter bank name"
+//        )
+//
+//        let request = EasyPay.Request(
 //            amount: 99,
 //            billingInfoData: jsonData,
 //            paymentMethods: [.Card, .Bank, .Crypto],
 //            themeConfiguration: themeConfiguration,
 //            tokenOnly: false,
 //            saveCard: false,
-//            saveAccount: false
-//           // submitButtonText: "Submit"
+//            saveAccount: false,
+//            submitButtonText: "Submit",
+//            authenticatedACH: authenticatedACH,
+//            grailPayParams: authenticatedACH ? grailPayParams : nil
 //        )
 //
-//        // If tokenOnly is true, wait for the clientToken and show it in lblResponseShow
 //        if request.tokenOnly == true {
 //            NotificationCenter.default.addObserver(forName: NSNotification.Name("ClientTokenReceived"), object: nil, queue: .main) { notification in
 //                if let clientToken = notification.object as? String {
@@ -82,21 +111,16 @@
 //            let controller = EasyPayViewController(request: request, delegate: self)
 //            self.present(controller, animated: true)
 //        }
-//
 //    }
-//
 //}
 //
 //extension ViewController: EasyPayViewControllerDelegate {
 //
-//    func easyPayController(_ controller: EasyPayViewController, didFinishWith result: Result) {
+//    func easyPayController(_ controller: EasyPayViewController, didFinishWith result: EasyPay.Result) {
 //        switch result.type {
 //        case .cancelled:
 //            print("Cancelled")
 //        case .success:
-//            // if let chargeData = result.chargeData {
-//            //   handleSuccess(with: chargeData)
-//            // }
 //            if let chargeData = result.chargeData {
 //                if let clientToken = chargeData["clientToken"] as? String {
 //                    // If tokenOnly was true, display the token
@@ -121,4 +145,16 @@
 //        lblResponseShow.isHidden = false
 //        lblResponseShow.text = "Received Charge Data: \(chargeData)"
 //    }
+//
 //}
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//

package/ios/Helper/GrailPayHelper.swift

@@ -0,0 +1,19 @@
+//
+//  GrailPayHelper.swift
+//  EasyPay
+//
+//  Created by Mony's Mac on 02/05/25.
+//
+
+public class GrailPayHelper {
+    public static func presentGrailPay(
+        from viewController: UIViewController,
+        request: GrailPayRequest,
+        completion: @escaping (Result) -> Void
+    ) {
+        let grailPayVC = GrailPayVC(request: request)
+        grailPayVC.onCompletion = completion
+        grailPayVC.modalPresentationStyle = .fullScreen
+        viewController.present(grailPayVC, animated: true)
+    }
+}

package/ios/Models/Request.swift

@@ -7,66 +7,107 @@
 
 import UIKit
 
-//@objc
-//public final class Request: NSObject {
-//    public let amount: Double
-//    public let billingInfoData: Data?
-//    let themeConfiguration: [String: Any]?
-//    let selectedPaymentMethods: [PaymentMethod]
-//
-//    public init(amount: Double, billingInfoData: Data, paymentMethods: [PaymentMethod]? = nil, themeConfiguration: [String: Any]? = nil) {
-//        self.amount = amount
-//        self.billingInfoData = billingInfoData
-//        self.themeConfiguration = themeConfiguration
-//
-//        // Use provided methods or fetch previously saved ones
-//        if let paymentMethods = paymentMethods {
-//            self.selectedPaymentMethods = paymentMethods
-//            UserStoreSingleton.shared.paymentMethods = paymentMethods.map { $0.rawValue } // Save in User Defaults
-//        } else {
-//            let savedMethods = UserStoreSingleton.shared.paymentMethods ?? []
-//            self.selectedPaymentMethods = savedMethods.compactMap { PaymentMethod(rawValue: $0) }
-//        }
-//
-//        super.init()
-//
-//        // Call the payment intent API
-//        self.paymentIntentApi { success in
-//            if success {
-//                print("Payment Intent API call succeeded")
-//                // Save the amount in UserStoreSingleton
-//                UserStoreSingleton.shared.price = String(self.amount)
-//                print("Saved amount: \(UserStoreSingleton.shared.price ?? "No amount")")
-//            }
-//        }
-//
-//    }
+public struct ThemeConfiguration: Codable {
+    public let bodyBackgroundColor: String?
+    public let containerBackgroundColor: String?
+    public let primaryFontColor: String?
+    public let secondaryFontColor: String?
+    public let primaryButtonBackgroundColor: String?
+    public let primaryButtonHoverColor: String?
+    public let primaryButtonFontColor: String?
+    public let secondaryButtonBackgroundColor: String?
+    public let secondaryButtonHoverColor: String?
+    public let secondaryButtonFontColor: String?
+    public let borderRadius: String?
+    public let fontSize: String?
 
+    public init(
+        bodyBackgroundColor: String? = nil,
+        containerBackgroundColor: String? = nil,
+        primaryFontColor: String? = nil,
+        secondaryFontColor: String? = nil,
+        primaryButtonBackgroundColor: String? = nil,
+        primaryButtonHoverColor: String? = nil,
+        primaryButtonFontColor: String? = nil,
+        secondaryButtonBackgroundColor: String? = nil,
+        secondaryButtonHoverColor: String? = nil,
+        secondaryButtonFontColor: String? = nil,
+        borderRadius: String? = nil,
+        fontSize: String? = nil
+    ) {
+        self.bodyBackgroundColor = bodyBackgroundColor
+        self.containerBackgroundColor = containerBackgroundColor
+        self.primaryFontColor = primaryFontColor
+        self.secondaryFontColor = secondaryFontColor
+        self.primaryButtonBackgroundColor = primaryButtonBackgroundColor
+        self.primaryButtonHoverColor = primaryButtonHoverColor
+        self.primaryButtonFontColor = primaryButtonFontColor
+        self.secondaryButtonBackgroundColor = secondaryButtonBackgroundColor
+        self.secondaryButtonHoverColor = secondaryButtonHoverColor
+        self.secondaryButtonFontColor = secondaryButtonFontColor
+        self.borderRadius = borderRadius
+        self.fontSize = fontSize
+    }
+}
+
+public struct GrailPayRequest: Codable {
+    public let accessToken: String
+    public let vendorId: String
+    public let role: String
+    public let timeout: Int
+    public let isSandbox: Bool
+    public let brandingName: String
+    public let finderSubtitle: String
+    public let searchPlaceholder: String
+
+    public init(
+        accessToken: String,
+        vendorId: String,
+        role: String,
+        timeout: Int,
+        isSandbox: Bool,
+        brandingName: String,
+        finderSubtitle: String,
+        searchPlaceholder: String
+    ) {
+        self.accessToken = accessToken
+        self.vendorId = vendorId
+        self.role = role
+        self.timeout = timeout
+        self.isSandbox = isSandbox
+        self.brandingName = brandingName  // Fixed: Use the actual parameter
+        self.finderSubtitle = finderSubtitle  // Fixed: Use the actual parameter
+        self.searchPlaceholder = searchPlaceholder  // Fixed: Use the actual parameter
+    }
+}
 
 @objc
 public final class Request: NSObject {
     public let amount: Double
     public let billingInfoData: Data?
-    let themeConfiguration: [String: Any]?
+    let themeConfiguration: ThemeConfiguration?
     let selectedPaymentMethods: [PaymentMethod]
-    
+
     // New parameters
     public let tokenOnly: Bool?
     public let saveCard: Bool?
     public let saveAccount: Bool?
     public let submitButtonText: String?
-    
+    public let authenticatedACH: Bool?
+    public let grailPayParams: GrailPayRequest?
+
     public init(
         amount: Double,
         billingInfoData: Data,
         paymentMethods: [PaymentMethod]? = nil,
-        themeConfiguration: [String: Any]? = nil,
+        themeConfiguration: ThemeConfiguration? = nil,
         tokenOnly: Bool = false,
         saveCard: Bool = false,
         saveAccount: Bool = false,
-        submitButtonText: String? = nil
+        submitButtonText: String? = nil,
+        authenticatedACH: Bool = false,
+        grailPayParams: GrailPayRequest? = nil
     ) {
-        
         self.amount = amount
         self.billingInfoData = billingInfoData
         self.themeConfiguration = themeConfiguration
@@ -74,7 +115,9 @@ public final class Request: NSObject {
         self.saveCard = saveCard
         self.saveAccount = saveAccount
         self.submitButtonText = submitButtonText
-        
+        self.authenticatedACH = authenticatedACH
+        self.grailPayParams = authenticatedACH ? grailPayParams : nil
+
         if let paymentMethods = paymentMethods {
             self.selectedPaymentMethods = paymentMethods
             UserStoreSingleton.shared.paymentMethods = paymentMethods.map { $0.rawValue }
@@ -82,25 +125,24 @@ public final class Request: NSObject {
             let savedMethods = UserStoreSingleton.shared.paymentMethods ?? []
             self.selectedPaymentMethods = savedMethods.compactMap { PaymentMethod(rawValue: $0) }
         }
-        
         // ✅ Save theme configuration in UserStoreSingleton only if themeConfiguration is not nil or empty
-        if let themeConfig = themeConfiguration, !themeConfig.isEmpty {
-            UserStoreSingleton.shared.body_bg_col = themeConfig["bodyBackgroundColor"] as? String
-            UserStoreSingleton.shared.container_bg_col = themeConfig["containerBackgroundColor"] as? String
-            UserStoreSingleton.shared.primary_font_col = themeConfig["primaryFontColor"] as? String
-            UserStoreSingleton.shared.secondary_font_col = themeConfig["secondaryFontColor"] as? String
-            UserStoreSingleton.shared.primary_btn_bg_col = themeConfig["primaryButtonBackgroundColor"] as? String
-            UserStoreSingleton.shared.primary_btn_hover_col = themeConfig["primaryButtonHoverColor"] as? String
-            UserStoreSingleton.shared.primary_btn_font_col = themeConfig["primaryButtonFontColor"] as? String
-            UserStoreSingleton.shared.secondary_btn_bg_col = themeConfig["secondaryButtonBackgroundColor"] as? String
-            UserStoreSingleton.shared.secondary_btn_hover_col = themeConfig["secondaryButtonHoverColor"] as? String
-            UserStoreSingleton.shared.secondary_btn_font_col = themeConfig["secondaryButtonFontColor"] as? String
-            UserStoreSingleton.shared.border_radious = themeConfig["borderRadius"] as? String
-            UserStoreSingleton.shared.fontSize = themeConfig["fontSize"] as? String
+        if let themeConfig = themeConfiguration {
+            UserStoreSingleton.shared.body_bg_col = themeConfig.bodyBackgroundColor
+            UserStoreSingleton.shared.container_bg_col = themeConfig.containerBackgroundColor
+            UserStoreSingleton.shared.primary_font_col = themeConfig.primaryFontColor
+            UserStoreSingleton.shared.secondary_font_col = themeConfig.secondaryFontColor
+            UserStoreSingleton.shared.primary_btn_bg_col = themeConfig.primaryButtonBackgroundColor
+            UserStoreSingleton.shared.primary_btn_hover_col = themeConfig.primaryButtonHoverColor
+            UserStoreSingleton.shared.primary_btn_font_col = themeConfig.primaryButtonFontColor
+            UserStoreSingleton.shared.secondary_btn_bg_col = themeConfig.secondaryButtonBackgroundColor
+            UserStoreSingleton.shared.secondary_btn_hover_col = themeConfig.secondaryButtonHoverColor
+            UserStoreSingleton.shared.secondary_btn_font_col = themeConfig.secondaryButtonFontColor
+            UserStoreSingleton.shared.border_radious = themeConfig.borderRadius
+            UserStoreSingleton.shared.fontSize = themeConfig.fontSize
         }
-        
+
         super.init()
-        
+
         // If tokenOnly is true, fetch only the clientToken and do not open the SDK
         if tokenOnly {
             self.paymentIntentApi { success in
@@ -110,7 +152,8 @@ public final class Request: NSObject {
                     }
                 }
             }
-        } else {
+        }
+        else {
             // Proceed with normal payment flow
             self.paymentIntentApi { success in
                 if success {
@@ -120,29 +163,29 @@ public final class Request: NSObject {
                 }
             }
         }
-        
+
     }
-    
+
     //MARK: - Payment Intent Api
     func paymentIntentApi(completion: @escaping (Bool) -> Void) {
         // Start loader when API call starts
-        
+
         guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
             print("Invalid 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")
-        
+
         let params: [String: Any] = [
             "amount": amount,
         ]
-        
+
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
@@ -150,34 +193,34 @@ public final class Request: NSObject {
             completion(false)
             return
         }
-        
+
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
             DispatchQueue.main.async {
                 // Stop loader when response is received
             }
-            
+
             guard let httpResponse = response as? HTTPURLResponse, error == nil else {
                 print("Error: \(error?.localizedDescription ?? "Unknown error")")
                 completion(false)
                 return
             }
-            
+
             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("Response Data: \(responseObject)")
-                            
+
                             // Save tokens
                             if let clientToken = responseObject["client_token"] as? String {
                                 UserStoreSingleton.shared.clientToken = clientToken
                                 print("Client Token successfully saved: \(UserStoreSingleton.shared.clientToken ?? "None")")
                             }
-                            
+
                             if let paymentIntent = responseObject["payment_intent"] as? String {
                                 UserStoreSingleton.shared.paymentIntent = paymentIntent
                             }
-                            
+
                             self.hostedCheckoutsApi { success in
                                 completion(success)
                             }
@@ -200,29 +243,29 @@ public final class Request: NSObject {
         }
         task.resume()
     }
-    
+
     // MARK: - Hosted Checkout API
     func hostedCheckoutsApi(completion: @escaping (Bool) -> Void) {
-        
+
         // Build the URL using EnvironmentConfig
         guard let baseURL = URL(string: EnvironmentConfig.baseURL) else {
             print("Invalid base URL")
             completion(false)
             return
         }
-        
+
         let endpointPath = EnvironmentConfig.Endpoints.hostedCheckouts.path()
         let serviceURL = baseURL.appendingPathComponent(endpointPath)
-        
+
         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,
         ]
-        
+
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
@@ -230,33 +273,33 @@ public final class Request: NSObject {
             completion(false)
             return
         }
-        
+
         let task = URLSession.shared.dataTask(with: request) { data, response, error in
-            
+
             guard let httpResponse = response as? HTTPURLResponse, error == nil else {
                 print("Error: \(error?.localizedDescription ?? "Unknown error")")
                 completion(false)
                 return
             }
-            
+
             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)
-                            
+
                             // Save merchant details
                             if let merchantEmail = dataObject["merchant_email"] as? String {
                                 UserStoreSingleton.shared.merchantEmail = merchantEmail
                                 print("Saved merchantEmail: \(merchantEmail)")
                             }
-                            
+
                             if let merchantName = dataObject["merchant_name"] as? String {
                                 UserStoreSingleton.shared.merchantName = merchantName
                                 print("Saved merchantName: \(merchantName)")
                             }
-                            
+
                             // Save payment methods (crypto payment account)
                             if let paymentMethods = dataObject["payment_methods"] as? [String: Any],
                                let cryptoSection = paymentMethods["crypto"] as? [String: Any],
@@ -264,80 +307,32 @@ public final class Request: NSObject {
                                 UserStoreSingleton.shared.paymentAccount = paymentAccount
                                 print("Saved paymentAccount (Crypto): \(paymentAccount)")
                             }
-                            
+
                             // Save payment methods
                             if let paymentMethods = dataObject["payment_methods"] as? [String: Any] {
                                 var paymentMethodNames: [String] = []
-                                
+
                                 if paymentMethods["card"] is [String: Any] {
                                     paymentMethodNames.append("Card")
                                 }
-                                
+
                                 if paymentMethods["ach"] is [String: Any] {
                                     paymentMethodNames.append("Bank")
                                 }
-                                
+
                                 if paymentMethods["crypto"] is [String: Any] {
                                     paymentMethodNames.append("Crypto")
                                 }
-                                
+
                                 if paymentMethods["wallet"] is [String: Any] {
                                     paymentMethodNames.append("Wallet")
                                 }
-                                
+
                                 UserStoreSingleton.shared.paymentMethods = paymentMethodNames
                                 print("Saved payment methods: \(paymentMethodNames)")
                             }
-                            
-                            // Save appearance settings
-                            //                            if let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
-                            //                                if let bodyBgCol = appearanceSettings["body_bg_col"] as? String {
-                            //                                    UserStoreSingleton.shared.body_bg_col = bodyBgCol
-                            //                                    print("Saved bodyBgCol: \(bodyBgCol)")
-                            //                                }
-                            //                                if let borderRadious = appearanceSettings["border_radious"] as? String {
-                            //                                    UserStoreSingleton.shared.border_radious = borderRadious
-                            //                                    print("Saved borderRadious: \(borderRadious)")
-                            //                                }
-                            //                                if let containerBgCol = appearanceSettings["container_bg_col"] as? String {
-                            //                                    UserStoreSingleton.shared.container_bg_col = containerBgCol
-                            //                                    print("Saved containerBgCol: \(containerBgCol)")
-                            //                                }
-                            //                                if let primaryBtnBgCol = appearanceSettings["primary_btn_bg_col"] as? String {
-                            //                                    UserStoreSingleton.shared.primary_btn_bg_col = primaryBtnBgCol
-                            //                                    print("Saved primaryBtnBgCol: \(primaryBtnBgCol)")
-                            //                                }
-                            //                                if let primaryBtnFontCol = appearanceSettings["primary_btn_font_col"] as? String {
-                            //                                    UserStoreSingleton.shared.primary_btn_font_col = primaryBtnFontCol
-                            //                                    print("Saved primaryBtnFontCol: \(primaryBtnFontCol)")
-                            //                                }
-                            //                                if let primaryBtnHoverCol = appearanceSettings["primary_btn_hover_col"] as? String {
-                            //                                    UserStoreSingleton.shared.primary_btn_hover_col = primaryBtnHoverCol
-                            //                                    print("Saved primaryBtnHoverCol: \(primaryBtnHoverCol)")
-                            //                                }
-                            //                                if let primaryFontCol = appearanceSettings["primary_font_col"] as? String {
-                            //                                    UserStoreSingleton.shared.primary_font_col = primaryFontCol
-                            //                                    print("Saved primaryFontCol: \(primaryFontCol)")
-                            //                                }
-                            //                                if let secondaryBtnBgCol = appearanceSettings["secondary_btn_bg_col"] as? String {
-                            //                                    UserStoreSingleton.shared.secondary_btn_bg_col = secondaryBtnBgCol
-                            //                                    print("Saved secondaryBtnBgCol: \(secondaryBtnBgCol)")
-                            //                                }
-                            //                                if let secondaryBtnFontCol = appearanceSettings["secondary_btn_font_col"] as? String {
-                            //                                    UserStoreSingleton.shared.secondary_font_col = secondaryBtnFontCol
-                            //                                    print("Saved secondaryBtnFontCol: \(secondaryBtnFontCol)")
-                            //                                }
-                            //                                if let secondaryBtnHoverCol = appearanceSettings["secondary_btn_hover_col"] as? String {
-                            //                                    UserStoreSingleton.shared.secondary_btn_hover_col = secondaryBtnHoverCol
-                            //                                    print("Saved secondaryBtnHoverCol: \(secondaryBtnHoverCol)")
-                            //                                }
-                            //                                if let secondaryFontCol = appearanceSettings["secondary_font_col"] as? String {
-                            //                                    UserStoreSingleton.shared.secondary_font_col = secondaryFontCol
-                            //                                    print("Saved secondaryFontCol: \(secondaryFontCol)")
-                            //                                }
-                            //                            }
-                            
-                            if (self.themeConfiguration == nil || self.themeConfiguration!.isEmpty), let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
+
+                            if self.themeConfiguration == 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
                                 UserStoreSingleton.shared.container_bg_col = appearanceSettings["container_bg_col"] as? String
@@ -349,13 +344,13 @@ public final class Request: NSObject {
                                 UserStoreSingleton.shared.secondary_btn_font_col = appearanceSettings["secondary_font_col"] as? String
                                 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")
                             completion(false)
@@ -375,5 +370,6 @@ public final class Request: NSObject {
         }
         task.resume()
     }
-    
+
 }
+