@jimrising/easymerchantsdk-react-native 1.6.0 → 1.6.1

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.6.0"
+  "@jimrising/easymerchantsdk-react-native": "^1.6.1"
 },
 ```
 
@@ -40,6 +40,10 @@ allprojects {
 ## Changes in IOS side.
 Add below content inside the AppDelegate.swift File :-
 
+## Requirements
+  - Ruby 3.2.8
+
+
 Create a new file named AppDelegate.swift
 ```swift
 import UIKit

package/android/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties

@@ -1 +1 @@
-#Thu Jun 19 14:12:11 IST 2025
+#Tue Jun 24 09:49:20 IST 2025

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/OTPVerificationVC.swift

@@ -504,8 +504,9 @@ class OTPVerificationVC: BaseVC {
                 if let data = serviceData,
                    let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let message = responseObj["message"] as? String {
-                   // self.presentPaymentErrorVC(errorMessage: message)
-                    self.showToast(message: message)
+                   DispatchQueue.main.async {
+                                           self.showToast(message: message)
+                                       }
                 }
             }
         }

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

@@ -5085,8 +5085,9 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 if let data = serviceData,
                    let responseObj = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any],
                    let message = responseObj["message"] as? String {
-//                    self.presentPaymentErrorVC(errorMessage: message)
-                    self.showToast(message: message)
+DispatchQueue.main.async {
+                        self.showToast(message: message)
+                    }
                 }
             }
         }

package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift

@@ -6,13 +6,11 @@
 //
 
 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!
@@ -144,26 +142,64 @@ 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() {
+        guard let bundlePath = Bundle.easyPayBundle.path(forResource: "hourglass", ofType: "gif"),
+              let gifData = try? Data(contentsOf: URL(fileURLWithPath: bundlePath)),
+              let source = CGImageSourceCreateWithData(gifData as CFData, nil) else {
+            print("⚠️ Could not load GIF from bundle")
+            return
         }
+        
+        var images: [UIImage] = []
+        var duration: Double = 0
+
+        let frameCount = CGImageSourceGetCount(source)
+        for i in 0..<frameCount {
+            if let cgImage = CGImageSourceCreateImageAtIndex(source, i, nil) {
+                let frameDuration = getFrameDuration(from: source, index: i)
+                duration += frameDuration
+                images.append(UIImage(cgImage: cgImage))
+            }
+        }
+
+        if !images.isEmpty {
+            let animatedImage = UIImage.animatedImage(with: images, duration: duration)
+            imgViewLoading.image = animatedImage
+            imgViewLoading.contentMode = .scaleAspectFit
+        }
+    }
     
-//    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
-//        }
-//    }
+    private func getFrameDuration(from source: CGImageSource, index: Int) -> Double {
+        let defaultFrameDuration = 0.1
+
+        guard let properties = CGImageSourceCopyPropertiesAtIndex(source, index, nil) as? [CFString: Any],
+              let gifProperties = properties[kCGImagePropertyGIFDictionary] as? [CFString: Any] else {
+            return defaultFrameDuration
+        }
+
+        if let unclampedDelay = gifProperties[kCGImagePropertyGIFUnclampedDelayTime] as? Double, unclampedDelay > 0 {
+            return unclampedDelay
+        }
+
+        if let delay = gifProperties[kCGImagePropertyGIFDelayTime] as? Double, delay > 0 {
+            return delay
+        }
+
+        return defaultFrameDuration
+    }
     
-//    func startRotatingImage() {
-//        showHourglassGIF()
-//    }
+    func startRotatingImage() {
+        showHourglassGIF()
+    }
     
     private func setupTapOnLabel() {
         if let url = redirectURL {
@@ -255,7 +291,7 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         }
         oneMinuteCountdownTimer?.resume()
         
-        // ✅ API check timer: runs continuously every 5 seconds until success/failure
+        // 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)

package/ios/easymerchantsdk.podspec

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