@jimrising/easymerchantsdk-react-native 2.7.6 → 2.7.8

package/android/build.gradle

@@ -94,7 +94,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.13.0'
 
     // Third-party libs
-    implementation 'com.app:paysdk:1.9.8'
+    implementation 'com.app:paysdk:2.0.0'
     implementation 'com.hbb20:ccp:2.7.3'
     implementation 'com.github.bumptech.glide:glide:5.0.4'
     implementation 'com.github.androidmads:QRGenerator:1.0.5'

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

@@ -551,9 +551,20 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     // let rawAmount = Double(self.request?.amount ?? 0)
                                     // let amountText = String(format: "$%.2f", rawAmount)
                                     
-                                    // ✅ new way: use parsedAmount immediately
-                                    let resolvedAmount = self.amount   // already set above
-                                let amountText = String(format: "$%.2f", resolvedAmount ?? 00.00)
+                                    // ✅ Use decimal-safe amount from backend (avoids binary rounding drift)
+                                    let amountText: String = {
+                                        if let savedAmount = UserStoreSingleton.shared.amount,
+                                           let decimal = Decimal(string: savedAmount) {
+                                            var value = decimal
+                                            var rounded = Decimal()
+                                            NSDecimalRound(&rounded, &value, 2, .plain)
+                                            return "$" + NSDecimalNumber(decimal: rounded).stringValue
+                                        } else if let resolvedAmount = self.amount {
+                                            return String(format: "$%.2f", resolvedAmount)
+                                        } else {
+                                            return "$0.00"
+                                        }
+                                    }()
                                     
                                     var buttonText: String
                                     if !billingVisible && !additionalVisible {
@@ -573,8 +584,19 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.btnPayNowSingleAccountView.setTitle(buttonText, for: .normal)
                                 } else {
                                     /// When no billingInfoData present
-                                    let resolvedAmount = self.amount
-                                    let amountText = String(format: "$%.2f", resolvedAmount ?? 00.00)
+                                    let amountText: String = {
+                                        if let savedAmount = UserStoreSingleton.shared.amount,
+                                           let decimal = Decimal(string: savedAmount) {
+                                            var value = decimal
+                                            var rounded = Decimal()
+                                            NSDecimalRound(&rounded, &value, 2, .plain)
+                                            return "$" + NSDecimalNumber(decimal: rounded).stringValue
+                                        } else if let resolvedAmount = self.amount {
+                                            return String(format: "$%.2f", resolvedAmount)
+                                        } else {
+                                            return "$0.00"
+                                        }
+                                    }()
                                     
                                     let submitText = self.request?.submitButtonText?.isEmpty == false ? self.request!.submitButtonText! : "Pay Now"
                                     let defaultTitle = "\(submitText) (\(amountText))"
@@ -2537,73 +2559,26 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     }
     
     private func updateShowSavedCardsVisibility() {
-        let shouldShow = emailView.isHidden && OTPView.isHidden
+        // Show the "Show saved cards/accounts" button whenever the OTP view is not visible,
+        // so the user can always re-open saved options after closing OTP or email views.
+        let shouldShow = OTPView.isHidden
         viewBtnShowSavedCards.isHidden = !shouldShow
         viewBtnShowSavedCardHeight.constant = shouldShow ? 50 : 0
         viewBtnShowSavedCardTopCon.constant = shouldShow ? 16 : 0
     }
     
