@primer-io/react-native 2.30.0 → 2.30.2

package/ios/Sources/DataModels/PrimerHeadlessUniversalCheckout_PaymentMethod.swift

@@ -10,11 +10,14 @@ import PrimerSDK
 
 extension PrimerHeadlessUniversalCheckout.PaymentMethod {
 
-    func toJsonObject() -> [String: Any] {
-        return [
-            "paymentMethodType": paymentMethodType,
-            "supportedPrimerSessionIntents": self.supportedPrimerSessionIntents.compactMap({ $0.rawValue }),
-            "paymentMethodManagerCategories": self.paymentMethodManagerCategories.compactMap({ $0.rawValue }).filter({ $0 != "CARD_COMPONENTS" })
-        ]
-    }
+  func toJsonObject() -> [String: Any] {
+    return [
+      "paymentMethodType": paymentMethodType,
+      "supportedPrimerSessionIntents": self.supportedPrimerSessionIntents.compactMap({ $0.rawValue }
+      ),
+      "paymentMethodManagerCategories": self.paymentMethodManagerCategories.compactMap({
+        $0.rawValue
+      }).filter({ $0 != "CARD_COMPONENTS" })
+    ]
+  }
 }

package/ios/Sources/DataModels/PrimerPhoneNumberData+Extension.swift

@@ -22,8 +22,7 @@ extension PrimerPhoneNumberData {
                 return nil
             }
 
