@jimrising/easymerchantsdk-react-native 2.0.6 → 2.0.9

package/ios/Classes/EasyMerchantSdk.swift

@@ -1,7 +1,6 @@
 import Foundation
 import UIKit
 import React
-//import EasyPay // Import the EasyPay module
 
 @objc(EasyMerchantSdkPlugin)
 public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
@@ -10,8 +9,9 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
     public static func moduleName() -> String! {
         return "EasyMerchantSdk"
     }
-    
+
     public static func requiresMainQueueSetup() -> Bool {
+        // We present view controllers and touch UIKit; main queue required.
         return true
     }
 
@@ -23,9 +23,12 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
     private var paymentReferenceResolver: RCTPromiseResolveBlock?
     private var paymentReferenceRejecter: RCTPromiseRejectBlock?
 
+    // MARK: - Notification tokens (so we can remove safely)
+    private var clientTokenObserver: NSObjectProtocol?
+    private var referenceObserver: NSObjectProtocol?
+
     // MARK: - View Controller Reference
-    private let viewControllerQueue = DispatchQueue(label: "com.easymerchantsdk.viewController")
-    private var viewController: UIViewController?
+    private weak var viewController: UIViewController?
 
     // MARK: - Init
     @objc public override init() {
@@ -40,8 +43,9 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
 
     // Expose setter for RN to inject the host view controller
     @objc public func setViewController(_ vc: UIViewController) {
-        viewControllerQueue.sync {
-            self.viewController = vc
+        // Always set on main thread; keep a weak ref to avoid retain cycles.
+        DispatchQueue.main.async { [weak self] in
+            self?.viewController = vc
         }
     }
 
@@ -58,9 +62,9 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
     @objc public func billing(
         _ amount: String,
         currency: String?,
-        billingInfo: [String: Any]?,
+        fields: [String: Any]?,
         paymentMethods: [String],
-        themeConfiguration: [String: Any]?,
+        appearanceSettings: [String: Any]?,
         tokenOnly: Bool,
         saveCard: Bool,
         saveAccount: Bool,
@@ -76,11 +80,11 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         showReceipt: Bool,
         showTotal: Bool,
         showSubmitButton: Bool,
-      isEmail : Bool,
+        isEmail: Bool,
         email: String?,
         name: String?,
         enable3DS: Bool,
-         metadata: [String: Any]?,
+        metadata: [String: Any]?,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock
     ) {
@@ -92,7 +96,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
 
         // 2) Process billing info into FieldSection
         var billingInfoData: Data? = nil
-        if let billingDict = billingInfo {
+        if let billingDict = fields {
             var billingFields: [FieldItem] = []
             var additionalFields: [FieldItem] = []
             var billingVisibility = true
@@ -126,14 +130,14 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
                 additionalVisibility = visibility["additional"] ?? true
             }
 
-            let fields = FieldSection(
+            let field = FieldSection(
                 visibility: FieldsVisibility(billing: billingVisibility, additional: additionalVisibility),
                 billing: billingFields,
                 additional: additionalFields
             )
 
             do {
-                billingInfoData = try JSONEncoder().encode(fields)
+                billingInfoData = try JSONEncoder().encode(field)
             } catch {
                 rejecter("INVALID_BILLING_INFO", "Failed to encode billing info: \(error.localizedDescription)", nil)
                 return
@@ -155,8 +159,6 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         var grailParams: GrailPayRequest? = nil
         if authenticatedACH, let params = grailPayParams {
             grailParams = GrailPayRequest(
-//                accessToken: params["accessToken"] as? String ?? "251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF",
-//                vendorId: params["vendorId"] as? String ?? "251",
                 role: params["role"] as? String ?? "business",
                 timeout: params["timeout"] as? Int ?? 10,
                 isSandbox: params["isSandbox"] as? Bool ?? true,
@@ -168,20 +170,20 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
 
         // 5) Build theme config
         let themeConfig = ThemeConfiguration(
-            bodyBackgroundColor: themeConfiguration?["bodyBackgroundColor"] as? String ?? "#121212",
-            containerBackgroundColor: themeConfiguration?["containerBackgroundColor"] as? String ?? "#1E1E1E",
-            primaryFontColor: themeConfiguration?["primaryFontColor"] as? String ?? "#FFFFFF",
-            secondaryFontColor: themeConfiguration?["secondaryFontColor"] as? String ?? "#B0B0B0",
-            primaryButtonBackgroundColor: themeConfiguration?["primaryButtonBackgroundColor"] as? String ?? "#2563EB",
-            primaryButtonHoverColor: themeConfiguration?["primaryButtonHoverColor"] as? String ?? "#1D4ED8",
-            primaryButtonFontColor: themeConfiguration?["primaryButtonFontColor"] as? String ?? "#FFFFFF",
-            secondaryButtonBackgroundColor: themeConfiguration?["secondaryButtonBackgroundColor"] as? String ?? "#374151",
-            secondaryButtonHoverColor: themeConfiguration?["secondaryButtonHoverColor"] as? String ?? "#4B5563",
-            secondaryButtonFontColor: themeConfiguration?["secondaryButtonFontColor"] as? String ?? "#E5E7EB",
-            borderRadius: themeConfiguration?["borderRadius"] as? String ?? "8",
-            fontSize: themeConfiguration?["fontSize"] as? String ?? "14",
-            fontWeight: themeConfiguration?["fontWeight"] as? Int ?? 500,
-            fontFamily: themeConfiguration?["fontFamily"] as? String ?? "\"Inter\", sans-serif"
+            bodyBackgroundColor: appearanceSettings?["bodyBackgroundColor"] as? String ?? "#121212",
+            containerBackgroundColor: appearanceSettings?["containerBackgroundColor"] as? String ?? "#1E1E1E",
+            primaryFontColor: appearanceSettings?["primaryFontColor"] as? String ?? "#FFFFFF",
+            secondaryFontColor: appearanceSettings?["secondaryFontColor"] as? String ?? "#B0B0B0",
+            primaryButtonBackgroundColor: appearanceSettings?["primaryButtonBackgroundColor"] as? String ?? "#2563EB",
+            primaryButtonHoverColor: appearanceSettings?["primaryButtonHoverColor"] as? String ?? "#1D4ED8",
+            primaryButtonFontColor: appearanceSettings?["primaryButtonFontColor"] as? String ?? "#FFFFFF",
+            secondaryButtonBackgroundColor: appearanceSettings?["secondaryButtonBackgroundColor"] as? String ?? "#374151",
+            secondaryButtonHoverColor: appearanceSettings?["secondaryButtonHoverColor"] as? String ?? "#4B5563",
+            secondaryButtonFontColor: appearanceSettings?["secondaryButtonFontColor"] as? String ?? "#E5E7EB",
+            borderRadius: appearanceSettings?["borderRadius"] as? String ?? "8",
+            fontSize: appearanceSettings?["fontSize"] as? String ?? "14",
+            fontWeight: appearanceSettings?["fontWeight"] as? Int ?? 500,
+            fontFamily: appearanceSettings?["fontFamily"] as? String ?? "\"Inter\", sans-serif"
         )
 
         // 6) Map recurring intervals
@@ -209,9 +211,9 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         let request = Request(
             amount: amountValue,
             currency: currency ?? "usd",
-            billingInfoData: billingInfoData,
+            fields: billingInfoData,
             paymentMethods: methods.isEmpty ? [.Card, .Bank] : methods,
-            themeConfiguration: themeConfig,
+            appearanceSettings: themeConfig,
             tokenOnly: tokenOnly,
             saveCard: saveCard,
             saveAccount: saveAccount,
@@ -229,8 +231,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             showSubmitButton: showSubmitButton,
             referenceID: enable3DS,
             referenceToken: nil,
-            isEmail : isEmail,
-            email:email,
+            isEmail: isEmail,
+            email: email,
             name: name,
             metadata: metadata
         )
@@ -241,7 +243,9 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
 
         // Handle tokenOnly or present EasyPayViewController
         if tokenOnly {
-            NotificationCenter.default.addObserver(
+            // Register observer directly (no extra Dispatch wrapper).
+            // Store the token so we can remove it later.
+            clientTokenObserver = NotificationCenter.default.addObserver(
                 forName: NSNotification.Name("ClientTokenReceived"),
                 object: nil,
                 queue: .main
@@ -255,11 +259,14 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
                 self.clearResolvers()
             }
         } else {
-            DispatchQueue.main.async {
+            // Always present on main thread
+            DispatchQueue.main.async { [weak self] in
+                guard let self = self else { return }
                 let vc = EasyPayViewController(request: request, delegate: self)
+
                 if let host = self.viewController {
                     host.present(vc, animated: true, completion: nil)
-                } else if let root = UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController {
+                } else if let root = Self.topMostViewController() {
                     root.present(vc, animated: true, completion: nil)
                 } else {
                     rejecter("NO_VIEW_CONTROLLER", "Cannot find a view controller to present.", nil)
@@ -285,27 +292,25 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         self.paymentReferenceResolver = resolver
         self.paymentReferenceRejecter = rejecter
 
-        // Build the request object
-        let request = Request(
+        // Build the request object (kept for parity; actual flow listens for a notification)
+        _ = Request(
             referenceID: true,
             referenceToken: referenceToken
         )
 
-        // Set up notification observer for ReferenceIDResponse
-        DispatchQueue.main.async {
-            NotificationCenter.default.addObserver(
-                forName: NSNotification.Name("ReferenceIDResponse"),
-                object: nil,
-                queue: .main
-            ) { [weak self] notification in
-                guard let self = self else { return }
-                if let data = notification.object as? [String: Any] {
-                    self.paymentReferenceResolver?(data)
-                } else {
-                    self.paymentReferenceRejecter?("INVALID_RESPONSE", "Invalid response data.", nil)
-                }
-                self.clearReferenceResolvers()
+        // Register observer directly (no outer Dispatch wrapper).
+        referenceObserver = NotificationCenter.default.addObserver(
+            forName: NSNotification.Name("ReferenceIDResponse"),
+            object: nil,
+            queue: .main
+        ) { [weak self] notification in
+            guard let self = self else { return }
+            if let data = notification.object as? [String: Any] {
+                self.paymentReferenceResolver?(data)
+            } else {
+                self.paymentReferenceRejecter?("INVALID_RESPONSE", "Invalid response data.", nil)
             }
+            self.clearReferenceResolvers()
         }
     }
 
@@ -321,28 +326,70 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
     private func clearResolvers() {
         billingResolver = nil
         billingRejecter = nil
+        if let token = clientTokenObserver {
+            NotificationCenter.default.removeObserver(token)
+            clientTokenObserver = nil
+        }
     }
 
     private func clearReferenceResolvers() {
         paymentReferenceResolver = nil
         paymentReferenceRejecter = nil
-        NotificationCenter.default.removeObserver(self, name: NSNotification.Name("ReferenceIDResponse"), object: nil)
+        if let token = referenceObserver {
+            NotificationCenter.default.removeObserver(token)
+            referenceObserver = nil
+        }
+        // (Old approach of removing by name kept out to avoid double-removal.)
+    }
+
+    // Find a top-most VC safely (iOS 13+ friendly)
+    private static func topMostViewController(base: UIViewController? = {
+        // Use key window from connected scenes
+        return UIApplication.shared.connectedScenes
+            .compactMap { $0 as? UIWindowScene }
+            .flatMap { $0.windows }
+            .first(where: { $0.isKeyWindow })?
+            .rootViewController
+    }()) -> UIViewController? {
+        if let nav = base as? UINavigationController {
+            return topMostViewController(base: nav.visibleViewController)
+        }
+        if let tab = base as? UITabBarController, let selected = tab.selectedViewController {
+            return topMostViewController(base: selected)
+        }
+        if let presented = base?.presentedViewController {
+            return topMostViewController(base: presented)
+        }
+        return base
     }
 }
 
 // MARK: - Delegate Implementation
 extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
     public func easyPayController(_ controller: EasyPayViewController, didFinishWith result: SDKResult) {
-        DispatchQueue.main.async {
+        let workItem = DispatchWorkItem { [weak self] in
+            guard let self = self else { return }
+
             switch result.type {
             case .cancelled:
-                self.billingResolver?(["status": "cancelled", "message": "User cancelled"])
+                if let message = result.chargeData?["message"] as? String {
+                    self.billingResolver?(["status": "cancelled", "message": message])
+                } else {
+                    self.billingResolver?(["status": "cancelled"])
+                }
 
             case .success:
                 var payload: [String: Any] = ["status": "success"]
-                if let cd = result.chargeData { payload["chargeData"] = cd }
-                if let bi = result.billingInfo { payload["billingInfo"] = bi }
-                if let ai = result.additionalInfo { payload["additionalInfo"] = ai }
+
+                if let cd = result.chargeData {
+                    payload["chargeData"] = cd
+                }
+                if let bi = result.billingInfo {
+                    payload["billingInfo"] = bi
+                }
+                if let ai = result.additionalInfo {
+                    payload["additionalInfo"] = ai
+                }
 
                 // Extract referenceToken for 3DS
                 if let additional = result.additionalInfo,
@@ -355,12 +402,21 @@ extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
                 self.billingResolver?(payload)
 
             case .error:
-                let errMsg = (result.chargeData?["errorMessage"] as? String) ?? "Unknown error"
-                self.billingRejecter?("PAYMENT_ERROR", errMsg, nil)
+                // Check for an errorMessage in chargeData.
+                let errorMessage = (result.chargeData?["message"] as? String) ?? "An unknown error occurred."
+
+                let errorResponse: [String: Any] = [
+                    "status": false,
+                    "message": errorMessage
+                ]
+
+                self.billingResolver?(errorResponse)
             }
 
             self.clearResolvers()
             controller.dismiss(animated: true, completion: nil)
         }
+
+        DispatchQueue.main.async(execute: workItem)
     }
 }

package/ios/Classes/EasyPayViewController.swift

@@ -45,7 +45,7 @@ public final class EasyPayViewController: UINavigationController {
         self.easyPayDelegate = delegate
         super.init(nibName: nil, bundle: nil)
         
-        if let themeConfiguration = request.themeConfiguration {
+        if let themeConfiguration = request.appearanceSettings {
             UserStoreSingleton.shared.updateThemeConfiguration(with: themeConfiguration)
         }
         
@@ -61,15 +61,13 @@ public final class EasyPayViewController: UINavigationController {
         let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "PaymentInfoVC") as! PaymentInfoVC
         vc.modalPresentationStyle = .overFullScreen
         vc.configureWith(request: request, delegate: easyPayDelegate)
-        vc.amount = Double(self.request.amount ?? 0)
-        
+        vc.amount = Double(self.request.amount ?? 0) // Set the amount here.
         vc.selectedPaymentMethod = "Card"
         
-       // vc.logOut()
         self.navigationBar.isHidden = true
         self.setViewControllers([vc], animated: false)
     }
-                            
+    
 }
 
 private extension EasyPayViewController {

package/ios/CustomComponents/CheckboxButton.swift

@@ -0,0 +1,66 @@
+//
+//  CheckboxButton.swift
+//  EasyPay
+//
+//  Created by iftekhar on 14/07/24.
+//
+
+//import Foundation
+//
+//final class CheckboxButton: UIButton {
+//
+//    override func awakeFromNib() {
+//        super.awakeFromNib()
+//        self.addTarget(self, action: #selector(tapAction(_:)), for: .touchUpInside)
+//    }
+//
+//    @objc private func tapAction(_ sender: UIButton) {
+//        self.isSelected.toggle()
+//    }
+//}
+
+
+import UIKit
+
+final class CheckboxButton: UIButton {
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.addTarget(self, action: #selector(tapAction(_:)), for: .touchUpInside)
+        applyPrimaryColor() // Apply primary color when the button initializes
+        applySecondaryFontColor()
+        applyFontSize()
+    }
+    
+    @objc private func tapAction(_ sender: UIButton) {
+        self.isSelected.toggle()
+    }
+    
+    private func applyPrimaryColor() {
+        if let primaryBtnBackgroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
+           let primaryUIColor = UIColor(hex: primaryBtnBackgroundColor) {
+            
+            // Apply tintColor to the image
+            self.imageView?.tintColor = primaryUIColor
+            self.setImage(self.image(for: .normal)?.withRenderingMode(.alwaysTemplate), for: .normal)
+            self.setImage(self.image(for: .selected)?.withRenderingMode(.alwaysTemplate), for: .selected)
+        }
+    }
+    
+    private func applySecondaryFontColor() {
+        if let secondaryFontColor = UserStoreSingleton.shared.secondary_font_col,
+           let fontUIColor = UIColor(hex: secondaryFontColor) {
+            self.setTitleColor(fontUIColor, for: .normal)
+            self.setTitleColor(fontUIColor, for: .selected)
+        }
+    }
+    
+    private func applyFontSize() {
+        if let fontSizeString = UserStoreSingleton.shared.fontSize,
+           let fontSizeDouble = Double(fontSizeString) {
+            let fontSize = CGFloat(fontSizeDouble)
+            self.titleLabel?.font = UIFont.systemFont(ofSize: fontSize) // Apply font size to the button title
+        }
+    }
+    
+}

package/ios/Helper/GrailPayHelper.swift

@@ -17,3 +17,4 @@ public class GrailPayHelper {
         viewController.present(grailPayVC, animated: true)
     }
 }
+

package/ios/Models/Request.swift

@@ -148,8 +148,8 @@ public struct FieldSection: Codable {
 public final class Request: NSObject {
     public let amount: Double?
     public let currency: String?
-    public let billingInfoData: Data?
-    public let themeConfiguration: ThemeConfiguration?
+    public let fields: Data?
+    public let appearanceSettings: ThemeConfiguration?
     public let selectedPaymentMethods: [PaymentMethod]
     public let tokenOnly: Bool?
     public let saveCard: Bool?
@@ -177,9 +177,9 @@ public final class Request: NSObject {
     public init(
         amount: Double? = nil,
         currency: String? = nil,
-        billingInfoData: Data? = nil,
+        fields: Data? = nil,
         paymentMethods: [PaymentMethod]? = nil,
-        themeConfiguration: ThemeConfiguration? = nil,
+        appearanceSettings: ThemeConfiguration? = nil,
         tokenOnly: Bool = false,
         saveCard: Bool = false,
         saveAccount: Bool = false,
@@ -225,8 +225,8 @@ public final class Request: NSObject {
         
         self.amount = amount
         self.currency = currency
-        self.billingInfoData = billingInfoData
-        self.themeConfiguration = themeConfiguration
+        self.fields = fields
+        self.appearanceSettings = appearanceSettings
         self.tokenOnly = tokenOnly
         self.saveCard = saveCard
         self.saveAccount = saveAccount
@@ -273,7 +273,7 @@ public final class Request: NSObject {
             self.selectedPaymentMethods = savedMethods.compactMap { PaymentMethod(rawValue: $0) }
         }
         // ✅ Save theme configuration in UserStoreSingleton only if themeConfiguration is not nil or empty
-        if let themeConfig = themeConfiguration {
+        if let themeConfig = appearanceSettings {
             UserStoreSingleton.shared.body_bg_col = themeConfig.bodyBackgroundColor
             UserStoreSingleton.shared.container_bg_col = themeConfig.containerBackgroundColor
             UserStoreSingleton.shared.primary_font_col = themeConfig.primaryFontColor
@@ -624,7 +624,7 @@ public final class Request: NSObject {
                                 print("Saved payment methods: \(paymentMethodNames)")
                             }
                             
-                            if self.themeConfiguration == nil, let appearanceSettings = dataObject["apperance_settings"] as? [String: Any] {
+                            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
                                 UserStoreSingleton.shared.container_bg_col = appearanceSettings["container_bg_col"] as? String