@jimrising/easymerchantsdk-react-native 2.2.9 → 2.3.1

package/ios/Classes/EasyPayViewController.swift

@@ -14,60 +14,63 @@ public protocol EasyPayViewControllerDelegate {
 
 @objc
 public final class EasyPayViewController: UINavigationController {
-    
+
     private static var isFirstTimeSetupComleted: Bool = false
-    
+
     internal required init?(coder aDecoder: NSCoder) {
         fatalError("Cannot use \(#function)")
     }
-    
+
     internal override init(nibName nibNameOrNil: String?, bundle nibBundleOrNil: Bundle?) {
         fatalError("Cannot use \(#function)")
     }
-    
+
     internal override init(rootViewController: UIViewController) {
         fatalError("Cannot use \(#function)")
     }
-    
+
     internal override init(navigationBarClass: AnyClass?, toolbarClass: AnyClass?) {
         fatalError("Cannot use \(#function)")
     }
-    
+
     private let request: Request
     public weak var easyPayDelegate: EasyPayViewControllerDelegate?
-    
+
     public init(request: Request, delegate: EasyPayViewControllerDelegate?) {
         if !Self.isFirstTimeSetupComleted {
             Self.runFirstTimeSetup()
         }
-        
+
         self.request = request
         self.easyPayDelegate = delegate
         super.init(nibName: nil, bundle: nil)
-        
+
         if let themeConfiguration = request.appearanceSettings {
             UserStoreSingleton.shared.updateThemeConfiguration(with: themeConfiguration)
         }
-        
+
         self.modalPresentationStyle = .fullScreen
         self.isModalInPresentation = true
     }
-    
+
     public override func viewDidLoad() {
         super.viewDidLoad()
         // Disable interactive pop gesture to prevent dismissal by sliding from left
         self.interactivePopGestureRecognizer?.isEnabled = false
-        
+
         let vc = UIStoryboard(name: "easymerchantsdk", bundle: Bundle.easyPayBundle).instantiateViewController(withIdentifier: "PaymentInfoVC") as! PaymentInfoVC
         vc.modalPresentationStyle = .overFullScreen
         vc.configureWith(request: request, delegate: easyPayDelegate)
-        vc.amount = Double(self.request.amount ?? 0) // Set the amount here.
+        // For API key/secret flow, pass amount immediately. For clientToken flow,
+        // allow PaymentInfoVC to populate amount after hostedCheckoutsApi persists it locally.
+        if (self.request.clientToken == nil) || (self.request.clientToken?.isEmpty == true) {
+            vc.amount = Double(self.request.amount ?? 0)
+        }
         vc.selectedPaymentMethod = "Card"
-        
         self.navigationBar.isHidden = true
         self.setViewControllers([vc], animated: false)
     }
-    
+
 }
 
 private extension EasyPayViewController {

package/ios/CustomComponents/TextFieldStackView.swift

@@ -17,26 +17,10 @@ final class TextFieldStackView: UIStackView {
     
     @IBOutlet private var containerView: UIView?
     @IBOutlet private(set) var textField: UITextField!
-    
-    //    var error: String? {
-    //        didSet {
-    //            if isFirstResponder {
-    //                containerView?.layer.borderColor = UIColor._1757D9.withAlphaComponent(0.5).cgColor
-    //                errorLabel?.text = " "
-    //            } else if let error = error {
-    //                containerView?.layer.borderColor = UIColor.E93939.cgColor
-    //                errorLabel?.text = error
-    //            } else {
-    //                containerView?.layer.borderColor = UIColor._00000016.cgColor
-    //                errorLabel?.text = " "
-    //            }
-    //        }
-    //    }
-    
+   
     override func awakeFromNib() {
         super.awakeFromNib()
         
-        //        error = nil
         titleLabel?.adjustsFontSizeToFitWidth = true
         
         // Apply colors from UserStoreSingleton
@@ -87,12 +71,19 @@ final class TextFieldStackView: UIStackView {
         containerView?.layer.masksToBounds = true // Ensure the corners are clipped properly
     }
     
+//    @IBInspectable var isEnabled: Bool = true {
+//        didSet {
+//            titleLabel?.isEnabled = isEnabled
+//            textField?.isEnabled = isEnabled
+//        }
+//    }
+    
     @IBInspectable var isEnabled: Bool = true {
         didSet {
-            titleLabel?.isEnabled = isEnabled
+            // Only affect the textField, not the titleLabel
             textField?.isEnabled = isEnabled
-            //            textField.leftView?.tintColor = isEnabled ? UIColor._00000060 : UIColor._00000038
-            //            textField.rightView?.tintColor = isEnabled ? UIColor._00000060 : UIColor._00000038
+            // Optional: Adjust textField appearance for disabled state
+            textField?.alpha = isEnabled ? 1.0 : 1.5 // Visually indicate disabled state
         }
     }
     
@@ -114,30 +105,9 @@ final class TextFieldStackView: UIStackView {
         }
     }
     
-    override var isFirstResponder: Bool {
-        if let textField = textField {
-            return textField.isFirstResponder
-        } else {
-            return super.isFirstResponder
-        }
-    }
-    
-    @discardableResult
-    override func becomeFirstResponder() -> Bool {
-        if let textField = textField {
-            return textField.becomeFirstResponder()
-        } else {
-            return super.becomeFirstResponder()
-        }
-    }
-    
-    @discardableResult
-    override func resignFirstResponder() -> Bool {
-        if let textField = textField {
-            return textField.resignFirstResponder()
-        } else {
-            return super.resignFirstResponder()
-        }
-    }
-    
 }
+
+
+
+
+

package/ios/EnvironmentConfig.swift

@@ -16,6 +16,7 @@ public class EnvironmentConfig {
     }
     
     public static var currentEnvironment: Environment = .staging
+    public static var isEnvironmentSet: Bool = false
     
     public static var apiKey: String?
     public static var apiSecret: String?
@@ -27,6 +28,20 @@ public class EnvironmentConfig {
         case .production: return "https://api.lyfepay.io"
         }
     }
+        
+    /// GrailPay SDK JS URL
+    public static var grailPaySDKURL: String {
+        return (currentEnvironment == .production)
+        ? "https://bank-link-widget.grailpay.com/sdk.js"
+        : "https://bank-link-widget-sandbox.grailpay.com/sdk.js"
+    }
+    
+    /// GrailPay Base URL (for WKWebView baseURL)
+    public static var grailPayBaseURL: String {
+        return (currentEnvironment == .production)
+        ? "https://bank-link-widget.grailpay.com"
+        : "https://bank-link-widget-sandbox.grailpay.com"
+    }
     
     /// Configure API keys dynamically
     public static func configure(apiKey: String, apiSecret: String) {
@@ -37,6 +52,7 @@ public class EnvironmentConfig {
     /// Set the environment (staging, sandbox, production)
     public static func setEnvironment(_ environment: Environment) {
         self.currentEnvironment = environment
+        self.isEnvironmentSet = true
     }
     
     public enum Endpoints {