-//    @IBAction func actionBtnShowSavedCards(_ sender: UIButton) {
-//        if UserStoreSingleton.shared.customerToken == nil {
-//            emailView.isHidden = false
-//            OTPView.isHidden = true
-//            updateShowSavedCardsVisibility()
-//        }
-//        else {
-//          //  UserStoreSingleton.shared.isLoggedIn = true
-//            
-//            emailView.isHidden = true
-//            OTPView.isHidden = true
-//            
-//            if self.selectedPaymentMethod == "Card" {
-//                if UserStoreSingleton.shared.customerId == nil {
-//                    self.OTPView.isHidden = true
-//                    self.viewCardFields.isHidden = false
-//                    self.viewSingleSavedCard.isHidden = true
-//                    self.viewBtnShowSavedCards.isHidden = true
-//                    self.viewBtnShowSavedCardHeight.constant = 0
-//                    self.viewBtnShowSavedCardTopCon.constant = 0
-//                    self.viewChangeCard.isHidden = true
-//                    self.viewUpdateCard.isHidden = true
-//                    self.viewAddNewCard.isHidden = true
-//                } else {
-//                    self.getShowCardsApi()
-//                    self.OTPView.isHidden = true
-//                    self.viewCardFields.isHidden = true
-//                    self.viewSingleSavedCard.isHidden = false
-//                    self.viewBtnShowSavedCards.isHidden = true
-//                    self.viewBtnShowSavedCardHeight.constant = 0
-//                    self.viewBtnShowSavedCardTopCon.constant = 0
-//                    self.viewChangeCard.isHidden = true
-//                    self.viewUpdateCard.isHidden = true
-//                    self.viewAddNewCard.isHidden = true
-//                    
-//                    self.viewTxtFieldCVVSingleCard.isHidden = true
-//                    self.btnPayNowSingleCard.isHidden = true
-//                    self.btnNext.isHidden = true
-//                    self.btnNextHeight.constant = 0
-//                    self.btnNextTopCon.constant = 8
-//                }
-//                
-//                self.txtFieldSelectPlanSingleSavedCard.isHidden = true
-//                self.txtFieldSelectDateSingleSavedCard.isHidden = true
-//                
-//                self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
-//                self.txtFieldSelectDateSingleSavedBankView.isHidden = true
-//            } else if self.selectedPaymentMethod == "Bank" {
-//                self.getShowBankAccountsApi()
-//            }
-//        }
-//    }
-    
-    
     @IBAction func actionBtnShowSavedCards(_ sender: UIButton) {
-        if UserStoreSingleton.shared.customerToken == nil {
+        // Mirror MobileCheckout iOS: require both customerToken and customerId to treat as a verified saved customer.
+        if UserStoreSingleton.shared.customerToken == nil || UserStoreSingleton.shared.customerId == nil {
+            // No verified saved customer yet – show email view so user can request OTP
+            isSavedViewVisible = false
             emailView.isHidden = false
             OTPView.isHidden = true
+            viewSingleSavedCard.isHidden = true
+            viewSingleSavedAccount.isHidden = true
             updateShowSavedCardsVisibility()
-        }
-        else {
+        } else {
+            // Verified saved customer exists – show saved cards/accounts UI
             isSavedViewVisible = true
             
             emailView.isHidden = true
@@ -2614,21 +2589,15 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     self.OTPView.isHidden = true
                     self.viewCardFields.isHidden = false
                     self.viewSingleSavedCard.isHidden = true
-//                    self.viewBtnShowSavedCards.isHidden = true
-//                    self.viewBtnShowSavedCardHeight.constant = 0
-//                    self.viewBtnShowSavedCardTopCon.constant = 0
                     self.viewChangeCard.isHidden = true
                     self.viewUpdateCard.isHidden = true
                     self.viewAddNewCard.isHidden = true
                 } else {
-                    // ✅ Only show saved cards when button tapped
+                    // Only show saved cards when button tapped
                     self.getShowCardsApi()
                     self.OTPView.isHidden = true
                     self.viewCardFields.isHidden = true
                     self.viewSingleSavedCard.isHidden = false
-//                    self.viewBtnShowSavedCards.isHidden = true
-//                    self.viewBtnShowSavedCardHeight.constant = 0
-//                    self.viewBtnShowSavedCardTopCon.constant = 0
                     self.viewChangeCard.isHidden = true
                     self.viewUpdateCard.isHidden = true
                     self.viewAddNewCard.isHidden = true
@@ -2646,7 +2615,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 self.txtFieldSelectPlanSingleSavedBankView.isHidden = true
                 self.txtFieldSelectDateSingleSavedBankView.isHidden = true
             } else if self.selectedPaymentMethod == "Bank" {
-                // ✅ Only show saved banks when button tapped
+                // Only show saved banks when button tapped
                 self.getShowBankAccountsApi()
                 self.viewBankFields.isHidden = true
                 self.viewSingleSavedAccount.isHidden = false

package/ios/easymerchantsdk.podspec

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