@jimrising/easymerchantsdk-react-native 1.3.7 → 1.3.9

package/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/em-MobileCheckoutSDK-ReactNative.iml" filepath="$PROJECT_DIR$/.idea/em-MobileCheckoutSDK-ReactNative.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

package/README.md

@@ -7,7 +7,7 @@ To add the path of sdk in your project. Open your `package.json` file and inside
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^1.3.6"
+  "@jimrising/easymerchantsdk-react-native": "^1.3.9"
 },
 ```
 
@@ -217,14 +217,14 @@ const App = () => {
          false, // tokenOnly
          false, // saveCard
          false, // saveAccount
-         true,  // authenticatedACH
-         authConfig,
+         true,  // authenticatedACH if it is true only then pass authConfig params
+         authConfig,    
          "Submit",
-         true,
-         ['weekly', 'monthly'],            
-         'custom',
-          "05/30/2025", 
-           true
+         true,          // is_recurring == true ? must need to send below 4 params
+         ['weekly', 'monthly'],               // recurringIntervals
+         'custom',                   // recurringStartDateType
+          "05/30/2025",   /// Format MM/dd/yyyy, must be today or future date
+           true   // enable3DS   :- must send it true for 3DS card payment.
        );
 
        console.log("Billing success:", result);

package/android/.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Tue May 27 16:30:51 IST 2025
-gradle.version=8.10
+#Wed May 28 13:58:36 IST 2025
+gradle.version=8.9

package/ios/Classes/EasyMerchantSdk.m

@@ -1,9 +1,9 @@
 #import "EasyMerchantSdk.h"
 #import <React/RCTLog.h>
 #import <React/RCTBridgeModule.h>
-//#import <easymerchantsdk/easymerchantsdk-Swift.h>
+#import <easymerchantsdk/easymerchantsdk-Swift.h>
 
- #import <easymerchantsdk-Swift.h>
+//  #import <easymerchantsdk-Swift.h>
 
 @interface EasyMerchantSdk()
 @property (nonatomic, strong) EasyMerchantSdkPlugin *sdkPluginInstance;

package/ios/Classes/EasyMerchantSdk.swift

@@ -1,3 +1,8 @@
+//
+//  EasyMerchantSdkPlugin.swift
+//  EasyMerchantSdk
+//
+
 import Foundation
 import UIKit
 import React
@@ -6,41 +11,42 @@ import React
 public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
 
     // MARK: - React Native Module Setup
-    public static func moduleName() -> String { "EasyMerchantSdk" }
-    public static func requiresMainQueueSetup() -> Bool { true }
+    public static func moduleName() -> String! {
+        return "EasyMerchantSdk"
+    }
+    public static func requiresMainQueueSetup() -> Bool {
+        return true
+    }
 
     public var bridge: RCTBridge?
 
-    // MARK: - Private Properties
-    private var viewController: UIViewController?
-    private let viewControllerQueue = DispatchQueue(label: "com.easymerchantsdk.viewController")
-
+    // MARK: - Stored Promise Callbacks
     private var billingResolver: RCTPromiseResolveBlock?
     private var billingRejecter: RCTPromiseRejectBlock?
 
-    // MARK: - Initializer
+    // MARK: - View Controller Reference
+    private let viewControllerQueue = DispatchQueue(label: "com.easymerchantsdk.viewController")
+    private var viewController: UIViewController?
+
+    // MARK: - Init
     @objc public override init() {
         super.init()
     }
 
-    // Called when the bridge finishes loading
     public func bridgeDidFinishLoading() {
-        if self.bridge != nil {
-            print("Bridge has been initialized successfully.")
-        } else {
-            print("Bridge initialization failed.")
+        if bridge != nil {
+            print("✅ EasyMerchantSdkPlugin bridge initialized")
         }
     }
 
-    // MARK: - Set ViewController (for presenting modal)
-    @objc public func setViewController(_ viewController: UIViewController) {
+    // Expose setter for RN to inject the host view controller
+    @objc public func setViewController(_ vc: UIViewController) {
         viewControllerQueue.sync {
-            self.viewController = viewController
+            self.viewController = vc
         }
-        print("ViewController set: \(String(describing: self.viewController))")
     }
 
-    // MARK: - Billing method exposed to React Native
+    // MARK: - billing(...) Exposed to RN
     @objc public func billing(
         _ amount: String,
         billinginfo: String?,
@@ -60,183 +66,170 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock
     ) {
-        // Validate amount
+        // 1) Validate amount
         guard let amountValue = Double(amount), amountValue > 0 else {
             rejecter("INVALID_AMOUNT", "Amount must be a positive number", nil)
             return
         }
 
-        // Validate billinginfo JSON if present
-        if let billinginfo = billinginfo {
-            guard let billingInfoData = billinginfo.data(using: .utf8),
-                  (try? JSONSerialization.jsonObject(with: billingInfoData, options: [])) != nil else {
+        // 2) Validate billinginfo JSON
+        if let info = billinginfo {
+            guard info.data(using: .utf8)
+                    .flatMap({ try? JSONSerialization.jsonObject(with: $0) }) != nil
+            else {
                 rejecter("INVALID_BILLING_INFO", "Billing info must be valid JSON", nil)
                 return
             }
         }
 
-        // Map payment method strings to enum cases
+        // 3) Map payment methods
         let methods: [PaymentMethod] = paymentMethods.compactMap {
             switch $0.lowercased() {
-            case "card": return .Card
-            case "bank": return .Bank
+            case "card":   return .Card
+            case "bank":   return .Bank
             case "crypto": return .Crypto
-            default: return nil
+            default:       return nil
             }
         }
 
-        // Setup GrailPayRequest if authenticatedACH is true
+        // 4) Prepare GrailPayRequest if needed
         var grailParams: GrailPayRequest? = nil
         if authenticatedACH, let params = grailPayParams {
             grailParams = GrailPayRequest(
-                accessToken: params["accessToken"] as? String ?? "",
-                vendorId: params["vendorId"] as? String ?? "",
-                role: params["role"] as? String ?? "business",
-                timeout: params["timeout"] as? Int ?? 10,
-                isSandbox: params["isSandbox"] as? Bool ?? true,
-                brandingName: params["brandingName"] as? String ?? "Payments",
-                finderSubtitle: params["finderSubtitle"] as? String ?? "Find your bank",
-                searchPlaceholder: params["searchPlaceholder"] as? String ?? "Search"
+                accessToken:        params["accessToken"] as? String ?? "",
+                vendorId:           params["vendorId"]    as? String ?? "",
+                role:               params["role"]        as? String ?? "business",
+                timeout:            params["timeout"]     as? Int    ??  10,
+                isSandbox:          params["isSandbox"]   as? Bool   ??  true,
+                brandingName:       params["brandingName"]    as? String ?? "Payments",
+                finderSubtitle:     params["finderSubtitle"]  as? String ?? "Find your bank",
+                searchPlaceholder:  params["searchPlaceholder"] as? String ?? "Search"
             )
         }
 
-        // Setup Theme Configuration with default fallbacks
+        // 5) Build theme config
         let themeConfig = ThemeConfiguration(
-            bodyBackgroundColor: themeConfiguration["bodyBackgroundColor"] as? String ?? "#EBF8FF",
-            containerBackgroundColor: themeConfiguration["containerBackgroundColor"] as? String ?? "#FFFFFF",
-            primaryFontColor: themeConfiguration["primaryFontColor"] as? String ?? "#1E3A8A",
-            secondaryFontColor: themeConfiguration["secondaryFontColor"] as? String ?? "#696969",
-            primaryButtonBackgroundColor: themeConfiguration["primaryButtonBackgroundColor"] as? String ?? "#1D4ED8",
-            primaryButtonHoverColor: themeConfiguration["primaryButtonHoverColor"] as? String ?? "#2563EB",
-            primaryButtonFontColor: themeConfiguration["primaryButtonFontColor"] as? String ?? "#FFFFFF",
-            secondaryButtonBackgroundColor: themeConfiguration["secondaryButtonBackgroundColor"] as? String ?? "#FFFFFF",
-            secondaryButtonHoverColor: themeConfiguration["secondaryButtonHoverColor"] as? String ?? "#BFDBFE",
-            secondaryButtonFontColor: themeConfiguration["secondaryButtonFontColor"] as? String ?? "#1E40AF",
-            borderRadius: themeConfiguration["borderRadius"] as? String ?? "8",
-            fontSize: themeConfiguration["fontSize"] as? String ?? "14"
+            bodyBackgroundColor:           themeConfiguration["bodyBackgroundColor"]           as? String ?? "#EBF8FF",
+            containerBackgroundColor:      themeConfiguration["containerBackgroundColor"]      as? String ?? "#FFFFFF",
+            primaryFontColor:              themeConfiguration["primaryFontColor"]              as? String ?? "#1E3A8A",
+            secondaryFontColor:            themeConfiguration["secondaryFontColor"]            as? String ?? "#696969",
+            primaryButtonBackgroundColor:  themeConfiguration["primaryButtonBackgroundColor"]  as? String ?? "#1D4ED8",
+            primaryButtonHoverColor:       themeConfiguration["primaryButtonHoverColor"]       as? String ?? "#2563EB",
+            primaryButtonFontColor:        themeConfiguration["primaryButtonFontColor"]        as? String ?? "#FFFFFF",
+            secondaryButtonBackgroundColor:themeConfiguration["secondaryButtonBackgroundColor"]as? String ?? "#FFFFFF",
+            secondaryButtonHoverColor:     themeConfiguration["secondaryButtonHoverColor"]     as? String ?? "#BFDBFE",
+            secondaryButtonFontColor:      themeConfiguration["secondaryButtonFontColor"]      as? String ?? "#1E40AF",
+            borderRadius:                  themeConfiguration["borderRadius"]                  as? String ?? "8",
+            fontSize:                      themeConfiguration["fontSize"]                      as? String ?? "14"
         )
 
-        // Prepare billing info data
-        let billingInfoData = billinginfo?.data(using: .utf8) ?? Data()
-
-        
-        print("🔥 recurringIntervals raw from JS:", recurringIntervals as Any)
-
-        // Updated mapping to strip leading "." if present
-        let intervals = (recurringIntervals ?? []).compactMap { raw -> RecurringIntervals? in
-            // 1) Trim whitespace, lowercase
+        // 6) Map recurring intervals (strip leading dots)
+        let intervals: [RecurringIntervals] = (recurringIntervals ?? []).compactMap { raw in
             let cleaned = raw.trimmingCharacters(in: .whitespacesAndNewlines).lowercased()
-            // 2) If it starts with ".", drop that character
-            let noDot = cleaned.hasPrefix(".") ? String(cleaned.dropFirst()) : cleaned
-            // 3) Try to initialize your enum
+            let noDot   = cleaned.hasPrefix(".") ? String(cleaned.dropFirst()) : cleaned
             return RecurringIntervals(rawValue: noDot)
         }
 
-        print("🔥 mapped intervals after stripping dots:", intervals)
-
-          guard !intervals.isEmpty else {
+        if isRecurring && intervals.isEmpty {
             rejecter("NO_RECURRING_INTERVALS", "No recurring intervals available.", nil)
             return
-          }
-
+        }
 
-           // 2) Map recurringStartDateType (assuming you have an enum for it)
-           let recurringStartDateTypeEnum: RecurringStartDateType = {
-             switch recurringStartDateType?.lowercased() {
-             case "custom": return .custom
-             case "fixed":  return .fixed
-             default:       return .custom
-             }
-           }()
+        // 7) Map start date type
+        let startType: RecurringStartDateType = {
+            switch recurringStartDateType?.lowercased() {
+            case "custom": return .custom
+            case "fixed":  return .fixed
+            default:       return .custom
+            }
+        }()
 
-        // Create Request object with all parameters
+        // 8) Build the request object
         let request = Request(
-            amount: amountValue,
-            billingInfoData: billingInfoData,
-            paymentMethods: methods,
-            themeConfiguration: themeConfig,
-            tokenOnly: tokenOnly,
-            saveCard: saveCard,
-            saveAccount: saveAccount,
-            submitButtonText: submitButtonText ?? "Submit",
-            authenticatedACH: authenticatedACH,
-            grailPayParams: authenticatedACH ? grailParams : nil,
-            is_recurring: isRecurring,
-            recurringIntervals: intervals,
-            recurringStartDateType: recurringStartDateTypeEnum,
-            recurringStartDate: recurringStartDate,
-            enable3DS: enable3DS
+            amount:                 amountValue,
+            billingInfoData:        billinginfo?.data(using: .utf8) ?? Data(),
+            paymentMethods:         methods,
+            themeConfiguration:     themeConfig,
+            tokenOnly:              tokenOnly,
+            saveCard:               saveCard,
+            saveAccount:            saveAccount,
+            submitButtonText:       submitButtonText ?? "Submit",
+            authenticatedACH:       authenticatedACH,
+            grailPayParams:         grailParams,
+            is_recurring:           isRecurring,
+            recurringIntervals:     intervals,
+            recurringStartDateType: startType,
+            recurringStartDate:     recurringStartDate,
+            enable3DS:              enable3DS
         )
 
-        // Store resolve/reject callbacks for later
+        // Store resolvers
         self.billingResolver = resolver
-        self.billingRejecter = rejecter
+        self.billingRejecter  = rejecter
 
+        // Present your EasyPayViewController
         DispatchQueue.main.async {
-            let controller = EasyPayViewController(request: request, delegate: self)
-            if let vc = self.viewController {
-                vc.present(controller, animated: true, completion: nil)
-            } else if let rootVC = UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController {
-                rootVC.present(controller, animated: true, completion: nil)
+            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 {
+                root.present(vc, animated: true, completion: nil)
             } else {
-                rejecter("NO_VIEW_CONTROLLER", "No view controller available to present payment screen.", nil)
+                rejecter("NO_VIEW_CONTROLLER", "Cannot find a view controller to present.", nil)
                 self.clearResolvers()
             }
         }
     }
 
-    // MARK: - Environment Configuration
+    // MARK: - Environment Config & Platform
     @objc public func configureEnvironment(_ env: String, apiKey: String, apiSecret: String) {
         switch env.lowercased() {
-        case "production":
-            EnvironmentConfig.setEnvironment(.production)
-        case "sandbox":
-            EnvironmentConfig.setEnvironment(.sandbox)
-        default:
-            EnvironmentConfig.setEnvironment(.staging)
+        case "production": EnvironmentConfig.setEnvironment(.production)
+        case "sandbox":    EnvironmentConfig.setEnvironment(.sandbox)
+        default:           EnvironmentConfig.setEnvironment(.staging)
         }
         EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
     }
 
-    // MARK: - Platform Version
     @objc public func getPlatformVersion(
-        _ resolver: @escaping RCTPromiseResolveBlock,
-        rejecter: @escaping RCTPromiseRejectBlock
+        _ resolver: RCTPromiseResolveBlock,
+        rejecter: RCTPromiseRejectBlock
     ) {
         resolver("iOS \(UIDevice.current.systemVersion)")
     }
 
-    // MARK: - Clear stored callbacks
     private func clearResolvers() {
-        self.billingResolver = nil
-        self.billingRejecter = nil
+        billingResolver = nil
+        billingRejecter  = nil
     }
 }
 
-// MARK: - EasyPayViewControllerDelegate Implementation
+// MARK: - Delegate Implementation
 extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
     public func easyPayController(_ controller: EasyPayViewController, didFinishWith result: Result) {
         DispatchQueue.main.async {
             switch result.type {
             case .cancelled:
                 self.billingResolver?(["status": "cancelled", "message": "User cancelled"])
+
             case .success:
-                if let chargeData = result.chargeData,
-                   let clientToken = chargeData["clientToken"] as? String {
-                    self.billingResolver?(["status": "success", "clientToken": clientToken])
-                } else {
-                    self.billingResolver?(["status": "success", "chargeData": result.chargeData ?? [:]])
-                }
+                // Build a single payload for RN
+                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   }
+
+                // Resolve promise
+                self.billingResolver?(payload)
+
             case .error:
-                if let error = result.chargeData?["errorMessage"] as? String {
-                    self.billingRejecter?("PAYMENT_ERROR", error, nil)
-                } else {
-                    self.billingRejecter?("PAYMENT_ERROR", "Unknown error", nil)
-                }
+                let errMsg = (result.chargeData?["errorMessage"] as? String) ?? "Unknown error"
+                self.billingRejecter?("PAYMENT_ERROR", errMsg, nil)
             }
+
+            // Cleanup & dismiss
             self.clearResolvers()
-            controller.dismiss(animated: true)
+            controller.dismiss(animated: true, completion: nil)
         }
     }
 }
-

package/ios/Models/Result.swift

@@ -1,39 +1,3 @@
-//
-//  Result.swift
-//  EasyPay
-//
-//  Created by iftekhar on 14/07/24.
-//
-
-//import UIKit
-//
-//@objc
-//public enum ResultType: Int {
-//    case cancelled
-//    case success
-//    case error
-//}
-//
-//@objc
-//public final class Result: NSObject {
-//
-//    @objc public let type: ResultType
-//
-//    @objc public let error: NSError?
-//
-//    internal init(error: NSError) {
-//        type = .error
-//        self.error = error
-//        super.init()
-//    }
-//
-//    internal init(type: ResultType) {
-//        self.type = type
-//        self.error = nil
-//        super.init()
-//    }
-//}
-
 import UIKit
 
 @objc
@@ -50,20 +14,29 @@ public final class Result: NSObject {
     @objc public let error: NSError?
     @objc public let chargeData: [String: Any]?
 
+    @objc public let billingInfo: [String: Any]?
+    @objc public let additionalInfo: [String: Any]?
+
     // Initializer for error type result
     internal init(error: NSError) {
         self.type = .error
         self.error = error
         self.chargeData = nil
+        self.billingInfo = nil
+        self.additionalInfo = nil
         super.init()
     }
 
-    // Initializer for other result types with optional charge data
-    internal init(type: ResultType, chargeData: [String: Any]? = nil) {
+    // Initializer for success/cancelled result types
+    internal init(type: ResultType,
+                  chargeData: [String: Any]? = nil,
+                  billingInfo: [String: Any]? = nil,
+                  additionalInfo: [String: Any]? = nil) {
         self.type = type
         self.error = nil
         self.chargeData = chargeData
+        self.billingInfo = billingInfo
+        self.additionalInfo = additionalInfo
         super.init()
     }
-}
-
+}

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -465,6 +465,9 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -624,6 +627,9 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -792,6 +798,9 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -954,6 +963,9 @@ class AdditionalInfoVC: BaseVC {
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -1113,6 +1125,9 @@ class AdditionalInfoVC: BaseVC {
                                         // Pass the selected payment method
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate // Pass the delegate
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -1276,6 +1291,9 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.selectedPaymentMethod = self.selectedPaymentMethod
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -1441,7 +1459,9 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }
@@ -1612,7 +1632,9 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.redirectURL = urlString
                                         paymentDoneVC.chargeData = responseObject
                                         paymentDoneVC.easyPayDelegate = self.easyPayDelegate
-                                        
+                                        // Pass billing and additional info
+                                        paymentDoneVC.billingInfo = billingInfo
+                                        paymentDoneVC.additionalInfo = additionalInfo
                                         self.navigationController?.pushViewController(paymentDoneVC, animated: true)
                                     }
                                 }