@jimrising/easymerchantsdk-react-native 1.7.9 → 1.8.0

package/README.md

@@ -7,7 +7,7 @@ To add the path of sdk in your project. Open your `package.json` file and inside
 
 ```json
 "dependencies": {
-  "@jimrising/easymerchantsdk-react-native": "^1.7.9"
+  "@jimrising/easymerchantsdk-react-native": "^1.8.0"
 },
 ```
 

package/ios/Classes/EasyMerchantSdk.m

@@ -2,8 +2,8 @@
 #import <React/RCTLog.h>
 #import <React/RCTBridgeModule.h>
 
-//#import <easymerchantsdk-Swift.h>
-#import <easymerchantsdk/easymerchantsdk-Swift.h>
+#import <easymerchantsdk-Swift.h>
+//#import <easymerchantsdk/easymerchantsdk-Swift.h>
 
 @interface EasyMerchantSdk ()
 @property (nonatomic, strong) EasyMerchantSdkPlugin *sdkPluginInstance;

package/ios/Pods/ViewControllers/BaseVC.swift

@@ -11,30 +11,30 @@ class BaseVC: UIViewController {
 
     private let activityIndicator: UIActivityIndicatorView? = nil
     private var overlayView: UIView?
-    
+        
     override func viewDidLoad() {
         super.viewDidLoad()
     }
     
-//    func addOverlayView() {
-//        guard let keyWindowScene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene,
-//              let keyWindow = keyWindowScene.windows.first(where: { $0.isKeyWindow }) else {
-//            return
-//        }
-//        DispatchQueue.main.async {
-//            let overlayView = UIView(frame: keyWindow.bounds)
-//            overlayView.backgroundColor = UIColor.black.withAlphaComponent(0.3)
-//            keyWindow.addSubview(overlayView)
-//            self.overlayView = overlayView
-//        }
-//    }
-//    
-//    func removeOverlayView() {
-//        DispatchQueue.main.async {
-//            self.overlayView?.removeFromSuperview()
-//            self.overlayView = nil
-//        }
-//    }
+    func addOverlayView() {
+        guard let keyWindowScene = UIApplication.shared.connectedScenes.first(where: { $0.activationState == .foregroundActive }) as? UIWindowScene,
+              let keyWindow = keyWindowScene.windows.first(where: { $0.isKeyWindow }) else {
+            return
+        }
+        DispatchQueue.main.async {
+            let overlayView = UIView(frame: keyWindow.bounds)
+            overlayView.backgroundColor = UIColor.black.withAlphaComponent(0.3)
+            keyWindow.addSubview(overlayView)
+            self.overlayView = overlayView
+        }
+    }
+    
+    func removeOverlayView() {
+        DispatchQueue.main.async {
+            self.overlayView?.removeFromSuperview()
+            self.overlayView = nil
+        }
+    }
     
     func showLoadingIndicator() {
         DispatchQueue.main.async {
@@ -42,7 +42,7 @@ class BaseVC: UIViewController {
             activityIndicator.center = self.view.center
             activityIndicator.hidesWhenStopped = true
             activityIndicator.startAnimating()
-//            self.addOverlayView()
+            self.addOverlayView()
             self.view.addSubview(activityIndicator)
         }
     }
@@ -53,7 +53,7 @@ class BaseVC: UIViewController {
             for subview in self.view.subviews {
                 if let activityIndicator = subview as? UIActivityIndicatorView {
                     activityIndicator.stopAnimating()
-//                    self.removeOverlayView()
+                    self.removeOverlayView()
                     activityIndicator.removeFromSuperview()
                 }
             }

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

@@ -1845,18 +1845,34 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         self.dismiss(animated: true)
     }
     
+    private func updateShowSavedCardsVisibility() {
+        let shouldShow = emailView.isHidden && OTPView.isHidden
+        viewBtnShowSavedCards.isHidden = !shouldShow
+        viewBtnShowSavedCardHeight.constant = shouldShow ? 50 : 0
+        viewBtnShowSavedCardTopCon.constant = shouldShow ? 16 : 0
+    }
+    
     @IBAction func actionBtnShowSavedCards(_ sender: UIButton) {
         emailView.isHidden = false
         OTPView.isHidden = true
+        updateShowSavedCardsVisibility()
     }
     
     @IBAction func actionBtnCloseEmailView(_ sender: UIButton) {
         emailView.isHidden = true
+        updateShowSavedCardsVisibility()
     }
     
     @IBAction func actionBtnCloseOTPView(_ sender: UIButton) {
         stopTimer()
         OTPView.isHidden = true
+        txtFieldOTPText1.text = ""
+        txtFieldOTPText2.text = ""
+        txtFieldOTPText3.text = ""
+        txtFieldOTPText4.text = ""
+        txtFieldOTPText5.text = ""
+        txtFieldOTPText6.text = ""
+        updateShowSavedCardsVisibility()
     }
     
     @IBAction func actionBtnResendOTP(_ sender: UIButton) {
@@ -3732,27 +3748,36 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
         }
         task.resume()
     }
-    
+        
     @IBAction func actionBtnNextEmailView(_ sender: UIButton) {
         // Check if the email field is empty
         guard let email = txtFieldEmail.text, !email.isEmpty else {
-            // Show an alert if the email field is empty
             showAlert(message: "Please enter an email address.")
             return
         }
 
         // Validate email format before calling the API
         if isValidEmail(email) {
-            // Hide email view, show OTP view, and start the timer
+            // Hide email view, show OTP view
             emailView.isHidden = true
             OTPView.isHidden = false
+
+            // Reset UI elements related to the timer
+            btnResendOTP.isHidden = true
+            lblOtpTimer.isHidden = false
+            lblUntillResendOtp.isHidden = false
+            imgEsclamationMark.isHidden = false
+
+            // Stop existing timer if any, then restart
+            stopTimer()
             startTimer()
+
             // Call the email verification API
             emailVerificationApi()
         } else {
-            // Show an alert or error message if the email is not valid
             showAlert(message: "Please enter a valid email address.")
         }
+        updateShowSavedCardsVisibility()
     }
     
     // MARK: - Action Button Next
@@ -5117,7 +5142,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                             print("Saved Verification Email: \(UserStoreSingleton.shared.verificationEmail ?? "nil")")
                             
                           //  self.btnSettings.isHidden = false
-                            
+                         
                             if self.selectedPaymentMethod == "Card" {
                                 if customerId.isEmpty {
                                     self.OTPView.isHidden = true
@@ -7239,21 +7264,36 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         
                         if self.bankAccounts.isEmpty {
                             self.showToast(message: "No saved bank accounts is available.")
-                            
                             self.viewSingleSavedAccount.isHidden = true
-                            self.viewBankFields.isHidden = false
+                            self.viewSingleSavedCard.isHidden = true
+                            self.OTPView.isHidden = true
+                            self.viewBtnShowSavedCards.isHidden = true
+                            self.viewBtnShowSavedCardHeight.constant = 0
+                            self.viewBtnShowSavedCardTopCon.constant = 8
+                            
+                            if self.request.authenticatedACH == true {
+                                self.viewBankFields.isHidden = true
+                                self.btnNext.isHidden = true
+                                self.btnNextHeight.constant = 0
+                                self.btnNextTopCon.constant = 0
+                            }
+                            else {
+                                self.viewBankFields.isHidden = false
+                                self.btnNext.isHidden = false
+                                self.btnNextHeight.constant = 50
+                                self.btnNextTopCon.constant = 20
+                            }
+                            
+                          ////  self.viewBankFields.isHidden = false
+                            ////  self.btnNext.isHidden = false
+                            ////  self.btnNextHeight.constant = 50
+                            ////  self.btnNextTopCon.constant = 20
                             
 //                            self.viewBtnShowSavedCards.isHidden = false
 //                            self.viewBtnShowSavedCardHeight.constant = 50
 //                            self.viewBtnShowSavedCardTopCon.constant = 20
 //                            self.btnShowSavedCard.isHidden = false
-                            
-                            self.btnNext.isHidden = false
-                            self.btnNextHeight.constant = 50
-                            self.btnNextTopCon.constant = 20
-                            
-                            self.viewSingleSavedCard.isHidden = true
-                            
+                        
                             return
                         }
 //                        else {
@@ -8958,7 +8998,6 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
     
     // MARK: - 3DS Functionality
     
-    // MARK: - Credit Card Charge Api If Billing info is nil and Without Login.
     func threeDSecurePaymentApi() {
         showLoadingIndicator()
         

package/ios/easymerchantsdk.podspec

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