@jimrising/easymerchantsdk-react-native 1.1.1 → 1.1.2

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

@@ -9,11 +9,32 @@ import UIKit
 
 class CityListTVC: UITableViewCell {
 
+    @IBOutlet weak var viewCell: UIView!
     @IBOutlet weak var lblCityName: UILabel!
     
     override func awakeFromNib() {
         super.awakeFromNib()
         
+        if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            lblCityName.textColor = uiColor
+        }
+        
+        // Set background color for the main view
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.contentView.backgroundColor = uiColor
+        }
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.contentView.backgroundColor = uiColor
+            viewCell?.backgroundColor = uiColor // Prevents crash if viewCell is nil
+        }
     }
 
 }

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

@@ -10,10 +10,32 @@ import UIKit
 class CountryListTVC: UITableViewCell {
 
     @IBOutlet weak var lblCountryName: UILabel!
+    @IBOutlet weak var viewCell: UIView!
     
     override func awakeFromNib() {
         super.awakeFromNib()
         
+        if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            lblCountryName.textColor = uiColor
+        }
+        
+        // Set background color for the main view
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.contentView.backgroundColor = uiColor
+        }
+        
     }
-
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.contentView.backgroundColor = uiColor
+            viewCell?.backgroundColor = uiColor // Prevents crash if viewCell is nil
+        }
+    }
+    
 }

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

@@ -10,10 +10,31 @@ import UIKit
 class StateListTVC: UITableViewCell {
 
     @IBOutlet weak var lblStateName: UILabel!
+    @IBOutlet weak var viewCell: UIView!
     
     override func awakeFromNib() {
         super.awakeFromNib()
         
+        if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            lblStateName.textColor = uiColor
+        }
+        
+        // Set background color for the main view
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.contentView.backgroundColor = uiColor
+        }
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.contentView.backgroundColor = uiColor
+            viewCell?.backgroundColor = uiColor // Prevents crash if viewCell is nil
+        }
     }
 
 }

package/ios/Pods/ViewControllers/CountryListVC.swift

@@ -13,6 +13,7 @@ protocol CountryListVCDelegate: AnyObject {
 
 class CountryListVC: UIViewController {
     
+    @IBOutlet var viewClass: UIView!
     @IBOutlet weak var searchBarCountry: UISearchBar!
     @IBOutlet weak var tblViewCountry: UITableView!
     
@@ -24,6 +25,23 @@ class CountryListVC: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.view.backgroundColor = uiColor
+            self.searchBarCountry.backgroundColor = uiColor
+            self.searchBarCountry.barTintColor = uiColor
+        }
+        
+        if let primaryFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            searchBarCountry.tintColor = uiColor
+        }
+        
+        if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            searchBarCountry.searchTextField.textColor = uiColor
+        }
+        
         tblViewCountry.delegate = self
         tblViewCountry.dataSource = self
         
@@ -339,6 +357,13 @@ extension CountryListVC: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "cell")
         cell?.textLabel?.text = "\(self.searchList[indexPath.row].flag!) \(self.searchList[indexPath.row].name!)"
+        
+        // Apply color from UserStoreSingleton
+        if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            cell?.textLabel?.textColor = uiColor
+        }
+        
         return cell!
     }
     

package/ios/Pods/ViewControllers/EmailVerificationVC.swift

@@ -9,7 +9,10 @@ import UIKit
 
 class EmailVerificationVC: BaseVC {
     
+    @IBOutlet weak var lblUsedSavedInfo: UILabel!
+    @IBOutlet weak var subLblUsedSavedInfo: UILabel!
     @IBOutlet weak var txtFieldEmail: UITextField!
+    @IBOutlet weak var btnGetOTP: UIButton!
     
     var cardNumber: String?
     var expiryDate: String?
@@ -28,15 +31,48 @@ class EmailVerificationVC: BaseVC {
     var easyPayDelegate: EasyPayViewControllerDelegate?
     
     var isSavedForFuture: Bool = false
-        
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.view.backgroundColor = uiColor
+        }
+        
+        if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            lblUsedSavedInfo.textColor = uiColor
+        }
+        
+        if let primaryFontColor = UserStoreSingleton.shared.secondary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            subLblUsedSavedInfo.textColor = uiColor
+        }
+        
+        if let primaryFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            btnGetOTP.backgroundColor = uiColor
+        }
+        
+        if let secondaryBtnBackgroundColor = UserStoreSingleton.shared.primary_btn_font_col,
+           let secondaryUIColor = UIColor(hex: secondaryBtnBackgroundColor) {
+            btnGetOTP.setTitleColor(secondaryUIColor, for: .normal)
+        }
+        
+        if let borderRadiusString = UserStoreSingleton.shared.border_radious,
+           let borderRadius = Double(borderRadiusString) { // Convert String to Double
+            btnGetOTP.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
+        } else {
+            btnGetOTP.layer.cornerRadius = 8 // Default value
+        }
+        btnGetOTP.layer.masksToBounds = true // Ensure the corners are clipped properly
+        
         // Add tap gesture recognizer to dismiss the keyboard
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard))
         view.addGestureRecognizer(tapGesture)
         
