@jimrising/easymerchantsdk-react-native 2.0.4 → 2.0.6

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

@@ -0,0 +1,2 @@
+#Fri Aug 08 13:51:00 IST 2025
+gradle.version=8.9

package/android/.gradle/nb-cache/trust/0B5D6BE682AD6AEE9815EC13516BF075752CAE5AD5BECDCC00315C37622C2FD3

@@ -0,0 +1 @@
+D9E91BE6371785C74509B60BC851F8287ED60F90F351A013DCA85C8F42CA7665

package/android/build/.transforms/664c2535aec304a21f4de38c6fe405c3/results.bin

@@ -0,0 +1 @@
+o/classes

package/android/build/.transforms/8b9a31b6d3889f12f1bd8cedf6c6f513/results.bin

@@ -0,0 +1 @@
+o/bundleLibRuntimeToDirDebug

package/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Jul 24 11:21:35 IST 2025
+#Thu Aug 07 12:33:01 IST 2025

package/android/build/intermediates/incremental/debug/packageDebugResources/merger.xml

@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/build/generated/res/resValues/debug"/></dataSet><mergedItems/></merger>
+<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/debug/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/build/generated/res/resValues/debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="generated" generated-set="generated$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/build/generated/res/resValues/debug"/></dataSet><mergedItems/></merger>

package/android/build/outputs/logs/manifest-merger-debug-report.txt

@@ -1,17 +1,17 @@
 -- Merging decision tree log ---
 manifest
-ADDED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:1-4:12
-INJECTED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:1-4:12
+ADDED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:1-4:12
+INJECTED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:1-4:12
 	package
-		ADDED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:3:11-37
-		INJECTED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+		ADDED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:3:11-37
+		INJECTED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
 	xmlns:android
-		ADDED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:11-69
+		ADDED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml:2:11-69
 uses-sdk
-INJECTED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
-INJECTED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
-INJECTED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+INJECTED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
 	android:targetSdkVersion
-		INJECTED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
 	android:minSdkVersion
-		INJECTED from /Users/appdev/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml
+		INJECTED from /Users/mony.dhingra/Documents/SampleApp/node_modules/@jimrising/easymerchantsdk-react-native/android/src/main/AndroidManifest.xml

package/android/build.gradle

@@ -39,7 +39,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.app:paysdk:1.4.9'
+    implementation 'com.app:paysdk:1.5.0'
     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/android/src/main/java/com/reactlibrary/RNEasymerchantsdkModule.java

@@ -106,6 +106,15 @@ public class RNEasymerchantsdkModule extends ReactContextBaseJavaModule {
                         jsonConfigMap.hasKey("name") ? jsonConfigMap.getString("name") : ""
                 );
 
+                if (jsonConfigMap.hasKey("metadata")) {
+                    ReadableMap metadataMap = jsonConfigMap.getMap("metadata");
+                    JSONObject metadata = new JSONObject();
+                    for (Map.Entry<String, Object> entry : metadataMap.toHashMap().entrySet()) {
+                        metadata.put(entry.getKey(), entry.getValue());
+                    }
+                    jsonConfig.put("metadata", metadata);
+                }
+
 
                 JSONArray paymentMethods = new JSONArray();
                 ReadableArray methods = jsonConfigMap.getArray("paymentMethod");

package/ios/Classes/EasyMerchantSdk.m

@@ -52,6 +52,7 @@ RCT_EXPORT_METHOD(
     isEmail:(BOOL)isEmail
     email:(NSString *)email
     name:(NSString *)name
+        metadata:(NSDictionary *)metadata
     resolver:(RCTPromiseResolveBlock)resolve
     rejecter:(RCTPromiseRejectBlock)reject
 )
