@jimrising/easymerchantsdk-react-native 1.5.1 → 1.5.3

package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift

@@ -6,11 +6,13 @@
 //
 
 import UIKit
+//import SDWebImage
 
 class ThreeDSecurePaymentDoneVC: BaseVC {
     
     @IBOutlet weak var imgViewPaymentDone: UIImageView!
     @IBOutlet weak var imgViewLoading: UIImageView!
+    //    @IBOutlet weak var imgViewLoading: SDAnimatedImageView!
     @IBOutlet weak var viewMain: UIView!
     @IBOutlet weak var lblCompleteAuthentication: UILabel!
     @IBOutlet weak var btnDone: UIButton!
@@ -91,24 +93,24 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         uiFinishingTouchElements()
-
+        
         // Restart rotating animation if missing
         if !imgViewLoading.isHidden && imgViewLoading.layer.animation(forKey: "rotationAnimation") == nil {
             startRotatingImage()
         }
-
+        
         if let chargeId = (threeDSecureStatusResponse?["data"] as? [String: Any])?["charge_id"] as? String,
            !chargeId.isEmpty {
             // Charge already found - do nothing
             return
         }
-
+        
         if countdownRemaining > 0 {
             imgViewLoading.isHidden = false
             imgViewPaymentDone.isHidden = true
-            lblCompleteAuthentication.text = "Please wait while Authentication is in process..."
+            lblCompleteAuthentication.text = "Click the link below to complete 3DS Authentication.!"
             btnDone.isHidden = true
-
+            
             if apiStatusCheckTimer == nil {
                 apiStatusCheckTimer = Timer.scheduledTimer(withTimeInterval: 10.0, repeats: true) { [weak self] _ in
                     guard let self = self else { return }
@@ -117,23 +119,23 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                     }
                 }
             }
-
+            
         } else {
             imgViewLoading.layer.removeAllAnimations()
             imgViewLoading.isHidden = true
             imgViewPaymentDone.isHidden = false
             imgViewPaymentDone.image = UIImage(systemName: "exclamationmark.circle.fill")
             imgViewPaymentDone.tintColor = .systemRed
-            lblCompleteAuthentication.text = "Please complete 3DS Authentication.!!"
+            lblCompleteAuthentication.text = "Click the link below to complete 3DS Authentication.!"
             btnDone.isHidden = false
             lblPaymentLink.isHidden = false
             viewPaymentDetails.isHidden = false
-
+            
             apiStatusCheckTimer?.invalidate()
             apiStatusCheckTimer = nil
         }
     }
-
+    
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         apiStatusCheckTimer?.invalidate()
@@ -142,14 +144,26 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         oneMinuteCountdownTimer = nil
     }
     
-    func startRotatingImage() {
-        let rotationAnimation = CABasicAnimation(keyPath: "transform.rotation")
-        rotationAnimation.toValue = CGFloat.pi * 2 // 360 degrees in radians
-        rotationAnimation.duration = 1 // Adjust the duration as needed
-        rotationAnimation.isCumulative = true
-        rotationAnimation.repeatCount = .infinity // Continuous rotation
-        imgViewLoading.layer.add(rotationAnimation, forKey: "rotationAnimation")
-    }
+        func startRotatingImage() {
+            let rotationAnimation = CABasicAnimation(keyPath: "transform.rotation")
+            rotationAnimation.toValue = CGFloat.pi * 2 // 360 degrees in radians
+            rotationAnimation.duration = 1 // Adjust the duration as needed
+            rotationAnimation.isCumulative = true
+            rotationAnimation.repeatCount = .infinity // Continuous rotation
+            imgViewLoading.layer.add(rotationAnimation, forKey: "rotationAnimation")
+        }
+    
+//    private func showHourglassGIF() {
+//        if let bundlePath = Bundle.easyPayBundle.path(forResource: "hourglass", ofType: "gif") {
+//            let url = URL(fileURLWithPath: bundlePath)
+//            imgViewLoading.sd_setImage(with: url)
+//            self.imgViewLoading.contentMode = .redraw
+//        }
+//    }
+    
+//    func startRotatingImage() {
+//        showHourglassGIF()
+//    }
     
     private func setupTapOnLabel() {
         if let url = redirectURL {
@@ -170,64 +184,64 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         }
         UIApplication.shared.open(url, options: [:], completionHandler: nil)
     }
