@jimrising/easymerchantsdk-react-native 2.7.7 → 2.7.9

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.1'
     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

@@ -2559,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
@@ -2636,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
@@ -2668,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
@@ -2779,8 +2726,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                     if cvvText.isEmpty {
                         self.showAlert(title: "Missing CVV", message: "Please enter the CVV to proceed.")
                         return
-                    } else if cvvText.count < 3 {
-                        self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
+                    } else if cvvText.count < 3 || cvvText.count > 4 ||
+                                !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: cvvText)) {
+                        self.showAlert(title: "Invalid CVV", message: "CVV must be 3 or 4 digits.")
                         return
                     }
                     
@@ -2866,8 +2814,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             if cvvText.isEmpty {
                 self.showAlert(title: "Missing CVV", message: "Please enter the CVV to proceed.")
                 return
-            } else if cvvText.count < 3 {
-                self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
+            } else if cvvText.count < 3 || cvvText.count > 4 ||
+                        !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: cvvText)) {
+                self.showAlert(title: "Invalid CVV", message: "CVV must be 3 or 4 digits.")
                 return
             }
             
@@ -5127,8 +5076,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if cardNumber.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Number is required.")
                             return
-                        } else if sanitizedCardNumber.count != 16 {
-                            self.showAlert(title: "Invalid Card Number", message: "Card Number must be 16 digits.")
+                        } else if sanitizedCardNumber.count < 12 || sanitizedCardNumber.count > 19 ||
+                                    !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: sanitizedCardNumber)) {
+                            self.showAlert(title: "Invalid Card Number", message: "Card Number must be 12 to 19 digits.")
                             return
                         } else if expiryDate.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Expiry Date is required.")
@@ -5184,8 +5134,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if cvv.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card CVV Number is required.")
                             return
-                        } else if cvv.count < 3 {
-                            self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
+                        } else if cvv.count < 3 || cvv.count > 4 ||
+                                    !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: cvv)) {
+                            self.showAlert(title: "Invalid CVV", message: "CVV must be 3 or 4 digits.")
                             return
                         } else if cardName.isEmpty {
                             self.showAlert(title: "Missing Information", message: "Card Name is required.")
@@ -5303,12 +5254,24 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         else if self.txtFieldAccountType.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
                             self.showAlert(title: "Missing Information", message: "Bank account type is required.")
                             return
-                        } else if self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-                            self.showAlert(title: "Missing Information", message: "Bank account number is required.")
+                        } else if let accountNumber = self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines),
+                                  (accountNumber.isEmpty || accountNumber.count < 4 || accountNumber.count > 17 ||
+                                   !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: accountNumber))) {
+                            if accountNumber.isEmpty {
+                                self.showAlert(title: "Missing Information", message: "Bank account number is required.")
+                            } else {
+                                self.showAlert(title: "Invalid Account Number", message: "Account number must be 4 to 17 digits.")
+                            }
                             return
                         }
