@jimrising/easymerchantsdk-react-native 2.3.3 → 2.3.5

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

@@ -1040,26 +1040,47 @@ class BillingInfoVC: BaseVC {
             params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -1068,6 +1089,11 @@ class BillingInfoVC: BaseVC {
             params["metadata"] = metadata
         }
         
+        // ✅ Include metadata only if it has at least 1 key-value pair
+        if let metadata = request?.metadata, !metadata.isEmpty {
+            params["metadata"] = metadata
+        }
+        
         // ✅ Only for logged-in users
         if UserStoreSingleton.shared.isLoggedIn == true {
             let emailText = userEmail
@@ -1213,13 +1239,6 @@ class BillingInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
             "email": userEmail ?? "",
@@ -1275,26 +1294,47 @@ class BillingInfoVC: BaseVC {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -1418,13 +1458,6 @@ class BillingInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        // Add API headers
-        if let apiKey = EnvironmentConfig.apiKey,
-           let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
-        }
-        
         var params: [String: Any] = [
             "name": nameOnCard ?? "",
             "email": userEmail ?? "",
@@ -1461,26 +1494,47 @@ class BillingInfoVC: BaseVC {
             params["zip"] = billingInfoDict["postal_code"] as? String ?? ""
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -1643,26 +1697,47 @@ class BillingInfoVC: BaseVC {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -1851,26 +1926,47 @@ class BillingInfoVC: BaseVC {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -2032,26 +2128,47 @@ class BillingInfoVC: BaseVC {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -2182,7 +2299,6 @@ class BillingInfoVC: BaseVC {
             "routing_number": routingNumber ?? "",
             "account_number": accountNumber ?? "",
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
         ]
         
@@ -2207,26 +2323,47 @@ class BillingInfoVC: BaseVC {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -2359,7 +2496,6 @@ class BillingInfoVC: BaseVC {
             "routing_number": routingNumber ?? "",
             "account_number": accountNumber ?? "",
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
             "save_account": 1,
             "payment_method": "ach"
@@ -2392,26 +2528,47 @@ class BillingInfoVC: BaseVC {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -2543,7 +2700,6 @@ class BillingInfoVC: BaseVC {
             "routing_number": routingNumber ?? "",
             "account_number": accountNumber ?? "",
             "payment_mode": "auth_and_capture",
-            "payment_intent": UserStoreSingleton.shared.paymentIntent ?? "",
             "levelIndicator": 1,
             "save_account": 1,
             "payment_method": "ach"
@@ -2580,26 +2736,47 @@ class BillingInfoVC: BaseVC {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -2720,13 +2897,6 @@ class BillingInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
         var params: [String: Any] = [
             "account_id": self.grailPayAccountID ?? "",
             "account_type": self.selectedGrailPayAccountType ?? "",
@@ -2776,26 +2946,47 @@ class BillingInfoVC: BaseVC {
             params["description"] = "Hosted payment checkout"
         }
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }
         
@@ -2916,13 +3107,6 @@ class BillingInfoVC: BaseVC {
         print("Setting clientToken header: \(token ?? "None")")
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
         
-        if let apiKey = EnvironmentConfig.apiKey {
-            uRLRequest.addValue(apiKey, forHTTPHeaderField: "X-Api-Key")
-        }
-        if let apiSecret = EnvironmentConfig.apiSecret {
-            uRLRequest.addValue(apiSecret, forHTTPHeaderField: "X-Api-Secret")
-        }
-        
         let emailPrefix = userEmail?.components(separatedBy: "@").first ?? ""
         
         var params: [String: Any] = [
@@ -3001,26 +3185,47 @@ class BillingInfoVC: BaseVC {
         }
         params["description"] = descriptionValue
         
+        // Add these if recurring is enabled
+//        if let req = request, req.is_recurring == true {
+//            if let recurringType = req.recurringStartDateType, recurringType == .custom {
+//                // Only send start_date if type is .custom and field is not empty
+//                if let startDateText = startDate, !startDateText.isEmpty {
+//                    let inputFormatter = DateFormatter()
+//                    inputFormatter.dateFormat = "dd/MM/yyyy"
+//                    
+//                    let outputFormatter = DateFormatter()
+//                    outputFormatter.dateFormat = "MM/dd/yyyy"
+//                    
+//                    if let date = inputFormatter.date(from: startDateText) {
+//                        let apiFormattedDate = outputFormatter.string(from: date)
+//                        params["start_date"] = apiFormattedDate
+//                    } else {
+//                        print("Invalid date format in startDateText")
+//                    }
+//                }
+//            }
+//            
+//            params["interval"] = chosenPlan?.lowercased()
+//        }
+        
         // Add these if recurring is enabled
         if let req = request, req.is_recurring == true {
-            if let recurringType = req.recurringStartDateType, recurringType == .custom {
-                // Only send start_date if type is .custom and field is not empty
-                if let startDateText = startDate, !startDateText.isEmpty {
-                    let inputFormatter = DateFormatter()
-                    inputFormatter.dateFormat = "dd/MM/yyyy"
-                    
-                    let outputFormatter = DateFormatter()
-                    outputFormatter.dateFormat = "MM/dd/yyyy"
-                    
-                    if let date = inputFormatter.date(from: startDateText) {
-                        let apiFormattedDate = outputFormatter.string(from: date)
-                        params["start_date"] = apiFormattedDate
-                    } else {
-                        print("Invalid date format in startDateText")
-                    }
+            if let startDateText = startDate, !startDateText.isEmpty {
+                let inputFormatter = DateFormatter()
+                inputFormatter.dateFormat = "dd/MM/yyyy"
+                
+                let outputFormatter = DateFormatter()
+                outputFormatter.dateFormat = "MM/dd/yyyy"
+                
+                if let date = inputFormatter.date(from: startDateText) {
+                    let apiFormattedDate = outputFormatter.string(from: date)
+                    params["start_date"] = apiFormattedDate
+                } else {
+                    print("Invalid date format in startDateText")
                 }
             }
             
+            // interval is still required
             params["interval"] = chosenPlan?.lowercased()
         }