@jimrising/easymerchantsdk-react-native 2.2.9 → 2.3.1

package/ios/Classes/EasyMerchantSdk.swift

@@ -4,568 +4,336 @@ import React
 
 @objc(EasyMerchantSdkPlugin)
 public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
-
+    
     // MARK: - React Native Module Setup
+    
+    @objc
     public static func moduleName() -> String! {
         return "EasyMerchantSdk"
     }
-
+    
+    @objc
     public static func requiresMainQueueSetup() -> Bool {
-        // We present view controllers and touch UIKit; main queue required.
-        return true
+        return true // UI-related module
     }
-
-    public var bridge: RCTBridge?
-
-    // MARK: - Stored Promise Callbacks
-    private var billingResolver: RCTPromiseResolveBlock?
-    private var billingRejecter: RCTPromiseRejectBlock?
-    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
+    
+    // MARK: - Properties
+    
     private weak var viewController: UIViewController?
-
-    // MARK: - Init
-    @objc public override init() {
+    private var resolve: RCTPromiseResolveBlock?
+    private var reject: RCTPromiseRejectBlock?
+    
+    // MARK: - Init / Deinit
+    
+    override public init() {
         super.init()
+        // Removed NotificationCenter observers; using delegate pattern instead
     }
-
-    public func bridgeDidFinishLoading() {
-        if bridge != nil {
-            print("✅ EasyMerchantSdkPlugin bridge initialized")
-        }
+    
+    deinit {
+        // No need for NotificationCenter cleanup
     }
-
-    // Expose setter for RN to inject the host view controller
-    @objc public func setViewController(_ vc: UIViewController) {
-        // Always set on main thread; keep a weak ref to avoid retain cycles.
-        DispatchQueue.main.async { [weak self] in
-            self?.viewController = vc
-        }
-    }
-
-    @objc public func configureEnvironment(_ env: String, apiKey: String, apiSecret: String) {
+    
+    // MARK: - React Native Exposed Methods
+    
+    @objc(configureEnvironment:apiKey:apiSecret:resolver:rejecter:)
+    public func configureEnvironment(_ env: String,
+                                    apiKey: String,
+                                    apiSecret: String,
+                                    resolver resolve: @escaping RCTPromiseResolveBlock,
+                                    rejecter reject: @escaping RCTPromiseRejectBlock) {
+        let environment: EnvironmentConfig.Environment
         switch env.lowercased() {
-        case "production": EnvironmentConfig.setEnvironment(.production)
-        case "sandbox":    EnvironmentConfig.setEnvironment(.sandbox)
-        default:           EnvironmentConfig.setEnvironment(.staging)
+        case "production": environment = .production
+        case "sandbox": environment = .sandbox
+        case "staging": environment = .staging
+        default:
+            reject("INVALID_ENVIRONMENT", "Environment must be 'production', 'sandbox', or 'staging'", nil)
+            return
         }
+        
+        EnvironmentConfig.setEnvironment(environment)
         EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
+        resolve("Environment configured successfully")
     }
-
-    // MARK: - makePayment(...) Exposed to RN - Unified Config Method
-    @objc public func makePayment(
-        _ jsonConfig: String,
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock
-    ) {
-        // Parse the JSON config string
-        guard let configData = jsonConfig.data(using: .utf8),
-              let config = try? JSONSerialization.jsonObject(with: configData) as? [String: Any] else {
-            rejecter("INVALID_CONFIG", "Failed to parse JSON config", nil)
+    
+    @objc(makePayment:resolver:rejecter:)
+    public func makePayment(_ jsonConfig: String,
+                            resolver resolve: @escaping RCTPromiseResolveBlock,
+                            rejecter reject: @escaping RCTPromiseRejectBlock) {
+        launchPayment(jsonConfig: jsonConfig, resolve: resolve, reject: reject)
+    }
+    
+    @objc(makePaymentV2:resolver:rejecter:)
+    public func makePaymentV2(_ jsonConfig: String,
+                              resolver resolve: @escaping RCTPromiseResolveBlock,
+                              rejecter reject: @escaping RCTPromiseRejectBlock) {
+        launchPayment(jsonConfig: jsonConfig, resolve: resolve, reject: reject)
+    }
+    
+    private func launchPayment(jsonConfig: String,
+                               resolve: @escaping RCTPromiseResolveBlock,
+                               reject: @escaping RCTPromiseRejectBlock) {
+        self.resolve = resolve
+        self.reject = reject
+        
+        guard let jsonData = jsonConfig.data(using: .utf8),
+              let jsonObject = try? JSONSerialization.jsonObject(with: jsonData, options: []) as? [String: Any] else {
+            reject("INVALID_JSON", "Failed to parse JSON configuration", nil)
+            clearCallbacks()
             return
         }
         
-        // Extract values from config with defaults
-        let amount: String
-        if let amountValue = config["amount"] {
-            if let amountString = amountValue as? String {
-                amount = amountString
-            } else if let amountNumber = amountValue as? NSNumber {
-                amount = amountNumber.stringValue
-            } else if let amountDouble = amountValue as? Double {
-                amount = String(amountDouble)
-            } else {
-                amount = "0"
-            }
-        } else {
-            amount = "0"
+        guard let presentingVC = viewController ?? getTopViewController() else {
+            reject("NO_VIEW_CONTROLLER", "Unable to find a valid view controller", nil)
+            clearCallbacks()
+            return
         }
         
-        let currency = config["currency"] as? String ?? "usd"
-        let fields = config["fields"] as? [String: Any]
-        var paymentMethods = config["paymentMethods"] as? [String] ?? ["card"]
-        
-        // If "ach" is present and "bank" is not, convert "ach" to "bank"
-        if paymentMethods.contains("ach") && !paymentMethods.contains("bank") {
-            print("🔄 iOS SDK: Converting 'ach' to 'bank' for payment methods")
-            paymentMethods = paymentMethods.map { method in
-                method.lowercased() == "ach" ? "bank" : method
-            }
+        let request = createRequest(from: jsonObject)
+        if let errorMessage = request.initializationErrorMessage {
+            reject("REQUEST_ERROR", errorMessage, nil)
+            clearCallbacks()
+            return
         }
-        let appearanceSettings = config["appearanceSettings"] as? [String: Any]
-        let tokenOnly = config["tokenOnly"] as? Bool ?? false
-        let saveCard = config["saveCard"] as? Bool ?? true
-        let saveAccount = config["saveAccount"] as? Bool ?? true
-        let authenticatedACH = config["authenticatedACH"] as? Bool ?? false
-        let grailPayParams = config["grailPayParams"] as? [String: Any]
-        let submitButtonText = config["submitButtonText"] as? String ?? "Submit"
-        let isRecurring = config["is_recurring"] as? Bool ?? false
-        let numOfCycle = config["numOfCycle"] as? Int ?? 1
-        let recurringIntervals = config["recurringIntervals"] as? [String]
-        let recurringStartDateType = config["recurringStartDateType"] as? String
-        let recurringStartDate = config["recurringStartDate"] as? String
-        let secureAuthentication = config["secureAuthentication"] as? Bool ?? false
-        let showReceipt = config["showReceipt"] as? Bool ?? true
-        let showTotal = config["showTotal"] as? Bool ?? true
-        let showSubmitButton = config["showSubmitButton"] as? Bool ?? true
-        let isEmail = config["isEmail"] as? Bool ?? true
-        let email = config["email"] as? String
-        let name = config["name"] as? String
-        let enable3DS = false // Default to false for now
-        let metadata = config["metadata"] as? [String : Any]
         
-        // Log what iOS is reading - clean and concise
-        print("=== iOS SDK: VALUES READ FROM JSON ===")
-        print("Amount: \(amount)")
-        print("Currency: \(currency ?? "nil")")
-        print("Payment Methods: \(paymentMethods)")
-        print("Email: \(email ?? "nil")")
-        print("Name: \(name ?? "nil")")
-        print("Token Only: \(tokenOnly)")
-        print("Save Card: \(saveCard)")
-        print("Save Account: \(saveAccount)")
-        print("Authenticated ACH: \(authenticatedACH)")
-        print("Is Recurring: \(isRecurring)")
-        print("Recurring Cycles: \(numOfCycle)")
-        print("Recurring Intervals: \(recurringIntervals ?? [])")
-        print("Recurring Start Date: \(recurringStartDate ?? "nil")")
-        print("Secure Authentication: \(secureAuthentication)")
-        print("Show Receipt: \(showReceipt)")
-        print("Show Total: \(showTotal)")
-        print("Show Submit Button: \(showSubmitButton)")
-        print("Is Email: \(isEmail)")
-        
-        if let appearance = appearanceSettings {
-            print("Appearance Settings: \(appearance)")
+        let controller = EasyPayViewController(request: request, delegate: self)
+        DispatchQueue.main.async {
+            presentingVC.present(controller, animated: true)
         }
+    }
+    
+    @objc(paymentReference:resolver:rejecter:)
+    public func paymentReference(_ referenceToken: String,
+                                 resolver resolve: @escaping RCTPromiseResolveBlock,
+                                 rejecter reject: @escaping RCTPromiseRejectBlock) {
+        self.resolve = resolve
+        self.reject = reject
         
-        if let grail = grailPayParams {
-            print("Grail Pay Params: \(grail)")
+        let request = Request(referenceID: true, referenceToken: referenceToken)
+        if let errorMessage = request.initializationErrorMessage {
+            reject("REQUEST_ERROR", errorMessage, nil)
+            clearCallbacks()
+            return
         }
         
-        if let fieldsData = fields {
-            print("Fields: \(fieldsData)")
+        guard let presentingVC = viewController ?? getTopViewController() else {
+            reject("NO_VIEW_CONTROLLER", "Unable to find a valid view controller", nil)
+            clearCallbacks()
+            return
         }
         
-        if let meta = metadata {
-            print("Metadata: \(meta)")
-        } else {
-            print("⚠️ Metadata is nil!")
+        let controller = EasyPayViewController(request: request, delegate: self)
+        DispatchQueue.main.async {
+            presentingVC.present(controller, animated: true)
         }
-        
-        // Call the existing billing method with extracted parameters
-        billing(
-            amount,
-            currency: currency,
-            fields: fields,
-            paymentMethods: paymentMethods,
-            appearanceSettings: appearanceSettings,
-            tokenOnly: tokenOnly,
-            saveCard: saveCard,
-            saveAccount: saveAccount,
-            authenticatedACH: authenticatedACH,
-            grailPayParams: grailPayParams,
-            submitButtonText: submitButtonText,
-            isRecurring: isRecurring,
-            numOfCycle: numOfCycle,
-            recurringIntervals: recurringIntervals,
-            recurringStartDateType: recurringStartDateType,
-            recurringStartDate: recurringStartDate,
-            secureAuthentication: secureAuthentication,
-            showReceipt: showReceipt,
-            showTotal: showTotal,
-            showSubmitButton: showSubmitButton,
-            isEmail: isEmail,
-            email: email,
-            name: name,
-            enable3DS: enable3DS,
-            metadata: metadata,
-            resolver: resolver,
-            rejecter: rejecter
-        )
     }
-
-    // MARK: - billing(...) Exposed to RN
-    @objc public func billing(
-        _ amount: String,
-        currency: String?,
-        fields: [String: Any]?,
-        paymentMethods: [String],
-        appearanceSettings: [String: Any]?,
-        tokenOnly: Bool,
-        saveCard: Bool,
-        saveAccount: Bool,
-        authenticatedACH: Bool,
-        grailPayParams: [String: Any]?,
-        submitButtonText: String?,
-        isRecurring: Bool,
-        numOfCycle: Int,
-        recurringIntervals: [String]?,
-        recurringStartDateType: String?,
-        recurringStartDate: String?,
-        secureAuthentication: Bool,
-        showReceipt: Bool,
-        showTotal: Bool,
-        showSubmitButton: Bool,
-        isEmail: Bool,
-        email: String?,
-        name: String?,
-        enable3DS: Bool,
-        metadata: [String: Any]?,
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock
-    ) {
-        // 1) Validate amount
-        guard let amountValue = Double(amount), amountValue >= 0.50 else {
-            rejecter("INVALID_AMOUNT", "Amount must be at least $0.50", nil)
-            return
-        }
-
-        // 2) Process billing info into FieldSection
-        var billingInfoData: Data? = nil
-        if let billingDict = fields {
-            var billingFields: [FieldItem] = []
-            var additionalFields: [FieldItem] = []
-            var billingVisibility = true
-            var additionalVisibility = true
-
-            // Parse billing fields
-            if let billing = billingDict["billing"] as? [[String: Any]] {
-                for field in billing {
-                    guard let name = field["name"] as? String,
-                          let value = field["value"] as? String,
-                          let required = field["required"] as? Bool else { continue }
-                    
-                    if let billingField = BillingFieldName(rawValue: name) {
-                        billingFields.append(FieldItem(name: billingField, required: required, value: value))
-                    }
-                }
-            }
-
-            // Parse additional fields
-            if let additional = billingDict["additional"] as? [[String: Any]] {
-                for field in additional {
-                    guard let name = field["name"] as? String,
-                          let value = field["value"] as? String,
-                          let required = field["required"] as? Bool else { continue }
-                    
-                    if let additionalField = AdditionalFieldName(rawValue: name) {
-                        additionalFields.append(FieldItem(name: additionalField, required: required, value: value))
-                    }
-                }
-            }
-
-            // Parse visibility
-            if let visibility = billingDict["visibility"] as? [String: Bool] {
-                billingVisibility = visibility["billing"] ?? true
-                additionalVisibility = visibility["additional"] ?? true
-            }
-
-            let field = FieldSection(
-                visibility: FieldsVisibility(billing: billingVisibility, additional: additionalVisibility),
-                billing: billingFields,
-                additional: additionalFields
-            )
-
-            do {
-                billingInfoData = try JSONEncoder().encode(field)
-            } catch {
-                rejecter("INVALID_BILLING_INFO", "Failed to encode billing info: \(error.localizedDescription)", nil)
-                return
-            }
+    
+    @objc(setViewController:resolver:rejecter:)
+    public func setViewController(_ viewController: UIViewController,
+                                  resolver resolve: @escaping RCTPromiseResolveBlock,
+                                  rejecter reject: @escaping RCTPromiseRejectBlock) {
+        self.viewController = viewController
+        resolve("View controller set successfully")
+    }
+    
+    @objc(getPlatformVersion:rejecter:)
+    public func getPlatformVersion(_ resolve: @escaping RCTPromiseResolveBlock,
+                                  rejecter reject: @escaping RCTPromiseRejectBlock) {
+        resolve("iOS \(UIDevice.current.systemVersion)")
+    }
+    
+    // MARK: - Helpers
+    
+    private func getTopViewController() -> UIViewController? {
+        guard let windowScene = UIApplication.shared.connectedScenes
+            .filter({ $0.activationState == .foregroundActive })
+            .first as? UIWindowScene,
+              let rootVC = windowScene.windows
+            .filter({ $0.isKeyWindow })
+            .first?.rootViewController else {
+            return nil
         }
-
-        // 3) Map payment methods with ACH to Bank conversion
-        var processedPaymentMethods = paymentMethods
         
-        // If "ach" is present and "bank" is not, convert "ach" to "bank"
-        if processedPaymentMethods.contains("ach") && !processedPaymentMethods.contains("bank") {
-            print("🔄 iOS SDK: Converting 'ach' to 'bank' for payment methods")
-            processedPaymentMethods = processedPaymentMethods.map { method in
-                method.lowercased() == "ach" ? "bank" : method
+        var topVC = rootVC
+        while let presentedVC = topVC.presentedViewController {
+            topVC = presentedVC
+        }
+        return topVC
+    }
+    
+    private func resolveJSON(_ object: Any) {
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: object, options: [])
+            if let jsonString = String(data: jsonData, encoding: .utf8) {
+                resolve?(jsonString)
+            } else {
+                reject?("JSON_ERROR", "Failed to serialize response", nil)
             }
+        } catch {
+            reject?("JSON_ERROR", "Serialization failed: \(error.localizedDescription)", error)
         }
+        clearCallbacks()
+    }
+    
+    private func clearCallbacks() {
+        resolve = nil
+        reject = nil
+    }
+    
+    private func createRequest(from json: [String: Any]) -> Request {
+        let amount = (json["amount"] as? String).flatMap(Double.init)
+        let currency = json["currency"] as? String
+        let fieldsData = json["fields"].flatMap { try? JSONSerialization.data(withJSONObject: $0, options: []) }
         
-        let methods: [PaymentMethod] = processedPaymentMethods.compactMap {
+        let paymentMethods = (json["paymentMethods"] as? [String])?.compactMap {
             switch $0.lowercased() {
-            case "card":   return .Card
-            case "bank":   return .Bank
-            case "crypto": return .Crypto
-            case "wallet": return .Wallet
-            default:       return nil
+            case "card": return PaymentMethod.Card
+            case "ach": return PaymentMethod.Bank
+            default: return nil
             }
         }
         
-        print("📱 iOS SDK: Payment Methods - Original: \(paymentMethods), Processed: \(processedPaymentMethods), Mapped: \(methods)")
-
-        // 4) Prepare GrailPayRequest if needed
-        var grailParams: GrailPayRequest? = nil
-        if authenticatedACH, let params = grailPayParams {
-            grailParams = GrailPayRequest(
-                role: params["role"] as? String ?? "business",
-                timeout: params["timeout"] as? Int ?? 10,
-                isSandbox: params["isSandbox"] as? Bool ?? true,
-                brandingName: params["brandingName"] as? String ?? "Lyfecycle Payments",
-                finderSubtitle: params["finderSubtitle"] as? String ?? "Search for your bank",
-                searchPlaceholder: params["searchPlaceholder"] as? String ?? "Enter bank name"
+        let theme = (json["appearanceSettings"] as? [String: Any]).flatMap {
+            ThemeConfiguration(
+                bodyBackgroundColor: $0["bodyBackgroundColor"] as? String,
+                containerBackgroundColor: $0["containerBackgroundColor"] as? String,
+                primaryFontColor: $0["primaryFontColor"] as? String,
+                secondaryFontColor: $0["secondaryFontColor"] as? String,
+                primaryButtonBackgroundColor: $0["primaryButtonBackgroundColor"] as? String,
+                primaryButtonHoverColor: $0["primaryButtonHoverColor"] as? String,
+                primaryButtonFontColor: $0["primaryButtonFontColor"] as? String,
+                secondaryButtonBackgroundColor: $0["secondaryButtonBackgroundColor"] as? String,
+                secondaryButtonHoverColor: $0["secondaryButtonHoverColor"] as? String,
+                secondaryButtonFontColor: $0["secondaryButtonFontColor"] as? String,
+                borderRadius: $0["borderRadius"] as? String,
+                fontSize: $0["fontSize"] as? String,
+                fontWeight: $0["fontWeight"] as? Int,
+                fontFamily: $0["fontFamily"] as? String
             )
         }
-
-        // 5) Build theme config
-        let themeConfig = ThemeConfiguration(
-            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
-        let intervals: [RecurringIntervals] = (recurringIntervals ?? []).compactMap { raw in
-            let cleaned = raw.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-            let noDot = cleaned.hasPrefix(".") ? String(cleaned.dropFirst()) : cleaned
-            return RecurringIntervals(rawValue: noDot)
+        
+        let grailPay = (json["grailPayParams"] as? [String: Any]).flatMap {
+            GrailPayRequest(
+                role: $0["role"] as? String ?? "",
+                timeout: $0["timeout"] as? Int ?? 0,
+                brandingName: $0["brandingName"] as? String ?? "",
+                finderSubtitle: $0["finderSubtitle"] as? String ?? "",
+                searchPlaceholder: $0["searchPlaceholder"] as? String ?? ""
+            )
         }
-
-        if isRecurring && intervals.isEmpty {
-            rejecter("NO_RECURRING_INTERVALS", "No recurring intervals available.", nil)
-            return
+        
+        let recurringIntervals = (json["recurringIntervals"] as? [String])?.compactMap {
+            switch $0.lowercased() {
+            case "daily": return RecurringIntervals.daily
+            case "weekly": return .weekly
+            case "monthly": return .monthly
+            case "quarterly": return .quarterly
+            case "yearly": return .yearly
+            default: return nil
+            }
         }
-
-        // 7) Map start date type
-        let startType: RecurringStartDateType? = {
-            switch recurringStartDateType?.lowercased() {
+        
+        let recurringStartDateType = (json["recurringStartDateType"] as? String).flatMap {
+            switch $0.lowercased() {
+            case "fixed": return RecurringStartDateType.fixed
             case "custom": return .custom
-            case "fixed":  return .fixed
-            default:       return nil
-            }
-        }()
-
-        // 8) Build the request object
-        let request = Request(
-            amount: amountValue,
-            currency: currency ?? "usd",
-            fields: billingInfoData,
-            paymentMethods: methods.isEmpty ? [.Card, .Bank] : methods,
-            appearanceSettings: themeConfig,
-            tokenOnly: tokenOnly,
-            saveCard: saveCard,
-            saveAccount: saveAccount,
-            submitButtonText: submitButtonText ?? "Submit",
-            authenticatedACH: authenticatedACH,
-            grailPayParams: grailParams,
-            is_recurring: isRecurring,
-            numOfCycle: numOfCycle,
-            recurringIntervals: intervals,
-            recurringStartDateType: startType,
-            recurringStartDate: recurringStartDate,
-            secureAuthentication: secureAuthentication,
-            showReceipt: showReceipt,
-            showTotal: showTotal,
-            showSubmitButton: showSubmitButton,
-            referenceID: enable3DS,
-            referenceToken: nil,
-            isEmail: isEmail,
-            email: email,
-            name: name,
-            metadata: metadata
-        )
-
-        // Store resolvers
-        self.billingResolver = resolver
-        self.billingRejecter = rejecter
-
-        // Handle tokenOnly or present EasyPayViewController
-        if tokenOnly {
-            // 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
-            ) { [weak self] notification in
-                guard let self = self else { return }
-                if let clientToken = notification.object as? String {
-                    self.billingResolver?(["status": "success", "clientToken": clientToken])
-                } else {
-                    self.billingRejecter?("TOKEN_ERROR", "Failed to receive client token.", nil)
-                }
-                self.clearResolvers()
-            }
-        } else {
-            // 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 = Self.topMostViewController() {
-                    root.present(vc, animated: true, completion: nil)
-                } else {
-                    rejecter("NO_VIEW_CONTROLLER", "Cannot find a view controller to present.", nil)
-                    self.clearResolvers()
-                }
+            default: return nil
             }
         }
-    }
-
-    // MARK: - paymentReference(...) Exposed to RN
-    @objc public func paymentReference(
-        _ referenceToken: String,
-        resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock
-    ) {
-        // Validate reference token
-        guard !referenceToken.isEmpty else {
-            rejecter("INVALID_REFERENCE_TOKEN", "Reference token cannot be empty.", nil)
-            return
+        
+        let environmentString = json["environment"] as? String
+        let environment: EnvironmentConfig.Environment
+        switch environmentString?.lowercased() {
+        case "production": environment = .production
+        case "sandbox": environment = .sandbox
+        case "staging": environment = .staging
+        default: environment = .sandbox
         }
-
-        // Store resolvers
-        self.paymentReferenceResolver = resolver
-        self.paymentReferenceRejecter = rejecter
-
-        // Build the request object (kept for parity; actual flow listens for a notification)
-        _ = Request(
-            referenceID: true,
-            referenceToken: referenceToken
+        
+        return Request(
+            amount: amount,
+            currency: currency,
+            fields: fieldsData,
+            paymentMethods: paymentMethods ?? [],
+            appearanceSettings: theme,
+            tokenOnly: json["tokenOnly"] as? Bool ?? false,
+            saveCard: json["saveCard"] as? Bool ?? false,
+            saveAccount: json["saveAccount"] as? Bool ?? false,
+            submitButtonText: json["submitButtonText"] as? String,
+            authenticatedACH: json["authenticatedACH"] as? Bool ?? false,
+            grailPayParams: grailPay,
+            is_recurring: json["is_recurring"] as? Bool ?? false,
+            numOfCycle: json["numOfCycle"] as? Int,
+            recurringIntervals: recurringIntervals,
+            recurringStartDateType: recurringStartDateType,
+            recurringStartDate: json["recurringStartDate"] as? String,
+            secureAuthentication: json["secureAuthentication"] as? Bool ?? false,
+            showReceipt: json["showReceipt"] as? Bool ?? false,
+            showTotal: json["showTotal"] as? Bool ?? false,
+            showSubmitButton: json["showSubmitButton"] as? Bool ?? false,
+            referenceID: false,
+            referenceToken: nil,
+            isEmail: json["isEmail"] as? Bool ?? false,
+            email: json["email"] as? String,
+            name: json["name"] as? String,
+            clientToken: json["clientToken"] as? String,
+            metadata: json["metadata"] as? [String: Any],
+            environment: environment
         )
-
-        // 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()
-        }
-    }
-
-    // MARK: - getPlatformVersion(...) Exposed to RN
-    @objc public func getPlatformVersion(
-        _ resolver: RCTPromiseResolveBlock,
-        rejecter: RCTPromiseRejectBlock
-    ) {
-        resolver("iOS \(UIDevice.current.systemVersion)")
-    }
-
-    // MARK: - Private Helpers
-    private func clearResolvers() {
-        billingResolver = nil
-        billingRejecter = nil
-        if let token = clientTokenObserver {
-            NotificationCenter.default.removeObserver(token)
-            clientTokenObserver = nil
-        }
-    }
-
-    private func clearReferenceResolvers() {
-        paymentReferenceResolver = nil
-        paymentReferenceRejecter = 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
+// MARK: - EasyPayViewControllerDelegate
+
 extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
     public func easyPayController(_ controller: EasyPayViewController, didFinishWith result: SDKResult) {
-        let workItem = DispatchWorkItem { [weak self] in
+        DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
-
+            
+            var response: [String: Any] = [:]
+            
             switch result.type {
-            case .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
+                response["status"] = "success"
+                
+                if let chargeData = result.chargeData {
+                    response["chargeData"] = chargeData
                 }
-                if let ai = result.additionalInfo {
-                    payload["additionalInfo"] = ai
+                if let billing = result.billingInfo {
+                    response["billingInfo"] = billing
                 }
-
-                // Extract referenceToken for 3DS
-                if let additional = result.additionalInfo,
-                   let threeDSecureStatus = additional["threeDSecureStatus"] as? [String: Any],
-                   let data = threeDSecureStatus["data"] as? [String: Any],
-                   let token = data["ref_token"] as? String {
-                    payload["referenceToken"] = token
+                if let additional = result.additionalInfo {
+                    response["additionalInfo"] = additional
+                    
+                    if let threeDSecureStatus = additional["threeDSecureStatus"] as? [String: Any],
+                       let data = threeDSecureStatus["data"] as? [String: Any],
+                       let token = data["ref_token"] as? String {
+                        response["referenceToken"] = token
+                    }
                 }
-
-                self.billingResolver?(payload)
-
+                
             case .error:
-                // 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)
+                let errorMessage =
+                    result.error?.localizedDescription ??
+                    (result.chargeData?["message"] as? String) ??
+                    "Unknown error occurred"
+                
+                response["status"] = "error"
+                response["message"] = errorMessage
+                
+            case .cancelled:
+                response["status"] = "cancelled"
+                response["message"] = "Payment cancelled"
+                
+                if let chargeData = result.chargeData {
+                    response["chargeData"] = chargeData
+                }
             }
-
-            self.clearResolvers()
-            controller.dismiss(animated: true, completion: nil)
+            
+            self.resolveJSON(response)
+            controller.dismiss(animated: true)
         }
-
-        DispatchQueue.main.async(execute: workItem)
     }
 }
+