-        
+    
     private func startOneMinuteCountdownAndAPICheck() {
         startRotatingImage()
         imgViewPaymentDone.isHidden = true
         imgViewLoading.isHidden = false
-        lblCompleteAuthentication.text = "Please wait while Authentication is in process..."
+        lblCompleteAuthentication.text = "Click the link below to complete 3DS Authentication.!"
         btnDone.isHidden = true
-
+        
         apiStatusCheckTimer?.invalidate()
         apiStatusCheckTimer = nil
-
+        
         initialAPIGroup.enter()
         checkThreeDSecureStatus { [weak self] in
             self?.initialAPIGroup.leave()
         }
-
+        
         countdownRemaining = 60
-
+        
         oneMinuteCountdownTimer = DispatchSource.makeTimerSource(queue: .main)
         oneMinuteCountdownTimer?.schedule(deadline: .now(), repeating: .seconds(1))
         oneMinuteCountdownTimer?.setEventHandler { [weak self] in
             guard let self = self else { return }
-
+            
             self.countdownRemaining -= 1
             if self.countdownRemaining <= 0 {
                 self.oneMinuteCountdownTimer?.cancel()
                 self.oneMinuteCountdownTimer = nil
-
+                
                 DispatchQueue.main.async {
                     self.imgViewLoading.layer.removeAllAnimations()
                     self.imgViewLoading.isHidden = true
                     self.imgViewPaymentDone.isHidden = false
-                    self.lblCompleteAuthentication.text = "Please complete 3DS Authentication.!!"
+                    self.lblCompleteAuthentication.text = "Click the link below to complete 3DS Authentication.!"
                     self.btnDone.isHidden = false
                     self.lblPaymentLink.isHidden = false
                     self.viewPaymentDetails.isHidden = false
-
+                    
                     if let json = self.threeDSecureStatusResponse,
                        let data = json["data"] as? [String: Any],
                        let chargeId = data["charge_id"],
                        chargeId is NSNull || (chargeId as? String ?? "").isEmpty {
                         self.imgViewPaymentDone.image = UIImage(systemName: "exclamationmark.circle.fill")
                         self.imgViewPaymentDone.tintColor = .systemRed
-
+                        
                         let refToken = data["ref_token"] as? String ?? "N/A"
                         let chargeId = data["charge_id"] as? String ?? "N/A"
                         let transactionId = data["transaction_id"] as? String ?? "N/A"
                         let subscriptionId = data["subscription_id"] as? String ?? "N/A"
                         let createdAt = data["created_at"] as? String ?? ""
                         let status = data["status"] as? String ?? ""
-
+                        
                         let formattedDate: String
                         if let date = self.convertToDate(dateString: createdAt) {
                             formattedDate = self.formatDate(date: date)
                         } else {
                             formattedDate = "N/A"
                         }
-
+                        
                         self.lblChargeId.text = "\(chargeId)"
                         self.lblTransactionId.text = "\(transactionId)"
                         self.lblSubscriptionId.text = "\(subscriptionId)"
@@ -240,43 +254,43 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
             }
         }
         oneMinuteCountdownTimer?.resume()
-
+        
         // ✅ API check timer: runs continuously every 5 seconds until success/failure
         apiStatusCheckTimer = Timer.scheduledTimer(withTimeInterval: 5.0, repeats: true) { [weak self] _ in
             guard let self = self else { return }
             self.checkThreeDSecureStatus(completion: nil)
         }
     }
-
+    
     @IBAction func actionBtnDone(_ sender: UIButton) {
         var resultBillingInfo: [String: Any]? = nil
         var resultAdditionalInfo: [String: Any]? = nil
-
+        
         // Only assign billingInfo if it contains at least one non-empty key-value pair
         if let billing = billingInfo, !billing.isEmpty {
             resultBillingInfo = billing
         }
-
+        
         // Combine 3DS status into additionalInfo if needed
         var combinedAdditionalInfo = additionalInfo ?? [:]
         if let threeDS = threeDSecureStatusResponse {
             combinedAdditionalInfo["threeDSecureStatus"] = threeDS
         }
-
+        
         // Only assign additionalInfo if it contains at least one non-empty key-value pair
         if !combinedAdditionalInfo.isEmpty {
             resultAdditionalInfo = combinedAdditionalInfo
         }
-
-        let result = Result(
+        
+        let result = SDKResult(
             type: .success,
             chargeData: chargeData,
             billingInfo: resultBillingInfo,
             additionalInfo: resultAdditionalInfo
         )
-
+        
         easyPayDelegate?.easyPayController(self.navigationController as! EasyPayViewController, didFinishWith: result)
-
+        
         if let easyPayVC = self.navigationController as? EasyPayViewController {
             easyPayVC.dismiss(animated: true, completion: {
                 if let delegate = easyPayVC.easyPayDelegate {
@@ -286,14 +300,15 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
             })
         }
     }
-        
+    
     func uiFinishingTouchElements() {
         // Set background color for the main view
         if let containerBGcolor = UserStoreSingleton.shared.container_bg_col,
            let uiColor = UIColor(hex: containerBGcolor) {
             self.view.backgroundColor = uiColor
             self.viewMain.backgroundColor = uiColor
-           // self.viewOverlay.backgroundColor = uiColor.withAlphaComponent(0.3)
+            self.imgViewLoading.backgroundColor = uiColor
+            // self.viewOverlay.backgroundColor = uiColor.withAlphaComponent(0.3)
         }
         
         if let primaryBtnBackGroundColor = UserStoreSingleton.shared.primary_btn_bg_col,
@@ -358,7 +373,7 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         formatter.timeZone = TimeZone(abbreviation: "UTC")
         return formatter.date(from: dateString)
     }
-
+    
     private func formatDate(date: Date) -> String {
         let formatter = DateFormatter()
         formatter.dateFormat = "dd/MM/yyyy, HH:mm:ss"
@@ -373,50 +388,50 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
             completion?()
             return
         }
-
+        
         let urlString = EnvironmentConfig.baseURL + EnvironmentConfig.Endpoints.threeDSecureStatus(secureToken).path()
         print("Final 3DS status URL: \(urlString)")
-
+        
         guard let url = URL(string: urlString) else {
             print("Invalid URL")
             completion?()
             return
         }
-
+        
         var uRLRequest = URLRequest(url: url)
         uRLRequest.httpMethod = "GET"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
-
+        
         if let token = UserStoreSingleton.shared.customerToken {
             uRLRequest.addValue(token, forHTTPHeaderField: "Customer-Token")
         }
-
+        
         if let apiKey = EnvironmentConfig.apiKey,
            let apiSecret = EnvironmentConfig.apiSecret {
             uRLRequest.addValue(apiKey, forHTTPHeaderField: "x-api-key")
             uRLRequest.addValue(apiSecret, forHTTPHeaderField: "x-api-secret")
         }
-
+        
         let task = URLSession.shared.dataTask(with: uRLRequest) { [weak self] data, response, error in
             defer { completion?() }
-
+            
             guard let self = self else { return }
-
+            
             if let error = error {
                 print("3DS status check error:", error.localizedDescription)
                 return
             }
-
+            
             guard let data = data else {
                 print("No data in response")
                 return
             }
-
+            
             do {
                 if let json = try JSONSerialization.jsonObject(with: data) as? [String: Any] {
                     print("3DS status response:", json)
                     self.threeDSecureStatusResponse = json
-
+                    
                     if let dataDict = json["data"] as? [String: Any] {
                         DispatchQueue.main.async {
                             let chargeId = dataDict["charge_id"] as? String ?? "N/A"
@@ -425,14 +440,14 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                             let createdAt = dataDict["created_at"] as? String ?? ""
                             let referenceId = dataDict["ref_token"] as? String ?? "N/A"
                             let status = dataDict["status"] as? String ?? "N/A"
-
+                            
                             let formattedDate: String
                             if let date = self.convertToDate(dateString: createdAt) {
                                 formattedDate = self.formatDate(date: date)
                             } else {
                                 formattedDate = "N/A"
                             }
-
+                            
                             self.lblChargeId.text = chargeId
                             self.lblTransactionId.text = transactionId
                             self.lblSubscriptionId.text = subscriptionId
@@ -440,16 +455,15 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                             self.lblTotal.text = "$\(self.amount ?? 0)"
                             self.lblRefferenceId.text = referenceId
                             self.lblStatus.text = status
-
+                            
                             if status.lowercased() == "failed" {
-                                // Handle failed status
-                                self.imgViewPaymentDone.image = UIImage(systemName: "xmark.circle.fill")
+                                self.imgViewPaymentDone.image = UIImage(named: "payment_error_icon", in: .easyPayBundle, compatibleWith: nil)
                                 self.imgViewPaymentDone.tintColor = .systemRed
                                 self.apiStatusCheckTimer?.invalidate()
                                 self.apiStatusCheckTimer = nil
                                 self.oneMinuteCountdownTimer?.cancel()
                                 self.oneMinuteCountdownTimer = nil
-
+                                
                                 self.imgViewLoading.layer.removeAllAnimations()
                                 self.imgViewLoading.isHidden = true
                                 self.imgViewPaymentDone.isHidden = false
@@ -457,15 +471,16 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                                 self.btnDone.isHidden = false
                                 self.lblPaymentLink.isHidden = false
                                 self.viewPaymentDetails.isHidden = false
-
-                            } else if status.lowercased() == "completed" {
+                                
+                            }
+                            else if status.lowercased() == "completed" {
                                 // Success case
                                 self.imgViewPaymentDone.image = UIImage(named: "payment_done_icon", in: .easyPayBundle, compatibleWith: nil)
                                 self.apiStatusCheckTimer?.invalidate()
                                 self.apiStatusCheckTimer = nil
                                 self.oneMinuteCountdownTimer?.cancel()
                                 self.oneMinuteCountdownTimer = nil
-
+                                
                                 self.imgViewLoading.layer.removeAllAnimations()
                                 self.imgViewLoading.isHidden = true
                                 self.imgViewPaymentDone.isHidden = false
@@ -473,7 +488,6 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                                 self.btnDone.isHidden = false
                                 self.lblPaymentLink.isHidden = false
                                 self.viewPaymentDetails.isHidden = false
-
                             } else {
                                 // Still waiting
                                 self.imgViewPaymentDone.image = UIImage(systemName: "exclamationmark.circle.fill")
@@ -488,6 +502,6 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         }
         task.resume()
     }
-
+    
 }
 

package/ios/easymerchantsdk.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'easymerchantsdk'
-  s.version          = '1.5.1'
+  s.version          = '1.5.3'
   s.summary          = 'A React Native SDK for Easy Merchant.'
   s.description      = <<-DESC
     A React Native SDK to enable Easy Merchant functionality in mobile applications.
@@ -27,6 +27,7 @@ Pod::Spec.new do |s|
    s.source_files  = [
       "Bundle/*",
       "Classes/*",
+      "ApiManager/*",
       "CustomComponents/**/*",
       "Extensions/**/*",
       "Models/**/*",
@@ -44,6 +45,7 @@ Pod::Spec.new do |s|
       "easymerchantsdk" => [
             "Bundle/*",
             "Classes/*",
+            "ApiManager/*",
             "CustomComponents/**/*",
             "Extensions/**/*",
             "Models/*",