-            if let phoneNumber = dict["phoneNumber"]
-            {
+            if let phoneNumber = dict["phoneNumber"] {
                 self.init(
                     phoneNumber: phoneNumber)
             } else {

package/ios/Sources/DataModels/PrimerRawRetailerData+Extension.swift

@@ -22,8 +22,7 @@ extension PrimerRetailerData {
                 return nil
             }
 
-            if let retailerId = dict["id"]
-            {
+            if let retailerId = dict["id"] {
                 self.init(
                     id: retailerId)
             } else {

package/ios/Sources/DataModels/PrimerSettings+Extensions.swift

@@ -1,51 +1,71 @@
 import PrimerSDK
 
 extension PrimerSettings {
-  
+
+  // swiftlint:disable function_body_length
+  // swiftlint:disable cyclomatic_complexity
   convenience init(settingsStr: String?) throws {
     if settingsStr == nil {
       self.init()
     } else {
       guard let settingsData = settingsStr!.data(using: .utf8) else {
-        let err = RNTNativeError(errorId: "native-ios", errorDescription: "The value of the 'settings' object is invalid.", recoverySuggestion: "Provide a valid 'settings' object")
+        let err = RNTNativeError(
+          errorId: "native-ios",
+          errorDescription: "The value of the 'settings' object is invalid.",
+          recoverySuggestion: "Provide a valid 'settings' object"
+        )
         throw err
       }
-      
+
       let settingsJson = try JSONSerialization.jsonObject(with: settingsData)
-      
+
       guard let settingsJson = settingsJson as? [String: Any] else {
-        let err = RNTNativeError(errorId: "native-ios", errorDescription: "The 'settings' object is not a valid JSON", recoverySuggestion: "Provide a valid 'settings' object")
+        let err = RNTNativeError(
+          errorId: "native-ios",
+          errorDescription: "The 'settings' object is not a valid JSON",
+          recoverySuggestion: "Provide a valid 'settings' object"
+        )
         throw err
       }
-      
+
       var paymentHandling: PrimerPaymentHandling = .auto
       if let rnPaymentHandling = settingsJson["paymentHandling"] as? String,
-         rnPaymentHandling == "MANUAL" {
+        rnPaymentHandling == "MANUAL" {
         paymentHandling = .manual
       }
-      
-      let rnLocaleDataLanguageCode = (settingsJson["localeData"] as? [String: Any])?["languageCode"] as? String
-      let rnLocaleDataLocaleCode = (settingsJson["localeData"] as? [String: Any])?["localeCode"] as? String
+
+      let rnLocaleDataLanguageCode =
+        (settingsJson["localeData"] as? [String: Any])?["languageCode"] as? String
+      let rnLocaleDataLocaleCode =
+        (settingsJson["localeData"] as? [String: Any])?["localeCode"] as? String
       let localeData = PrimerLocaleData(
         languageCode: rnLocaleDataLanguageCode,
         regionCode: rnLocaleDataLocaleCode)
-      
-      let rnUrlScheme = ((settingsJson["paymentMethodOptions"] as? [String: Any])?["iOS"] as? [String: Any])?["urlScheme"] as? String
-      
+
+      let rnUrlScheme =
+        ((settingsJson["paymentMethodOptions"] as? [String: Any])?["iOS"] as? [String: Any])?[
+          "urlScheme"] as? String
+
       var applePayOptions: PrimerApplePayOptions?
-      if let rnApplePayOptions = ((settingsJson["paymentMethodOptions"] as? [String: Any])?["applePayOptions"] as? [String: Any]),
-         let rnApplePayMerchantIdentifier = rnApplePayOptions["merchantIdentifier"] as? String
-      {
+      if let rnApplePayOptions =
+        ((settingsJson["paymentMethodOptions"] as? [String: Any])?["applePayOptions"]
+          as? [String: Any]),
+        let rnApplePayMerchantIdentifier = rnApplePayOptions["merchantIdentifier"] as? String {
         let rnApplePayMerchantName = rnApplePayOptions["merchantName"] as? String
-        let rnApplePayIsCaptureBillingAddressEnabled = (rnApplePayOptions["isCaptureBillingAddressEnabled"] as? Bool) ?? false
-        let rnApplePayShowApplePayForUnsupportedDevice = (rnApplePayOptions["showApplePayForUnsupportedDevice"] as? Bool) ?? true
-        let rnApplePayCheckProvidedNetworks = (rnApplePayOptions["checkProvidedNetworks"] as? Bool) ?? true
-        
-        var shippingOptions: PrimerApplePayOptions.ShippingOptions? = nil
+        let rnApplePayIsCaptureBillingAddressEnabled =
+          (rnApplePayOptions["isCaptureBillingAddressEnabled"] as? Bool) ?? false
+        // swiftlint:disable identifier_name
+        let rnApplePayShowApplePayForUnsupportedDevice =
+          (rnApplePayOptions["showApplePayForUnsupportedDevice"] as? Bool) ?? true
+        // swiftlint:enable identifier_name
+        let rnApplePayCheckProvidedNetworks =
+          (rnApplePayOptions["checkProvidedNetworks"] as? Bool) ?? true
+
+        var shippingOptions: PrimerApplePayOptions.ShippingOptions?
         if let rnShippingOptions = rnApplePayOptions["shippingOptions"] as? [String: Any] {
           let requireShippingMethod = rnShippingOptions["requireShippingMethod"] as? Bool ?? false
-          
-          var shippingContactFields: [PrimerApplePayOptions.RequiredContactField]? = nil
+
+          var shippingContactFields: [PrimerApplePayOptions.RequiredContactField]?
           if let requiredFieldsStrings = rnShippingOptions["shippingContactFields"] as? [String] {
             shippingContactFields = requiredFieldsStrings.compactMap { fieldStr in
               switch fieldStr {
@@ -58,21 +78,22 @@ extension PrimerSettings {
               case "postalAddress":
                 return .postalAddress
               default:
-                return nil // Ignore unknown values or handle accordingly
+                return nil  // Ignore unknown values or handle accordingly
               }
             }
           }
-          
+
           shippingOptions = PrimerApplePayOptions.ShippingOptions(
             shippingContactFields: shippingContactFields,
             requireShippingMethod: requireShippingMethod
           )
         }
-        
-        var billingOptions: PrimerApplePayOptions.BillingOptions? = nil
+
+        var billingOptions: PrimerApplePayOptions.BillingOptions?
         if let rnBillingOptions = rnApplePayOptions["billingOptions"] as? [String: Any] {
-          var requiredBillingContactFields: [PrimerApplePayOptions.RequiredContactField]? = nil
-          if let requiredFieldsStrings = rnBillingOptions["requiredBillingContactFields"] as? [String] {
+          var requiredBillingContactFields: [PrimerApplePayOptions.RequiredContactField]?
+          if let requiredFieldsStrings = rnBillingOptions["requiredBillingContactFields"]
+            as? [String] {
             requiredBillingContactFields = requiredFieldsStrings.compactMap { fieldStr in
               switch fieldStr {
               case "name":
@@ -84,16 +105,16 @@ extension PrimerSettings {
               case "postalAddress":
                 return .postalAddress
               default:
-                return nil // Ignore unknown values or handle accordingly
+                return nil  // Ignore unknown values or handle accordingly
               }
             }
           }
-          
+
           billingOptions = PrimerApplePayOptions.BillingOptions(
             requiredBillingContactFields: requiredBillingContactFields
           )
         }
-        
+
         applePayOptions = PrimerApplePayOptions(
           merchantIdentifier: rnApplePayMerchantIdentifier,
           merchantName: rnApplePayMerchantName,
@@ -104,22 +125,27 @@ extension PrimerSettings {
           billingOptions: billingOptions
         )
       }
-      
+
       var klarnaOptions: PrimerKlarnaOptions?
-      if let rnKlarnaRecurringPaymentDescription = ((settingsJson["paymentMethodOptions"] as? [String: Any])?["klarnaOptions"] as? [String: Any])?["recurringPaymentDescription"] as? String {
-        klarnaOptions = PrimerKlarnaOptions(recurringPaymentDescription: rnKlarnaRecurringPaymentDescription)
+      if let rnKlarnaRecurringPaymentDescription =
+        ((settingsJson["paymentMethodOptions"]
+        as? [String: Any])?["klarnaOptions"]
+        as? [String: Any])?["recurringPaymentDescription"]
+        as? String {
+        klarnaOptions = PrimerKlarnaOptions(
+          recurringPaymentDescription: rnKlarnaRecurringPaymentDescription)
       }
-      
+
       var uiOptions: PrimerUIOptions?
       if let rnUIOptions = settingsJson["uiOptions"] as? [String: Any] {
-        
+
         var theme: PrimerTheme?
         if let rnTheme = rnUIOptions["theme"] as? [String: Any] {
           let rnThemeData = (try JSONSerialization.data(withJSONObject: rnTheme))
           let rnTheme = try JSONDecoder().decode(PrimerThemeRN.self, from: rnThemeData)
           theme = rnTheme.asPrimerTheme()
         }
-        
+
         uiOptions = PrimerUIOptions(
           isInitScreenEnabled: rnUIOptions["isInitScreenEnabled"] as? Bool,
           isSuccessScreenEnabled: rnUIOptions["isSuccessScreenEnabled"] as? Bool,
@@ -143,14 +169,16 @@ extension PrimerSettings {
           }(),
           theme: theme)
       }
-      
+
       var debugOptions: PrimerDebugOptions?
-      if let rnIs3DSSanityCheckEnabled = (settingsJson["debugOptions"] as? [String: Any])?["is3DSSanityCheckEnabled"] as? Bool {
+      if let rnIs3DSSanityCheckEnabled = (settingsJson["debugOptions"] as? [String: Any])?[
+        "is3DSSanityCheckEnabled"] as? Bool {
         debugOptions = PrimerDebugOptions(is3DSSanityCheckEnabled: rnIs3DSSanityCheckEnabled)
       }
-      
+
       var clientSessionCachingEnabled: Bool?
-      if let clientSessionCachingEnabledValue = (settingsJson["clientSessionCachingEnabled"] as? Bool) {
+      if let clientSessionCachingEnabledValue =
+        (settingsJson["clientSessionCachingEnabled"] as? Bool) {
         clientSessionCachingEnabled = clientSessionCachingEnabledValue
       }
       
@@ -170,14 +198,21 @@ extension PrimerSettings {
           throw RNTNativeError(errorId: "native-ios", errorDescription: "The value of the 'apiVersion' string is invalid.", recoverySuggestion: "Provide a valid 'apiVersion' string")
         }
       }
-      
+
       var threeDsOptions: PrimerThreeDsOptions?
-      if let rnThreeDsAppRequestorUrlStr = (((settingsJson["paymentMethodOptions"] as? [String: Any])?["threeDsOptions"] as? [String: Any])?["iOS"] as? [String: Any])?["threeDsAppRequestorUrl"] as? String {
+      if let rnThreeDsAppRequestorUrlStr =
+        (((settingsJson["paymentMethodOptions"]
+        as? [String: Any])?["threeDsOptions"]
+        as? [String: Any])?["iOS"]
+        as? [String: Any])?["threeDsAppRequestorUrl"]
+        as? String {
         threeDsOptions = PrimerThreeDsOptions(threeDsAppRequestorUrl: rnThreeDsAppRequestorUrlStr)
       }
-      
+
       var stripeOptions: PrimerStripeOptions?
-      if let stripeOptionsMap = ((settingsJson["paymentMethodOptions"] as? [String: Any])?["stripeOptions"] as? [String: Any]) {
+      if let stripeOptionsMap =
+        ((settingsJson["paymentMethodOptions"] as? [String: Any])?["stripeOptions"]
+          as? [String: Any]) {
         if let publishableKey = stripeOptionsMap["publishableKey"] as? String {
           var mandateData: PrimerStripeOptions.MandateData?
           if let mandateDataMap = stripeOptionsMap["mandateData"] as? [String: String] {
@@ -186,10 +221,14 @@ extension PrimerSettings {
             } else if let merchantName = mandateDataMap["merchantName"] {
               mandateData = .templateMandate(merchantName: merchantName)
             } else {
-              PrimerLogging.shared.logger.warn(message: "Found mandate data but no resource key or merchant name - check your stripe config")
+              PrimerLogging.shared.logger.warn(
+                message:
+                  "Found mandate data but no resource key or merchant name - check your stripe config"
+              )
             }
           } else {
-            PrimerLogging.shared.logger.warn(message: "Found stripe options but no mandate data - check your stripe config")
+            PrimerLogging.shared.logger.warn(
+              message: "Found stripe options but no mandate data - check your stripe config")
           }
           stripeOptions = .init(
             publishableKey: publishableKey,
@@ -197,14 +236,14 @@ extension PrimerSettings {
           )
         }
       }
-      
+
       let paymentMethodOptions = PrimerPaymentMethodOptions(
         urlScheme: rnUrlScheme,
         applePayOptions: applePayOptions,
         klarnaOptions: klarnaOptions,
         threeDsOptions: threeDsOptions,
         stripeOptions: stripeOptions)
-      
+
       self.init(
         paymentHandling: paymentHandling,
         localeData: localeData,
@@ -215,4 +254,6 @@ extension PrimerSettings {
         apiVersion: apiVersion ?? .latest)
     }
   }
+  // swiftlint:enable function_body_length
+  // swiftlint:enable cyclomatic_complexity
 }

package/ios/Sources/DataModels/PrimerThemeRN.swift

@@ -1,8 +1,8 @@
 import PrimerSDK
 
 struct PrimerThemeRN: Decodable {
-    let colors: ColorThemeRN?;
-    let darkModeColors: ColorThemeRN?;
+    let colors: ColorThemeRN?
+    let darkModeColors: ColorThemeRN?
 }
 
 extension PrimerThemeRN {
@@ -10,9 +10,9 @@ extension PrimerThemeRN {
 
         let isDarkMode = UITraitCollection.current.userInterfaceStyle == .dark
 
-        let _colors = isDarkMode ? darkModeColors : colors
+        let currentColors = isDarkMode ? darkModeColors : colors
 
-        guard let colors = _colors else {
+        guard let colors = currentColors else {
             return PrimerTheme()
         }
 
@@ -71,9 +71,9 @@ extension ColorThemeRN {
             success1: mainColor?.uiColor ?? .systemBlue
         )
     }
-    
+
     @available(iOS 13.0, *)
-    var primerDarkModeTheme: ColorTheme  {
+    var primerDarkModeTheme: ColorTheme {
         return PrimerDefaultTheme(
             text1: text?.uiColor ?? .white,
             text2: contrastingText?.uiColor ?? .white,

package/ios/Sources/DataModels/RNTNativeError.swift

@@ -1,18 +1,17 @@
-
 import Foundation
 
 struct RNTNativeError: CustomNSError, LocalizedError, Codable {
-    
+
     let errorId: String
     let errorDescription: String?
     let recoverySuggestion: String?
-    
+
     var rnError: [String: String] {
         var json: [String: String] = [
             "errorId": errorId,
             "description": errorDescription ?? "Something went wrong"
         ]
-        
+
         if let recoverySuggestion = recoverySuggestion {
             json["recoverySuggestion"] = recoverySuggestion
         }

package/ios/Sources/DataModels/RNTPrimerPaymentMethodAsset.swift

@@ -9,59 +9,65 @@ import Foundation
 import PrimerSDK
 
 struct RNTPrimerPaymentMethodAsset: Codable {
-    
-    let paymentMethodType: String
-    let paymentMethodName: String
-    let paymentMethodLogo: RNTPrimerPaymentMethodLogo
-    let paymentMethodBackgroundColor: RNTPrimerPaymentMethodBackgroundColor
-    
-    init(primerPaymentMethodAsset: PrimerPaymentMethodAsset) {
-        self.paymentMethodType = primerPaymentMethodAsset.paymentMethodType
-        self.paymentMethodName = primerPaymentMethodAsset.paymentMethodName
-        self.paymentMethodLogo = RNTPrimerPaymentMethodLogo(
-            paymentMethodType: primerPaymentMethodAsset.paymentMethodType,
-            primerPaymentMethodLogo: primerPaymentMethodAsset.paymentMethodLogo)
-        self.paymentMethodBackgroundColor = RNTPrimerPaymentMethodBackgroundColor(
-            primerPaymentMethodBackgroundColor: primerPaymentMethodAsset.paymentMethodBackgroundColor)
-    }
+
+  let paymentMethodType: String
+  let paymentMethodName: String
+  let paymentMethodLogo: RNTPrimerPaymentMethodLogo
+  let paymentMethodBackgroundColor: RNTPrimerPaymentMethodBackgroundColor
+
+  init(primerPaymentMethodAsset: PrimerPaymentMethodAsset) {
+    self.paymentMethodType = primerPaymentMethodAsset.paymentMethodType
+    self.paymentMethodName = primerPaymentMethodAsset.paymentMethodName
+    self.paymentMethodLogo = RNTPrimerPaymentMethodLogo(
+      paymentMethodType: primerPaymentMethodAsset.paymentMethodType,
+      primerPaymentMethodLogo: primerPaymentMethodAsset.paymentMethodLogo)
+    self.paymentMethodBackgroundColor = RNTPrimerPaymentMethodBackgroundColor(
+      primerPaymentMethodBackgroundColor: primerPaymentMethodAsset.paymentMethodBackgroundColor)
+  }
 }
 
 struct RNTPrimerPaymentMethodLogo: Codable {
-    
-    let colored: String?
-    let dark: String?
-    let light: String?
-    
-    init(paymentMethodType: String, primerPaymentMethodLogo: PrimerAsset) {
-        self.colored = (try? primerPaymentMethodLogo.colored?.store(withName: "\(paymentMethodType)-colored").absoluteString) ?? nil
-        self.dark = (try? primerPaymentMethodLogo.dark?.store(withName: "\(paymentMethodType)-dark").absoluteString) ?? nil
-        self.light = (try? primerPaymentMethodLogo.light?.store(withName: "\(paymentMethodType)-light").absoluteString) ?? nil
-    }
+
+  let colored: String?
+  let dark: String?
+  let light: String?
+
+  init(paymentMethodType: String, primerPaymentMethodLogo: PrimerAsset) {
+    self.colored =
+      (try? primerPaymentMethodLogo.colored?.store(withName: "\(paymentMethodType)-colored")
+        .absoluteString) ?? nil
+    self.dark =
+      (try? primerPaymentMethodLogo.dark?.store(withName: "\(paymentMethodType)-dark")
+        .absoluteString) ?? nil
+    self.light =
+      (try? primerPaymentMethodLogo.light?.store(withName: "\(paymentMethodType)-light")
+        .absoluteString) ?? nil
+  }
 }
 
 struct RNTPrimerPaymentMethodBackgroundColor: Codable {
-    
-    let colored: String?
-    let dark: String?
-    let light: String?
-    
-    init(primerPaymentMethodBackgroundColor: PrimerPaymentMethodBackgroundColor) {
-        if let bgColoredHex = primerPaymentMethodBackgroundColor.colored?.toHex() {
-            self.colored = "#\(bgColoredHex)"
-        } else {
-            self.colored = nil
-        }
-        
-        if let darkColoredHex = primerPaymentMethodBackgroundColor.dark?.toHex() {
-            self.dark = "#\(darkColoredHex)"
-        } else {
-            self.dark = nil
-        }
-        
-        if let lightColoredHex = primerPaymentMethodBackgroundColor.light?.toHex() {
-            self.light = "#\(lightColoredHex)"
-        } else {
-            self.light = nil
-        }
+
+  let colored: String?
+  let dark: String?
+  let light: String?
+
+  init(primerPaymentMethodBackgroundColor: PrimerPaymentMethodBackgroundColor) {
+    if let bgColoredHex = primerPaymentMethodBackgroundColor.colored?.toHex() {
+      self.colored = "#\(bgColoredHex)"
+    } else {
+      self.colored = nil
+    }
+
+    if let darkColoredHex = primerPaymentMethodBackgroundColor.dark?.toHex() {
+      self.dark = "#\(darkColoredHex)"
+    } else {
+      self.dark = nil
+    }
+
+    if let lightColoredHex = primerPaymentMethodBackgroundColor.light?.toHex() {
+      self.light = "#\(lightColoredHex)"
+    } else {
+      self.light = nil
     }
+  }
 }