@jimrising/easymerchantsdk-react-native 1.2.9 → 1.3.1

package/.idea/caches/deviceStreaming.xml

@@ -69,6 +69,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2340" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="samsung" />
+          <option name="codename" value="a16x" />
+          <option name="id" value="a16x" />
+          <option name="manufacturer" value="Samsung" />
+          <option name="name" value="A16 5G" />
+          <option name="screenDensity" value="450" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2340" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="samsung" />

package/.idea/workspace.xml

@@ -6,6 +6,8 @@
   <component name="ChangeListManager">
     <list default="true" id="3e2fa6c1-ea79-4c71-afdb-28176876a8c4" name="Changes" comment="">
       <change afterPath="$PROJECT_DIR$/ios/EnvironmentConfig.swift" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ios/Helper/GrailPayHelper.swift" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/ios/Pods/ViewControllers/GrailPayVC.swift" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/caches/deviceStreaming.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/deviceStreaming.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.npmrc" beforeDir="false" afterPath="$PROJECT_DIR$/.npmrc" afterDir="false" />
@@ -149,25 +151,27 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;dart.analysis.tool.window.visible&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;dev-branch&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/appdev/Documents/em-MobileCheckoutSDK-ReactNative/ios/Example&quot;,
-    &quot;show.migrate.to.gradle.popup&quot;: &quot;false&quot;,
-    &quot;structure.view.defaults.are.configured&quot;: &quot;true&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "dart.analysis.tool.window.visible": "false",
+    "git-widget-placeholder": "dev-branch",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/Users/appdev/Documents/em-MobileCheckoutSDK-ReactNative/ios/Pods/ViewControllers",
+    "show.migrate.to.gradle.popup": "false",
+    "structure.view.defaults.are.configured": "true"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
-      <recent name="$PROJECT_DIR$/ios/Example" />
+      <recent name="$PROJECT_DIR$/ios/Pods/ViewControllers" />
       <recent name="$PROJECT_DIR$/ios" />
