@jimrising/easymerchantsdk-react-native 1.8.4 → 1.8.5

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

@@ -331,8 +331,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     private var request: Request!
     private weak var delegate: EasyPayViewControllerDelegate?
     
-    public var amount: Int?
-    
+//    public var amount: Int?
+    public var amount: Double?
+        
     var arrPaymentMethods: [PaymentsData] = []
     
     private var selectedIndex: IndexPath?
@@ -406,6 +407,8 @@ 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
@@ -443,7 +446,10 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             let billingVisible = fieldSection.visibility.billing
             let additionalVisible = fieldSection.visibility.additional
             let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
-            let amountText = String(format: "$%.2f", request?.amount ?? 0)
+           // let amountText = String(format: "$%.2f", request?.amount ?? 0)
+        
+            let rawAmount = Double(request?.amount ?? 0)
+            let amountText = String(format: "$%.2f", rawAmount)
             
             var buttonText: String
             
@@ -465,8 +471,12 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             btnPayNowSingleCard.setTitle(buttonText, for: .normal)
             btnPayNowSingleAccountView.setTitle(buttonText, for: .normal)
         } else {
-            // When no billingInfoData present
-            let amountText = String(format: "$%.2f", request?.amount ?? 0)
+            /// When no billingInfoData present
+           // let amountText = String(format: "$%.2f", request?.amount ?? 0)
+            
+            let rawAmount = Double(request?.amount ?? 0)
+            let amountText = String(format: "$%.2f", rawAmount)
+
             let submitText = request?.submitButtonText?.isEmpty == false ? request!.submitButtonText! : "Pay Now"
             let defaultTitle = "\(submitText) (\(amountText))"
             
@@ -2002,7 +2012,8 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         billingInfoVC.isFrom = "SavedCards"
                         billingInfoVC.selectedCard = self.selectedCard // Passing the selected card data
                         billingInfoVC.cvvText = cvvText // Passing the CVV text
-                        billingInfoVC.amount = Int(self.request.amount ?? 0)
+//                        billingInfoVC.amount = Int(self.request.amount ?? 0)
+                        billingInfoVC.amount = Double(self.request.amount ?? 0)
                         billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                         
                         if let billingInfoData = self.request.billingInfoData {
@@ -2026,7 +2037,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         additionalInfoVC.isFrom = "SavedCards"
                         additionalInfoVC.selectedCard = self.selectedCard // Passing the selected card data
                         additionalInfoVC.cvvText = cvvText // Passing the CVV text
-                        additionalInfoVC.amount = Int(self.request.amount ?? 0)
+                        additionalInfoVC.amount = Double(self.request.amount ?? 0)
                         additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                         
                         if let billingInfoData = self.request.billingInfoData {
@@ -2215,7 +2226,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             billingInfoVC.isSavedNewCard = self.isSavedNewCardForFuture
                             
                             billingInfoVC.isFrom = "AddNewCard"
-                            billingInfoVC.amount = Int(self.request.amount ?? 0)
+                            billingInfoVC.amount = Double(self.request.amount ?? 0)
                             billingInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                             
                             if let billingInfoData = self.request.billingInfoData {
@@ -2242,7 +2253,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             additionalInfoVC.isSavedNewCard = self.isSavedNewCardForFuture
                             
                             additionalInfoVC.isFrom = "AddNewCard"
-                            additionalInfoVC.amount = Int(self.request.amount ?? 0)
+                            additionalInfoVC.amount = Double(self.request.amount ?? 0)
                             additionalInfoVC.selectedPaymentMethod = self.selectedPaymentMethod
                             
                             if let billingInfoData = self.request.billingInfoData {
@@ -4323,7 +4334,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 = ""

package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift

@@ -49,7 +49,7 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
     var apiStatusCheckTimer: Timer?
     // New property for the 1-minute countdown
     var oneMinuteCountdownTimer: DispatchSourceTimer?
-    var countdownRemaining: Int = 60 // 60 seconds
+    var countdownRemaining: Int = 120 // 120 seconds
     
     var additionalInfoData: [FieldItem]?
     var billingInfoData: [FieldItem]?
@@ -58,7 +58,8 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
     // Dispatch group to wait for initial API call
     let initialAPIGroup = DispatchGroup()
     
-    var amount: Int?
+//    var amount: Int?
+    var amount: Double?
     
     var cardApiParams: [String: Any]?
     
@@ -238,7 +239,7 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
             self?.initialAPIGroup.leave()
         }
         
-        countdownRemaining = 60
+        countdownRemaining = 120
         
         oneMinuteCountdownTimer = DispatchSource.makeTimerSource(queue: .main)
         oneMinuteCountdownTimer?.schedule(deadline: .now(), repeating: .seconds(1))

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '1.8.4'
+  s.version          = '1.8.5'
   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.4",
+  "version": "1.8.5",
   "description": "",
   "main": "index.js",
   "scripts": {