@@ -84,6 +85,7 @@ RCT_EXPORT_METHOD(
                                   email:email
                                    name:name
                               enable3DS:secureAuthentication
+                               metadata:metadata
                                resolver:^(id result) {
                                    resolve(result);
                                    self.sdkPluginInstance = nil;

package/ios/Classes/EasyMerchantSdk.swift

@@ -80,6 +80,7 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
         email: String?,
         name: String?,
         enable3DS: Bool,
+         metadata: [String: Any]?,
         resolver: @escaping RCTPromiseResolveBlock,
         rejecter: @escaping RCTPromiseRejectBlock
     ) {
@@ -230,7 +231,8 @@ public class EasyMerchantSdkPlugin: NSObject, RCTBridgeModule {
             referenceToken: nil,
             isEmail : isEmail,
             email:email,
-            name: name
+            name: name,
+            metadata: metadata
         )
 
         // Store resolvers

package/ios/Models/Request.swift

@@ -171,6 +171,8 @@ public final class Request: NSObject {
     public let isEmail: Bool?
     public let email: String?
     public let name: String?
+    
+    public var metadata: [String: Any]?
         
     public init(
         amount: Double? = nil,
@@ -197,7 +199,9 @@ public final class Request: NSObject {
         referenceToken: String? = nil,
         isEmail: Bool = false,
         email: String? = nil,
-        name: String? = nil
+        name: String? = nil,
+        
+        metadata: [String: Any]? = nil
     ) {
         // Validate if amount is provided, must be ≥ 0.50
         if let amt = amount, amt < 0.50 {
@@ -244,6 +248,8 @@ public final class Request: NSObject {
         self.email = email
         self.name = name
         
+        self.metadata = metadata
+        
         // Conditionally assign recurring fields only if is_recurring == true
         if is_recurring {
             self.is_recurring = true
@@ -284,7 +290,30 @@ public final class Request: NSObject {
         
         super.init()
         
-        // ✅ Validate recurring intervals
+        // Validate metadata limits
+        if let metadata = metadata {
+            if metadata.count > 50 {
+                Request.showErrorAndDismissForMetaData(message: "Metadata must contain no more than 50 keys.")
+                return
+            }
+            
+            for (key, value) in metadata {
+                if key.count > 40 {
+                    Request.showErrorAndDismissForMetaData(message: "Metadata key '\(key)' exceeds 40 characters.")
+                    return
+                }
+                if let stringValue = value as? String, stringValue.count > 500 {
+                    Request.showErrorAndDismissForMetaData(message: "Value for key '\(key)' exceeds 500 characters.")
+                    return
+                }
+            }
+            
+            self.metadata = metadata
+        } else {
+            self.metadata = nil
+        }
+        
+        // Validate recurring intervals
         if is_recurring == true {
             let intervals = recurringIntervals ?? []
             
@@ -453,7 +482,25 @@ public final class Request: NSObject {
         task.resume()
     }
         
-    private func showErrorAndDismiss(message: String) {
+    private static func showErrorAndDismissForMetaData(message: String) {
+        DispatchQueue.main.async {
+            if let topVC = UIApplication.topViewController() {
+                let alert = UIAlertController(title: "Payment Error",
+                                              message: message,
+                                              preferredStyle: .alert)
+                alert.addAction(UIAlertAction(title: "OK", style: .default, handler: { _ in
+                    if let easyPayVC = UIApplication.findEasyPayViewController(from: topVC) {
+                        easyPayVC.dismiss(animated: true)
+                    } else {
+                        topVC.dismiss(animated: true)
+                    }
+                }))
+                topVC.present(alert, animated: true)
+            }
+        }
+    }
+    
+   private func showErrorAndDismiss(message: String) {
         DispatchQueue.main.async {
             if let topVC = UIApplication.topViewController() {
                 let alert = UIAlertController(title: "Payment Error",

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -371,11 +371,32 @@ class AdditionalInfoVC: BaseVC {
         }
         else {
             // Direct Payment Flow
+//            if selectedPaymentMethod == "Card" {
+//                if isFrom == "SavedCards" {
+//                    paymentIntentFromShowCardApi()
+//                }
+//                if isSavedNewCard {
+//                    if isFrom == "AddNewCard" {
+//                        if request.secureAuthentication == true {
+//                            threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+//                        } else {
+//                            paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
+//                        }
+//                    }
+//                }
+//                else {
+//                    if request.secureAuthentication == true {
+//                        threeDSecurePaymentApi()
+//                    } else {
+//                        paymentIntentApi()
+//                    }
+//                }
+//            }
             if selectedPaymentMethod == "Card" {
                 if isFrom == "SavedCards" {
                     paymentIntentFromShowCardApi()
                 }
-                if isSavedNewCard {
+                else if isSavedNewCard {
                     if isFrom == "AddNewCard" {
                         if request.secureAuthentication == true {
                             threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
@@ -505,6 +526,18 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        //        // ✅ Include metadata only if it has at least 1 key-value pair
+        //        if let metadata = request?.metadata, !metadata.isEmpty {
+        //            requestBody["metadata"] = metadata
+        //        }
+                
+                // ✅ Flatten metadata into requestBody
+                if let metadata = request?.metadata, !metadata.isEmpty {
+                    for (key, value) in metadata {
+                        params[key] = value
+                    }
+                }
+        
         print(params)
         
         do {
@@ -608,6 +641,10 @@ class AdditionalInfoVC: BaseVC {
     
     //MARK: - Credit Card Charge Api from Saved cards
     func paymentIntentFromShowCardApi() {
+        
+        print(">>> paymentIntentFromShowCardApi() called")
+            Thread.callStackSymbols.forEach { print($0) }
+        
         showLoadingIndicator()
         
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.charges.path()
@@ -638,8 +675,8 @@ class AdditionalInfoVC: BaseVC {
             "customer_id" : selectedCard?.customerId ?? "",
             "card_id" : selectedCard?.cardId ?? "",
             "cvc" : cvvText ?? "",
-            "name": UserStoreSingleton.shared.merchantName ?? "",
-            "email": UserStoreSingleton.shared.verificationEmail ?? ""
+            "name": nameOnCard ?? "",
+            "email": userEmail ?? "",
         ]
         
         // Conditionally add billing info
@@ -716,6 +753,18 @@ class AdditionalInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        //        // ✅ Include metadata only if it has at least 1 key-value pair
+        //        if let metadata = request?.metadata, !metadata.isEmpty {
+        //            requestBody["metadata"] = metadata
+        //        }
+                
+                // ✅ Flatten metadata into requestBody
+                if let metadata = request?.metadata, !metadata.isEmpty {
+                    for (key, value) in metadata {
+                        params[key] = value
+                    }
+                }
+        
         print(params)
         
         do {
@@ -913,6 +962,18 @@ class AdditionalInfoVC: BaseVC {
             params["email"] = UserStoreSingleton.shared.verificationEmail
         }
         
+        //        // ✅ Include metadata only if it has at least 1 key-value pair
+        //        if let metadata = request?.metadata, !metadata.isEmpty {
+        //            requestBody["metadata"] = metadata
+        //        }
+                
+                // ✅ Flatten metadata into requestBody
+                if let metadata = request?.metadata, !metadata.isEmpty {
+                    for (key, value) in metadata {
+                        params[key] = value
+                    }
+                }
+        
         print(params)
         
         do {
@@ -1015,6 +1076,10 @@ class AdditionalInfoVC: BaseVC {
     
     //MARK: - Banking Account Charge Api
     func accountChargeApi() {
+        
+        print(">>> accountChargeApi() called")
+            Thread.callStackSymbols.forEach { print($0) }
+        
         showLoadingIndicator()
         
         let fullURL = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.achCharge.path()
@@ -1037,7 +1102,8 @@ class AdditionalInfoVC: BaseVC {
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
         var params: [String: Any] = [
-            "name": accountName ?? "",
+           // "name": accountName ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName ?? ""),
             "email": userEmail ?? "",
             "description": txtFieldDescription.text ?? "",
             "currency": "usd",
@@ -1221,7 +1287,8 @@ class AdditionalInfoVC: BaseVC {
         let localPhone = txtFieldPhoneNumber.text?.components(separatedBy: CharacterSet.decimalDigits.inverted).joined() ?? ""
         
         var params: [String: Any] = [
-            "name": UserStoreSingleton.shared.merchantName ?? "",
+           // "name": UserStoreSingleton.shared.merchantName ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (UserStoreSingleton.shared.merchantName ?? ""),
             "account_id": accountID ?? "",
             "payment_method": "ach",
             "customer": customerID ?? "",
@@ -1403,7 +1470,8 @@ class AdditionalInfoVC: BaseVC {
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
-            "name": accountName ?? "",
+           // "name": accountName ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName ?? ""),
             "email": userEmail ?? "",
             "currency": "usd",
             "account_type": accountType?.lowercased() ?? "",

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

@@ -113,6 +113,8 @@ class BillingInfoVC: BaseVC {
     var filteredStateList: [[String: Any]] = []       // For search results
     var isSearchingState = false                      // Track if user is searching
     
+    private var didApplyInitialCountry = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         updateNextButtonTitle()
@@ -209,6 +211,15 @@ class BillingInfoVC: BaseVC {
         configureFieldVisibility()
     }
     
+    override func viewDidAppear(_ animated: Bool) {
+        super.viewDidAppear(animated)
+        
+        if !didApplyInitialCountry {
+            didApplyInitialCountry = true
+            handleCountrySelection(countryName: txtFieldCountry.text ?? "")
+        }
+    }
+    
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         keyboardObserver.invalidate()
@@ -625,6 +636,32 @@ class BillingInfoVC: BaseVC {
         task.resume()
     }
     
+    func handleCountrySelection(countryName: String) {
+        var normalizedCountry = countryName
+        let lowercased = countryName.lowercased()
+        
+        // Normalize common aliases
+        if lowercased == "usa" {
+            normalizedCountry = "United States"
+        }
+
+        if lowercased == "us" {
+            normalizedCountry = "United States"
+        }
+
+        // Show/hide state dropdown
+        if lowercased == "united states" || lowercased == "usa" || lowercased == "canada" {
+            btnSelectState.isHidden = false
+            txtFieldState.placeholder = "Select State"
+        } else {
+            btnSelectState.isHidden = true
+            txtFieldState.placeholder = "State"
+        }
+
+        // Fetch states using normalized country name
+        getStateListApi(for: normalizedCountry)
+    }
+
     func updateBillingInfoData() {
         setFieldValue("address", to: txtFieldAddress.text)
         setFieldValue("country", to: txtFieldCountry.text)
@@ -1008,6 +1045,18 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        //        // ✅ Include metadata only if it has at least 1 key-value pair
+        //        if let metadata = request?.metadata, !metadata.isEmpty {
+        //            requestBody["metadata"] = metadata
+        //        }
+                
+                // ✅ Flatten metadata into requestBody
+                if let metadata = request?.metadata, !metadata.isEmpty {
+                    for (key, value) in metadata {
+                        params[key] = value
+                    }
+                }
+        
         print(params)
         
         do {
@@ -1560,6 +1609,18 @@ class BillingInfoVC: BaseVC {
             params["email"] = UserStoreSingleton.shared.verificationEmail
         }
         
+        //        // ✅ Include metadata only if it has at least 1 key-value pair
+        //        if let metadata = request?.metadata, !metadata.isEmpty {
+        //            requestBody["metadata"] = metadata
+        //        }
+                
+                // ✅ Flatten metadata into requestBody
+                if let metadata = request?.metadata, !metadata.isEmpty {
+                    for (key, value) in metadata {
+                        params[key] = value
+                    }
+                }
+        
         print(params)
         
         do {
@@ -1680,8 +1741,9 @@ class BillingInfoVC: BaseVC {
             "customer_id" : selectedCard?.customerId ?? "",
             "card_id" : selectedCard?.cardId ?? "",
             "cvc" : cvvText ?? "",
-            "name": UserStoreSingleton.shared.merchantName ?? "",
-            "email": UserStoreSingleton.shared.verificationEmail ?? ""
+           // "name": UserStoreSingleton.shared.merchantName ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (UserStoreSingleton.shared.merchantName ?? ""),
+            "email": UserStoreSingleton.shared.verificationEmail ?? "",
         ]
         
         // Conditionally add billing info
@@ -1743,6 +1805,18 @@ class BillingInfoVC: BaseVC {
             params["interval"] = chosenPlan?.lowercased()
         }
         
+        //        // ✅ Include metadata only if it has at least 1 key-value pair
+        //        if let metadata = request?.metadata, !metadata.isEmpty {
+        //            requestBody["metadata"] = metadata
+        //        }
+                
+                // ✅ Flatten metadata into requestBody
+                if let metadata = request?.metadata, !metadata.isEmpty {
+                    for (key, value) in metadata {
+                        params[key] = value
+                    }
+                }
+        
         print(params)
         
         do {
@@ -1855,7 +1929,8 @@ class BillingInfoVC: BaseVC {
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         var params: [String: Any] = [
-            "name": UserStoreSingleton.shared.merchantName ?? "",
+           // "name": UserStoreSingleton.shared.merchantName ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (UserStoreSingleton.shared.merchantName ?? ""),
             "account_id": accountID ?? "",
             "payment_method": "ach",
             "customer": customerID ?? "",
@@ -2021,7 +2096,8 @@ class BillingInfoVC: BaseVC {
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
         var params: [String: Any] = [
-            "name": accountName ?? "",
+            //"name": accountName ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName ?? ""),
             "email": userEmail ?? "",
             "currency": "usd",
             "account_type": accountType?.lowercased() ?? "",
@@ -2192,7 +2268,8 @@ class BillingInfoVC: BaseVC {
         let emailPrefix = UserStoreSingleton.shared.verificationEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
-            "name": accountName ?? "",
+           // "name": accountName ?? "",
+            "name": !(request.name?.isEmpty ?? true) ? request.name! : (accountName ?? ""),
             "email": userEmail ?? "",
             "currency": "usd",
             "account_type": accountType?.lowercased() ?? "",
@@ -2805,28 +2882,23 @@ extension BillingInfoVC: UITableViewDelegate, UITableViewDataSource {
             guard indexPath.row < currentList.count else { return }
             
             let selectedCountry = currentList[indexPath.row]["name"] as? String
-            //                txtFieldCountry.text = selectedCountry
-            //                viewCountryList.isHidden = true
-            //
-            //                // Fetch states for the selected country
-            //                if let country = selectedCountry {
-            //                    getStateListApi(for: country)
-            //                }
             
             txtFieldCountry.text = selectedCountry
             viewCountryList.isHidden = true
             
             // Show/hide state dropdown and update placeholder
             if let country = selectedCountry {
-                if country.lowercased() == "united states" || country.lowercased() == "usa" || country.lowercased() == "canada" {
-                    btnSelectState.isHidden = false
-                    txtFieldState.placeholder = "Select State"
-                } else {
-                    btnSelectState.isHidden = true
-                    txtFieldState.placeholder = "State"
-                }
+//                if country.lowercased() == "united states" || country.lowercased() == "usa" || country.lowercased() == "canada" {
+//                    btnSelectState.isHidden = false
+//                    txtFieldState.placeholder = "Select State"
+//                } else {
+//                    btnSelectState.isHidden = true
+//                    txtFieldState.placeholder = "State"
+//                }
+//                
+//                getStateListApi(for: country)
                 
-                getStateListApi(for: country)
+                handleCountrySelection(countryName: country)
             }