+      <recent name="$PROJECT_DIR$/ios/ThirdParty" />
+      <recent name="$PROJECT_DIR$/ios/Example" />
     </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/ios" />

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.2.9"
+  "@jimrising/easymerchantsdk-react-native": "^1.3.1"
 },
 ```
 
@@ -136,9 +136,9 @@ const App = () => {
         if (Platform.OS === 'ios') {
           await EasyMerchantSdk.setViewController();
           EasyMerchantSdk.configureEnvironment(
-            'sandbox', // sandbox , staging , production
+            'staging', // sandbox , staging , production
             'apiKey',
-            'apiSecret'
+            'secretKey'
           );
         }
 
@@ -184,54 +184,65 @@ const App = () => {
 
   const handleBilling = async () => {
     const amount = '72';
-    
     const billingInfo = {
-        address: '123 Main Street',
-        country: 'USA',
-        state: 'California',
-        city: 'San Francisco',
-        postal_code: '94107',
-        additional_info: {
-            name: 'John Doe',
-            email: 'johndoe@example.com',
-            phone_number: '1234567890',
-            country_code: '1',
-            description: 'Testing SDK Integration'
-        }
+      address: 'Test',
+      country: 'test',
+      state: 'test',
+      city: 'test',
+      postal_code: '234132',
+      additional_info: {
+        name: 'Test User',
+        email: 'test@gmail.com',
+        phone_number: '7888821587',
+        country_code: '91',
+        description: 'SDK Test'
+      }
     };
 
-
-   const theme = {
-     bodyBackgroundColor: '#F0FDF4',
-     containerBackgroundColor: '#FFFFFF',
-     primaryFontColor: '#14532D',
-     secondaryFontColor: '#4D7C0F',
-     primaryButtonBackgroundColor: '#22C55E',
-     primaryButtonHoverColor: '#16A34A',
-     primaryButtonFontColor: '#FFFFFF',
-     secondaryButtonBackgroundColor: '#DCFCE7',
-     secondaryButtonHoverColor: '#BBF7D0',
-     secondaryButtonFontColor: '#166534',
-     borderRadius: '12',
-     fontSize: '16'
+   const themeConfiguration = {
+     bodyBackgroundColor: '#FFEEEE', 
+     containerBackgroundColor: '#FFCCCC', 
+     primaryFontColor: '#B30000', 
+     secondaryFontColor: '#660000',
+     primaryButtonBackgroundColor: '#D50000', 
+     primaryButtonHoverColor: '#9C0000', 
+     primaryButtonFontColor: '#FFFFFF', 
+     secondaryButtonBackgroundColor: '#FF6666', 
+     secondaryButtonHoverColor: '#FF4D4D',
+     secondaryButtonFontColor: '#FFFFFF', 
+     borderRadius: '12', 
+     fontSize: '16' 
    };
 
 
 
+
     try {
       if (Platform.OS === 'android') {
         const result = await RNEasymerchantsdk.billing(amount, null);
         setResponse(`✅ Android Payment Success: ${result}`);
       } else {
-        await EasyMerchantSdk.billing(
-          amount,
-          JSON.stringify(billingInfo),
-          ['Card', 'Bank', 'Crypto'],
-          theme,
-          false,
-          false,
-          false
-        );
+       await EasyMerchantSdk.billing(
+         amount,
+         JSON.stringify(billingInfo),
+         ['card', 'bank', 'crypto'],
+         themeConfiguration,
+         false, // tokenOnly
+         false, // saveCard
+         false, // saveAccount
+         true,  // authenticatedACH
+         {
+           accessToken: "251|uTijpDGfrS88UR2V1cZNMQ8S4hUJA0sVzsnsoUZF",
+           vendorId: "251",
+           role: "business",
+           timeout: 10,
+           isSandbox: true,
+           brandingName: "Lyfecycle Payments",
+           finderSubtitle: "Search for your bank",
+           searchPlaceholder: "Enter bank name"
+         }
+       );
+
         setResponse('🔁 Billing started on iOS. Awaiting response...');
       }
     } catch (error) {
@@ -283,6 +294,7 @@ const styles = StyleSheet.create({
   }
 });
 
+
 ```
 
 You can send `null` if billing info not available.

package/ios/Classes/EasyMerchantSdk.m

@@ -25,6 +25,8 @@ RCT_EXPORT_METHOD(
         tokenOnly:(BOOL)tokenOnly
         saveCard:(BOOL)saveCard
         saveAccount:(BOOL)saveAccount
+        authenticatedACH:(BOOL)authenticatedACH
+        grailPayParams:(NSDictionary *)grailPayParams
         resolver:(RCTPromiseResolveBlock)resolve
         rejecter:(RCTPromiseRejectBlock)reject
 )
@@ -38,10 +40,13 @@ RCT_EXPORT_METHOD(
              tokenOnly:tokenOnly
               saveCard:saveCard
            saveAccount:saveAccount
+      authenticatedACH:authenticatedACH
+        grailPayParams:grailPayParams
               resolver:resolve
               rejecter:reject];
 }
 