-        print(isSavedForFuture)
+         print(isSavedForFuture)
         print(cardNumber ?? "")
         print(expiryDate ?? "")
         print(cvv ?? "")
@@ -51,16 +87,16 @@ class EmailVerificationVC: BaseVC {
     // MARK: - Send OTP Email Verification Api
     func emailVerificationApi() {
         showLoadingIndicator()
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/customer/send_otp"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
+        //        var components = URLComponents()
+        //        components.scheme = "https"
+        //        components.host = "stage-api.stage-easymerchant.io"
+        //        components.path = "/api/v1/customer/send_otp"
+        //
+        //        guard let serviceURL = components.url else {
+        //            print("Invalid URL")
+        //            hideLoadingIndicator()
+        //            return
+        //        }
         
         // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.path()

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -26,6 +26,10 @@ class OTPVerificationVC: BaseVC {
     @IBOutlet weak var lblUntillResendOtp: UILabel!
     @IBOutlet weak var btnResendOTP: UIButton!
     
+    @IBOutlet weak var btnConfirmCode: UIButton!
+    @IBOutlet weak var lblUsedSavedInfo: UILabel!
+    @IBOutlet weak var lblEnterOTP: UILabel!
+    
     var cardNumber: String?
     var expiryDate: String?
     var cvv: String?
@@ -54,6 +58,8 @@ class OTPVerificationVC: BaseVC {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        uiFinishingTouchElements()
+        
         // Add tap gesture recognizer to dismiss the keyboard
         let tapGesture = UITapGestureRecognizer(target: self, action: #selector(dismissKeyboard))
         view.addGestureRecognizer(tapGesture)
@@ -65,6 +71,82 @@ class OTPVerificationVC: BaseVC {
     
     override func viewWillAppear(_ animated: Bool) {
         startTimer()
+        uiFinishingTouchElements()
+    }
+    
+    //MARK: - Ui Colors Setup.
+    func uiFinishingTouchElements() {
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.view.backgroundColor = uiColor
+        }
+        
+        if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            lblUsedSavedInfo.textColor = uiColor
+            txtFieldOTPText1.textColor = uiColor
+            txtFieldOTPText2.textColor = uiColor
+            txtFieldOTPText3.textColor = uiColor
+            txtFieldOTPText4.textColor = uiColor
+            txtFieldOTPText5.textColor = uiColor
+            txtFieldOTPText6.textColor = uiColor
+        }
+        
+        if let primaryFontColor = UserStoreSingleton.shared.secondary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            lblEnterOTP.textColor = uiColor
+            lblUntillResendOtp.textColor = uiColor
+        }
+        
+        if let primaryFontColor = UserStoreSingleton.shared.primary_btn_bg_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            btnConfirmCode.backgroundColor = uiColor
+            btnResendOTP.tintColor = uiColor
+            txtFieldOTPText1.tintColor = uiColor
+            txtFieldOTPText2.tintColor = uiColor
+            txtFieldOTPText3.tintColor = uiColor
+            txtFieldOTPText4.tintColor = uiColor
+            txtFieldOTPText5.tintColor = uiColor
+            txtFieldOTPText6.tintColor = uiColor
+        }
+        
+        if let secondaryBtnBackgroundColor = UserStoreSingleton.shared.primary_btn_font_col,
+           let secondaryUIColor = UIColor(hex: secondaryBtnBackgroundColor) {
+            btnConfirmCode.setTitleColor(secondaryUIColor, for: .normal)
+        }
+        
+        if let borderRadiusString = UserStoreSingleton.shared.border_radious,
+           let borderRadius = Double(borderRadiusString) { // Convert String to Double
+            btnConfirmCode.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
+            viewTextOTP1.layer.cornerRadius = CGFloat(borderRadius)
+            viewTextOTP2.layer.cornerRadius = CGFloat(borderRadius)
+            viewTextOTP3.layer.cornerRadius = CGFloat(borderRadius)
+            viewTextOTP4.layer.cornerRadius = CGFloat(borderRadius)
+            viewTextOTP5.layer.cornerRadius = CGFloat(borderRadius)
+            viewTextOTP6.layer.cornerRadius = CGFloat(borderRadius)
+        } else {
+            btnConfirmCode.layer.cornerRadius = 8 // Default value
+        }
+        btnConfirmCode.layer.masksToBounds = true // Ensure the corners are clipped properly
+        
+        if let viewOtpPrimaryBackgroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
+           let primaryUIColor = UIColor(hex: viewOtpPrimaryBackgroundColor),
+           let viewOtpSecondaryColor = UserStoreSingleton.shared.secondary_font_col,
+           let secondaryUIColor = UIColor(hex: viewOtpSecondaryColor) {
+            
+            viewTextOTP1.layer.borderWidth = 1.0
+            viewTextOTP1.layer.borderColor = txtFieldOTPText1.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP2.layer.borderWidth = 1.0
+            viewTextOTP2.layer.borderColor = txtFieldOTPText2.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP3.layer.borderWidth = 1.0
+            viewTextOTP3.layer.borderColor = txtFieldOTPText3.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP4.layer.borderWidth = 1.0
+            viewTextOTP4.layer.borderColor = txtFieldOTPText4.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP5.layer.borderWidth = 1.0
+            viewTextOTP5.layer.borderColor = txtFieldOTPText5.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP6.layer.borderWidth = 1.0
+            viewTextOTP6.layer.borderColor = txtFieldOTPText6.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+        }
     }
     
     // Method to dismiss the keyboard
@@ -116,16 +198,16 @@ class OTPVerificationVC: BaseVC {
     func otpVerificationApi() {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/customer/verify_otp"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
+        //        var components = URLComponents()
+        //        components.scheme = "https"
+        //        components.host = "stage-api.stage-easymerchant.io"
+        //        components.path = "/api/v1/customer/verify_otp"
+        //
+        //        guard let serviceURL = components.url else {
+        //            print("Invalid URL")
+        //            hideLoadingIndicator()
+        //            return
+        //        }
         
         // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.verifyOtp.path()
@@ -242,16 +324,16 @@ class OTPVerificationVC: BaseVC {
     //MARK: - Send OTP Email Verification Api
     func emailVerificationApi() {
         showLoadingIndicator()
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/customer/send_otp"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
+        //        var components = URLComponents()
+        //        components.scheme = "https"
+        //        components.host = "stage-api.stage-easymerchant.io"
+        //        components.path = "/api/v1/customer/send_otp"
+        //
+        //        guard let serviceURL = components.url else {
+        //            print("Invalid URL")
+        //            hideLoadingIndicator()
+        //            return
+        //        }
         
         // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.emailVerification.path()
@@ -330,16 +412,16 @@ class OTPVerificationVC: BaseVC {
     func paymentIntentApi(customerId: String?) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/charges"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
+        //        var components = URLComponents()
+        //        components.scheme = "https"
+        //        components.host = "stage-api.stage-easymerchant.io"
+        //        components.path = "/api/v1/charges"
+        //
+        //        guard let serviceURL = components.url else {
+        //            print("Invalid URL")
+        //            hideLoadingIndicator()
+        //            return
+        //        }
         
         // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
@@ -477,16 +559,16 @@ class OTPVerificationVC: BaseVC {
     func paymentIntentWithSavedCardApi(customerId: String?) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/charges"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
+        //        var components = URLComponents()
+        //        components.scheme = "https"
+        //        components.host = "stage-api.stage-easymerchant.io"
+        //        components.path = "/api/v1/charges"
+        //
+        //        guard let serviceURL = components.url else {
+        //            print("Invalid URL")
+        //            hideLoadingIndicator()
+        //            return
+        //        }
         
         // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
@@ -610,16 +692,16 @@ class OTPVerificationVC: BaseVC {
     func accountChargeApi(customerId: String?) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/ach/charge"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
+        //        var components = URLComponents()
+        //        components.scheme = "https"
+        //        components.host = "stage-api.stage-easymerchant.io"
+        //        components.path = "/api/v1/ach/charge"
+        //
+        //        guard let serviceURL = components.url else {
+        //            print("Invalid URL")
+        //            hideLoadingIndicator()
+        //            return
+        //        }
         
         // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
@@ -756,16 +838,16 @@ class OTPVerificationVC: BaseVC {
     func accountChargeWithSavedAccountApi(customerId: String?) {
         showLoadingIndicator()
         
-//        var components = URLComponents()
-//        components.scheme = "https"
-//        components.host = "stage-api.stage-easymerchant.io"
-//        components.path = "/api/v1/ach/charge"
-//        
-//        guard let serviceURL = components.url else {
-//            print("Invalid URL")
-//            hideLoadingIndicator()
-//            return
-//        }
+        //        var components = URLComponents()
+        //        components.scheme = "https"
+        //        components.host = "stage-api.stage-easymerchant.io"
+        //        components.path = "/api/v1/ach/charge"
+        //
+        //        guard let serviceURL = components.url else {
+        //            print("Invalid URL")
+        //            hideLoadingIndicator()
+        //            return
+        //        }
         
         // Construct the full URL using baseURL from EnvironmentConfig and path from the endpoint
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
@@ -934,7 +1016,7 @@ extension OTPVerificationVC: UITextFieldDelegate {
                     txtFieldOTPText6.resignFirstResponder()
                     // Call OTP verification API when the last field is filled
                     if getCombinedOTP().count == 6 {
-                        //                       otpVerificationApi()
+                        // otpVerificationApi()
                     }
                 default:
                     break
@@ -967,14 +1049,40 @@ extension OTPVerificationVC: UITextFieldDelegate {
         return true
     }
     
-    // Update the view colors based on text presence in OTP fields.
+    // Update the view colors based on text presence in OTP fields
     private func updateViewColors() {
-        viewTextOTP1.backgroundColor = txtFieldOTPText1.text?.isEmpty == false ? .systemBlue : .systemGray
-        viewTextOTP2.backgroundColor = txtFieldOTPText2.text?.isEmpty == false ? .systemBlue : .systemGray
-        viewTextOTP3.backgroundColor = txtFieldOTPText3.text?.isEmpty == false ? .systemBlue : .systemGray
-        viewTextOTP4.backgroundColor = txtFieldOTPText4.text?.isEmpty == false ? .systemBlue : .systemGray
-        viewTextOTP5.backgroundColor = txtFieldOTPText5.text?.isEmpty == false ? .systemBlue : .systemGray
-        viewTextOTP6.backgroundColor = txtFieldOTPText6.text?.isEmpty == false ? .systemBlue : .systemGray
+        if let primaryBtnBackgroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
+           let primaryUIColor = UIColor(hex: primaryBtnBackgroundColor),
+           let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
+           let secondaryUIColor = UIColor(hex: secondaryFontColor) {
+            
+            viewTextOTP1.layer.borderWidth = 1.0
+            viewTextOTP1.layer.borderColor = txtFieldOTPText1.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP2.layer.borderWidth = 1.0
+            viewTextOTP2.layer.borderColor = txtFieldOTPText2.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP3.layer.borderWidth = 1.0
+            viewTextOTP3.layer.borderColor = txtFieldOTPText3.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP4.layer.borderWidth = 1.0
+            viewTextOTP4.layer.borderColor = txtFieldOTPText4.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP5.layer.borderWidth = 1.0
+            viewTextOTP5.layer.borderColor = txtFieldOTPText5.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+            viewTextOTP6.layer.borderWidth = 1.0
+            viewTextOTP6.layer.borderColor = txtFieldOTPText6.text?.isEmpty == false ? primaryUIColor.cgColor : secondaryUIColor.cgColor
+        }
+        else {
+            viewTextOTP1.layer.borderWidth = 1.0
+            viewTextOTP1.layer.borderColor = (txtFieldOTPText1.text?.isEmpty == false ? UIColor.systemBlue : UIColor.systemGray).cgColor
+            viewTextOTP2.layer.borderWidth = 1.0
+            viewTextOTP2.layer.borderColor = (txtFieldOTPText2.text?.isEmpty == false ? UIColor.systemBlue : UIColor.systemGray).cgColor
+            viewTextOTP3.layer.borderWidth = 1.0
+            viewTextOTP3.layer.borderColor = (txtFieldOTPText3.text?.isEmpty == false ? UIColor.systemBlue : UIColor.systemGray).cgColor
+            viewTextOTP4.layer.borderWidth = 1.0
+            viewTextOTP4.layer.borderColor = (txtFieldOTPText4.text?.isEmpty == false ? UIColor.systemBlue : UIColor.systemGray).cgColor
+            viewTextOTP5.layer.borderWidth = 1.0
+            viewTextOTP5.layer.borderColor = (txtFieldOTPText5.text?.isEmpty == false ? UIColor.systemBlue : UIColor.systemGray).cgColor
+            viewTextOTP6.layer.borderWidth = 1.0
+            viewTextOTP6.layer.borderColor = (txtFieldOTPText6.text?.isEmpty == false ? UIColor.systemBlue : UIColor.systemGray).cgColor
+        }
     }
     
     @objc func textFieldDidChange(_ textField: UITextField) {

package/ios/Pods/ViewControllers/PaymentDoneVC.swift

@@ -13,6 +13,12 @@ class PaymentDoneVC: UIViewController {
     @IBOutlet weak var lblTransactionId: UILabel!
     @IBOutlet weak var lblPaymentSource: UILabel!
     @IBOutlet weak var lblTotal: UILabel!
+    @IBOutlet weak var btnDone: UIButton!
+    
+    @IBOutlet weak var lblHeadingDate: UILabel!
+    @IBOutlet weak var lblHeadingTransactionID: UILabel!
+    @IBOutlet weak var lbHeadingPaymentMethod: UILabel!
+    @IBOutlet weak var lblHeadingTotal: UILabel!    
     
     var chargeData: [String: Any]?
     var selectedPaymentMethod: String?
@@ -27,6 +33,8 @@ class PaymentDoneVC: UIViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
+        uiFinishingTouchElements()
+        
         if isFrom == "Crypto" {
             // Display the crypto data if available
             lblTotal.text = "$\(amount ?? "0.00")"
@@ -58,6 +66,49 @@ class PaymentDoneVC: UIViewController {
         
     }
     
+    override func viewWillAppear(_ animated: Bool) {
+        uiFinishingTouchElements()
+    }
+    
+    func uiFinishingTouchElements() {
+        // Set background color for the main view
+        if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
+           let uiColor = UIColor(hex: containerBGcolor) {
+            self.view.backgroundColor = uiColor
+        }
+        
+        if let primaryBtnBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
+           let uiColor = UIColor(hex: primaryBtnBackGroundColor) {
+            btnDone.backgroundColor = uiColor
+        }
+        
+        if let primaryBtnFontColor = UserStoreSingleton.shared.primary_btn_font_col,
+           let secondaryUIColor = UIColor(hex: primaryBtnFontColor) {
+            btnDone.setTitleColor(secondaryUIColor, for: .normal)
+        }
+        
+        if let borderRadiusString = UserStoreSingleton.shared.border_radious,
+           let borderRadius = Double(borderRadiusString) { // Convert String to Double
+            btnDone.layer.cornerRadius = CGFloat(borderRadius) // Set corner radius
+        } else {
+            btnDone.layer.cornerRadius = 8 // Default value
+        }
+        btnDone.layer.masksToBounds = true // Ensure the corners are clipped properly
+        
+        if let primaryFontColor = UserStoreSingleton.shared.primary_font_col,
+           let uiColor = UIColor(hex: primaryFontColor) {
+            lblHeadingDate.textColor = uiColor
+            lblHeadingTransactionID.textColor = uiColor
+            lbHeadingPaymentMethod.textColor = uiColor
+            lblHeadingTotal.textColor = uiColor
+            lblDate.textColor = uiColor
+            lblTransactionId.textColor = uiColor
+            lblPaymentSource.textColor = uiColor
+            lblTotal.textColor = uiColor
+        }
+        
+    }
+    
     // Helper method to check if the date string is valid
     func isValidDate(_ dateString: String) -> Bool {
         let dateFormatter = DateFormatter()
@@ -66,6 +117,7 @@ class PaymentDoneVC: UIViewController {
     }
     
     func showDateAndTime() {
+   
         // Get the current date and time
         let currentDate = Date()
         // Format the date and time as "dd/MM/yyyy, HH:mm:ss"