diff --git a/ios/CSE/ActionModule.swift b/ios/CSE/ActionModule.swift index f83205b6f..8de75ef50 100644 --- a/ios/CSE/ActionModule.swift +++ b/ios/CSE/ActionModule.swift @@ -5,9 +5,9 @@ // import Adyen +import Adyen3DS2 import Foundation import React -import Adyen3DS2 @objc(AdyenAction) internal final class ActionModule: BaseModule, ActionComponentDelegate { diff --git a/ios/Components/BaseModule.swift b/ios/Components/BaseModule.swift index 278b016cf..6ad241859 100644 --- a/ios/Components/BaseModule.swift +++ b/ios/Components/BaseModule.swift @@ -160,7 +160,7 @@ extension Error { var is3DSCanceled: Bool { (self as NSError).domain == "com.adyen.Adyen3DS2.ADYRuntimeError" && - (self as NSError).code == ADYRuntimeErrorCode.challengeCancelled.rawValue + (self as NSError).code == ADYRuntimeErrorCode.challengeCancelled.rawValue } } diff --git a/ios/Components/DropInModule.swift b/ios/Components/DropInModule.swift index 1c55a1e57..cb89cfa3e 100644 --- a/ios/Components/DropInModule.swift +++ b/ios/Components/DropInModule.swift @@ -43,7 +43,7 @@ internal final class DropInModule: BaseModule { config.localizationParameters = LocalizationParameters(enforcedLocale: locale) } if let requestorAppUrl = ThreeDS2ConfigurationParser(configuration: configuration).requestorAppUrl, - let url = URL(string: requestorAppUrl) { + let url = URL(string: requestorAppUrl) { config.actionComponent.threeDS.requestorAppURL = url } diff --git a/ios/Components/InstantModule.swift b/ios/Components/InstantModule.swift index 1a46b353a..77ff460a4 100644 --- a/ios/Components/InstantModule.swift +++ b/ios/Components/InstantModule.swift @@ -33,7 +33,7 @@ internal final class InstantModule: BaseModule { let style = AdyenAppearanceLoader.findStyle()?.actionComponent ?? .init() var config = AdyenActionComponent.Configuration(style: style) - if let locale = BaseModule.session?.sessionContext.shopperLocale ?? parser.shopperLocale { + if let locale = BaseModule.session?.sessionContext.shopperLocale ?? parser.shopperLocale { config.localizationParameters = LocalizationParameters(enforcedLocale: locale) } diff --git a/ios/Configuration/AnalyticsParser.swift b/ios/Configuration/AnalyticsParser.swift index afc1ead60..76b25d952 100644 --- a/ios/Configuration/AnalyticsParser.swift +++ b/ios/Configuration/AnalyticsParser.swift @@ -27,11 +27,11 @@ public struct AnalyticsParser { } public var analyticsOn: Bool { - return dict[AnalyticsKeys.enabled] as? Bool == true + dict[AnalyticsKeys.enabled] as? Bool == true } public var verboseLogsOn: Bool { - return dict[AnalyticsKeys.verboseLogs] as? Bool == true + dict[AnalyticsKeys.verboseLogs] as? Bool == true } public var configuration: AnalyticsConfiguration { diff --git a/ios/Configuration/Parameters.swift b/ios/Configuration/Parameters.swift index b385845df..9749fc4dd 100644 --- a/ios/Configuration/Parameters.swift +++ b/ios/Configuration/Parameters.swift @@ -30,7 +30,7 @@ internal enum Keys { internal enum AnalyticsKeys: SubConfig { static var rootKey = "analytics" static var enabled = "enabled" - static var verboseLogs = "verboseLogs" + static var verboseLogs = "verboseLogs" } internal enum DropInKeys: SubConfig { diff --git a/ios/Configuration/RootConfigurationParser.swift b/ios/Configuration/RootConfigurationParser.swift index fcc75d7f6..ddcf355b2 100644 --- a/ios/Configuration/RootConfigurationParser.swift +++ b/ios/Configuration/RootConfigurationParser.swift @@ -46,7 +46,7 @@ public struct RootConfigurationParser { public var payment: Payment? { guard let amount = self.amount, - let countryCode = countryCode + let countryCode else { return nil } @@ -55,7 +55,7 @@ public struct RootConfigurationParser { } public var shopperLocale: String? { - return configuration[Keys.locale] as? String + configuration[Keys.locale] as? String } } @@ -70,7 +70,7 @@ extension RootConfigurationParser { let analytics = AnalyticsParser(configuration: configuration).configuration var payment: Payment? - if + if let context = session?.sessionContext, let countryCode = context.countryCode ?? self.countryCode { payment = Payment(amount: context.amount, countryCode: countryCode) diff --git a/ios/Configuration/ThreeDSConfigurationParser.swift b/ios/Configuration/ThreeDSConfigurationParser.swift index 3f41e7f77..10b5c59c2 100644 --- a/ios/Configuration/ThreeDSConfigurationParser.swift +++ b/ios/Configuration/ThreeDSConfigurationParser.swift @@ -8,7 +8,7 @@ import Foundation public struct ThreeDS2ConfigurationParser { - private var dict: [String:Any] + private var dict: [String: Any] public init(configuration: NSDictionary) { guard let configuration = configuration as? [String: Any] else { @@ -23,6 +23,6 @@ public struct ThreeDS2ConfigurationParser { } var requestorAppUrl: String? { - return dict[ThreeDSKey.requestorAppUrl] as? String + dict[ThreeDSKey.requestorAppUrl] as? String } }