+
 RCT_EXPORT_METHOD(setViewController:(RCTPromiseResolveBlock)resolve
         rejecter:(RCTPromiseRejectBlock)reject)
 {
@@ -60,66 +65,3 @@ RCT_EXPORT_METHOD(getPlatformVersion:(RCTPromiseResolveBlock)resolve
 
 @end
 
-//
-//#import "EasyMerchantSdk.h"
-//#import <React/RCTLog.h>
-//#import <React/RCTBridgeModule.h>
-////#import <easymerchantsdk/easymerchantsdk-Swift.h>
-//#import <easymerchantsdk-Swift.h>
-//
-//
-//@implementation EasyMerchantSdk
-//
-//RCT_EXPORT_MODULE()
-//
-//RCT_EXPORT_METHOD(
-//        billing:(NSString *)amount
-//        billingInfo:(NSString *)billingInfo
-//        paymentMethods:(NSArray *)paymentMethods
-//        themeConfiguration:(NSDictionary *)themeConfiguration
-//        tokenOnly:(BOOL)tokenOnly
-//        saveCard:(BOOL)saveCard
-//        saveAccount:(BOOL)saveAccount
-//        resolver:(RCTPromiseResolveBlock)resolve
-//        rejecter:(RCTPromiseRejectBlock)reject
-//)
-//{
-//    EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
-//
-//    [sdkPlugin billing:amount
-//           billinginfo:billingInfo
-//        paymentMethods:paymentMethods
-//    themeConfiguration:themeConfiguration
-//             tokenOnly:tokenOnly
-//              saveCard:saveCard
-//           saveAccount:saveAccount
-//              resolver:resolve
-//              rejecter:reject];
-//}
-//
-//RCT_EXPORT_METHOD(setViewController:(RCTPromiseResolveBlock)resolve
-//        rejecter:(RCTPromiseRejectBlock)reject)
-//{
-//    UIViewController *rootViewController = [UIApplication sharedApplication].delegate.window.rootViewController;
-//    EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
-//    [sdkPlugin setViewController:rootViewController];
-//    resolve(@"ViewController set successfully");
-//}
-//
-//RCT_EXPORT_METHOD(getPlatformVersion:(RCTPromiseResolveBlock)resolve
-//        rejecter:(RCTPromiseRejectBlock)reject)
-//{
-//    NSString *platformVersion = [NSString stringWithFormat:@"iOS %@", [[UIDevice currentDevice] systemVersion]];
-//    resolve(platformVersion);
-//}
-//
-//RCT_EXPORT_METHOD(configureEnvironment:(NSString *)env
-//        apiKey:(NSString *)apiKey
-//        apiSecret:(NSString *)apiSecret)
-//{
-//    EasyMerchantSdkPlugin *sdkPlugin = [[EasyMerchantSdkPlugin alloc] init];
-//    [sdkPlugin configureEnvironment:env apiKey:apiKey apiSecret:apiSecret];
-//}
-//
-//
-//@end

package/ios/Classes/EasyMerchantSdk.swift

@@ -1,130 +1,3 @@
-//
-//import Foundation
-//import UIKit
-//import React
-//
-//@objc(EasyMerchantSdkPlugin)
-//public class EasyMerchantSdkPlugin: NSObject {
-//
-//    private var viewController: UIViewController?
-//    private let viewControllerQueue = DispatchQueue(label: "com.easymerchantsdk.viewController")
-//
-//    @objc public func setViewController(_ viewController: UIViewController) {
-//        viewControllerQueue.sync {
-//            self.viewController = viewController
-//        }
-//        print("ViewController set: \(String(describing: self.viewController))")
-//    }
-//
-//
-//@objc public func billing(
-//    _ amount: String,
-//    billinginfo: String,
-//    paymentMethods: [String],
-//    themeConfiguration: [String: Any],
-//    tokenOnly: Bool,
-//    saveCard: Bool,
-//    saveAccount: Bool,
-//    resolver: @escaping RCTPromiseResolveBlock,
-//    rejecter: @escaping RCTPromiseRejectBlock
-//) {
-//    guard let amountValue = Double(amount), amountValue > 0 else {
-//        rejecter("INVALID_AMOUNT", "Amount must be a positive number", nil)
-//        return
-//    }
-//
-//    guard !billinginfo.isEmpty,
-//          let billingInfoData = billinginfo.data(using: .utf8),
-//          let _ = try? JSONSerialization.jsonObject(with: billingInfoData, options: []) as? [String: Any] else {
-//        rejecter("INVALID_BILLING_INFO", "Billing info must be valid JSON", nil)
-//        return
-//    }
-//
-//    let methods: [PaymentMethod] = paymentMethods.compactMap {
-//        switch $0.lowercased() {
-//            case "card": return .Card
-//            case "bank": return .Bank
-//            case "crypto": return .Crypto
-//            default: return nil
-//        }
-//    }
-//
-//    let request = Request(
-//        amount: amountValue,
-//        billingInfoData: billingInfoData,
-//        paymentMethods: methods,
-//        themeConfiguration: themeConfiguration,
-//        tokenOnly: tokenOnly,
-//        saveCard: saveCard,
-//        saveAccount: saveAccount
-//    )
-//
-//    let paymentController = EasyPayViewController(request: request, delegate: self)
-//
-//    DispatchQueue.main.async {
-//        if let rootViewController = UIApplication.shared.windows.first(where: { $0.isKeyWindow })?.rootViewController {
-//            rootViewController.present(paymentController, animated: true) {
-//                resolver("Payment process started for amount \(amount)")
-//            }
-//        } else {
-//            rejecter("VIEW_CONTROLLER_NOT_FOUND", "Root ViewController not found", nil)
-//        }
-//    }
-//}
-//
-//    @objc public func getPlatformVersion(
-//        _ resolver: @escaping RCTPromiseResolveBlock,
-//        rejecter: @escaping RCTPromiseRejectBlock
-//    ) {
-//        resolver("iOS \(UIDevice.current.systemVersion)")
-//    }
-//}
-//
-//
-//
-//
-//
-//
-//
-//@objc(EasyMerchantSdkPlugin)
-//extension EasyMerchantSdkPlugin: RCTBridgeModule {
-//    public static func moduleName() -> String {
-//        return "EasyMerchantSdk"
-//    }
-//
-//    public static func requiresMainQueueSetup() -> Bool {
-//        return true
-//    }
-//}
-//
-//extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
-//    public func easyPayController(_ controller: EasyPayViewController, didFinishWith result: Result) {
-//        DispatchQueue.main.async {
-//            switch result.type {
-//            case .cancelled:
-//                print("Payment Cancelled by user.")
-//            case .success:
-//                if let chargeData = result.chargeData {
-//                    self.handleSuccess(with: chargeData)
-//                } else {
-//                    print("Payment succeeded but no charge data received.")
-//                }
-//            case .error:
-//                if let chargeData = result.chargeData,
-//                   let errorMessage = chargeData["errorMessage"] as? String {
-//                    print("Payment Error: \(errorMessage)")
-//                } else {
-//                    print("Unknown Payment Error.")
-//                }
-//            }
-//        }
-//    }
-//
-//    private func handleSuccess(with chargeData: [String: Any]) {
-//        print("Payment Successful. Charge Data: \(chargeData)")
-//    }
-//}
-
 import Foundation
 import UIKit
 import React
@@ -139,20 +12,20 @@ public class EasyMerchantSdkPlugin: NSObject {
         viewControllerQueue.sync {
             self.viewController = viewController
         }
-                print("ViewController set: \(String(describing: self.viewController))")
-
+        print("ViewController set: \(String(describing: self.viewController))")
     }
 
 
-
     @objc public func billing(
         _ amount: String,
         billinginfo: String,
         paymentMethods: [String],
-        themeConfiguration: [String: Any],
+        themeConfiguration: [String: Any],  // Accept dynamic theme from JS
         tokenOnly: Bool,
         saveCard: Bool,
         saveAccount: Bool,
+        authenticatedACH: Bool,
+        grailPayParams: [String: Any]?,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock
     ) {
@@ -176,14 +49,60 @@ public class EasyMerchantSdkPlugin: NSObject {
             }
         }
 
+        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"
+            )
+        }
+
+        // Extract themeConfiguration values from JS
+        let bodyBackgroundColor = themeConfiguration["bodyBackgroundColor"] as? String ?? "#EBF8FF"
+        let containerBackgroundColor = themeConfiguration["containerBackgroundColor"] as? String ?? "#FFFFFF"
+        let primaryFontColor = themeConfiguration["primaryFontColor"] as? String ?? "#1E3A8A"
+        let secondaryFontColor = themeConfiguration["secondaryFontColor"] as? String ?? "#696969"
+        let primaryButtonBackgroundColor = themeConfiguration["primaryButtonBackgroundColor"] as? String ?? "#1D4ED8"
+        let primaryButtonHoverColor = themeConfiguration["primaryButtonHoverColor"] as? String ?? "#2563EB"
+        let primaryButtonFontColor = themeConfiguration["primaryButtonFontColor"] as? String ?? "#FFFFFF"
+        let secondaryButtonBackgroundColor = themeConfiguration["secondaryButtonBackgroundColor"] as? String ?? "#FFFFFF"
+        let secondaryButtonHoverColor = themeConfiguration["secondaryButtonHoverColor"] as? String ?? "#BFDBFE"
+        let secondaryButtonFontColor = themeConfiguration["secondaryButtonFontColor"] as? String ?? "#1E40AF"
+        let borderRadius = themeConfiguration["borderRadius"] as? String ?? "8"
+        let fontSize = themeConfiguration["fontSize"] as? String ?? "14"
+
+        let themeConfig = ThemeConfiguration(
+            bodyBackgroundColor: bodyBackgroundColor,
+            containerBackgroundColor: containerBackgroundColor,
+            primaryFontColor: primaryFontColor,
+            secondaryFontColor: secondaryFontColor,
+            primaryButtonBackgroundColor: primaryButtonBackgroundColor,
+            primaryButtonHoverColor: primaryButtonHoverColor,
+            primaryButtonFontColor: primaryButtonFontColor,
+            secondaryButtonBackgroundColor: secondaryButtonBackgroundColor,
+            secondaryButtonHoverColor: secondaryButtonHoverColor,
+            secondaryButtonFontColor: secondaryButtonFontColor,
+            borderRadius: borderRadius,
+            fontSize: fontSize
+        )
+
         let request = Request(
             amount: amountValue,
             billingInfoData: billingInfoData,
             paymentMethods: methods,
-            themeConfiguration: themeConfiguration,
+            themeConfiguration: themeConfig,
             tokenOnly: tokenOnly,
             saveCard: saveCard,
-            saveAccount: saveAccount
+            saveAccount: saveAccount,
+            submitButtonText: "Submit",
+            authenticatedACH: authenticatedACH,
+            grailPayParams: authenticatedACH ? grailParams : nil
         )
 
         DispatchQueue.main.async {
@@ -203,25 +122,25 @@ public class EasyMerchantSdkPlugin: NSObject {
     }
 
 
-     @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)
-            }
-
-            EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
+    @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)
         }
 