-                        else if self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty == true {
-                            self.showAlert(title: "Missing Information", message: "Please confirm your bank account number.")
+                        else if let confirmAccountNumber = self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines),
+                                (confirmAccountNumber.isEmpty || confirmAccountNumber.count < 4 || confirmAccountNumber.count > 17 ||
+                                 !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: confirmAccountNumber))) {
+                            if confirmAccountNumber.isEmpty {
+                                self.showAlert(title: "Missing Information", message: "Please confirm your bank account number.")
+                            } else {
+                                self.showAlert(title: "Invalid Account Number", message: "Confirm account number must be 4 to 17 digits.")
+                            }
                             return
                         }
                         else if self.txtFieldAccountNumber.text?.trimmingCharacters(in: .whitespacesAndNewlines) != self.txtFieldConfirmBankAccount.text?.trimmingCharacters(in: .whitespacesAndNewlines) {
@@ -5437,8 +5400,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if cardNumber.isEmpty {
                     self.showAlert(title: "Missing Information", message: "Card Number is required.")
                     return
-                } else if sanitizedCardNumber.count != 16 {
-                    self.showAlert(title: "Invalid Card Number", message: "Card Number must be 16 digits.")
+                } else if sanitizedCardNumber.count < 12 || sanitizedCardNumber.count > 19 ||
+                            !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: sanitizedCardNumber)) {
+                    self.showAlert(title: "Invalid Card Number", message: "Card Number must be 12 to 19 digits.")
                     return
                 } else if expiryDate.isEmpty {
                     self.showAlert(title: "Missing Information", message: "Card Expiry Date is required.")
@@ -5494,8 +5458,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if cvv.isEmpty {
                     self.showAlert(title: "Missing Information", message: "Card CVV Number is required.")
                     return
-                } else if cvv.count < 3 {
-                    self.showAlert(title: "Invalid CVV", message: "CVV must be at least 3 digits.")
+                } else if cvv.count < 3 || cvv.count > 4 ||
+                            !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: cvv)) {
+                    self.showAlert(title: "Invalid CVV", message: "CVV must be 3 or 4 digits.")
                     return
                 } else if cardName.isEmpty {
                     self.showAlert(title: "Missing Information", message: "Card Name is required.")
@@ -6083,6 +6048,18 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             self.showAlert(title: "Invalid Routing Number", message: "Routing number is not correct. It must be exactly 9 digits.")
                             return
                         }
+
+                        // Account number must be 4 to 17 digits and numeric
+                        if accountNumber.count < 4 || accountNumber.count > 17 || !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: accountNumber)) {
+                            self.showAlert(title: "Invalid Account Number", message: "Account number must be 4 to 17 digits.")
+                            return
+                        }
+
+                        // Confirm account number must be 4 to 17 digits and numeric
+                        if confirmAccountNumber.count < 4 || confirmAccountNumber.count > 17 || !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: confirmAccountNumber)) {
+                            self.showAlert(title: "Invalid Account Number", message: "Confirm account number must be 4 to 17 digits.")
+                            return
+                        }
                         
                         // Check if account number and confirmation match
                         if accountNumber != confirmAccountNumber {
@@ -12399,12 +12376,18 @@ extension PaymentInfoVC: UITextFieldDelegate {
                 textField.text = formatCardNumber(modifiedText)
                 return false
             }
-            
-            let text = (textField.text ?? "") + string
-            if text.filter({ $0.isNumber }).count > 16 {
+
+            // Only allow digits (including paste); formatting inserts spaces itself
+            let cleanedInput = string.replacingOccurrences(of: " ", with: "")
+            if !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: cleanedInput)) {
                 return false
             }
-            
+
+            let text = (textField.text ?? "") + cleanedInput
+            if text.filter({ $0.isNumber }).count > 19 {
+                return false
+            }
+
             textField.text = formatCardNumber(text)
             if let lastCharacter = text.last, lastCharacter == " " {
                 textField.text = String(text.dropLast())
@@ -12418,6 +12401,9 @@ extension PaymentInfoVC: UITextFieldDelegate {
             let maxLength = 4
             let currentString = (textField.text ?? "") as NSString
             let newString = currentString.replacingCharacters(in: range, with: string)
+            if !CharacterSet.decimalDigits.isSuperset(of: CharacterSet(charactersIn: string)) && !string.isEmpty {
+                return false
+            }
             return newString.count <= maxLength
         }
         
@@ -12521,6 +12507,15 @@ extension PaymentInfoVC: UITextFieldDelegate {
             
             return allowedCharacters.isSuperset(of: characterSet) && newLength <= 9
         }
+
+        else if textField == txtFieldAccountNumber || textField == txtFieldConfirmBankAccount ||
+                    textField == txtFieldAccountNumberNewAccountView || textField == txtFieldConfirmAccountNewAccountView {
+            let allowedCharacters = CharacterSet.decimalDigits
+            let characterSet = CharacterSet(charactersIn: string)
+            let currentText = textField.text ?? ""
+            let newLength = (currentText as NSString).replacingCharacters(in: range, with: string).count
+            return allowedCharacters.isSuperset(of: characterSet) && newLength <= 17
+        }
         
         return true
     }

package/ios/easymerchantsdk.podspec

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