@jimrising/easymerchantsdk-react-native 2.5.9 → 2.6.1

package/android/build.gradle

@@ -7,7 +7,8 @@ if (configFile.exists()) {
 }
 
 buildscript {
-    ext.kotlinVersion = "1.9.10"
+    // Align with expeditermobile (2.0.21) to avoid Kotlin metadata mismatch
+    ext.kotlinVersion = "2.0.21"
 
     repositories {
         google()
@@ -96,7 +97,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.13.0'
 
     // Third-party libs
-    implementation 'com.app:paysdk:1.7.5'
+    implementation 'com.app:paysdk:1.7.9'
     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/ApiManager/APIHeaders.swift

@@ -8,8 +8,13 @@
 import Foundation
 
 struct APIHeaders {
+    static let userAgent = "ESAdvantage"
+    
     static func commonHeaders(contentType: String = "application/json") -> [String: String] {
-        return ["Content-Type": contentType]
+        return [
+            "Content-Type": contentType,
+            "User-Agent": userAgent
+        ]
     }
 
     static func clientTokenHeader() -> [String: String] {

package/ios/Models/Request.swift

@@ -516,6 +516,7 @@ public final class Request: NSObject {
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         request.addValue(EnvironmentConfig.apiKey ?? "", forHTTPHeaderField: "X-Api-Key")
         request.addValue(EnvironmentConfig.apiSecret ?? "", forHTTPHeaderField: "X-Api-Secret")
         
@@ -671,6 +672,7 @@ public final class Request: NSObject {
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = clientToken ?? UserStoreSingleton.shared.clientToken ?? ""
         if token.isEmpty {
@@ -774,6 +776,11 @@ public final class Request: NSObject {
                                 UserStoreSingleton.shared.amount = "\(paymentAmount)"
                             }
                             
+                            // Set secureAuthentication from hostedcheckout three_d_secure
+                            if let threeDSecure = dataObject["three_d_secure"] as? Bool {
+                                UserStoreSingleton.shared.secureAuthentication = threeDSecure
+                            }
+                            
                             // Save recurring details
                             if let recurringDetails = dataObject["recurring_details"] as? [String: Any] {
                                 if let allowedCycles = recurringDetails["allowed_cycles"] {
@@ -932,6 +939,7 @@ public final class Request: NSObject {
         var uRLRequest = URLRequest(url: url)
         uRLRequest.httpMethod = "GET"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         //        let tokenn = UserStoreSingleton.shared.customerToken
         //        uRLRequest.addValue(tokenn ?? "", forHTTPHeaderField: "customer-token")
@@ -972,6 +980,13 @@ public final class Request: NSObject {
     
 }
 
+extension Request {
+    /// Effective 3DS flag: from hosted checkout (three_d_secure) when set, otherwise from init config.
+    var effectiveSecureAuthentication: Bool {
+        (UserStoreSingleton.shared.secureAuthentication ?? secureAuthentication) == true
+    }
+}
+
 extension DateFormatter {
     static let recurringDateFormatter: DateFormatter = {
         let formatter = DateFormatter()

package/ios/Pods/Storyboard/EasyPaySdk.storyboard

@@ -8715,10 +8715,10 @@
                                         <rect key="frame" x="0.0" y="0.0" width="393" height="847.66666666666663"/>
                                         <subviews>
                                             <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="payment_done_icon" translatesAutoresizingMaskIntoConstraints="NO" id="5Tx-1L-CH6">
-                                                <rect key="frame" x="96.666666666666686" y="100" width="200" height="200"/>
+                                                <rect key="frame" x="96.666666666666686" y="100" width="150" height="150"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="width" constant="200" id="hqG-2m-iXd"/>
-                                                    <constraint firstAttribute="height" constant="200" id="nf6-x2-tPc"/>
+                                                    <constraint firstAttribute="width" constant="150" id="hqG-2m-iXd"/>
+                                                    <constraint firstAttribute="height" constant="150" id="nf6-x2-tPc"/>
                                                 </constraints>
                                                 <userDefinedRuntimeAttributes>
                                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
@@ -8727,10 +8727,10 @@
                                                 </userDefinedRuntimeAttributes>
                                             </imageView>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="redraw" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xHM-Ip-TLk">
-                                                <rect key="frame" x="96.666666666666686" y="100" width="200" height="200"/>
+                                                <rect key="frame" x="96.666666666666686" y="100" width="150" height="150"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="200" id="JJA-mJ-vdg"/>
-                                                    <constraint firstAttribute="width" constant="200" id="ODJ-fO-vJQ"/>
+                                                    <constraint firstAttribute="height" constant="150" id="JJA-mJ-vdg"/>
+                                                    <constraint firstAttribute="width" constant="150" id="ODJ-fO-vJQ"/>
                                                 </constraints>
                                                 <userDefinedRuntimeAttributes>
                                                     <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">

package/ios/Pods/UserDefaults/UserStoreSingleton.swift

@@ -212,6 +212,21 @@ class UserStoreSingleton: NSObject {
         }
     }
     
+    /// 3DS enabled flag from hosted checkout response (three_d_secure). When set, overrides request.secureAuthentication.
+    var secureAuthentication: Bool? {
+        get {
+            guard UserDefaults.standard.object(forKey: "secure_authentication") != nil else { return nil }
+            return UserDefaults.standard.bool(forKey: "secure_authentication")
+        }
+        set {
+            if let v = newValue {
+                UserDefaults.standard.set(v, forKey: "secure_authentication")
+            } else {
+                UserDefaults.standard.removeObject(forKey: "secure_authentication")
+            }
+        }
+    }
+    
     //apperance_settings
     var body_bg_col : String? {
         get {
@@ -338,6 +353,7 @@ class UserStoreSingleton: NSObject {
             "payment_methods",
             "bank_widget_key",
             "vendor_id",
+            "secure_authentication",
 //            "amount"
 //            "allowCycles",
 //            "interval",

package/ios/Pods/ViewControllers/AdditionalInfoVC.swift

@@ -318,7 +318,7 @@ class AdditionalInfoVC: BaseVC {
             if UserStoreSingleton.shared.isLoggedIn == true {
                 switch selectedPaymentMethod {
                 case "Card":
-                    if request.secureAuthentication == true {
+                    if request.effectiveSecureAuthentication {
                         threeDSecurePaymentApi()
                     } else {
                         paymentIntentApi()
@@ -415,7 +415,7 @@ class AdditionalInfoVC: BaseVC {
                             }
                             return
                         }
-                        if request.secureAuthentication == true {
+                        if request.effectiveSecureAuthentication {
                             threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
                         } else {
                             paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
@@ -423,7 +423,7 @@ class AdditionalInfoVC: BaseVC {
                     }
                 }
                 else {
-                    if request.secureAuthentication == true {
+                    if request.effectiveSecureAuthentication {
                         threeDSecurePaymentApi()
                     } else {
                         paymentIntentApi()
@@ -477,6 +477,7 @@ class AdditionalInfoVC: BaseVC {
         var urlRequest = URLRequest(url: serviceURL)
         urlRequest.httpMethod = "POST"
         urlRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        urlRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         urlRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -718,6 +719,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -973,6 +975,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -1221,6 +1224,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -1456,6 +1460,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -1695,6 +1700,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -1944,6 +1950,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -2187,6 +2194,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -2413,6 +2421,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")
@@ -2657,6 +2666,7 @@ class AdditionalInfoVC: BaseVC {
         var uRLRequest = URLRequest(url: serviceURL)
         uRLRequest.httpMethod = "POST"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let token = UserStoreSingleton.shared.clientToken
         uRLRequest.addValue(token ?? "", forHTTPHeaderField: "Client-Token")

package/ios/Pods/ViewControllers/BillingInfoVC/BillingInfoVC.swift

@@ -754,7 +754,7 @@ class BillingInfoVC: BaseVC {
             }
             else if !isAdditionalVisible && isSavedForFuture {
                 if UserStoreSingleton.shared.isLoggedIn == true {
-                    if request.secureAuthentication == true {
+                    if request.effectiveSecureAuthentication {
                         threeDSecurePaymentApi()
                     } else {
                         paymentIntentApi()
@@ -787,7 +787,7 @@ class BillingInfoVC: BaseVC {
             }
             else if !isAdditionalVisible && isSavedNewCard {
                 if isFrom == "AddNewCard" {
-                    if request.secureAuthentication == true {
+                    if request.effectiveSecureAuthentication {
                         threeDSecurePaymentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
                     }
                     else {
@@ -797,7 +797,7 @@ class BillingInfoVC: BaseVC {
             }
             else {
                 // ✅ Skip to Payment directly
-                if request.secureAuthentication == true {
+                if request.effectiveSecureAuthentication {
                     threeDSecurePaymentApi()
                 } else {
                     paymentIntentApi()

package/ios/Pods/ViewControllers/EmailVerificationVC.swift

@@ -169,6 +169,7 @@ class EmailVerificationVC: BaseVC {
         var request = URLRequest(url: serviceURL)
         request.httpMethod = "POST"
         request.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        request.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
 
         let token = UserStoreSingleton.shared.clientToken
         request.addValue(token ?? "", forHTTPHeaderField: "Client-Token")

package/ios/Pods/ViewControllers/OTPVerificationVC.swift

@@ -402,7 +402,7 @@ class OTPVerificationVC: BaseVC {
                                    let innerData = dataSection["data"] as? [String: Any],
                                    let customerId = innerData["customer_id"] as? String {
                                     if self.billingInfoData == nil {
-                                        if self.request.secureAuthentication == true {
+                                        if self.request.effectiveSecureAuthentication {
                                             self.threeDSecurePaymentApi(customerId: customerId)
                                         }
                                         else {
@@ -412,7 +412,7 @@ class OTPVerificationVC: BaseVC {
                                     else {
                                         // self.paymentIntentApi(customerId: customerId)
                                         if let request = self.request {
-                                            if request.secureAuthentication == true {
+                                            if request.effectiveSecureAuthentication {
                                                 self.threeDSecurePaymentSavedCardApi(customerId: customerId)
                                             } else {
                                                 self.paymentIntentApi(customerId: customerId)
@@ -421,7 +421,7 @@ class OTPVerificationVC: BaseVC {
                                     }
                                 } else {
                                     if let request = self.request {
-                                        if request.secureAuthentication == true {
+                                        if request.effectiveSecureAuthentication {
                                             self.threeDSecurePaymentSavedCardApi(customerId: nil)
                                         }
                                         else {

package/ios/Pods/ViewControllers/PaymentDoneVC.swift

@@ -203,14 +203,36 @@ class PaymentDoneVC: UIViewController {
     }
     
     func showDateAndTime() {
-        // Get the current date and time
-        let currentDate = Date()
-        // Format the date and time as "dd/MM/yyyy, HH:mm:ss"
-        let dateFormatter = DateFormatter()
-        dateFormatter.dateFormat = "dd/MM/yyyy, HH:mm:ss"
-        let formattedDate = dateFormatter.string(from: currentDate)
-        // Set the formatted date and time to the lblDate
-        lblDate.text = formattedDate
+        let createdAt = chargeData?["created_at"] as? String
+            ?? (chargeData?["data"] as? [String: Any])?["created_at"] as? String
+        if let createdAt = createdAt, !createdAt.isEmpty, let formatted = formatApiDateTime(createdAt) {
+            lblDate.text = formatted
+        } else {
+            let dateFormatter = DateFormatter()
+            dateFormatter.dateFormat = "dd/MM/yyyy, HH:mm:ss"
+            lblDate.text = dateFormatter.string(from: Date())
+        }
+    }
+    
+    private func formatApiDateTime(_ apiDateString: String) -> String? {
+        let displayFormat = "dd/MM/yyyy, HH:mm:ss"
+        let formatters = [
+            "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+            "yyyy-MM-dd'T'HH:mm:ss'Z'",
+            "yyyy-MM-dd HH:mm:ss"
+        ]
+        for fmt in formatters {
+            let parser = DateFormatter()
+            parser.dateFormat = fmt
+            parser.timeZone = TimeZone(identifier: "UTC")
+            if let date = parser.date(from: apiDateString) {
+                let out = DateFormatter()
+                out.dateFormat = displayFormat
+                out.timeZone = TimeZone(identifier: "UTC")
+                return out.string(from: date)
+            }
+        }
+        return nil
     }
     
 //    @IBAction func actionBtnDone(_ sender: UIButton) {

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

@@ -2993,7 +2993,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         NSLog("%@", "[PayNowNewCard] LOGGED IN: showBilling=\(showBilling), showAdditional=\(showAdditional)")
                         if !showBilling && !showAdditional {
                             NSLog("%@", "[PayNowNewCard] LOGGED IN: no billing → calling payment API directly")
-                            if self.request.secureAuthentication == true {
+                            if self.request.effectiveSecureAuthentication {
                                 self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                             } else {
                                 self.paymentIntentAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
@@ -3060,7 +3060,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
             }
             else {
                 NSLog("%@", "[PayNowNewCard] LOGGED IN: no billingInfoData → calling payment API")
-                if request.secureAuthentication == true {
+                if request.effectiveSecureAuthentication {
                     threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                 }
                 else {
@@ -3162,7 +3162,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                 }
                             } else {
                                 NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: saveCard not checked → calling payment API (bypassing OTP)")
-                                if self.request.secureAuthentication == true {
+                                if self.request.effectiveSecureAuthentication {
                                     self.threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                                 } else {
                                     self.paymentIntentFromAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
@@ -3217,7 +3217,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 }
             } else {
                 NSLog("%@", "[PayNowNewCard] NOT LOGGED IN: no billingInfoData → calling payment API (bypassing OTP)")
-                if request.secureAuthentication == true {
+                if request.effectiveSecureAuthentication {
                     threeDSecurePaymentNewCardApi(customerId: UserStoreSingleton.shared.customerId ?? "")
                 } else {
                     paymentIntentFromAddNewCardApi(customerId: UserStoreSingleton.shared.customerId)
@@ -5201,7 +5201,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         if !showBilling && !showAdditional {
                             if saveCardChecked {
                                 if UserStoreSingleton.shared.isLoggedIn == true {
-                                    if self.request.secureAuthentication == true {
+                                    if self.request.effectiveSecureAuthentication {
                                         self.threeDSecurePaymentApi()
                                     } else {
                                         self.paymentIntentCardApi()
@@ -5211,7 +5211,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.navigateCardDataToEmailVerificationVC()
                                 }
                             } else {
-                                if self.request.secureAuthentication == true {
+                                if self.request.effectiveSecureAuthentication {
                                     self.threeDSecurePaymentApi()
                                 } else {
                                     self.paymentIntentCardApi()
@@ -5508,7 +5508,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                 // Navigate to EmailVerificationVC if isSavedForFuture is true, else call paymentIntentApi
                 if isSavedForFuture {
                     if UserStoreSingleton.shared.isLoggedIn == true {
-                        if request.secureAuthentication == true {
+                        if request.effectiveSecureAuthentication {
                             threeDSecurePaymentApi()
                         } else {
                             paymentIntentApi()
@@ -5533,7 +5533,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                         }
                     }
                 } else {
-                    if request.secureAuthentication == true {
+                    if request.effectiveSecureAuthentication {
                         threeDSecurePaymentApi()
                     }
                     else {
@@ -6616,7 +6616,7 @@ class PaymentInfoVC: BaseVC, BillingInfoVCDelegate {
                                     self.OTPView.isHidden = true
                                     // After verify_otp: run charge so card is saved (same pattern as OTPVerificationVC → paymentIntentWithSavedCardApi / paymentIntentApi)
                                     if self.isSavedNewCardForFuture {
-                                        if self.request.secureAuthentication == true {
+                                        if self.request.effectiveSecureAuthentication {
                                             self.threeDSecurePaymentNewCardApi(customerId: customerId)
                                         } else {
                                             self.paymentIntentAddNewCardApi(customerId: customerId)

package/ios/Pods/ViewControllers/ThreeDSecurePaymentDoneVC.swift

@@ -669,6 +669,9 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
     
     var didTapContinue = false
     
+    /// Static date for 3DS details (no live timer); set once from first API response.
+    private var displayed3dsDate: String?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         uiFinishingTouchElements()
@@ -758,60 +761,17 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         }
     }
     
-    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 {
-            imgViewLoading.image = UIImage(systemName: "hourglass")?.withRenderingMode(.alwaysTemplate)
-            imgViewLoading.tintColor = UIColor.systemGray
-            imgViewLoading.contentMode = .scaleAspectFit
-            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 = .scaleToFill
+    private func showLockIcon() {
+        if let lockImage = UIImage(named: "lock_3ds", in: .easyPayBundle, compatibleWith: nil) {
+            imgViewLoading.image = lockImage.withRenderingMode(.alwaysTemplate)
         } else {
-            imgViewLoading.image = UIImage(systemName: "hourglass")?.withRenderingMode(.alwaysTemplate)
-            imgViewLoading.tintColor = UIColor.systemGray
-            imgViewLoading.contentMode = .scaleAspectFit
+            imgViewLoading.image = UIImage(systemName: "lock.fill")?.withRenderingMode(.alwaysTemplate)
         }
-    }
-    
-    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
+        imgViewLoading.contentMode = .scaleAspectFit
     }
     
     func startRotatingImage() {
-        showHourglassGIF()
+        showLockIcon()
     }
     
     @IBAction func actionBtnContinue(_ sender: UIButton) {
@@ -828,32 +788,64 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         self.navigationController?.pushViewController(vc, animated: true)
     }
     
+    /// Build "Card 4242xxxx4242" (or "Card xxxx4242") from 3DS API status data using card_number or last_4.
+    private func formatMaskedCard(from data: [String: Any]?) -> String {
+        guard let data = data else { return "Card" }
+        let cardNum = (data["card_number"] as? String ?? "").replacingOccurrences(of: " ", with: "")
+        if cardNum.count >= 8 {
+            let prefix = String(cardNum.prefix(4))
+            let suffix = String(cardNum.suffix(4))
+            return "Card \(prefix)xxxx\(suffix)"
+        }
+        if cardNum.count == 4 {
+            return "Card xxxx\(cardNum)"
+        }
+        if let last4 = (data["last_4"] as? String)?.replacingOccurrences(of: " ", with: ""), !last4.isEmpty {
+            return "Card xxxx\(last4)"
+        }
+        return "Card"
+    }
+    
     private func populateInitialLabels() {
-        // Populate labels with initial data from chargeData or defaults
-        let refToken = chargeData["ref_token"] as? String ?? "N/A"
-        let chargeId = chargeData["charge_id"] as? String ?? "N/A"
-        let transactionId = chargeData["transaction_id"] as? String ?? "N/A"
-        let subscriptionId = chargeData["subscription_id"] as? String ?? "N/A"
-        let createdAt = chargeData["created_at"] as? String ?? ""
-        let status = chargeData["status"] as? String ?? "N/A"
+        lblTransactionHeading.text = "3DS reference:"
+        lblSubscriptionHeading.text = "Subscription ID:"
+        lblReferenceIdHeading.isHidden = true
+        lblRefferenceId.isHidden = true
+        
+        let dataSource = (threeDSecureStatusResponse?["data"] as? [String: Any]) ?? chargeData
+        let chargeId = dataSource["charge_id"] as? String ?? "N/A"
+        let transactionId = dataSource["transaction_id"] as? String ?? "N/A"
+        let subscriptionId = dataSource["subscription_id"] as? String
+        let status = dataSource["status"] as? String ?? "N/A"
+        let dateStringToUse = dateStringForDisplay(dataSource: dataSource, status: status)
         
         let formattedDate: String
-        if let date = convertToDate(dateString: createdAt) {
+        if !dateStringToUse.isEmpty, let date = convertToDate(dateString: dateStringToUse) {
             formattedDate = formatDate(date: date)
         } else {
             formattedDate = "N/A"
         }
         
+        if !dateStringToUse.isEmpty { displayed3dsDate = formattedDate }
+        
         lblChargeId.text = chargeId
         lblTransactionId.text = transactionId
-        lblSubscriptionId.text = subscriptionId
-        lblDate.text = formattedDate
+        lblDate.text = displayed3dsDate ?? formattedDate
         let rawAmount = Double(request?.amount ?? 0)
         let amountText = String(format: "$%.2f", rawAmount)
         lblTotal.text = amountText
-        lblRefferenceId.text = refToken
         lblStatus.text = status
-        lblPaymentMethodValue.text = "Card" // Set to "Card" by default
+        
+        if let subId = subscriptionId, !subId.isEmpty, subId != "null" {
+            lblSubscriptionHeading.isHidden = false
+            lblSubscriptionId.isHidden = false
+            lblSubscriptionId.text = subId
+        } else {
+            lblSubscriptionHeading.isHidden = true
+            lblSubscriptionId.isHidden = true
+        }
+        
+        lblPaymentMethodValue.text = formatMaskedCard(from: dataSource)
     }
     
     private func startOneMinuteCountdownAndAPICheck() {
@@ -899,28 +891,37 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                     
                     if let json = self.threeDSecureStatusResponse,
                        let data = json["data"] as? [String: Any] {
-                        let refToken = data["ref_token"] as? String ?? "N/A"
+                        self.lblTransactionHeading.text = "3DS reference:"
+                        self.lblSubscriptionHeading.text = "Subscription ID:"
+                        self.lblReferenceIdHeading.isHidden = true
+                        self.lblRefferenceId.isHidden = true
                         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 formattedDate: String
-                        if let date = self.convertToDate(dateString: createdAt) {
-                            formattedDate = self.formatDate(date: date)
-                        } else {
-                            formattedDate = "N/A"
+                        let subscriptionId = data["subscription_id"] as? String
+                        let status = data["status"] as? String ?? ""
+                        let dateStringToUse = self.dateStringForDisplay(dataSource: data, status: status)
+                        if !dateStringToUse.isEmpty {
+                            let formatted: String
+                            if let date = self.convertToDate(dateString: dateStringToUse) {
+                                formatted = self.formatDate(date: date)
+                            } else { formatted = "N/A" }
+                            self.displayed3dsDate = formatted
                         }
-                        
                         self.lblChargeId.text = chargeId
                         self.lblTransactionId.text = transactionId
-                        self.lblSubscriptionId.text = subscriptionId
-                        self.lblDate.text = formattedDate
+                        self.lblDate.text = self.displayed3dsDate ?? "N/A"
                         let rawAmount = Double(self.request?.amount ?? 0)
                         let amountText = String(format: "$%.2f", rawAmount)
                         self.lblTotal.text = amountText
-                        self.lblRefferenceId.text = refToken
-                        self.lblPaymentMethodValue.text = "Card"
+                        if let subId = subscriptionId, !subId.isEmpty, subId != "null" {
+                            self.lblSubscriptionHeading.isHidden = false
+                            self.lblSubscriptionId.isHidden = false
+                            self.lblSubscriptionId.text = subId
+                        } else {
+                            self.lblSubscriptionHeading.isHidden = true
+                            self.lblSubscriptionId.isHidden = true
+                        }
+                        self.lblPaymentMethodValue.text = self.formatMaskedCard(from: data)
                     }
                     // Match Android behavior: timeout shows warning UI only.
                 }
@@ -1055,10 +1056,21 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         return formatter.date(from: dateString)
     }
     
+    /// When status is "completed", prefer charge_data.date_created; otherwise use created_at.
+    private func dateStringForDisplay(dataSource: [String: Any], status: String) -> String {
+        if status == "completed",
+           let chargeData = dataSource["charge_data"] as? [String: Any],
+           let dateCreated = chargeData["date_created"] as? String, !dateCreated.isEmpty {
+            return dateCreated
+        }
+        return dataSource["created_at"] as? String ?? ""
+    }
+    
+    /// Format date for display using UTC so we show server time (created_at) as-is, not local time.
     private func formatDate(date: Date) -> String {
         let formatter = DateFormatter()
         formatter.dateFormat = "dd/MM/yyyy, HH:mm:ss"
-        formatter.timeZone = TimeZone.current
+        formatter.timeZone = TimeZone(abbreviation: "UTC")
         return formatter.string(from: date)
     }
     
@@ -1085,6 +1097,7 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
         var uRLRequest = URLRequest(url: url)
         uRLRequest.httpMethod = "GET"
         uRLRequest.addValue("application/json", forHTTPHeaderField: "Content-Type")
+        uRLRequest.addValue(APIHeaders.userAgent, forHTTPHeaderField: "User-Agent")
         
         let clientToken = UserStoreSingleton.shared.clientToken ?? ""
         uRLRequest.addValue(clientToken, forHTTPHeaderField: "Client-Token")
@@ -1108,30 +1121,45 @@ class ThreeDSecurePaymentDoneVC: BaseVC {
                     
                     if let dataDict = json["data"] as? [String: Any] {
                         DispatchQueue.main.async {
+                            self.lblTransactionHeading.text = "3DS reference:"
+                            self.lblSubscriptionHeading.text = "Subscription ID:"
+                            self.lblReferenceIdHeading.isHidden = true
+                            self.lblRefferenceId.isHidden = true
+                            
                             let chargeId = dataDict["charge_id"] as? String ?? "N/A"
                             let transactionId = dataDict["transaction_id"] as? String ?? "N/A"
-                            let subscriptionId = dataDict["subscription_id"] as? String ?? "N/A"
-                            let createdAt = dataDict["created_at"] as? String ?? ""
-                            let referenceId = dataDict["ref_token"] as? String ?? "N/A"
+                            let subscriptionId = dataDict["subscription_id"] as? String
                             let status = dataDict["status"] as? String ?? "N/A"
+                            let dateStringToUse = self.dateStringForDisplay(dataSource: dataDict, status: status)
                             
-                            let formattedDate: String
-                            if let date = self.convertToDate(dateString: createdAt) {
-                                formattedDate = self.formatDate(date: date)
-                            } else {
-                                formattedDate = "N/A"
+                            if !dateStringToUse.isEmpty {
+                                let formatted: String
+                                if let date = self.convertToDate(dateString: dateStringToUse) {
+                                    formatted = self.formatDate(date: date)
+                                } else {
+                                    formatted = "N/A"
+                                }
+                                self.displayed3dsDate = formatted
                             }
                             
                             self.lblChargeId.text = chargeId
                             self.lblTransactionId.text = transactionId
-                            self.lblSubscriptionId.text = subscriptionId
-                            self.lblDate.text = formattedDate
+                            self.lblDate.text = self.displayed3dsDate ?? "N/A"
                             let rawAmount = Double(self.request?.amount ?? 0)
                             let amountText = String(format: "$%.2f", rawAmount)
                             self.lblTotal.text = amountText
-                            self.lblRefferenceId.text = referenceId
                             self.lblStatus.text = status
-                            self.lblPaymentMethodValue.text = "Card" // Ensure "Card" in all cases
+                            
+                            if let subId = subscriptionId, !subId.isEmpty, subId != "null" {
+                                self.lblSubscriptionHeading.isHidden = false
+                                self.lblSubscriptionId.isHidden = false
+                                self.lblSubscriptionId.text = subId
+                            } else {
+                                self.lblSubscriptionHeading.isHidden = true
+                                self.lblSubscriptionId.isHidden = true
+                            }
+                            
+                            self.lblPaymentMethodValue.text = self.formatMaskedCard(from: dataDict)
                             
                             // MATCH ANDROID EXACTLY:
                             // - keep polling ONLY while status == "initiated"

package/ios/Resources/Assets.xcassets/lock_3ds.imageset/Contents.json

@@ -0,0 +1,16 @@
+{
+  "images" : [
+    {
+      "filename" : "lock.svg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

package/ios/Resources/Assets.xcassets/lock_3ds.imageset/lock.svg

@@ -0,0 +1,4 @@
+<svg width="56" height="56" viewBox="0 0 56 56" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28.3633 17.0916C38.0031 17.0916 45.8183 24.9058 45.8184 34.5457C45.8184 44.1857 38.0031 52.0008 28.3633 52.0008C18.7236 52.0006 10.9092 44.1856 10.9092 34.5457C10.9093 24.906 18.7237 17.0918 28.3633 17.0916ZM28.3643 29.8856C26.6483 29.8856 25.2568 31.277 25.2568 32.993C25.2569 34.2202 25.9697 35.2779 27.0029 35.782C27.1934 35.8749 27.3291 36.0604 27.3291 36.2723V38.7068C27.3291 38.983 27.553 39.2068 27.8291 39.2068H28.9004C29.1765 39.2068 29.4004 38.983 29.4004 38.7068V36.2713C29.4004 36.0596 29.5355 35.8741 29.7256 35.7811C30.7581 35.2767 31.4706 34.2197 31.4707 32.993C31.4707 31.2771 30.08 29.8858 28.3643 29.8856Z" fill="#E9A400"/>
+<path d="M17.8902 21.455V13.6973C17.8902 11.1255 18.9936 8.65901 20.9576 6.84045C22.9216 5.0219 25.5854 4.00024 28.3629 4.00024C31.1405 4.00024 33.8042 5.0219 35.7683 6.84045C37.7323 8.65901 38.8356 11.1255 38.8356 13.6973V21.455" stroke="#E9A400" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

package/ios/easymerchantsdk.podspec

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