@jimrising/easymerchantsdk-react-native 1.8.1 → 1.8.4

package/.idea/caches/deviceStreaming.xml

@@ -135,6 +135,17 @@
           <option name="screenX" value="1080" />
           <option name="screenY" value="2400" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="35" />
+          <option name="brand" value="google" />
+          <option name="codename" value="akita" />
+          <option name="id" value="akita" />
+          <option name="manufacturer" value="Google" />
+          <option name="name" value="Pixel 8a" />
+          <option name="screenDensity" value="420" />
+          <option name="screenX" value="1080" />
+          <option name="screenY" value="2400" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="34" />
           <option name="brand" value="motorola" />
@@ -509,6 +520,17 @@
           <option name="screenX" value="1008" />
           <option name="screenY" value="2244" />
         </PersistentDeviceSelectionData>
+        <PersistentDeviceSelectionData>
+          <option name="api" value="34" />
+          <option name="brand" value="motorola" />
+          <option name="codename" value="lion" />
+          <option name="id" value="lion" />
+          <option name="manufacturer" value="Motorola" />
+          <option name="name" value="moto g04" />
+          <option name="screenDensity" value="280" />
+          <option name="screenX" value="720" />
+          <option name="screenY" value="1612" />
+        </PersistentDeviceSelectionData>
         <PersistentDeviceSelectionData>
           <option name="api" value="33" />
           <option name="brand" value="google" />

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.8.1"
+  "@jimrising/easymerchantsdk-react-native": "^1.8.4"
 },
 ```
 
@@ -137,29 +137,47 @@ const App = () => {
   const [email, setEmail] = useState('');
   const [environment, setEnvironment] = useState('sandbox');
   const [isRecurring, setIsRecurring] = useState(false);
-  const [emailEditable, setEmailEditable] = useState(true); // Android only
-  const [isEmail, setIsEmail] = useState(true); // iOS only
+  const [isAuthenticatedACH, setAuthenticatedACH] = useState(false);
+  const [isSecureAuthentication, setSecureAuthentication] = useState(false);
+  const [isBillingVisible, setBillingVisible] = useState(false);
+  const [isAdditionalVisible, setAdditionalVisible] = useState(false);
+  const [emailEditable, setEmailEditable] = useState(true);
+  const [isEmail, setIsEmail] = useState(true);
   const [result, setResult] = useState('');
   const [referenceToken, setReferenceToken] = useState('');
   const [loading, setLoading] = useState(false);
+  const [apiKey, setApiKey] = useState('');
+  const [apiSecret, setApiSecret] = useState('');
 
-  useEffect(() => {
-    const setupIOS = async () => {
-      if (Platform.OS === 'ios') {
-        try {
-          await EasyMerchantSdk.setViewController();
-          await EasyMerchantSdk.configureEnvironment(
-            environment,
-            'apiKey',
-            'secretKey'
-          );
-        } catch (err) {
-          console.error('iOS Initialization Error:', err);
-        }
+useEffect(() => {
+  const key = environment === 'staging'
+    ? 'stagingApiKey'
+    : 'sandboxApiKey';
+
+  const secret = environment === 'staging'
+    ? 'stagingApiSecretKey'
+    : 'sandboxApiSecretKey';
+
+  setApiKey(key);
+  setApiSecret(secret);
+
+  const setupIOS = async () => {
+    if (Platform.OS === 'ios') {
+      try {
+        await EasyMerchantSdk.setViewController();
+        await EasyMerchantSdk.configureEnvironment(
+          environment,
+          key,
+          secret
+        );
+      } catch (err) {
+        console.error('iOS Initialization Error:', err);
       }
-    };
-    setupIOS();
-  }, [environment]);
+    }
+  };
+  setupIOS();
+}, [environment]);
+
 
   const handlePayment = async () => {
     if (!amount || isNaN(parseFloat(amount)) || parseFloat(amount) <= 0) {
@@ -174,8 +192,8 @@ const App = () => {
     if (Platform.OS === 'android') {
       const config = {
         amount,
-        apiKey: 'apiKey',
-        secretKey: 'secretKey',
+        apiKey: apiKey,
+        secretKey: apiSecret,
         jsonConfig: {
           environment,
           amount,
@@ -183,8 +201,8 @@ const App = () => {
           currency: 'usd',
           saveCard: true,
           saveAccount: true,
-          authenticatedACH: true,
-          secureAuthentication: false,
+          authenticatedACH: isAuthenticatedACH,
+          secureAuthentication: isSecureAuthentication,
           showReceipt: true,
           showDonate: false,
           showTotal: true,
@@ -194,18 +212,18 @@ const App = () => {
           email,
           name: 'Pavan',
           fields: {
-            visibility: { billing: true, additional: false },
+            visibility: { billing: isBillingVisible, additional: isAdditionalVisible },
             billing: [
               { name: 'address', required: true, value: 'New Address' },
-              { name: 'country', required: true, value: 'USA' },
+              { name: 'country', required: true, value: 'India' },
               { name: 'state', required: true, value: 'California' },
-              { name: 'city', required: true, value: 'California' },
+              { name: 'city', required: true, value: 'Goa' },
               { name: 'postal_code', required: true, value: '1432456' },
             ],
             additional: [
               { name: 'name', required: true, value: 'Test User 7' },
               { name: 'email_address', required: true, value: 'usertest@gmail.com' },
-              { name: 'phone_number', required: false, value: '8978967895' },
+              { name: 'phone_number', required: true, value: '8978967895' },
               { name: 'description', required: true, value: 'Hi This is description' },
             ],
           },
@@ -252,6 +270,7 @@ const App = () => {
        const response = await RNEasymerchantsdk.makePayment(config);
        console.log('Full payment response:', response);
        setResult(JSON.stringify(response, null, 2));
+
       } catch (error) {
         setResult(`Error: ${error.message}`);
         Alert.alert('Payment Error', error.message);
@@ -265,9 +284,9 @@ const App = () => {
 
   const handleBilling = async () => {
     const billingInfo = {
-      visibility: { billing: false, additional: false },
+      visibility: { billing: isBillingVisible, additional: isAdditionalVisible },
       billing: {
-        address: 'San Fran',
+        address: 'San Fransisco',
         country: 'USA',
         state: 'California',
         city: 'Paris',
@@ -294,22 +313,23 @@ const App = () => {
       },
     };
 
-    const themeConfiguration = {
-      bodyBackgroundColor: "#121212",
-      containerBackgroundColor: "#1E1E1E",
-      primaryFontColor: "#FFFFFF",
-      secondaryFontColor: "#B0B0B0",
-      primaryButtonBackgroundColor: "#2563EB",
-      primaryButtonHoverColor: "#1D4ED8",
-      primaryButtonFontColor: "#FFFFFF",
-      secondaryButtonBackgroundColor: "#374151",
-      secondaryButtonHoverColor: "#4B5563",
-      secondaryButtonFontColor: "#E5E7EB",
-      borderRadius: "8",
-      fontSize: "14",
-      fontWeight: 500,
-      fontFamily: "\"Inter\", sans-serif"
-    };
+ const themeConfiguration = {
+   bodyBackgroundColor: "#0f1715",
+   containerBackgroundColor: "#152321",
+   primaryFontColor: "#FFFFFF",
+   secondaryFontColor: "#A0B5A4",
+   primaryButtonBackgroundColor: "#10B981",
+   primaryButtonHoverColor: "#059669",
+   primaryButtonFontColor: "#FFFFFF",
+   secondaryButtonBackgroundColor: "#374151",
+   secondaryButtonHoverColor: "#4B5563",
+   secondaryButtonFontColor: "#E5E7EB",
+   borderRadius: "8",
+   fontSize: "14",
+   fontWeight: 500,
+   fontFamily: "\"Inter\", sans-serif"
+ };
+
 
     const authConfig = {
       role: 'business',
@@ -330,7 +350,7 @@ const App = () => {
         false,  // tokenOnly
         true,  // saveCard
         true,  // saveAccount
-        true,  // authenticatedACH
+        isAuthenticatedACH,  // authenticatedACH
         authConfig,   // grailPayParams
         'Submit',
         isRecurring,   // isRecurring
@@ -338,7 +358,7 @@ const App = () => {
         isRecurring ? ['weekly', 'monthly'] : [],    //  if isRecurring == true then it is required
         isRecurring ? 'custom' : '',  //  if isRecurring == true then it is required
         isRecurring ? '07/08/2025' : '',   //  if isRecurring == true then it is required
-        true,  // secureAuthentication
+        isSecureAuthentication,  // secureAuthentication
         true,   // showReceipt
         true,  // showTotal
         true,  // showSubmitButton
@@ -356,6 +376,20 @@ const App = () => {
     }
   };
 
+   const handleCheckStatus = async () => {
+      setLoading(true);
+      try {
+        const response = await RNEasymerchantsdk.checkPaymentStatus();
+        console.log('Full payment response:', response);
+              setResult(JSON.stringify(response, null, 2));
+      } catch (error) {
+        setResult(`Error: ${error.message}`);
+        Alert.alert('Status Check Error', error.message);
+      } finally {
+        setLoading(false);
+      }
+    };
+
   const handlePaymentReference = async () => {
     if (Platform.OS === 'android') {
       setResult('❌ Payment Reference not supported on Android');
@@ -378,6 +412,8 @@ const App = () => {
       <ScrollView contentContainerStyle={styles.scrollContent}>
         <Text style={styles.title}>EasyMerchant SDK</Text>
 
+          <Text style={styles.label}>amount</Text>
+
         <TextInput
           style={styles.input}
           placeholder="Enter amount (e.g., 10.00)"
@@ -386,6 +422,8 @@ const App = () => {
           onChangeText={setAmount}
         />
 
+          <Text style={styles.label}>Email</Text>
+
         <TextInput
           style={styles.input}
           placeholder="Enter email"
@@ -410,6 +448,38 @@ const App = () => {
           </View>
         </View>
 
+
+         <View style={styles.pickerContainer}>
+                  <Text style={styles.label}>Billing Visible:</Text>
+                  <View style={styles.buttonGroup}>
+                    <Button
+                      title="Yes"
+                      onPress={() => setBillingVisible(true)}
+                      color={isBillingVisible ? '#2563EB' : '#ccc'}
+                    />
+                    <Button
+                      title="No"
+                      onPress={() => setBillingVisible(false)}
+                      color={!isBillingVisible ? '#2563EB' : '#ccc'}
+                    />
+                  </View>
+                </View>
+
+                   <View style={styles.pickerContainer}>
+                                  <Text style={styles.label}>Additional Info Visible:</Text>
+                                  <View style={styles.buttonGroup}>
+                                    <Button
+                                      title="Yes"
+                                      onPress={() => setAdditionalVisible(true)}
+                                      color={isAdditionalVisible ? '#2563EB' : '#ccc'}
+                                    />
+                                    <Button
+                                      title="No"
+                                      onPress={() => setAdditionalVisible(false)}
+                                      color={!isAdditionalVisible ? '#2563EB' : '#ccc'}
+                                    />
+                                  </View>
+                                </View>
         <View style={styles.pickerContainer}>
           <Text style={styles.label}>Recurring Payment:</Text>
           <View style={styles.buttonGroup}>
@@ -426,6 +496,38 @@ const App = () => {
           </View>
         </View>
 
+        <View style={styles.pickerContainer}>
+          <Text style={styles.label}>AuthenticatedACH:</Text>
+          <View style={styles.buttonGroup}>
+            <Button
+              title="Yes"
+              onPress={() => setAuthenticatedACH(true)}
+              color={isAuthenticatedACH ? '#2563EB' : '#ccc'}
+            />
+            <Button
+              title="No"
+              onPress={() => setAuthenticatedACH(false)}
+              color={!isAuthenticatedACH ? '#2563EB' : '#ccc'}
+            />
+          </View>
+        </View>
+
+        <View style={styles.pickerContainer}>
+          <Text style={styles.label}>SecureAuthentication:</Text>
+          <View style={styles.buttonGroup}>
+            <Button
+              title="Yes"
+              onPress={() => setSecureAuthentication(true)}
+              color={isSecureAuthentication ? '#2563EB' : '#ccc'}
+            />
+            <Button
+              title="No"
+              onPress={() => setSecureAuthentication(false)}
+              color={!isSecureAuthentication ? '#2563EB' : '#ccc'}
+            />
+          </View>
+        </View>
+
         {Platform.OS === 'android' ? (
           <View style={styles.pickerContainer}>
             <Text style={styles.label}>Email Editable (Android):</Text>
@@ -460,10 +562,17 @@ const App = () => {
           </View>
         )}
 
-        <View style={styles.buttonGroup}>
-          <Button title="Pay" onPress={handlePayment} />
-          <Button title="Payment Ref" onPress={handlePaymentReference} />
-        </View>
+
+    <View style={styles.buttonGroup}>
+      <Button title="Pay" onPress={handlePayment} />
+        {Platform.OS === 'ios' ? (
+               <Button title="Payment Ref" onPress={handlePaymentReference} />
+             ) : (
+               <Button title="Check Status" onPress={handleCheckStatus} disabled={loading} />
+             )}
+    </View>
+
+
 
         <Text selectable style={styles.result}>{result}</Text>
       </ScrollView>

package/android/build.gradle

@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.3.6'
+    implementation 'com.app:paysdk:1.3.7'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation 'com.github.bumptech.glide:glide:4.16.0'
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1"

package/ios/Classes/EasyMerchantSdk.m

@@ -11,7 +11,6 @@
 
 @implementation EasyMerchantSdk
 
-
 RCT_EXPORT_MODULE()
 
 RCT_EXPORT_METHOD(configureEnvironment:(NSString *)env

package/ios/Classes/EasyPayViewController.swift

@@ -7,13 +7,11 @@
 
 import UIKit
 
-// @available(iOS 16.0, *)
 @objc
 public protocol EasyPayViewControllerDelegate {
     func easyPayController(_ controller: EasyPayViewController, didFinishWith result: SDKResult)
 }
 
-// @available(iOS 16.0, *)
 @objc
 public final class EasyPayViewController: UINavigationController {
     
@@ -48,8 +46,8 @@ public final class EasyPayViewController: UINavigationController {
         super.init(nibName: nil, bundle: nil)
         
         if let themeConfiguration = request.themeConfiguration {
-                    UserStoreSingleton.shared.updateThemeConfiguration(with: themeConfiguration)
-                }
+            UserStoreSingleton.shared.updateThemeConfiguration(with: themeConfiguration)
+        }
         
         self.modalPresentationStyle = .fullScreen
         self.isModalInPresentation = true
@@ -63,30 +61,19 @@ 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 = Int(request.amount ?? 0.0) // Set the amount here
+        vc.amount = Int(request.amount ?? 0) // Set the amount here.
+        vc.selectedPaymentMethod = "Card"
+        
+        vc.logOut()
         self.navigationBar.isHidden = true
         self.setViewControllers([vc], animated: false)
     }
-    
-}
-
-// @available(iOS 16.0, *)
-private extension EasyPayViewController {
-    func setupDetents() {
-        if let sheetController = self.sheetPresentationController {
-            sheetController.prefersGrabberVisible = false
-            var detents: [UISheetPresentationController.Detent] = []
-            detents.append(.large())
-            sheetController.detents = detents
-        }
-    }
+                            
 }
 
 private extension EasyPayViewController {
-    
     private static func runFirstTimeSetup() {
         UIFont.registerEasyPayFonts()
         Self.isFirstTimeSetupComleted = true
     }
-    
 }

package/ios/Models/Request.swift

@@ -171,7 +171,7 @@ public final class Request: NSObject {
     public let isEmail: Bool?
     public let email: String?
     public let name: String?
-    
+        
     public init(
         amount: Double? = nil,
         currency: String? = nil,
@@ -284,6 +284,13 @@ public final class Request: NSObject {
         
         super.init()
         
+//        /// ✅ Clear old user data first
+//        DispatchQueue.main.async {
+//            if let topVC = UIApplication.topViewController() as? PaymentInfoVC {
+//                topVC.logOut()
+//            }
+//        }
+        
         // If tokenOnly is true, fetch only the clientToken and do not open the SDK
         if tokenOnly {
             self.paymentIntentApi { success in
@@ -315,93 +322,237 @@ public final class Request: NSObject {
     }
     
     //MARK: - Payment Intent Api
+//    func paymentIntentApi(completion: @escaping (Bool) -> Void) {
+//        guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
+//            showErrorAndDismiss(message: "Invalid payment URL.")
+//            completion(false)
+//            return
+//        }
+//        
+//        var request = URLRequest(url: serviceURL)
+//        request.httpMethod = "POST"
+//        request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+//        request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
+//        request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
+//        
+//        // Recurring date validation
+//        if let startDateString = recurringStartDate,
+//           let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
+//            let today = Calendar.current.startOfDay(for: Date())
+//            let startDay = Calendar.current.startOfDay(for: startDate)
+//            
+//            if startDay < today {
+//                showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
+//                completion(false)
+//                return
+//            }
+//        }
+//        
+//        let params: [String: Any] = [
+//            "amount": amount ?? 0,
+//            // "allowed_cycles": String(recurringIntervals?.count ?? 0),
+//            "allowed_cycles": numOfCycle ?? 0,
+//            "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
+//            "is_recurring": self.is_recurring ?? false,
+//            "recurring_start_date": recurringStartDate ?? "",
+//            "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
+//        ]
+//        
+//        do {
+//            request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
+//        } catch {
+//            showErrorAndDismiss(message: "Failed to encode payment data.")
+//            completion(false)
+//            return
+//        }
+//        
+//        let task = URLSession.shared.dataTask(with: request) { data, response, error in
+//            guard let httpResponse = response as? HTTPURLResponse, error == nil else {
+//                self.showErrorAndDismiss(message: error?.localizedDescription ?? "An unknown error occurred.")
+//                completion(false)
+//                return
+//            }
+//            
+//            if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
+//                if let data = data {
+//                    do {
+//                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
+//                            if let clientToken = responseObject["client_token"] as? String {
+//                                UserStoreSingleton.shared.clientToken = clientToken
+//                                print(clientToken)
+//                            }
+//                            if let paymentIntent = responseObject["payment_intent"] as? String {
+//                                UserStoreSingleton.shared.paymentIntent = paymentIntent
+//                            }
+//                            self.hostedCheckoutsApi { success in
+//                                completion(success)
+//                            }
+//                            return
+//                        } else {
+//                            self.showErrorAndDismiss(message: "Invalid response format.")
+//                        }
+//                    } catch {
+//                        self.showErrorAndDismiss(message: "Failed to parse response.")
+//                    }
+//                } else {
+//                    self.showErrorAndDismiss(message: "No response data received.")
+//                }
+//            } else {
+//                var message = "Payment request failed with status code: \(httpResponse.statusCode)"
+//                if let data = data,
+//                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+//                   let msg = responseObj["message"] as? String {
+//                    message = msg
+//                }
+//                self.showErrorAndDismiss(message: message)
+//            }
+//            completion(false)
+//        }
+//        
+//        task.resume()
+//    }
+    
+    // MARK: - Payment Intent Api
     func paymentIntentApi(completion: @escaping (Bool) -> Void) {
+        // ✅ Show Loader
+        DispatchQueue.main.async {
+            UIApplication.topViewController()?.ep_showLoadingIndicator()
+        }
+
         guard let serviceURL = URL(string: EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.paymentIntent.path()) else {
-            showErrorAndDismiss(message: "Invalid payment URL.")
+            DispatchQueue.main.async {
+                UIApplication.topViewController()?.ep_hideLoadingIndicator()
+                self.showErrorAndDismiss(message: "Invalid payment URL.")
+            }
             completion(false)
             return
         }
-        
+
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
         request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
         request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
-        
-        // Recurring date validation
+
+        // Validate recurring start date
         if let startDateString = recurringStartDate,
            let startDate = DateFormatter.recurringDateFormatter.date(from: startDateString) {
             let today = Calendar.current.startOfDay(for: Date())
             let startDay = Calendar.current.startOfDay(for: startDate)
-            
+
             if startDay < today {
-                showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
+                DispatchQueue.main.async {
+                    UIApplication.topViewController()?.ep_hideLoadingIndicator()
+                    self.showErrorAndDismiss(message: "The recurring start date cannot be in the past. Please select today or a future date.")
+                }
                 completion(false)
                 return
             }
         }
-        
+
         let params: [String: Any] = [
             "amount": amount ?? 0,
-            // "allowed_cycles": String(recurringIntervals?.count ?? 0),
             "allowed_cycles": numOfCycle ?? 0,
             "intervals": recurringIntervals?.map { $0.rawValue } ?? [],
             "is_recurring": self.is_recurring ?? false,
             "recurring_start_date": recurringStartDate ?? "",
             "recurring_start_date_type": recurringStartDateType?.rawValue ?? ""
         ]
-        
+
         do {
             request.httpBody = try JSONSerialization.data(withJSONObject: params, options: .prettyPrinted)
         } catch {
-            showErrorAndDismiss(message: "Failed to encode payment data.")
+            DispatchQueue.main.async {
+                UIApplication.topViewController()?.ep_hideLoadingIndicator()
+                self.showErrorAndDismiss(message: "Failed to encode payment data.")
+            }
             completion(false)
             return
         }
-        
-        let task = URLSession.shared.dataTask(with: request) { data, response, error in
-            guard let httpResponse = response as? HTTPURLResponse, error == nil else {
-                self.showErrorAndDismiss(message: error?.localizedDescription ?? "An unknown error occurred.")
+
+        URLSession.shared.dataTask(with: request) { data, response, error in
+            defer {
+                DispatchQueue.main.async {
+                    UIApplication.topViewController()?.ep_hideLoadingIndicator()
+                }
+            }
+
+            if let error = error {
+                DispatchQueue.main.async {
+                    self.showErrorAndDismiss(message: error.localizedDescription)
+                }
                 completion(false)
                 return
             }
-            
+
+            guard let httpResponse = response as? HTTPURLResponse else {
+                DispatchQueue.main.async {
+                    self.showErrorAndDismiss(message: "Invalid response.")
+                }
+                completion(false)
+                return
+            }
+
             if httpResponse.statusCode == 200 || httpResponse.statusCode == 201 {
-                if let data = data {
-                    do {
-                        if let responseObject = try JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-                            if let clientToken = responseObject["client_token"] as? String {
-                                UserStoreSingleton.shared.clientToken = clientToken
-                            }
-                            if let paymentIntent = responseObject["payment_intent"] as? String {
-                                UserStoreSingleton.shared.paymentIntent = paymentIntent
-                            }
-                            self.hostedCheckoutsApi { success in
-                                completion(success)
-                            }
-                            return
-                        } else {
+                guard let data = data else {
+                    DispatchQueue.main.async {
+                        self.showErrorAndDismiss(message: "No response data received.")
+                    }
+                    completion(false)
+                    return
+                }
+
+                do {
+                    guard let responseObject = try JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+                        DispatchQueue.main.async {
                             self.showErrorAndDismiss(message: "Invalid response format.")
                         }
-                    } catch {
+                        completion(false)
+                        return
+                    }
+
+                    // ✅ Save values into UserStoreSingleton
+                    if let clientToken = responseObject["client_token"] as? String {
+                        UserStoreSingleton.shared.clientToken = clientToken
+                        print("✅ Saved Client Token: \(clientToken)")
+                    }
+                    if let paymentIntent = responseObject["payment_intent"] as? String {
+                        UserStoreSingleton.shared.paymentIntent = paymentIntent
+                        print("✅ Saved Payment Intent: \(paymentIntent)")
+                    }
+
+                    // ✅ Proceed to next step only after saving
+                    self.hostedCheckoutsApi { success in
+                        DispatchQueue.main.async {
+                            UIApplication.topViewController()?.ep_hideLoadingIndicator()
+                        }
+                        completion(success)
+                    }
+                    return
+
+                } catch {
+                    DispatchQueue.main.async {
                         self.showErrorAndDismiss(message: "Failed to parse response.")
                     }
-                } else {
-                    self.showErrorAndDismiss(message: "No response data received.")
+                    completion(false)
+                    return
                 }
+
             } else {
                 var message = "Payment request failed with status code: \(httpResponse.statusCode)"
                 if let data = data,
-                   let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
+                   let responseObj = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
                    let msg = responseObj["message"] as? String {
                     message = msg
                 }
-                self.showErrorAndDismiss(message: message)
+                DispatchQueue.main.async {
+                    self.showErrorAndDismiss(message: message)
+                }
             }
+
             completion(false)
-        }
-        
-        task.resume()
+
+        }.resume()
     }
     
     private func showErrorAndDismiss(message: String) {
@@ -663,3 +814,35 @@ extension UIApplication {
     }
 }
 
+
+extension UIViewController {
+    
+    func ep_showLoadingIndicator() {
+        let tag = 99999 // A unique tag so we can identify and remove the loader later
+        if self.view.viewWithTag(tag) == nil {
+            let loader = UIActivityIndicatorView(style: .large)
+            loader.center = self.view.center
+            loader.tag = tag
+            loader.startAnimating()
+            loader.color = .gray
+            loader.hidesWhenStopped = true
+            loader.translatesAutoresizingMaskIntoConstraints = false
+            self.view.addSubview(loader)
+            
+            // Optional: center constraints
+            NSLayoutConstraint.activate([
+                loader.centerXAnchor.constraint(equalTo: self.view.centerXAnchor),
+                loader.centerYAnchor.constraint(equalTo: self.view.centerYAnchor)
+            ])
+        }
+    }
+    
+    func ep_hideLoadingIndicator() {
+        let tag = 99999
+        if let loader = self.view.viewWithTag(tag) as? UIActivityIndicatorView {
+            loader.stopAnimating()
+            loader.removeFromSuperview()
+        }
+    }
+}
+

package/ios/Pods/UserDefaults/UserStoreSingleton.swift

@@ -234,12 +234,6 @@ class UserStoreSingleton: NSObject {
         }
     }
     
-//    func updateThemeConfiguration(with json: [String: Any]) {
-//        json.forEach { key, value in
-//            UserDefaults.standard.set(value, forKey: key)
-//        }
-//    }
-    
     func updateThemeConfiguration(with themeConfiguration: ThemeConfiguration) {
         self.body_bg_col = themeConfiguration.bodyBackgroundColor
         self.container_bg_col = themeConfiguration.containerBackgroundColor
@@ -256,13 +250,38 @@ class UserStoreSingleton: NSObject {
     }
 
     // Method to clear user data from UserDefaults
+//    func clearUserData() {
+//        UserDefaults.standard.removeObject(forKey: "customer_id")
+//        UserDefaults.standard.removeObject(forKey: "verificationEmail")
+//        UserDefaults.standard.removeObject(forKey: "customer_token")
+//        UserDefaults.standard.removeObject(forKey: "client_token")
+//        UserDefaults.standard.synchronize() // Optional, but can help ensure the changes are applied immediately
+//    }
+    
     func clearUserData() {
-        UserDefaults.standard.removeObject(forKey: "customer_id")
-        UserDefaults.standard.removeObject(forKey: "verificationEmail")
-        UserDefaults.standard.removeObject(forKey: "customer_token")
-        UserDefaults.standard.synchronize() // Optional, but can help ensure the changes are applied immediately
+        let keysToRemove = [
+            "client_token",
+            "payment_intent",
+            "merchant_email",
+            "merchant_name",
+            "payment_account",
+            "price",
+            "isLoggedIn",
+            "customer_id",
+            "customer_token",
+            "verificationEmail",
+            "payment_methods",
+            "bank_widget_key",
+            "vendor_id",
+        ]
+
+        for key in keysToRemove {
+            UserDefaults.standard.removeObject(forKey: key)
+        }
+
+        UserDefaults.standard.synchronize()
     }
-    
+        
     @objc private func handleAppTermination() {
         print("App is terminating. Clearing user data...")
         clearUserData()
@@ -273,3 +292,13 @@ class UserStoreSingleton: NSObject {
     }
     
 }
+
+
+
+
+
+
+
+
+
+

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -324,7 +324,8 @@ class AdditionalInfoVC: BaseVC {
                 grailPayAccountChargeApi(customerId: UserStoreSingleton.shared.customerId)
             } else {
                 // Navigate to EmailVerificationVC for all other payment methods
-                if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+                // if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "EmailVerificationVC") as? EmailVerificationVC {
+                if let emailVerificationVC = self.storyboard?.instantiateViewController(withIdentifier: "OTPVerificationVC") as? OTPVerificationVC {
                     
                     emailVerificationVC.billingInfoData = billingInfoData
                     emailVerificationVC.selectedPaymentMethod = selectedPaymentMethod
@@ -337,6 +338,7 @@ class AdditionalInfoVC: BaseVC {
                     emailVerificationVC.additionalInfo = fieldSection?.additional
                     emailVerificationVC.visibility = fieldSection?.visibility
                     emailVerificationVC.amount = amount
+                    emailVerificationVC.email = userEmail
                     
                     // Payment method-specific data
                     switch selectedPaymentMethod {
@@ -1710,6 +1712,7 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.visibility = self.visibility
                                         paymentDoneVC.amount = self.amount
                                         paymentDoneVC.cardApiParams = params
+                                        
                                        // if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
                                             var billingDict: [String: Any] = [:]
@@ -1907,6 +1910,7 @@ class AdditionalInfoVC: BaseVC {
                                         paymentDoneVC.visibility = self.visibility
                                         paymentDoneVC.amount = self.amount
                                         paymentDoneVC.cardApiParams = params
+                                        
                                       //  if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
                                             var billingDict: [String: Any] = [:]

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

@@ -682,7 +682,8 @@ class BillingInfoVC: BaseVC {
                 
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                 vc.cardNumber = cardNumber
                 vc.expiryDate = expiryDate
                 vc.cvv = cvv
@@ -754,7 +755,8 @@ class BillingInfoVC: BaseVC {
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+               // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                 vc.accountName = accountName
                 vc.routingNumber = routingNumber
                 vc.accountType = accountType
@@ -764,7 +766,7 @@ class BillingInfoVC: BaseVC {
                 vc.fieldSection = updatedFieldSection
                 vc.selectedPaymentMethod = selectedPaymentMethod
                 vc.easyPayDelegate = easyPayDelegate
-                vc.request = request
+                vc.request = self.request
                 vc.chosenPlan = chosenPlan
                 vc.startDate = startDate
                 vc.billingInfo = updatedFieldSection.billing
@@ -776,6 +778,7 @@ class BillingInfoVC: BaseVC {
                 vc.grailPayAccountID = grailPayAccountID
                 vc.selectedGrailPayAccountType = selectedGrailPayAccountType
                 vc.selectedGrailPayAccountName = selectedGrailPayAccountName
+                vc.email = userEmail
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if isFrom == "SavedBank" {
@@ -815,7 +818,8 @@ class BillingInfoVC: BaseVC {
                 navigationController?.pushViewController(vc, animated: true)
             }
             else if !isAdditionalVisible && isSavedForFuture {
-                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                // let vc = easymerchantsdk.instantiateViewController(withIdentifier: "EmailVerificationVC") as! EmailVerificationVC
+                let vc = easymerchantsdk.instantiateViewController(withIdentifier: "OTPVerificationVC") as! OTPVerificationVC
                 vc.billingInfoData = updatedBillingData
                 vc.fieldSection = updatedFieldSection
                 vc.billingInfo = updatedFieldSection.billing
@@ -833,6 +837,11 @@ class BillingInfoVC: BaseVC {
                 vc.selectedGrailPayAccountType = selectedGrailPayAccountType
                 vc.selectedGrailPayAccountName = selectedGrailPayAccountName
                 vc.userEmail = userEmail
+                vc.email = userEmail
+                
+                vc.grailPayAccountID = self.grailPayAccountID
+                vc.selectedGrailPayAccountType = self.selectedGrailPayAccountType
+                vc.selectedGrailPayAccountName = self.selectedGrailPayAccountName
                 navigationController?.pushViewController(vc, animated: true)
             }
             else {

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -76,9 +76,12 @@ class OTPVerificationVC: BaseVC {
     
     var isSavedNewCard: Bool = false
     
+    var isSavedNewAccount: Bool?
+    var isFrom = String()
+    
     override func viewDidLoad() {
         super.viewDidLoad()
-        emailVerificationApi()
+        // emailVerificationApi()
         
         uiFinishingTouchElements()
         
@@ -111,6 +114,7 @@ class OTPVerificationVC: BaseVC {
     }
     
     override func viewWillAppear(_ animated: Bool) {
+        emailVerificationApi()
         startTimer()
         uiFinishingTouchElements()
     }
@@ -291,7 +295,7 @@ class OTPVerificationVC: BaseVC {
         let token = UserStoreSingleton.shared.clientToken
         print("Setting clientToken header: \(token ?? "None")")
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
-        
+
         // Add API headers
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
@@ -1813,6 +1817,7 @@ class OTPVerificationVC: BaseVC {
                                         paymentDoneVC.visibility = self.visibility
                                         paymentDoneVC.amount = self.amount
                                         paymentDoneVC.cardApiParams = params
+                                        
                                       //  if self.visibility?.billing == true {
                                             paymentDoneVC.billingInfoData = self.billingInfo
                                             var billingDict: [String: Any] = [:]

package/ios/Pods/ViewControllers/PaymentInformation/PaymentInfoVC.swift

@@ -406,7 +406,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - View Did Load
     override func viewDidLoad() {
         super.viewDidLoad()
-       // logOut()
+        // Then: safely start new API call
+        DispatchQueue.main.asyncAfter(deadline: .now() + 0.1) {
+            self.request?.paymentIntentApi { success in
+                if success {
+                    print("Payment Intent completed")
+                    // Continue flow
+                } else {
+                    print("Payment Intent failed")
+                    // Handle failure
+                }
+            }
+        }
         
         viewAppearanceOn()
         
@@ -730,9 +741,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.viewAddNewCard.isHidden = true
                 }
                 else {
-                    self.getShowCardsApi()
+                   // self.getShowCardsApi()
                     self.viewCardFields.isHidden = true
-                    self.viewSingleSavedCard.isHidden = false
+                   // self.viewSingleSavedCard.isHidden = false
                     self.viewBtnShowSavedCards.isHidden = true
                     self.viewBtnShowSavedCardHeight.constant = 0
                     self.viewBtnShowSavedCardTopCon.constant = 0
@@ -4312,7 +4323,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             print("isLoggedIn after clear: \(UserStoreSingleton.shared.isLoggedIn ?? false)")
 
             UserStoreSingleton.shared.isLoggedIn = false
-            self.settingsView.isHidden = true
+//            self.settingsView.isHidden = true
             self.btnSettings.isHidden = true
             // self.txtFieldEmail.text = ""
             self.txtFieldOTPText1.text = ""
@@ -5207,13 +5218,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     // MARK: - GET Show Cards API
     func getShowCardsApi() {
-        showLoadingIndicator()
+      //  showLoadingIndicator()
         
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.getCards.path()
         
         guard let serviceURL = URL(string: fullURL) else {
             print("❌ Invalid URL: \(fullURL)")
-            hideLoadingIndicator()
+           // hideLoadingIndicator()
             return
         }
         
@@ -5236,11 +5247,11 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let task = session.dataTask(with: uRLRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
             
-            defer {
-                DispatchQueue.main.async {
-                    self.hideLoadingIndicator()
-                }
-            }
+//            defer {
+//                DispatchQueue.main.async {
+//                    self.hideLoadingIndicator()
+//                }
+//            }
             
             if let error = error {
                 print("❌ Error in getShowCardsApi: \(error.localizedDescription)")
@@ -7201,13 +7212,13 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     //MARK: - Bank Api's
     // MARK: - GET Show Bank Accounts API
     func getShowBankAccountsApi() {
-        showLoadingIndicator()
+      //  showLoadingIndicator()
         
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.account.path()
         
         guard let serviceURL = URL(string: fullURL) else {
             print("Invalid URL")
-            hideLoadingIndicator()
+          //  hideLoadingIndicator()
             return
         }
         
@@ -7218,7 +7229,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         // Retrieve and validate customer token
         guard let token = UserStoreSingleton.shared.customerToken, !token.isEmpty else {
             print("Customer token is missing or empty")
-            hideLoadingIndicator()
+          //  hideLoadingIndicator()
             showAlert(message: "Session expired. Please log in again.")
             return
         }
@@ -7230,9 +7241,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         let task = session.dataTask(with: urlRequest) { [weak self] (data, response, error) in
             guard let self = self else { return }
             
-            DispatchQueue.main.async {
-                self.hideLoadingIndicator()
-            }
+//            DispatchQueue.main.async {
+//                self.hideLoadingIndicator()
+//            }
             
             if let error = error {
                 print("Error: \(error.localizedDescription)")

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '1.8.1'
+  s.version          = '1.8.4'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jimrising/easymerchantsdk-react-native",
-  "version": "1.8.1",
+  "version": "1.8.4",
   "description": "",
   "main": "index.js",
   "scripts": {