-     @objc public func getPlatformVersion(
-                _ resolver: @escaping RCTPromiseResolveBlock,
-                rejecter: @escaping RCTPromiseRejectBlock
-            ) {
-                resolver("iOS \(UIDevice.current.systemVersion)")
-            }
+        EnvironmentConfig.configure(apiKey: apiKey, apiSecret: apiSecret)
+    }
+
+    @objc public func getPlatformVersion(
+        _ resolver: @escaping RCTPromiseResolveBlock,
+        rejecter: @escaping RCTPromiseRejectBlock
+    ) {
+        resolver("iOS \(UIDevice.current.systemVersion)")
+    }
 }
 
 // MARK: - React Native Bridge
@@ -259,3 +178,4 @@ extension EasyMerchantSdkPlugin: EasyPayViewControllerDelegate {
         NotificationCenter.default.post(name: NSNotification.Name(name), object: nil, userInfo: body)
     }
 }
+

package/ios/Classes/EasyPayViewController.swift

@@ -47,6 +47,10 @@ public final class EasyPayViewController: UINavigationController {
         self.easyPayDelegate = delegate
         super.init(nibName: nil, bundle: nil)
         
+        if let themeConfiguration = request.themeConfiguration {
+                    UserStoreSingleton.shared.updateThemeConfiguration(with: themeConfiguration)
+                }
+        
         self.modalPresentationStyle = .fullScreen
         self.isModalInPresentation = true
     }

package/ios/EnvironmentConfig.swift

@@ -49,6 +49,7 @@ public class EnvironmentConfig {
         case account
         case achCharge
         case charges
+        case accountConnect
         
         func path() -> String {
             switch self {
@@ -61,6 +62,9 @@ public class EnvironmentConfig {
             case .account: return "/api/v1/ach/account"
             case .achCharge: return "/api/v1/ach/charge"
             case .charges: return "/api/v1/charges"
+            case .accountConnect: return "/api/v1/ach/account/connect"
+             
+                
             }
         }
     }