From d8fdc3c4fb2cefc272cde4559f6b91b7b09afb4e Mon Sep 17 00:00:00 2001
From: vladimir <vladimir.abramichev@adyen.com>
Date: Fri, 8 Dec 2023 15:52:02 +0100
Subject: [PATCH 1/6] chore: migrate iOS to v5

---
 .gitignore                                    |   3 +-
 adyen-react-native.podspec                    |   2 +-
 android/build.gradle                          |  17 +-
 docs/v2-MigrationGuide.md                     |   3 +-
 example/ios/Podfile.lock                      | 168 +++---------------
 ios/Components/AdyenApperance.swift           |   3 +-
 ios/Components/AdyenDropIn.swift              |  47 ++---
 ios/Components/ApplePayComponent.swift        |   8 +-
 ios/Components/BaseModule.swift               |   2 +-
 ios/Components/InstantComponent.swift         |   8 +-
 .../ApplepayConfigurationParser.swift         |  25 +--
 .../CardConfigurationParser.swift             |  38 +++-
 .../DropInConfigurationParser.swift           |   5 +-
 ios/Helpers/Environment.swift                 |   5 +-
 14 files changed, 129 insertions(+), 205 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0dcd6a0da..22510b3bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,7 @@
 .VolumeIcon.icns
 
 # Xcode
-build/
+[bB]uild/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -31,6 +31,7 @@ DerivedData
 *.xcuserstate
 project.xcworkspace
 Pods/
+*.xcode.env
 
 # Android/IJ
 .idea
diff --git a/adyen-react-native.podspec b/adyen-react-native.podspec
index b55529d64..f6b6d49db 100644
--- a/adyen-react-native.podspec
+++ b/adyen-react-native.podspec
@@ -16,6 +16,6 @@ Pod::Spec.new do |s|
 
 
   s.dependency "React-Core"
-  s.dependency "Adyen", '4.11.1'
+  s.dependency "Adyen", '5.4.1'
 
 end
diff --git a/android/build.gradle b/android/build.gradle
index e54f84559..6794a68e5 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -3,16 +3,17 @@ def safeExtGet(prop, fallback) {
 }
 
 buildscript {
-      rootProject.ext.adyenReactNativeRedirectScheme = "adyenreactnative"
+    rootProject.ext.adyenReactNativeRedirectScheme = "adyenreactnative"
+    ext.kotlin_version = rootProject.ext.has('kotlin_version') ? rootProject.ext.get('kotlin_version') : '1.9.10'
 
-      repositories {
-          google()
-          jcenter()
-      }
+    repositories {
+        google()
+        jcenter()
+    }
 
-      dependencies {
-          classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-      }
+    dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
 }
 
 apply plugin: 'com.android.library'
diff --git a/docs/v2-MigrationGuide.md b/docs/v2-MigrationGuide.md
index 5db435ef1..49a71f382 100644
--- a/docs/v2-MigrationGuide.md
+++ b/docs/v2-MigrationGuide.md
@@ -2,9 +2,8 @@
 
 ## Breacking changes
 
-* Merchant's app theme must be decendent of `Theme.MaterialComponents` to operate with "instant" payment components (ex. Paypal, Klarna)
+* Merchant's app theme must be decendent of `Theme.MaterialComponents` to operate with "instant" payment components (ex. Paypal, Klarna). Example:
 ```xml
-<style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
     <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar"> 
 ```
 
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
index 5c96a284a..a12bd5a9d 100644
--- a/example/ios/Podfile.lock
+++ b/example/ios/Podfile.lock
@@ -1,36 +1,40 @@
 PODS:
-  - Adyen (4.11.1):
-    - Adyen/Actions (= 4.11.1)
-    - Adyen/Card (= 4.11.1)
-    - Adyen/Components (= 4.11.1)
-    - Adyen/Core (= 4.11.1)
-    - Adyen/DropIn (= 4.11.1)
-    - Adyen/Encryption (= 4.11.1)
+  - Adyen (5.4.1):
+    - Adyen/Actions (= 5.4.1)
+    - Adyen/Card (= 5.4.1)
+    - Adyen/Components (= 5.4.1)
+    - Adyen/Core (= 5.4.1)
+    - Adyen/DropIn (= 5.4.1)
+    - Adyen/Encryption (= 5.4.1)
+    - Adyen/Session (= 5.4.1)
   - adyen-react-native (1.0.0-local.5):
-    - Adyen (= 4.11.1)
+    - Adyen (= 5.4.1)
     - React-Core
-  - Adyen/Actions (4.11.1):
+  - Adyen/Actions (5.4.1):
     - Adyen/Core
     - Adyen3DS2 (= 2.3.3)
-  - Adyen/Card (4.11.1):
+  - Adyen/Card (5.4.1):
     - Adyen/Core
     - Adyen/Encryption
-  - Adyen/Components (4.11.1):
+  - Adyen/Components (5.4.1):
     - Adyen/Core
     - Adyen/Encryption
-  - Adyen/Core (4.11.1):
-    - AdyenNetworking (= 1.0.0)
-  - Adyen/DropIn (4.11.1):
+  - Adyen/Core (5.4.1):
+    - AdyenNetworking (= 2.0.0)
+  - Adyen/DropIn (5.4.1):
     - Adyen/Actions
     - Adyen/Card
     - Adyen/Components
     - Adyen/Core
     - Adyen/Encryption
-  - Adyen/Encryption (4.11.1)
+  - Adyen/Encryption (5.4.1):
+    - Adyen/Core
+  - Adyen/Session (5.4.1):
+    - Adyen/Actions
+    - Adyen/Core
   - Adyen3DS2 (2.3.3)
-  - AdyenNetworking (1.0.0)
+  - AdyenNetworking (2.0.0)
   - boost (1.76.0)
-  - CocoaAsyncSocket (7.6.5)
   - DoubleConversion (1.1.6)
   - FBLazyVector (0.71.14)
   - FBReactNativeSpec (0.71.14):
@@ -40,71 +44,8 @@ PODS:
     - React-Core (= 0.71.14)
     - React-jsi (= 0.71.14)
     - ReactCommon/turbomodule/core (= 0.71.14)
-  - Flipper (0.125.0):
-    - Flipper-Folly (~> 2.6)
-    - Flipper-RSocket (~> 1.4)
-  - Flipper-Boost-iOSX (1.76.0.1.11)
-  - Flipper-DoubleConversion (3.2.0.1)
-  - Flipper-Fmt (7.1.7)
-  - Flipper-Folly (2.6.10):
-    - Flipper-Boost-iOSX
-    - Flipper-DoubleConversion
-    - Flipper-Fmt (= 7.1.7)
-    - Flipper-Glog
-    - libevent (~> 2.1.12)
-    - OpenSSL-Universal (= 1.1.1100)
-  - Flipper-Glog (0.5.0.5)
-  - Flipper-PeerTalk (0.0.4)
-  - Flipper-RSocket (1.4.3):
-    - Flipper-Folly (~> 2.6)
-  - FlipperKit (0.125.0):
-    - FlipperKit/Core (= 0.125.0)
-  - FlipperKit/Core (0.125.0):
-    - Flipper (~> 0.125.0)
-    - FlipperKit/CppBridge
-    - FlipperKit/FBCxxFollyDynamicConvert
-    - FlipperKit/FBDefines
-    - FlipperKit/FKPortForwarding
-    - SocketRocket (~> 0.6.0)
-  - FlipperKit/CppBridge (0.125.0):
-    - Flipper (~> 0.125.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (0.125.0):
-    - Flipper-Folly (~> 2.6)
-  - FlipperKit/FBDefines (0.125.0)
-  - FlipperKit/FKPortForwarding (0.125.0):
-    - CocoaAsyncSocket (~> 7.6)
-    - Flipper-PeerTalk (~> 0.0.4)
-  - FlipperKit/FlipperKitHighlightOverlay (0.125.0)
-  - FlipperKit/FlipperKitLayoutHelpers (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutTextSearchable
-  - FlipperKit/FlipperKitLayoutIOSDescriptors (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutPlugin (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitHighlightOverlay
-    - FlipperKit/FlipperKitLayoutHelpers
-    - FlipperKit/FlipperKitLayoutIOSDescriptors
-    - FlipperKit/FlipperKitLayoutTextSearchable
-    - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutTextSearchable (0.125.0)
-  - FlipperKit/FlipperKitNetworkPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitReactPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/FlipperKitUserDefaultsPlugin (0.125.0):
-    - FlipperKit/Core
-  - FlipperKit/SKIOSNetworkPlugin (0.125.0):
-    - FlipperKit/Core
-    - FlipperKit/FlipperKitNetworkPlugin
   - fmt (6.2.1)
   - glog (0.3.5)
-  - libevent (2.1.12)
-  - OpenSSL-Universal (1.1.1100)
   - RCT-Folly (2021.07.22.00):
     - boost
     - DoubleConversion
@@ -410,15 +351,12 @@ PODS:
     - React-jsi (= 0.71.14)
     - React-logger (= 0.71.14)
     - React-perflogger (= 0.71.14)
-  - RNCAsyncStorage (1.19.5):
+  - RNCAsyncStorage (1.19.4):
     - React-Core
   - RNScreens (3.27.0):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - SocketRocket (0.6.1)
   - Yoga (1.14.0)
-  - YogaKit (1.18.1):
-    - Yoga (~> 1.14)
 
 DEPENDENCIES:
   - "adyen-react-native (from `../node_modules/@adyen/react-native`)"
@@ -426,29 +364,7 @@ DEPENDENCIES:
   - DoubleConversion (from `../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../node_modules/react-native/Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
-  - Flipper (= 0.125.0)
-  - Flipper-Boost-iOSX (= 1.76.0.1.11)
-  - Flipper-DoubleConversion (= 3.2.0.1)
-  - Flipper-Fmt (= 7.1.7)
-  - Flipper-Folly (= 2.6.10)
-  - Flipper-Glog (= 0.5.0.5)
-  - Flipper-PeerTalk (= 0.0.4)
-  - Flipper-RSocket (= 1.4.3)
-  - FlipperKit (= 0.125.0)
-  - FlipperKit/Core (= 0.125.0)
-  - FlipperKit/CppBridge (= 0.125.0)
-  - FlipperKit/FBCxxFollyDynamicConvert (= 0.125.0)
-  - FlipperKit/FBDefines (= 0.125.0)
-  - FlipperKit/FKPortForwarding (= 0.125.0)
-  - FlipperKit/FlipperKitHighlightOverlay (= 0.125.0)
-  - FlipperKit/FlipperKitLayoutPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitLayoutTextSearchable (= 0.125.0)
-  - FlipperKit/FlipperKitNetworkPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitReactPlugin (= 0.125.0)
-  - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.125.0)
-  - FlipperKit/SKIOSNetworkPlugin (= 0.125.0)
   - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
-  - OpenSSL-Universal (= 1.1.1100)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
@@ -487,21 +403,7 @@ SPEC REPOS:
     - Adyen
     - Adyen3DS2
     - AdyenNetworking
-    - CocoaAsyncSocket
-    - Flipper
-    - Flipper-Boost-iOSX
-    - Flipper-DoubleConversion
-    - Flipper-Fmt
-    - Flipper-Folly
-    - Flipper-Glog
-    - Flipper-PeerTalk
-    - Flipper-RSocket
-    - FlipperKit
     - fmt
-    - libevent
-    - OpenSSL-Universal
-    - SocketRocket
-    - YogaKit
 
 EXTERNAL SOURCES:
   adyen-react-native:
@@ -580,28 +482,16 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  Adyen: f4f7f5a0ee34282f5caa553b43ca9d2285bf1c35
-  adyen-react-native: 247d63883da5a4e91534464a279df978f8f3f37a
+  Adyen: c176e4770fb8ac01559459dde00d78f63b5c55ba
+  adyen-react-native: 2315be0c1d1c22811aacc0abb4bc94885f8588a7
   Adyen3DS2: 868f5fe2dc7dba62c97be5821b95d2838e6540d8
-  AdyenNetworking: 14567bd00c00ba2e2580a904708c7ba5f010b1f9
+  AdyenNetworking: 49e447632b542e08c6dd06bb47ea1077a8adecb7
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
-  CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: 12ea01e587c9594e7b144e1bfc86ac4d9ac28fde
   FBReactNativeSpec: b6ae48e67aaba46442f84d6f9ba598ccfbe2ee66
-  Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0
-  Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c
-  Flipper-DoubleConversion: 2dc99b02f658daf147069aad9dbd29d8feb06d30
-  Flipper-Fmt: 60cbdd92fc254826e61d669a5d87ef7015396a9b
-  Flipper-Folly: 584845625005ff068a6ebf41f857f468decd26b3
-  Flipper-Glog: 70c50ce58ddaf67dc35180db05f191692570f446
-  Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
-  Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
-  FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: e9df143e880d0e879e7a498dc06923d728809c79
   RCTTypeSafety: c2d89c8308829c12c038ec1f431191eaa0d8c15c
@@ -630,12 +520,10 @@ SPEC CHECKSUMS:
   React-RCTVibration: 64e412b9ac684c4edc938fa1187135ada9af7faf
   React-runtimeexecutor: ffe826b7b1cfbc32a35ed5b64d5886c0ff75f501
   ReactCommon: 7cf566ddbc9344e1f02bae1ecdaf03dbedb7eb17
-  RNCAsyncStorage: f2974eca860c16a3e56eea5771fda8d12e2d2057
+  RNCAsyncStorage: 3a8f7145d17cdd9f88e7b77666c94a09e4f759c8
   RNScreens: 3c2d122f5e08c192e254c510b212306da97d2581
-  SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: e71803b4c1fff832ccf9b92541e00f9b873119b9
-  YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
-PODFILE CHECKSUM: 304bbd36d32532a53a5803fa271e05c2324a64ff
+PODFILE CHECKSUM: 23c052ef163d747e6a30255df0415afd5484e294
 
-COCOAPODS: 1.14.2
+COCOAPODS: 1.14.3
diff --git a/ios/Components/AdyenApperance.swift b/ios/Components/AdyenApperance.swift
index 0716cee90..0808544b8 100644
--- a/ios/Components/AdyenApperance.swift
+++ b/ios/Components/AdyenApperance.swift
@@ -4,9 +4,10 @@
 // This file is open source and available under the MIT license. See the LICENSE file for more info.
 //
 
-import Adyen
+@_spi(AdyenInternal) import Adyen
 import Foundation
 
+
 /// Describes class that provides customization to Adyen UI elements.
 public protocol AdyenAppearanceProvider: AnyObject {
     
diff --git a/ios/Components/AdyenDropIn.swift b/ios/Components/AdyenDropIn.swift
index 206aae64a..b1cb2721c 100644
--- a/ios/Components/AdyenDropIn.swift
+++ b/ios/Components/AdyenDropIn.swift
@@ -35,22 +35,25 @@ internal final class AdyenDropIn: BaseModule {
             return sendEvent(error: error)
         }
 
-        let apiContext = APIContext(environment: parser.environment, clientKey: clientKey)
-
-        let config = DropInConfigurationParser(configuration: configuration).configuration(apiContext: apiContext)
-        config.card = CardConfigurationParser(configuration: configuration).configuration
+        guard let apiContext = try? APIContext(environment: parser.environment, clientKey: clientKey) else { return }
+        let config = DropInConfigurationParser(configuration: configuration).configuration
+        config.card = CardConfigurationParser(configuration: configuration).dropinConfiguration
+        config.style = AdyenAppearanceLoader.findStyle() ?? DropInComponent.Style()
 
+        let context: AdyenContext
         if let payment = parser.payment {
-            config.payment = payment
-            (try? ApplepayConfigurationParser(configuration: configuration).buildConfiguration(amount: payment.amount)).map {
+            (try? ApplepayConfigurationParser(configuration: configuration).buildConfiguration(payment: payment)).map {
                 config.applePay = $0
             }
+            context = AdyenContext(apiContext: apiContext, payment: payment, analyticsConfiguration: AnalyticsConfiguration())
+        } else {
+            context = AdyenContext(apiContext: apiContext, payment: nil, analyticsConfiguration: AnalyticsConfiguration())
         }
 
-        let dropInComponentStyle = AdyenAppearanceLoader.findStyle() ?? DropInComponent.Style()
+
         let component = DropInComponent(paymentMethods: paymentMethods,
-                                        configuration: config,
-                                        style: dropInComponentStyle)
+                                        context: context,
+                                        configuration: config)
         currentComponent = component
         component.delegate = self
         present(component: component)
@@ -73,10 +76,7 @@ internal final class AdyenDropIn: BaseModule {
 }
 
 extension AdyenDropIn: DropInComponentDelegate {
-
-    func didSubmit(_ data: PaymentComponentData,
-                   for paymentMethod: PaymentMethod,
-                   from component: DropInComponent) {
+    func didSubmit(_ data: Adyen.PaymentComponentData, from component: Adyen.PaymentComponent, in dropInComponent: Adyen.AnyDropInComponent) {
         let response: SubmitData
         if let appleData = data.paymentMethod as? ApplePayDetails {
             response = SubmitData(paymentData: data.jsonObject, extra: appleData.extraData)
@@ -85,17 +85,24 @@ extension AdyenDropIn: DropInComponentDelegate {
         }
         sendEvent(event: .didSubmit, body: response.jsonObject)
     }
-
-    func didProvide(_ data: ActionComponentData, from component: DropInComponent) {
+    
+    func didFail(with error: Error, from component: Adyen.PaymentComponent, in dropInComponent: Adyen.AnyDropInComponent) {
+        sendEvent(error: error)
+    }
+    
+    func didProvide(_ data: Adyen.ActionComponentData, from component: Adyen.ActionComponent, in dropInComponent: Adyen.AnyDropInComponent) {
         sendEvent(event: .didProvide, body: data.jsonObject)
     }
-
-    func didComplete(from component: DropInComponent) {
+    
+    func didComplete(from component: Adyen.ActionComponent, in dropInComponent: Adyen.AnyDropInComponent) {
         sendEvent(event: .didComplete, body: nil)
     }
-
-    func didFail(with error: Error, from component: DropInComponent) {
+    
+    func didFail(with error: Error, from component: Adyen.ActionComponent, in dropInComponent: Adyen.AnyDropInComponent) {
+        sendEvent(error: error)
+    }
+    
+    func didFail(with error: Error, from dropInComponent: Adyen.AnyDropInComponent) {
         sendEvent(error: error)
     }
-
 }
diff --git a/ios/Components/ApplePayComponent.swift b/ios/Components/ApplePayComponent.swift
index a31fa206a..753647b59 100644
--- a/ios/Components/ApplePayComponent.swift
+++ b/ios/Components/ApplePayComponent.swift
@@ -31,17 +31,17 @@ internal final class ApplePayComponent: BaseModule {
             paymentMethod = try parsePaymentMethod(from: paymentMethodsDict, for: ApplePayPaymentMethod.self)
             clientKey = try fetchClientKey(from: parser)
             payment = try fetchPayment(from: parser)
-            applepayConfig = try applePayParser.buildConfiguration(amount: payment.amount)
+            applepayConfig = try applePayParser.buildConfiguration(payment: payment)
         } catch {
             return sendEvent(error: error)
         }
         
-        let apiContext = APIContext(environment: parser.environment, clientKey: clientKey)
+        guard let apiContext = try? APIContext(environment: parser.environment, clientKey: clientKey) else { return }
+        let context = AdyenContext(apiContext: apiContext, payment: payment, analyticsConfiguration: AnalyticsConfiguration())
         let applePayComponent: Adyen.ApplePayComponent
         do {
             applePayComponent = try Adyen.ApplePayComponent(paymentMethod: paymentMethod,
-                                                            apiContext: apiContext,
-                                                            payment: payment,
+                                                            context: context,
                                                             configuration: applepayConfig)
         } catch {
             return sendEvent(error: error)
diff --git a/ios/Components/BaseModule.swift b/ios/Components/BaseModule.swift
index c429dad66..7a79f9579 100644
--- a/ios/Components/BaseModule.swift
+++ b/ios/Components/BaseModule.swift
@@ -136,7 +136,7 @@ internal class BaseModule: RCTEventEmitter {
     }
     
     internal func cleanUp() {
-        actionHandler?.currentActionComponent?.cancelIfNeeded()
+        actionHandler?.cancelIfNeeded()
         actionHandler = nil
         currentComponent = nil
         
diff --git a/ios/Components/InstantComponent.swift b/ios/Components/InstantComponent.swift
index 3a7c6edec..f4ed5fe55 100644
--- a/ios/Components/InstantComponent.swift
+++ b/ios/Components/InstantComponent.swift
@@ -31,15 +31,15 @@ internal final class InstantComponent: BaseModule {
             return sendEvent(error: error)
         }
 
-        let apiContext = APIContext(environment: parser.environment, clientKey: clientKey)
+        guard let apiContext = try? APIContext(environment: parser.environment, clientKey: clientKey) else { return }
+        let context = AdyenContext(apiContext: apiContext, payment: nil, analyticsConfiguration: AnalyticsConfiguration())
 
         let style = AdyenAppearanceLoader.findStyle()?.actionComponent ?? .init()
-        actionHandler = AdyenActionComponent(apiContext: apiContext, style: style)
+        actionHandler = AdyenActionComponent(context: context, configuration: .init(style: style))
         actionHandler?.delegate = self
         actionHandler?.presentationDelegate = self
 
-        let component = InstantPaymentComponent(paymentMethod: paymentMethod, paymentData: nil, apiContext: apiContext)
-        component.payment = parser.payment
+        let component = InstantPaymentComponent(paymentMethod: paymentMethod, context: context, order: nil)
         component.delegate = self
         currentComponent = component
         
diff --git a/ios/Configuration/ApplepayConfigurationParser.swift b/ios/Configuration/ApplepayConfigurationParser.swift
index f0379c3e1..0a2b61e3a 100644
--- a/ios/Configuration/ApplepayConfigurationParser.swift
+++ b/ios/Configuration/ApplepayConfigurationParser.swift
@@ -169,7 +169,7 @@ public struct ApplepayConfigurationParser {
         return summaryItems.isEmpty ? nil : summaryItems
     }
 
-    public func buildConfiguration(amount: Amount) throws -> Adyen.ApplePayComponent.Configuration {
+    public func buildConfiguration(payment: Payment) throws -> Adyen.ApplePayComponent.Configuration {
         guard let merchantID else {
             throw ApplePayError.invalidMerchantID
         }
@@ -182,19 +182,22 @@ public struct ApplepayConfigurationParser {
                 throw ApplePayError.invalidMerchantName
             }
             
-            let amount = AmountFormatter.decimalAmount(amount.value,
-                                                       currencyCode: amount.currencyCode,
-                                                       localeIdentifier: amount.localeIdentifier)
+            let amount = AmountFormatter.decimalAmount(payment.amount.value,
+                                                       currencyCode: payment.amount.currencyCode,
+                                                       localeIdentifier: payment.amount.localeIdentifier)
             summaryItems = [PKPaymentSummaryItem(label: merchantName, amount: amount)]
         }
         
-        return .init(summaryItems: summaryItems,
-                     merchantIdentifier: merchantID,
-                     requiredBillingContactFields: requiredBillingContactFields,
-                     requiredShippingContactFields: requiredShippingContactFields,
-                     billingContact: billingContact,
-                     allowOnboarding: allowOnboarding
-        )
+        let paymentRequest = PKPaymentRequest()
+        paymentRequest.merchantIdentifier = merchantID
+        paymentRequest.paymentSummaryItems = summaryItems
+        paymentRequest.countryCode = payment.countryCode
+        paymentRequest.currencyCode = payment.amount.currencyCode
+        paymentRequest.billingContact = billingContact
+        paymentRequest.requiredShippingContactFields = requiredShippingContactFields
+        paymentRequest.requiredBillingContactFields = requiredBillingContactFields
+        paymentRequest.merchantCapabilities = [.threeDSecure]
+        return try .init(paymentRequest: paymentRequest, allowOnboarding: allowOnboarding)
     }
 }
 
diff --git a/ios/Configuration/CardConfigurationParser.swift b/ios/Configuration/CardConfigurationParser.swift
index 590523a8a..0e2b5c756 100644
--- a/ios/Configuration/CardConfigurationParser.swift
+++ b/ios/Configuration/CardConfigurationParser.swift
@@ -80,18 +80,46 @@ public struct CardConfigurationParser {
     public var configuration: CardComponent.Configuration {
         var storedConfiguration = StoredCardConfiguration()
         storedConfiguration.showsSecurityCodeField = showsStoredSecurityCodeField
-        
+
+        var billingAddressConfiguration = BillingAddressConfiguration()
+        billingAddressConfiguration.countryCodes = billingAddressCountryCodes
+        billingAddressConfiguration.mode = addressVisibility
+
+        var soredCardConfiguration = StoredCardConfiguration()
+        return .init(style: FormComponentStyle(),
+                     shopperInformation: nil,
+                     localizationParameters: nil,
+                     showsHolderNameField: showsHolderNameField,
+                     showsStorePaymentMethodField: showsStorePaymentMethodField,
+                     showsSecurityCodeField: showsSecurityCodeField,
+                     koreanAuthenticationMode: kcpVisibility,
+                     socialSecurityNumberMode: socialSecurityVisibility,
+                     storedCardConfiguration: soredCardConfiguration,
+                     allowedCardTypes: allowedCardTypes,
+                     installmentConfiguration:nil,
+                     billingAddress: billingAddressConfiguration )
+    }
+
+    public var dropinConfiguration: DropInComponent.Card {
+        var storedConfiguration = StoredCardConfiguration()
+        storedConfiguration.showsSecurityCodeField = showsStoredSecurityCodeField
+
+        var billingAddressConfiguration = BillingAddressConfiguration()
+        billingAddressConfiguration.countryCodes = billingAddressCountryCodes
+        billingAddressConfiguration.mode = addressVisibility
+
+        var soredCardConfiguration = StoredCardConfiguration()
         return .init(showsHolderNameField: showsHolderNameField,
                      showsStorePaymentMethodField: showsStorePaymentMethodField,
                      showsSecurityCodeField: showsSecurityCodeField,
                      koreanAuthenticationMode: kcpVisibility,
                      socialSecurityNumberMode: socialSecurityVisibility,
-                     billingAddressMode: addressVisibility,
-                     storedCardConfiguration: storedConfiguration,
+                     storedCardConfiguration: soredCardConfiguration,
                      allowedCardTypes: allowedCardTypes,
-                     billingAddressCountryCodes: billingAddressCountryCodes)
+                     installmentConfiguration:nil,
+                     billingAddress: billingAddressConfiguration )
     }
-    
+
     private func parseVisibility(_ key: String) -> CardComponent.FieldVisibility {
         guard let value = dict[key] as? String else {
             return .hide
diff --git a/ios/Configuration/DropInConfigurationParser.swift b/ios/Configuration/DropInConfigurationParser.swift
index 618f39564..e1f36a87d 100644
--- a/ios/Configuration/DropInConfigurationParser.swift
+++ b/ios/Configuration/DropInConfigurationParser.swift
@@ -36,9 +36,8 @@ public struct DropInConfigurationParser {
         return value
     }
 
-    public func configuration(apiContext: APIContext) -> DropInComponent.Configuration {
-        .init(apiContext: apiContext,
-              allowsSkippingPaymentList: skipListWhenSinglePaymentMethod,
+    public var configuration: DropInComponent.Configuration {
+        .init(allowsSkippingPaymentList: skipListWhenSinglePaymentMethod,
               allowPreselectedPaymentView: showPreselectedStoredPaymentMethod)
     }
 
diff --git a/ios/Helpers/Environment.swift b/ios/Helpers/Environment.swift
index 20466524b..de60ceb0d 100644
--- a/ios/Helpers/Environment.swift
+++ b/ios/Helpers/Environment.swift
@@ -8,10 +8,6 @@ import Adyen
 import Foundation
 
 extension Environment {
-    
-    // TODO: remove when updated to v4.10+
-    /// Adyen's Asia Pacific and South East live  environment.
-    static let liveApse = Environment(baseURL: URL(string: "https://checkoutshopper-live-apse.adyen.com/")!)
 
     internal static func parse(_ value: String) -> Environment {
         switch value.lowercased() {
@@ -20,6 +16,7 @@ extension Environment {
         case "live-us": return .liveUnitedStates
         case "live-apse": return liveApse
         case "live-in": return .liveIndia
+        case "live-apse": return .liveApse
         default:
             return .test
         }

From b5cf8b2ea46b208d741938d6a5ba0e0fb1471b87 Mon Sep 17 00:00:00 2001
From: vladimir <vladimir.abramichev@adyen.com>
Date: Fri, 8 Dec 2023 15:57:35 +0100
Subject: [PATCH 2/6] chore: disable Flipper due to openssl error

---
 example/ios/Podfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/ios/Podfile b/example/ios/Podfile
index e7ccae39a..14a6c3911 100644
--- a/example/ios/Podfile
+++ b/example/ios/Podfile
@@ -24,7 +24,7 @@ target 'AdyenExample' do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable the next line.
-  use_flipper!()
+  # use_flipper!()
 
   post_install do |installer|
     react_native_post_install(installer)

From c7bcf13f32e9f485af18660b65b50ae74d848464 Mon Sep 17 00:00:00 2001
From: vladimir <vladimir.abramichev@adyen.com>
Date: Fri, 8 Dec 2023 16:06:25 +0100
Subject: [PATCH 3/6] chore: rename components into modules

---
 .../{ApplePayComponent.swift => ApplePayModule.swift}  |  8 +++++---
 .../{AdyenDropIn.swift => DropInModule.swift}          | 10 +++++++---
 ...enGooglePayMock.swift => GooglePayModuleMock.swift} |  2 +-
 .../{InstantComponent.swift => InstantModule.swift}    | 10 ++++++----
 4 files changed, 19 insertions(+), 11 deletions(-)
 rename ios/Components/{ApplePayComponent.swift => ApplePayModule.swift} (96%)
 rename ios/Components/{AdyenDropIn.swift => DropInModule.swift} (94%)
 rename ios/Components/{AdyenGooglePayMock.swift => GooglePayModuleMock.swift} (90%)
 rename ios/Components/{InstantComponent.swift => InstantModule.swift} (92%)

diff --git a/ios/Components/ApplePayComponent.swift b/ios/Components/ApplePayModule.swift
similarity index 96%
rename from ios/Components/ApplePayComponent.swift
rename to ios/Components/ApplePayModule.swift
index 753647b59..727b79fe3 100644
--- a/ios/Components/ApplePayComponent.swift
+++ b/ios/Components/ApplePayModule.swift
@@ -10,7 +10,7 @@ import PassKit
 import React
 
 @objc(AdyenApplePay)
-internal final class ApplePayComponent: BaseModule {
+internal final class ApplePayModule: BaseModule {
     
     override func supportedEvents() -> [String]! { [ Events.didSubmit.rawValue, Events.didFail.rawValue ] }
 
@@ -37,7 +37,9 @@ internal final class ApplePayComponent: BaseModule {
         }
         
         guard let apiContext = try? APIContext(environment: parser.environment, clientKey: clientKey) else { return }
-        let context = AdyenContext(apiContext: apiContext, payment: payment, analyticsConfiguration: AnalyticsConfiguration())
+
+        // TODO: add analyticsConfiguration: AnalyticsConfiguration()
+        let context = AdyenContext(apiContext: apiContext, payment: payment)
         let applePayComponent: Adyen.ApplePayComponent
         do {
             applePayComponent = try Adyen.ApplePayComponent(paymentMethod: paymentMethod,
@@ -52,7 +54,7 @@ internal final class ApplePayComponent: BaseModule {
 
 }
 
-extension ApplePayComponent: PaymentComponentDelegate {
+extension ApplePayModule: PaymentComponentDelegate {
 
     internal func didSubmit(_ data: PaymentComponentData, from component: PaymentComponent) {
         let applePayDetails = data.paymentMethod as? ApplePayDetails
diff --git a/ios/Components/AdyenDropIn.swift b/ios/Components/DropInModule.swift
similarity index 94%
rename from ios/Components/AdyenDropIn.swift
rename to ios/Components/DropInModule.swift
index b1cb2721c..1648f119e 100644
--- a/ios/Components/AdyenDropIn.swift
+++ b/ios/Components/DropInModule.swift
@@ -10,7 +10,7 @@ import PassKit
 import React
 
 @objc(AdyenDropIn)
-internal final class AdyenDropIn: BaseModule {
+internal final class DropInModule: BaseModule {
 
     override public func supportedEvents() -> [String]! { Events.allCases.map(\.rawValue) }
 
@@ -35,6 +35,8 @@ internal final class AdyenDropIn: BaseModule {
             return sendEvent(error: error)
         }
 
+        AdyenLogging.isEnabled = true
+
         guard let apiContext = try? APIContext(environment: parser.environment, clientKey: clientKey) else { return }
         let config = DropInConfigurationParser(configuration: configuration).configuration
         config.card = CardConfigurationParser(configuration: configuration).dropinConfiguration
@@ -45,7 +47,9 @@ internal final class AdyenDropIn: BaseModule {
             (try? ApplepayConfigurationParser(configuration: configuration).buildConfiguration(payment: payment)).map {
                 config.applePay = $0
             }
-            context = AdyenContext(apiContext: apiContext, payment: payment, analyticsConfiguration: AnalyticsConfiguration())
+
+            // TODO: add analyticsConfiguration: AnalyticsConfiguration()
+            context = AdyenContext(apiContext: apiContext, payment: payment)
         } else {
             context = AdyenContext(apiContext: apiContext, payment: nil, analyticsConfiguration: AnalyticsConfiguration())
         }
@@ -75,7 +79,7 @@ internal final class AdyenDropIn: BaseModule {
 
 }
 
-extension AdyenDropIn: DropInComponentDelegate {
+extension DropInModule: DropInComponentDelegate {
     func didSubmit(_ data: Adyen.PaymentComponentData, from component: Adyen.PaymentComponent, in dropInComponent: Adyen.AnyDropInComponent) {
         let response: SubmitData
         if let appleData = data.paymentMethod as? ApplePayDetails {
diff --git a/ios/Components/AdyenGooglePayMock.swift b/ios/Components/GooglePayModuleMock.swift
similarity index 90%
rename from ios/Components/AdyenGooglePayMock.swift
rename to ios/Components/GooglePayModuleMock.swift
index e6b4d1069..7083e4308 100644
--- a/ios/Components/AdyenGooglePayMock.swift
+++ b/ios/Components/GooglePayModuleMock.swift
@@ -9,7 +9,7 @@ import React
 import UIKit
 
 @objc(AdyenGooglePay)
-internal class AdyenGooglePayMock: BaseModule {
+internal class GooglePayModuleMock: BaseModule {
     
     override func supportedEvents() -> [String]! { [Events.didFail.rawValue] }
     
diff --git a/ios/Components/InstantComponent.swift b/ios/Components/InstantModule.swift
similarity index 92%
rename from ios/Components/InstantComponent.swift
rename to ios/Components/InstantModule.swift
index f4ed5fe55..b234db246 100644
--- a/ios/Components/InstantComponent.swift
+++ b/ios/Components/InstantModule.swift
@@ -10,7 +10,7 @@ import PassKit
 import React
 
 @objc(AdyenInstant)
-internal final class InstantComponent: BaseModule {
+internal final class InstantModule: BaseModule {
     
     override public func supportedEvents() -> [String]! { Events.allCases.map(\.rawValue) }
 
@@ -32,7 +32,9 @@ internal final class InstantComponent: BaseModule {
         }
 
         guard let apiContext = try? APIContext(environment: parser.environment, clientKey: clientKey) else { return }
-        let context = AdyenContext(apiContext: apiContext, payment: nil, analyticsConfiguration: AnalyticsConfiguration())
+
+        // TODO: add analyticsConfiguration: AnalyticsConfiguration()
+        let context = AdyenContext(apiContext: apiContext, payment: nil)
 
         let style = AdyenAppearanceLoader.findStyle()?.actionComponent ?? .init()
         actionHandler = AdyenActionComponent(context: context, configuration: .init(style: style))
@@ -64,7 +66,7 @@ internal final class InstantComponent: BaseModule {
 
 }
 
-extension InstantComponent: PaymentComponentDelegate {
+extension InstantModule: PaymentComponentDelegate {
 
     internal func didSubmit(_ data: PaymentComponentData, from component: PaymentComponent) {
         let response = SubmitData(paymentData: data.jsonObject, extra: nil)
@@ -77,7 +79,7 @@ extension InstantComponent: PaymentComponentDelegate {
 
 }
 
-extension InstantComponent: ActionComponentDelegate {
+extension InstantModule: ActionComponentDelegate {
 
     internal func didFail(with error: Error, from component: ActionComponent) {
         sendEvent(error: error)

From 3372517b44297544e07717aedfb091fd663a03fe Mon Sep 17 00:00:00 2001
From: vladimir <vladimir.abramichev@adyen.com>
Date: Fri, 8 Dec 2023 16:45:50 +0100
Subject: [PATCH 4/6] chore: fix tests

---
 .../ApplePayConfigurationTests.swift          | 88 +++++++++----------
 .../CardConfigurationTests.swift              | 24 ++++-
 ios/AdyenExample.xctestplan                   | 37 ++++++++
 .../ApplepayConfigurationParser.swift         | 14 ++-
 4 files changed, 111 insertions(+), 52 deletions(-)
 create mode 100644 ios/AdyenExample.xctestplan

diff --git a/example/ios/AdyenExampleTests/ApplePayConfigurationTests.swift b/example/ios/AdyenExampleTests/ApplePayConfigurationTests.swift
index 4f3ecbb41..2d1ce4431 100644
--- a/example/ios/AdyenExampleTests/ApplePayConfigurationTests.swift
+++ b/example/ios/AdyenExampleTests/ApplePayConfigurationTests.swift
@@ -6,13 +6,14 @@
 
 import XCTest
 import Adyen
-import adyen_react_native
+@testable import adyen_react_native
 import PassKit
 
 final class ApplePayConfigurationTests: XCTestCase {
   
   let mockAmount = Amount(value: 1000, currencyCode: "USD", localeIdentifier: "en-US")
-  
+  lazy var  mockPayment = Payment(amount: mockAmount, countryCode: "US")
+
   func testNewDictionary() throws {
     let sut = ApplepayConfigurationParser(configuration: NSDictionary())
     XCTAssertNotNil(sut)
@@ -28,7 +29,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertNotNil(sut)
     
     let expectation = self.expectation(description: "Expect throw")
-    XCTAssertThrowsError(try sut.buildConfiguration(amount: mockAmount)) { error in
+    XCTAssertThrowsError(try sut.buildConfiguration(payment: mockPayment)) { error in
       XCTAssertEqual(error.localizedDescription, ApplepayConfigurationParser.ApplePayError.invalidMerchantID.localizedDescription)
       expectation.fulfill()
     }
@@ -39,7 +40,7 @@ final class ApplePayConfigurationTests: XCTestCase {
   func testWrongSubDictionary() throws {
     let sut = ApplepayConfigurationParser(configuration: ["applepay": "some value"])
     let expectation = self.expectation(description: "Expect throw")
-    XCTAssertThrowsError(try sut.buildConfiguration(amount: mockAmount)) { error in
+    XCTAssertThrowsError(try sut.buildConfiguration(payment: mockPayment)) { error in
       XCTAssertEqual(error.localizedDescription, ApplepayConfigurationParser.ApplePayError.invalidMerchantID.localizedDescription)
       expectation.fulfill()
     }
@@ -56,7 +57,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     ])
     
     let expectation = self.expectation(description: "Expect throw")
-    XCTAssertThrowsError(try sut.buildConfiguration(amount: mockAmount)) { error in
+    XCTAssertThrowsError(try sut.buildConfiguration(payment: mockPayment)) { error in
       XCTAssertEqual(error.localizedDescription, ApplepayConfigurationParser.ApplePayError.invalidMerchantName.localizedDescription)
       expectation.fulfill()
     }
@@ -72,10 +73,10 @@ final class ApplePayConfigurationTests: XCTestCase {
           "merchantName": "SomeName"
         ]
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertNotNil(config.merchantIdentifier)
-    XCTAssertNotNil(config.summaryItems)
-    XCTAssertEqual(config.summaryItems.count, 1)
+    let paymentRequest = try sut.buildPaymentRequest(payment: mockPayment)
+    XCTAssertNotNil(paymentRequest.merchantIdentifier)
+    XCTAssertNotNil(paymentRequest.paymentSummaryItems)
+    XCTAssertEqual(paymentRequest.paymentSummaryItems.count, 1)
   }
   
   func testMinimalValidDictionaryValuesWithNoSubDirectory() throws {
@@ -83,10 +84,10 @@ final class ApplePayConfigurationTests: XCTestCase {
       "merchantID": "merchant.com.adyen.test",
       "merchantName": "SomeName"
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertNotNil(config.merchantIdentifier)
-    XCTAssertNotNil(config.summaryItems)
-    XCTAssertEqual(config.summaryItems.count, 1)
+    let paymentRequest = try sut.buildPaymentRequest(payment: mockPayment)
+    XCTAssertNotNil(paymentRequest.merchantIdentifier)
+    XCTAssertNotNil(paymentRequest.paymentSummaryItems)
+    XCTAssertEqual(paymentRequest.paymentSummaryItems.count, 1)
   }
   
   func testCorrectSummaryItems() throws {
@@ -114,14 +115,14 @@ final class ApplePayConfigurationTests: XCTestCase {
           ]
         ]
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertNotNil(config.merchantIdentifier)
-    XCTAssertNotNil(config.summaryItems)
-    XCTAssertEqual(config.summaryItems.count, 4)
-    XCTAssertEqual(config.summaryItems[0].amount, 70.20)
-    XCTAssertEqual(config.summaryItems[1].amount, 20)
-    XCTAssertEqual(config.summaryItems[2].amount, 10)
-    XCTAssertEqual(config.summaryItems[3].amount, 100.50)
+    let paymentRequest = try sut.buildPaymentRequest(payment: mockPayment)
+    XCTAssertNotNil(paymentRequest.merchantIdentifier)
+    XCTAssertNotNil(paymentRequest.paymentSummaryItems)
+    XCTAssertEqual(paymentRequest.paymentSummaryItems.count, 4)
+    XCTAssertEqual(paymentRequest.paymentSummaryItems[0].amount, 70.20)
+    XCTAssertEqual(paymentRequest.paymentSummaryItems[1].amount, 20)
+    XCTAssertEqual(paymentRequest.paymentSummaryItems[2].amount, 10)
+    XCTAssertEqual(paymentRequest.paymentSummaryItems[3].amount, 100.50)
   }
   
   func testInvalidSummaryItemsThrows() throws {
@@ -132,7 +133,7 @@ final class ApplePayConfigurationTests: XCTestCase {
                                                             ]
                                                          ])
     let expectation = self.expectation(description: "Expect throw")
-    XCTAssertThrowsError(try sut.buildConfiguration(amount: mockAmount)) { error in
+    XCTAssertThrowsError(try sut.buildConfiguration(payment: mockPayment)) { error in
       XCTAssertEqual(error.localizedDescription, ApplepayConfigurationParser.ApplePayError.invalidMerchantName.localizedDescription)
       expectation.fulfill()
     }
@@ -149,8 +150,7 @@ final class ApplePayConfigurationTests: XCTestCase {
           "allowOnboarding": true
         ]
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertTrue(config.allowOnboarding)
+    XCTAssertTrue(sut.allowOnboarding)
   }
   
   func testAllowOnboardingStringValue() throws {
@@ -162,8 +162,7 @@ final class ApplePayConfigurationTests: XCTestCase {
           "allowOnboarding": "true"
         ]
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertTrue(config.allowOnboarding)
+    XCTAssertTrue(sut.allowOnboarding)
   }
   
   func testAllowOnboardingNumericValue() throws {
@@ -175,8 +174,7 @@ final class ApplePayConfigurationTests: XCTestCase {
           "allowOnboarding": 1
         ]
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertTrue(config.allowOnboarding)
+    XCTAssertTrue(sut.allowOnboarding)
   }
   
   func testBillingAddress() throws {
@@ -204,7 +202,7 @@ final class ApplePayConfigurationTests: XCTestCase {
         ]
     ])
     
-    let contact = try XCTUnwrap(sut.buildConfiguration(amount: mockAmount).billingContact)
+    let contact = try XCTUnwrap(sut.billingContact)
     XCTAssertEqual(contact.phoneNumber?.stringValue, "123-456-7890")
     XCTAssertEqual(contact.emailAddress, "example@email.com")
     XCTAssertEqual(contact.name?.givenName, "John")
@@ -235,7 +233,7 @@ final class ApplePayConfigurationTests: XCTestCase {
         ]
     ])
     
-    let contact = try XCTUnwrap(sut.buildConfiguration(amount: mockAmount).billingContact)
+    let contact = try XCTUnwrap(sut.billingContact)
     XCTAssertEqual(contact.phoneNumber?.stringValue, "123-456-7890")
     XCTAssertNil(contact.emailAddress)
     XCTAssertEqual(contact.name?.givenName, "John")
@@ -259,7 +257,7 @@ final class ApplePayConfigurationTests: XCTestCase {
         ]
     ])
     
-    let contact = try XCTUnwrap(sut.buildConfiguration(amount: mockAmount).billingContact)
+    let contact = try XCTUnwrap(sut.billingContact)
     XCTAssertNil(contact.phoneNumber)
     XCTAssertEqual(contact.emailAddress, "example@email.com")
     XCTAssertNil(contact.name?.givenName)
@@ -277,8 +275,8 @@ final class ApplePayConfigurationTests: XCTestCase {
           "requiredBillingContactFields": []
         ]
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertEqual(config.requiredBillingContactFields.count, 0)
+    let paymentRequest = try sut.buildPaymentRequest(payment: mockPayment)
+    XCTAssertEqual(paymentRequest.requiredBillingContactFields.count, 0)
   }
   
   func testRequiredBillingFileds() throws {
@@ -290,11 +288,11 @@ final class ApplePayConfigurationTests: XCTestCase {
           "requiredBillingContactFields": ["emailAddress", "phoneNumber", "postalAddress"]
         ]
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertEqual(config.requiredBillingContactFields.count, 3)
-    XCTAssertTrue(config.requiredBillingContactFields.contains(.phoneNumber))
-    XCTAssertTrue(config.requiredBillingContactFields.contains(.emailAddress))
-    XCTAssertTrue(config.requiredBillingContactFields.contains(.postalAddress))
+    let paymentRequest = try sut.buildPaymentRequest(payment: mockPayment)
+    XCTAssertEqual(paymentRequest.requiredBillingContactFields.count, 3)
+    XCTAssertTrue(paymentRequest.requiredBillingContactFields.contains(.phoneNumber))
+    XCTAssertTrue(paymentRequest.requiredBillingContactFields.contains(.emailAddress))
+    XCTAssertTrue(paymentRequest.requiredBillingContactFields.contains(.postalAddress))
   }
   
   func testRequiredShippingFileds() throws {
@@ -306,13 +304,13 @@ final class ApplePayConfigurationTests: XCTestCase {
           "requiredShippingContactFields": ["email", "phone", "phoneticName", "name", "post"]
         ]
     ])
-    let config = try sut.buildConfiguration(amount: mockAmount)
-    XCTAssertEqual(config.requiredShippingContactFields.count, 5)
-    XCTAssertTrue(config.requiredShippingContactFields.contains(.phoneNumber))
-    XCTAssertTrue(config.requiredShippingContactFields.contains(.emailAddress))
-    XCTAssertTrue(config.requiredShippingContactFields.contains(.name))
-    XCTAssertTrue(config.requiredShippingContactFields.contains(.phoneticName))
-    XCTAssertTrue(config.requiredShippingContactFields.contains(.postalAddress))
+    let paymentRequest = try sut.buildPaymentRequest(payment: mockPayment)
+    XCTAssertEqual(paymentRequest.requiredShippingContactFields.count, 5)
+    XCTAssertTrue(paymentRequest.requiredShippingContactFields.contains(.phoneNumber))
+    XCTAssertTrue(paymentRequest.requiredShippingContactFields.contains(.emailAddress))
+    XCTAssertTrue(paymentRequest.requiredShippingContactFields.contains(.name))
+    XCTAssertTrue(paymentRequest.requiredShippingContactFields.contains(.phoneticName))
+    XCTAssertTrue(paymentRequest.requiredShippingContactFields.contains(.postalAddress))
   }
   
   // 'postalAddress' | 'name' | 'phoneticName' | 'phone' | 'email';
diff --git a/example/ios/AdyenExampleTests/CardConfigurationTests.swift b/example/ios/AdyenExampleTests/CardConfigurationTests.swift
index 20d7402bc..2e52b9002 100644
--- a/example/ios/AdyenExampleTests/CardConfigurationTests.swift
+++ b/example/ios/AdyenExampleTests/CardConfigurationTests.swift
@@ -50,12 +50,12 @@ final class CardConfigurationTests: XCTestCase {
 
     func testFullAddressVisibility() throws {
         let sut = CardConfigurationParser(configuration: ["card": ["addressVisibility": "full"]])
-      XCTAssertEqual(sut.configuration.billingAddressMode, .full)
+      XCTAssertEqual(sut.configuration.billingAddress.mode, .full)
     }
   
   func testPostalAddressVisibility() throws {
       let sut = CardConfigurationParser(configuration: ["card": ["addressVisibility": "postal"]])
-    XCTAssertEqual(sut.configuration.billingAddressMode, .postalCode)
+    XCTAssertEqual(sut.configuration.billingAddress.mode, .postalCode)
   }
 
     func testHideKcpVisibility() throws {
@@ -85,7 +85,25 @@ final class CardConfigurationTests: XCTestCase {
 
     func testBillingAddressCountryCodes() throws {
         let sut = CardConfigurationParser(configuration: ["card": ["allowedAddressCountryCodes": ["GB", "US"]]])
-      XCTAssertEqual(sut.configuration.billingAddressCountryCodes?.count, 2)
+      XCTAssertEqual(sut.configuration.billingAddress.countryCodes?.count, 2)
     }
 
 }
+
+
+extension CardComponent.AddressFormType: Equatable {
+
+  public static func == (lhs: Self, rhs: Self) -> Bool {
+    switch (lhs, rhs) {
+    case (.full, .full):
+      return true
+    case (.none, .none):
+      return true
+    case (.postalCode, .postalCode):
+      return true
+    default:
+      return false
+    }
+  }
+
+}
diff --git a/ios/AdyenExample.xctestplan b/ios/AdyenExample.xctestplan
new file mode 100644
index 000000000..a03404e95
--- /dev/null
+++ b/ios/AdyenExample.xctestplan
@@ -0,0 +1,37 @@
+{
+  "configurations" : [
+    {
+      "id" : "F964E966-C83B-45AD-9979-827BCA3DBB35",
+      "name" : "Configuration 1",
+      "options" : {
+
+      }
+    }
+  ],
+  "defaultOptions" : {
+    "codeCoverage" : {
+      "targets" : [
+        {
+          "containerPath" : "container:Pods\/Pods.xcodeproj",
+          "identifier" : "AAD28DD7969F9D87A63AC862A9B80294",
+          "name" : "adyen-react-native"
+        }
+      ]
+    },
+    "targetForVariableExpansion" : {
+      "containerPath" : "container:AdyenExample.xcodeproj",
+      "identifier" : "13B07F861A680F5B00A75B9A",
+      "name" : "AdyenExample"
+    }
+  },
+  "testTargets" : [
+    {
+      "target" : {
+        "containerPath" : "container:AdyenExample.xcodeproj",
+        "identifier" : "00E356ED1AD99517003FC87E",
+        "name" : "AdyenExampleTests"
+      }
+    }
+  ],
+  "version" : 1
+}
diff --git a/ios/Configuration/ApplepayConfigurationParser.swift b/ios/Configuration/ApplepayConfigurationParser.swift
index 0a2b61e3a..db080228d 100644
--- a/ios/Configuration/ApplepayConfigurationParser.swift
+++ b/ios/Configuration/ApplepayConfigurationParser.swift
@@ -170,10 +170,15 @@ public struct ApplepayConfigurationParser {
     }
 
     public func buildConfiguration(payment: Payment) throws -> Adyen.ApplePayComponent.Configuration {
+        let paymentRequest = try buildPaymentRequest(payment: payment)
+        return try .init(paymentRequest: paymentRequest, allowOnboarding: allowOnboarding)
+    }
+
+    internal func buildPaymentRequest(payment: Payment) throws -> PKPaymentRequest {
         guard let merchantID else {
             throw ApplePayError.invalidMerchantID
         }
-        
+
         let summaryItems: [PKPaymentSummaryItem]
         if let summaryItemsFromConfig = self.summaryItems {
             summaryItems = summaryItemsFromConfig
@@ -181,13 +186,13 @@ public struct ApplepayConfigurationParser {
             guard let merchantName else {
                 throw ApplePayError.invalidMerchantName
             }
-            
+
             let amount = AmountFormatter.decimalAmount(payment.amount.value,
                                                        currencyCode: payment.amount.currencyCode,
                                                        localeIdentifier: payment.amount.localeIdentifier)
             summaryItems = [PKPaymentSummaryItem(label: merchantName, amount: amount)]
         }
-        
+
         let paymentRequest = PKPaymentRequest()
         paymentRequest.merchantIdentifier = merchantID
         paymentRequest.paymentSummaryItems = summaryItems
@@ -197,7 +202,8 @@ public struct ApplepayConfigurationParser {
         paymentRequest.requiredShippingContactFields = requiredShippingContactFields
         paymentRequest.requiredBillingContactFields = requiredBillingContactFields
         paymentRequest.merchantCapabilities = [.threeDSecure]
-        return try .init(paymentRequest: paymentRequest, allowOnboarding: allowOnboarding)
+
+        return paymentRequest
     }
 }
 

From b4f385cd148b225e840e591dba311c55f8df6d6a Mon Sep 17 00:00:00 2001
From: vladimir <vladimir.abramichev@adyen.com>
Date: Fri, 8 Dec 2023 17:04:37 +0100
Subject: [PATCH 5/6] chore: format with swiftlint

---
 .../ApplePayConfigurationTests.swift          | 68 +++++++++----------
 .../CardConfigurationTests.swift              | 13 ++--
 .../ios/AdyenExampleTests/DropInTest.swift    | 32 ++++-----
 ios/CSE/AdyenCSE.swift                        |  8 +--
 ios/CSE/CardDTO.swift                         |  4 +-
 ios/Components/AdyenApperance.swift           | 11 ++-
 ios/Components/ApplePayModule.swift           | 18 ++---
 ios/Components/BaseModule.swift               | 54 +++++++--------
 ios/Components/DropInModule.swift             | 15 ++--
 ios/Components/GooglePayModuleMock.swift      |  4 +-
 ios/Components/InstantModule.swift            |  6 +-
 .../ApplepayConfigurationParser.swift         | 54 +++++++--------
 .../CardConfigurationParser.swift             | 14 ++--
 ios/Configuration/Parameters.swift            |  2 +-
 ios/Helpers/UIViewControllerHelper.swift      |  2 +-
 ios/Model/EncodablePaymentComponentData.swift |  2 +-
 ios/Model/EncodablePaymentMethod.swift        |  2 +-
 ios/Model/SubmitData.swift                    |  8 +--
 18 files changed, 156 insertions(+), 161 deletions(-)

diff --git a/example/ios/AdyenExampleTests/ApplePayConfigurationTests.swift b/example/ios/AdyenExampleTests/ApplePayConfigurationTests.swift
index 2d1ce4431..cb379581d 100644
--- a/example/ios/AdyenExampleTests/ApplePayConfigurationTests.swift
+++ b/example/ios/AdyenExampleTests/ApplePayConfigurationTests.swift
@@ -10,33 +10,33 @@ import Adyen
 import PassKit
 
 final class ApplePayConfigurationTests: XCTestCase {
-  
+
   let mockAmount = Amount(value: 1000, currencyCode: "USD", localeIdentifier: "en-US")
-  lazy var  mockPayment = Payment(amount: mockAmount, countryCode: "US")
+  lazy var mockPayment = Payment(amount: mockAmount, countryCode: "US")
 
   func testNewDictionary() throws {
     let sut = ApplepayConfigurationParser(configuration: NSDictionary())
     XCTAssertNotNil(sut)
   }
-  
+
   func testEmptyDictionary() throws {
     let sut = ApplepayConfigurationParser(configuration: [:])
     XCTAssertNotNil(sut)
   }
-  
+
   func testEmptySubDictionary() throws {
-    let sut = ApplepayConfigurationParser(configuration: ["applepay":[:]])
+    let sut = ApplepayConfigurationParser(configuration: ["applepay": [:]])
     XCTAssertNotNil(sut)
-    
+
     let expectation = self.expectation(description: "Expect throw")
     XCTAssertThrowsError(try sut.buildConfiguration(payment: mockPayment)) { error in
       XCTAssertEqual(error.localizedDescription, ApplepayConfigurationParser.ApplePayError.invalidMerchantID.localizedDescription)
       expectation.fulfill()
     }
-    
+
     self.wait(for: [expectation], timeout: 1)
   }
-  
+
   func testWrongSubDictionary() throws {
     let sut = ApplepayConfigurationParser(configuration: ["applepay": "some value"])
     let expectation = self.expectation(description: "Expect throw")
@@ -44,10 +44,10 @@ final class ApplePayConfigurationTests: XCTestCase {
       XCTAssertEqual(error.localizedDescription, ApplepayConfigurationParser.ApplePayError.invalidMerchantID.localizedDescription)
       expectation.fulfill()
     }
-    
+
     self.wait(for: [expectation], timeout: 1)
   }
-  
+
   func testThrowOnNoMerchantNameMerchantID() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -55,16 +55,16 @@ final class ApplePayConfigurationTests: XCTestCase {
           "merchantID": "someID"
         ]
     ])
-    
+
     let expectation = self.expectation(description: "Expect throw")
     XCTAssertThrowsError(try sut.buildConfiguration(payment: mockPayment)) { error in
       XCTAssertEqual(error.localizedDescription, ApplepayConfigurationParser.ApplePayError.invalidMerchantName.localizedDescription)
       expectation.fulfill()
     }
-    
+
     self.wait(for: [expectation], timeout: 1)
   }
-  
+
   func testMinimalValidDictionaryValues() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -78,7 +78,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertNotNil(paymentRequest.paymentSummaryItems)
     XCTAssertEqual(paymentRequest.paymentSummaryItems.count, 1)
   }
-  
+
   func testMinimalValidDictionaryValuesWithNoSubDirectory() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "merchantID": "merchant.com.adyen.test",
@@ -89,7 +89,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertNotNil(paymentRequest.paymentSummaryItems)
     XCTAssertEqual(paymentRequest.paymentSummaryItems.count, 1)
   }
-  
+
   func testCorrectSummaryItems() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -124,7 +124,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertEqual(paymentRequest.paymentSummaryItems[2].amount, 10)
     XCTAssertEqual(paymentRequest.paymentSummaryItems[3].amount, 100.50)
   }
-  
+
   func testInvalidSummaryItemsThrows() throws {
     let sut = ApplepayConfigurationParser(configuration: ["applepay":
                                                             [
@@ -137,10 +137,10 @@ final class ApplePayConfigurationTests: XCTestCase {
       XCTAssertEqual(error.localizedDescription, ApplepayConfigurationParser.ApplePayError.invalidMerchantName.localizedDescription)
       expectation.fulfill()
     }
-    
+
     self.wait(for: [expectation], timeout: 1)
   }
-  
+
   func testAllowOnboardingBoolValue() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -152,7 +152,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     ])
     XCTAssertTrue(sut.allowOnboarding)
   }
-  
+
   func testAllowOnboardingStringValue() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -164,7 +164,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     ])
     XCTAssertTrue(sut.allowOnboarding)
   }
-  
+
   func testAllowOnboardingNumericValue() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -176,7 +176,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     ])
     XCTAssertTrue(sut.allowOnboarding)
   }
-  
+
   func testBillingAddress() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -201,7 +201,7 @@ final class ApplePayConfigurationTests: XCTestCase {
           ]
         ]
     ])
-    
+
     let contact = try XCTUnwrap(sut.billingContact)
     XCTAssertEqual(contact.phoneNumber?.stringValue, "123-456-7890")
     XCTAssertEqual(contact.emailAddress, "example@email.com")
@@ -218,7 +218,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertEqual(contact.postalAddress?.country, "Country")
     XCTAssertEqual(contact.postalAddress?.isoCountryCode, "US")
   }
-  
+
   func testBillingAddressWIthNoPhoneticNameAndNoAddress() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -228,11 +228,11 @@ final class ApplePayConfigurationTests: XCTestCase {
           "billingContact": [
             "phoneNumber": "123-456-7890",
             "givenName": "John",
-            "familyName": "Doe",
+            "familyName": "Doe"
           ]
         ]
     ])
-    
+
     let contact = try XCTUnwrap(sut.billingContact)
     XCTAssertEqual(contact.phoneNumber?.stringValue, "123-456-7890")
     XCTAssertNil(contact.emailAddress)
@@ -242,7 +242,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertNil(contact.postalAddress)
     XCTAssertNil(contact.emailAddress)
   }
-  
+
   func testBillingAddressWIthNoName() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -252,11 +252,11 @@ final class ApplePayConfigurationTests: XCTestCase {
           "billingContact": [
             "emailAddress": "example@email.com",
             "phoneticGivenName": "John",
-            "phoneticFamilyName": "Doe",
+            "phoneticFamilyName": "Doe"
           ]
         ]
     ])
-    
+
     let contact = try XCTUnwrap(sut.billingContact)
     XCTAssertNil(contact.phoneNumber)
     XCTAssertEqual(contact.emailAddress, "example@email.com")
@@ -265,7 +265,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertEqual(contact.name?.phoneticRepresentation?.givenName, "John")
     XCTAssertEqual(contact.name?.phoneticRepresentation?.familyName, "Doe")
   }
-  
+
   func testRequiredBillingFiledsWithEmptyArray() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -278,7 +278,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     let paymentRequest = try sut.buildPaymentRequest(payment: mockPayment)
     XCTAssertEqual(paymentRequest.requiredBillingContactFields.count, 0)
   }
-  
+
   func testRequiredBillingFileds() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -294,7 +294,7 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertTrue(paymentRequest.requiredBillingContactFields.contains(.emailAddress))
     XCTAssertTrue(paymentRequest.requiredBillingContactFields.contains(.postalAddress))
   }
-  
+
   func testRequiredShippingFileds() throws {
     let sut = ApplepayConfigurationParser(configuration: [
       "applepay":
@@ -312,8 +312,8 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertTrue(paymentRequest.requiredShippingContactFields.contains(.phoneticName))
     XCTAssertTrue(paymentRequest.requiredShippingContactFields.contains(.postalAddress))
   }
-  
-  // 'postalAddress' | 'name' | 'phoneticName' | 'phone' | 'email';
+
+    // 'postalAddress' | 'name' | 'phoneticName' | 'phone' | 'email';
   func testPKContactField() throws {
     XCTAssertNotEqual(PKContactField.init(rawValue: "phoneNumber"), PKContactField.phoneNumber)
     XCTAssertEqual(PKContactField.init(rawValue: "phone"), PKContactField.phoneNumber)
@@ -324,5 +324,5 @@ final class ApplePayConfigurationTests: XCTestCase {
     XCTAssertEqual(PKContactField.init(rawValue: "phoneticName"), PKContactField.phoneticName)
     XCTAssertEqual(PKContactField.init(rawValue: "name"), PKContactField.name)
   }
-  
+
 }
diff --git a/example/ios/AdyenExampleTests/CardConfigurationTests.swift b/example/ios/AdyenExampleTests/CardConfigurationTests.swift
index 2e52b9002..48754063d 100644
--- a/example/ios/AdyenExampleTests/CardConfigurationTests.swift
+++ b/example/ios/AdyenExampleTests/CardConfigurationTests.swift
@@ -10,19 +10,19 @@ import PassKit
 import XCTest
 
 final class CardConfigurationTests: XCTestCase {
-  
+
     let mockAmount = Amount(value: 1000, currencyCode: "USD", localeIdentifier: "en-US")
 
     func testNewDictionary() throws {
         let sut = CardConfigurationParser(configuration: NSDictionary())
         XCTAssertNotNil(sut.configuration)
     }
-  
+
     func testEmptyDictionary() throws {
         let sut = CardConfigurationParser(configuration: [:])
         XCTAssertNotNil(sut.configuration)
     }
-  
+
     func testEmptySubDictionary() throws {
         let sut = CardConfigurationParser(configuration: ["card": [:]])
         XCTAssertNotNil(sut.configuration)
@@ -52,7 +52,7 @@ final class CardConfigurationTests: XCTestCase {
         let sut = CardConfigurationParser(configuration: ["card": ["addressVisibility": "full"]])
       XCTAssertEqual(sut.configuration.billingAddress.mode, .full)
     }
-  
+
   func testPostalAddressVisibility() throws {
       let sut = CardConfigurationParser(configuration: ["card": ["addressVisibility": "postal"]])
     XCTAssertEqual(sut.configuration.billingAddress.mode, .postalCode)
@@ -62,7 +62,7 @@ final class CardConfigurationTests: XCTestCase {
         let sut = CardConfigurationParser(configuration: ["card": ["kcpVisibility": "hide"]])
       XCTAssertEqual(sut.configuration.koreanAuthenticationMode, .hide)
     }
-  
+
   func testShowKcpVisibility() throws {
       let sut = CardConfigurationParser(configuration: ["card": ["kcpVisibility": "show"]])
     XCTAssertEqual(sut.configuration.koreanAuthenticationMode, .show)
@@ -72,7 +72,7 @@ final class CardConfigurationTests: XCTestCase {
         let sut = CardConfigurationParser(configuration: ["card": ["socialSecurity": "hide"]])
       XCTAssertEqual(sut.configuration.socialSecurityNumberMode, .hide)
     }
-  
+
   func testShowSocialSecurity() throws {
       let sut = CardConfigurationParser(configuration: ["card": ["socialSecurity": "show"]])
     XCTAssertEqual(sut.configuration.socialSecurityNumberMode, .show)
@@ -90,7 +90,6 @@ final class CardConfigurationTests: XCTestCase {
 
 }
 
-
 extension CardComponent.AddressFormType: Equatable {
 
   public static func == (lhs: Self, rhs: Self) -> Bool {
diff --git a/example/ios/AdyenExampleTests/DropInTest.swift b/example/ios/AdyenExampleTests/DropInTest.swift
index 307c64ae8..c4c60375e 100644
--- a/example/ios/AdyenExampleTests/DropInTest.swift
+++ b/example/ios/AdyenExampleTests/DropInTest.swift
@@ -9,70 +9,70 @@ import XCTest
 
 final class DropInTest: XCTestCase {
     private let timeout: TimeInterval! = TimeInterval(exactly: 60 * 2)
-  
+
     override func setUpWithError() throws {
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
-  
+
     override func tearDownWithError() throws {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
-  
+
     func testForTest() {
         XCTAssert(true, "Test are running")
     }
-  
+
     func testCheckNoErrorsWhenOpenApp() throws {
         let vc = RCTSharedApplication()!.keyWindow!.rootViewController!
         let timeoutDate = Date(timeIntervalSinceNow: timeout)
         var success = false
-        var redboxError: String? = nil
-        RCTSetLogFunction { level, source, fileName, lineNumber, message in
+        var redboxError: String?
+        RCTSetLogFunction { level, _, _, _, message in
             if level.rawValue >= RCTLogLevel.error.rawValue {
                 redboxError = message
             }
         }
-    
+
         while Date() < timeoutDate, !success {
             wait(for: .seconds(10))
             success = findSubview(in: vc.view, that: { $0.accessibilityLabel == "Checkout" })
         }
-    
+
         RCTSetLogFunction(RCTDefaultLogFunction)
-    
+
         XCTAssertNil(redboxError, "RedBox error: \(redboxError!)")
         // XCTAssertTrue(success, "View Herarchy: \(printSubview(in: vc.view))")
         // TODO: make a screenshot
         print(printSubview(in: vc.view))
     }
-  
+
     func findSubview(in view: UIView, that predicate: (UIView) -> Bool) -> Bool {
         if predicate(view) {
             return true
         }
-    
+
         for subview in view.subviews {
             if findSubview(in: subview, that: predicate) {
                 return true
             }
         }
-    
+
         return false
     }
-  
+
     func printSubview(in view: UIView) -> String {
         var buffer = ""
         printSubview(in: view, bufer: &buffer, tab: "")
         return buffer
     }
-  
+
     private func printSubview(in view: UIView, bufer: inout String, tab: String) {
         bufer.append("\(tab)\(NSStringFromClass(type(of: view.self))) - \(view.accessibilityLabel ?? "")\n")
         for subview in view.subviews {
             printSubview(in: subview, bufer: &bufer, tab: tab + " ")
         }
     }
-  
+
 }
 
 extension XCTestCase {
@@ -85,7 +85,7 @@ extension XCTestCase {
 
         wait(for: [dummyExpectation], timeout: 100)
     }
-    
+
     func waitFor(predicate: @escaping () -> Bool) {
         let dummyExpectation = XCTNSPredicateExpectation(predicate: NSPredicate(block: { _, _ in
             predicate()
diff --git a/ios/CSE/AdyenCSE.swift b/ios/CSE/AdyenCSE.swift
index b1feb6f4b..b1d3d142e 100644
--- a/ios/CSE/AdyenCSE.swift
+++ b/ios/CSE/AdyenCSE.swift
@@ -10,10 +10,10 @@ import React
 
 @objc(AdyenCSE)
 internal final class AdyenCSE: NSObject {
-    
+
     @objc
     static func requiresMainQueueSetup() -> Bool { true }
-    
+
     @objc
     func encryptCard(_ payload: NSDictionary,
                      publicKey: NSString,
@@ -27,7 +27,7 @@ internal final class AdyenCSE: NSObject {
             rejecter(Constant.errorMessage, nil, error)
         }
     }
-    
+
     @objc
     func encryptBin(_ bin: NSString,
                     publicKey: NSString,
@@ -41,7 +41,7 @@ internal final class AdyenCSE: NSObject {
             rejecter(Constant.errorMessage, nil, error)
         }
     }
-    
+
     private enum Constant {
         static var errorMessage = "Encryption failed"
     }
diff --git a/ios/CSE/CardDTO.swift b/ios/CSE/CardDTO.swift
index dfcac13ad..cf6a07212 100644
--- a/ios/CSE/CardDTO.swift
+++ b/ios/CSE/CardDTO.swift
@@ -15,7 +15,7 @@ extension EncryptedCard: Encodable {
         try? container.encodeIfPresent(expiryMonth, forKey: .expiryMonth)
         try? container.encodeIfPresent(securityCode, forKey: .securityCode)
     }
-    
+
     private enum CodingKeys: String, CodingKey {
         case number, expiryYear, expiryMonth
         case securityCode = "cvv"
@@ -30,7 +30,7 @@ extension Card: Decodable {
                       expiryMonth: container.decodeIfPresent(String.self, forKey: .expiryMonth),
                       expiryYear: container.decodeIfPresent(String.self, forKey: .expiryYear))
     }
-    
+
     private enum CodingKeys: String, CodingKey {
         case number, expiryYear, expiryMonth
         case securityCode = "cvv"
diff --git a/ios/Components/AdyenApperance.swift b/ios/Components/AdyenApperance.swift
index 0808544b8..071ad2007 100644
--- a/ios/Components/AdyenApperance.swift
+++ b/ios/Components/AdyenApperance.swift
@@ -7,21 +7,20 @@
 @_spi(AdyenInternal) import Adyen
 import Foundation
 
-
 /// Describes class that provides customization to Adyen UI elements.
 public protocol AdyenAppearanceProvider: AnyObject {
-    
+
     /// Implement this method to apply the style to the Drop-In and all components.
     /// Uses Drop-In Component Style as an umbrella style.
     static func createStyle() -> DropInComponent.Style
-    
+
 }
 
 internal class AdyenAppearanceLoader: NSObject {
-    
+
     private static let expectedClassName = "AdyenAppearance"
     private static let bundleExecutableKey = "CFBundleExecutable"
-    
+
     static func findStyle() -> Adyen.DropInComponent.Style? {
         let appearanceProviders = Bundle.allBundles
             .compactMap { $0.infoDictionary?[bundleExecutableKey] as? String }
@@ -29,7 +28,7 @@ internal class AdyenAppearanceLoader: NSObject {
             .map { $0.replacingOccurrences(of: "-", with: "_") }
             .compactMap { NSClassFromString("\($0).\(expectedClassName)") }
             .compactMap { $0 as? AdyenAppearanceProvider.Type }
-        
+
         guard let appearanceProvider = appearanceProviders.first else {
             adyenPrint("AdyenAppearance: class not linked or does not conform to AdyenAppearanceProvider protocol")
             return nil
diff --git a/ios/Components/ApplePayModule.swift b/ios/Components/ApplePayModule.swift
index 727b79fe3..92ccc32ab 100644
--- a/ios/Components/ApplePayModule.swift
+++ b/ios/Components/ApplePayModule.swift
@@ -11,7 +11,7 @@ import React
 
 @objc(AdyenApplePay)
 internal final class ApplePayModule: BaseModule {
-    
+
     override func supportedEvents() -> [String]! { [ Events.didSubmit.rawValue, Events.didFail.rawValue ] }
 
     @objc
@@ -35,7 +35,7 @@ internal final class ApplePayModule: BaseModule {
         } catch {
             return sendEvent(error: error)
         }
-        
+
         guard let apiContext = try? APIContext(environment: parser.environment, clientKey: clientKey) else { return }
 
         // TODO: add analyticsConfiguration: AnalyticsConfiguration()
@@ -75,8 +75,8 @@ extension ApplePayDetails {
         static let network = "network"
         static let shippingContact = "shippingContact"
     }
-    
-    internal var extraData: [String : Any] {
+
+    internal var extraData: [String: Any] {
         return [
             Key.billingContact: self.billingContact?.jsonObject,
             Key.network: self.network,
@@ -88,20 +88,20 @@ extension ApplePayDetails {
 extension PKContact {
     var jsonObject: [String: Any] {
         var dictionary: [String: Any] = [:]
-        
+
         if let email = self.emailAddress {
             dictionary[ApplePayKeys.PKContactKeys.emailAddress] = email
         }
-        
+
         if let phoneNumber = self.phoneNumber {
             dictionary[ApplePayKeys.PKContactKeys.phoneNumber] = phoneNumber.stringValue
         }
-        
+
         if let name = self.name {
             dictionary[ApplePayKeys.PKContactKeys.givenName] = name.givenName
             dictionary[ApplePayKeys.PKContactKeys.familyName] = name.familyName
         }
-        
+
         if let name = self.name?.phoneticRepresentation {
             dictionary[ApplePayKeys.PKContactKeys.phoneticGivenName] = name.givenName
             dictionary[ApplePayKeys.PKContactKeys.phoneticFamilyName] = name.familyName
@@ -117,7 +117,7 @@ extension PKContact {
             dictionary[ApplePayKeys.PKContactKeys.country] = postalAddress.country
             dictionary[ApplePayKeys.PKContactKeys.countryCode] = postalAddress.isoCountryCode
         }
-        
+
         return dictionary
     }
 }
diff --git a/ios/Components/BaseModule.swift b/ios/Components/BaseModule.swift
index 7a79f9579..58bc33dcd 100644
--- a/ios/Components/BaseModule.swift
+++ b/ios/Components/BaseModule.swift
@@ -10,14 +10,14 @@ import React
 import UIKit
 
 internal class BaseModule: RCTEventEmitter {
-    
+
     #if DEBUG
         override func invalidate() {
             super.invalidate()
             dismiss(false)
         }
     #endif
-        
+
     @objc
     override static func requiresMainQueueSetup() -> Bool { true }
     override func stopObserving() { /* No JS events expected */ }
@@ -35,7 +35,7 @@ internal class BaseModule: RCTEventEmitter {
 
     internal var currentPresenter: UIViewController?
     internal var actionHandler: AdyenActionComponent?
-    
+
     internal func present(_ component: PresentableComponent) {
         if let paymentComponent = component as? PaymentComponent {
             paymentComponent.delegate = self as? PaymentComponentDelegate
@@ -63,11 +63,11 @@ internal class BaseModule: RCTEventEmitter {
         currentComponent?.cancelIfNeeded()
         sendEvent(error: NativeModuleError.canceled)
     }
-        
+
     internal func sendEvent(event: Events, body: Any!) {
         sendEvent(withName: event.rawValue, body: body)
     }
-    
+
     internal func sendEvent(error: Swift.Error) {
         let errorToSend: Error
         if let componentError = (error as? ComponentError), componentError == ComponentError.cancelled {
@@ -81,17 +81,17 @@ internal class BaseModule: RCTEventEmitter {
         }
         sendEvent(withName: Events.didFail.rawValue, body: errorToSend.jsonObject)
     }
-    
+
     internal func parsePaymentMethods(from dicionary: NSDictionary) throws -> PaymentMethods {
         guard let data = try? JSONSerialization.data(withJSONObject: dicionary, options: []),
               let paymentMethods = try? JSONDecoder().decode(PaymentMethods.self, from: data)
         else {
             throw NativeModuleError.invalidPaymentMethods
         }
-        
+
         return paymentMethods
     }
-    
+
     internal func parseAction(from dicionary: NSDictionary) throws -> Action {
         guard let data = try? JSONSerialization.data(withJSONObject: dicionary, options: []),
               let action = try? JSONDecoder().decode(Action.self, from: data)
@@ -100,64 +100,64 @@ internal class BaseModule: RCTEventEmitter {
         }
         return action
     }
-    
+
     internal func fetchClientKey(from parser: RootConfigurationParser) throws -> String {
         guard let clientKey = parser.clientKey else {
             throw NativeModuleError.noClientKey
         }
         return clientKey
     }
-    
+
     internal func fetchPayment(from parser: RootConfigurationParser) throws -> Payment {
         guard let payment = parser.payment else {
             throw NativeModuleError.noPayment
         }
         return payment
     }
-    
+
     internal func parsePaymentMethod<T: PaymentMethod>(from dicionary: NSDictionary, for type: T.Type) throws -> T {
         let paymentMethods = try parsePaymentMethods(from: dicionary)
-        
+
         guard let paymentMethod = paymentMethods.paymentMethod(ofType: type) else {
             throw NativeModuleError.paymentMethodNotFound(type)
         }
-        
+
         return paymentMethod
     }
-    
+
     internal func parseAnyPaymentMethod(from dicionary: NSDictionary) throws -> PaymentMethod {
         let paymentMethods = try parsePaymentMethods(from: dicionary)
-        
+
         guard let paymentMethod = paymentMethods.regular.first else {
             throw NativeModuleError.invalidPaymentMethods
         }
-        
+
         return paymentMethod
     }
-    
+
     internal func cleanUp() {
         actionHandler?.cancelIfNeeded()
         actionHandler = nil
         currentComponent = nil
-        
+
         currentPresenter?.dismiss(animated: true)
         currentPresenter = nil
     }
-    
+
     internal func dismiss(_ result: Bool) {
         DispatchQueue.main.async { [weak self] in
             guard let self else { return }
-            
+
             self.currentComponent?.finalizeIfNeeded(with: result) {
                 self.cleanUp()
             }
         }
     }
-    
+
 }
 
 extension BaseModule {
-    
+
     enum NativeModuleError: LocalizedError, KnownError {
         case canceled
         case noClientKey
@@ -166,7 +166,7 @@ extension BaseModule {
         case invalidPaymentMethods
         case invalidAction
         case paymentMethodNotFound(PaymentMethod.Type)
-        
+
         var errorCode: String {
             switch self {
             case .canceled:
@@ -185,7 +185,7 @@ extension BaseModule {
                 return "noPaymentMethod"
             }
         }
-        
+
         var errorDescription: String? {
             switch self {
             case .canceled:
@@ -205,15 +205,15 @@ extension BaseModule {
             }
         }
     }
-    
+
 }
 
 extension BaseModule: PresentationDelegate {
-    
+
     internal func present(component: PresentableComponent) {
         DispatchQueue.main.async { [weak self] in
             self?.present(component)
         }
     }
-    
+
 }
diff --git a/ios/Components/DropInModule.swift b/ios/Components/DropInModule.swift
index 1648f119e..bb816f51e 100644
--- a/ios/Components/DropInModule.swift
+++ b/ios/Components/DropInModule.swift
@@ -17,7 +17,7 @@ internal final class DropInModule: BaseModule {
     private var dropInComponent: DropInComponent? {
         currentComponent as? DropInComponent
     }
-    
+
     @objc
     func hide(_ success: NSNumber, event: NSDictionary) {
         dismiss(success.boolValue)
@@ -35,8 +35,6 @@ internal final class DropInModule: BaseModule {
             return sendEvent(error: error)
         }
 
-        AdyenLogging.isEnabled = true
-
         guard let apiContext = try? APIContext(environment: parser.environment, clientKey: clientKey) else { return }
         let config = DropInConfigurationParser(configuration: configuration).configuration
         config.card = CardConfigurationParser(configuration: configuration).dropinConfiguration
@@ -54,7 +52,6 @@ internal final class DropInModule: BaseModule {
             context = AdyenContext(apiContext: apiContext, payment: nil, analyticsConfiguration: AnalyticsConfiguration())
         }
 
-
         let component = DropInComponent(paymentMethods: paymentMethods,
                                         context: context,
                                         configuration: config)
@@ -89,23 +86,23 @@ extension DropInModule: DropInComponentDelegate {
         }
         sendEvent(event: .didSubmit, body: response.jsonObject)
     }
-    
+
     func didFail(with error: Error, from component: Adyen.PaymentComponent, in dropInComponent: Adyen.AnyDropInComponent) {
         sendEvent(error: error)
     }
-    
+
     func didProvide(_ data: Adyen.ActionComponentData, from component: Adyen.ActionComponent, in dropInComponent: Adyen.AnyDropInComponent) {
         sendEvent(event: .didProvide, body: data.jsonObject)
     }
-    
+
     func didComplete(from component: Adyen.ActionComponent, in dropInComponent: Adyen.AnyDropInComponent) {
         sendEvent(event: .didComplete, body: nil)
     }
-    
+
     func didFail(with error: Error, from component: Adyen.ActionComponent, in dropInComponent: Adyen.AnyDropInComponent) {
         sendEvent(error: error)
     }
-    
+
     func didFail(with error: Error, from dropInComponent: Adyen.AnyDropInComponent) {
         sendEvent(error: error)
     }
diff --git a/ios/Components/GooglePayModuleMock.swift b/ios/Components/GooglePayModuleMock.swift
index 7083e4308..000d0cb66 100644
--- a/ios/Components/GooglePayModuleMock.swift
+++ b/ios/Components/GooglePayModuleMock.swift
@@ -10,9 +10,9 @@ import UIKit
 
 @objc(AdyenGooglePay)
 internal class GooglePayModuleMock: BaseModule {
-    
+
     override func supportedEvents() -> [String]! { [Events.didFail.rawValue] }
-    
+
     @objc
     func open(_ paymentMethodsDict: NSDictionary, configuration: NSDictionary) {
         sendEvent(error: NativeModuleError.notSupported)
diff --git a/ios/Components/InstantModule.swift b/ios/Components/InstantModule.swift
index b234db246..31ddf0c17 100644
--- a/ios/Components/InstantModule.swift
+++ b/ios/Components/InstantModule.swift
@@ -11,7 +11,7 @@ import React
 
 @objc(AdyenInstant)
 internal final class InstantModule: BaseModule {
-    
+
     override public func supportedEvents() -> [String]! { Events.allCases.map(\.rawValue) }
 
     @objc
@@ -44,7 +44,7 @@ internal final class InstantModule: BaseModule {
         let component = InstantPaymentComponent(paymentMethod: paymentMethod, context: context, order: nil)
         component.delegate = self
         currentComponent = component
-        
+
         DispatchQueue.main.async {
             component.initiatePayment()
         }
@@ -58,7 +58,7 @@ internal final class InstantModule: BaseModule {
         } catch {
             return sendEvent(error: error)
         }
-        
+
         DispatchQueue.main.async { [weak self] in
             self?.actionHandler?.handle(action)
         }
diff --git a/ios/Configuration/ApplepayConfigurationParser.swift b/ios/Configuration/ApplepayConfigurationParser.swift
index db080228d..396108ba5 100644
--- a/ios/Configuration/ApplepayConfigurationParser.swift
+++ b/ios/Configuration/ApplepayConfigurationParser.swift
@@ -43,118 +43,118 @@ public struct ApplepayConfigurationParser {
         }
         return false
     }
-        
+
     var requiredShippingContactFields: Set<PKContactField> {
         guard let requiredFields = dict[ApplePayKeys.requiredShippingContactFields] as? [String] else {
             return []
         }
         return Set<PKContactField>(requiredFields.compactMap { PKContactField.fromString($0) })
     }
-    
+
     var requiredBillingContactFields: Set<PKContactField> {
         guard let requiredFields = dict[ApplePayKeys.requiredBillingContactFields] as? [String] else {
             return []
         }
         return Set<PKContactField>(requiredFields.compactMap { PKContactField.fromString($0) })
     }
-    
+
     var billingContact: PKContact? {
         guard let dictionary = dict[ApplePayKeys.billingContact] as? [String: Any] else {
             return nil
         }
-        
+
         let contact = PKContact()
-        
+
         if let phoneNumber = dictionary[ApplePayKeys.PKContactKeys.phoneNumber] as? String {
             contact.phoneNumber = CNPhoneNumber(stringValue: phoneNumber)
         }
-        
+
         if let emailAddress = dictionary[ApplePayKeys.PKContactKeys.emailAddress] as? String {
             contact.emailAddress = emailAddress
         }
-        
+
         var name = PersonNameComponents()
         var nameUodated = false
         if let givenName = dictionary[ApplePayKeys.PKContactKeys.givenName] as? String {
             name.givenName = givenName
             nameUodated = true
         }
-        
+
         if let familyName = dictionary[ApplePayKeys.PKContactKeys.familyName] as? String {
             name.familyName = familyName
             nameUodated = true
         }
-        
+
         if let phoneticGivenName = dictionary[ApplePayKeys.PKContactKeys.phoneticGivenName] as? String {
             name.phoneticRepresentation = PersonNameComponents()
             name.phoneticRepresentation?.givenName = phoneticGivenName
             nameUodated = true
         }
-        
+
         if let phoneticFamilyName = dictionary[ApplePayKeys.PKContactKeys.phoneticFamilyName] as? String {
             name.phoneticRepresentation = name.phoneticRepresentation ?? PersonNameComponents()
             name.phoneticRepresentation?.familyName = phoneticFamilyName
             nameUodated = true
         }
-        
+
         if nameUodated {
             contact.name = name
         }
-        
+
         let postalAddress = CNMutablePostalAddress()
         var postalAddressUpdated = false
         if let addressLines = dictionary[ApplePayKeys.PKContactKeys.addressLines] as? [String] {
             postalAddress.street = addressLines.joined(separator: "\n")
             postalAddressUpdated = true
         }
-        
+
         if let subLocality = dictionary[ApplePayKeys.PKContactKeys.subLocality] as? String {
             postalAddress.subLocality = subLocality
             postalAddressUpdated = true
         }
-        
+
         if let locality = dictionary[ApplePayKeys.PKContactKeys.locality] as? String {
             postalAddress.city = locality
             postalAddressUpdated = true
         }
-        
+
         if let postalCode = dictionary[ApplePayKeys.PKContactKeys.postalCode] as? String {
             postalAddress.postalCode = postalCode
             postalAddressUpdated = true
         }
-        
+
         if let subAdministrativeArea = dictionary[ApplePayKeys.PKContactKeys.subAdministrativeArea] as? String {
             postalAddress.subAdministrativeArea = subAdministrativeArea
             postalAddressUpdated = true
         }
-        
+
         if let administrativeArea = dictionary[ApplePayKeys.PKContactKeys.administrativeArea] as? String {
             postalAddress.state = administrativeArea
             postalAddressUpdated = true
         }
-        
+
         if let country = dictionary[ApplePayKeys.PKContactKeys.country] as? String {
             postalAddress.country = country
             postalAddressUpdated = true
         }
-        
+
         if let countryCode = dictionary[ApplePayKeys.PKContactKeys.countryCode] as? String {
             postalAddress.isoCountryCode = countryCode
             postalAddressUpdated = true
         }
-        
+
         if postalAddressUpdated {
             contact.postalAddress = postalAddress
         }
-        
+
         return contact
     }
-    
+
     var summaryItems: [PKPaymentSummaryItem]? {
         guard let items = dict[ApplePayKeys.summaryItems] as? [[String: Any]] else {
             return nil
         }
-        
+
         var summaryItems = [PKPaymentSummaryItem]()
         for item in items {
             if let label = item[ApplePayKeys.summaryItemsLabel] as? String,
@@ -208,15 +208,15 @@ public struct ApplepayConfigurationParser {
 }
 
 extension ApplepayConfigurationParser {
-    
+
     public enum ApplePayError: String, LocalizedError, KnownError {
         case invalidMerchantName
         case invalidMerchantID
-        
+
         var errorCode: String {
             self.rawValue
         }
-        
+
         public var errorDescription: String? {
             switch self {
             case .invalidMerchantName:
@@ -229,7 +229,7 @@ extension ApplepayConfigurationParser {
 }
 
 extension PKContactField {
-    
+
     /// 'postalAddress' | 'name' | 'phoneticName' | 'phone' | 'email'
     static func fromString(_ rawValue: String) -> PKContactField {
         switch rawValue {
diff --git a/ios/Configuration/CardConfigurationParser.swift b/ios/Configuration/CardConfigurationParser.swift
index 0e2b5c756..fc53ebaeb 100644
--- a/ios/Configuration/CardConfigurationParser.swift
+++ b/ios/Configuration/CardConfigurationParser.swift
@@ -55,16 +55,16 @@ public struct CardConfigurationParser {
     var kcpVisibility: CardComponent.FieldVisibility {
         parseVisibility(CardKeys.kcpVisibility)
     }
-    
+
     var socialSecurityVisibility: CardComponent.FieldVisibility {
         parseVisibility(CardKeys.socialSecurity)
     }
-    
+
     var allowedCardTypes: [CardType]? {
         guard let strings = dict[CardKeys.allowedCardTypes] as? [String], !strings.isEmpty else {
             return nil
         }
-        
+
         return strings.map { CardType(rawValue: $0) }
     }
 
@@ -74,9 +74,9 @@ public struct CardConfigurationParser {
         }
         return strings
     }
-    
+
     // TODO: add installmentConfiguration: InstallmentConfiguration?
-    
+
     public var configuration: CardComponent.Configuration {
         var storedConfiguration = StoredCardConfiguration()
         storedConfiguration.showsSecurityCodeField = showsStoredSecurityCodeField
@@ -96,7 +96,7 @@ public struct CardConfigurationParser {
                      socialSecurityNumberMode: socialSecurityVisibility,
                      storedCardConfiguration: soredCardConfiguration,
                      allowedCardTypes: allowedCardTypes,
-                     installmentConfiguration:nil,
+                     installmentConfiguration: nil,
                      billingAddress: billingAddressConfiguration )
     }
 
@@ -116,7 +116,7 @@ public struct CardConfigurationParser {
                      socialSecurityNumberMode: socialSecurityVisibility,
                      storedCardConfiguration: soredCardConfiguration,
                      allowedCardTypes: allowedCardTypes,
-                     installmentConfiguration:nil,
+                     installmentConfiguration: nil,
                      billingAddress: billingAddressConfiguration )
     }
 
diff --git a/ios/Configuration/Parameters.swift b/ios/Configuration/Parameters.swift
index 032989bbc..09d355ac1 100644
--- a/ios/Configuration/Parameters.swift
+++ b/ios/Configuration/Parameters.swift
@@ -58,7 +58,7 @@ internal enum ApplePayKeys: SubConfig {
     static var requiredBillingContactFields = "requiredBillingContactFields"
     static var requiredShippingContactFields = "requiredShippingContactFields"
     static var billingContact = "billingContact"
-    
+
     enum PKContactKeys {
         static var phoneNumber = "phoneNumber"
         static var emailAddress = "emailAddress"
diff --git a/ios/Helpers/UIViewControllerHelper.swift b/ios/Helpers/UIViewControllerHelper.swift
index 5c60174f1..e91950048 100644
--- a/ios/Helpers/UIViewControllerHelper.swift
+++ b/ios/Helpers/UIViewControllerHelper.swift
@@ -9,7 +9,7 @@ import UIKit
 extension UIViewController {
     internal static var topPresenter: UIViewController? {
         var topController: UIViewController? = UIApplication.shared.keyWindow?.rootViewController
-        
+
         while let presenter = topController?.presentedViewController {
             topController = presenter
         }
diff --git a/ios/Model/EncodablePaymentComponentData.swift b/ios/Model/EncodablePaymentComponentData.swift
index ea5915bd1..108ba868b 100644
--- a/ios/Model/EncodablePaymentComponentData.swift
+++ b/ios/Model/EncodablePaymentComponentData.swift
@@ -47,4 +47,4 @@ internal extension PaymentComponentData {
     var jsonObject: [String: Any] {
         EncodablePaymentComponentData(data: self).jsonObject
     }
-}
\ No newline at end of file
+}
diff --git a/ios/Model/EncodablePaymentMethod.swift b/ios/Model/EncodablePaymentMethod.swift
index 70f436d0b..a8ec78c01 100644
--- a/ios/Model/EncodablePaymentMethod.swift
+++ b/ios/Model/EncodablePaymentMethod.swift
@@ -26,4 +26,4 @@ internal extension PaymentMethod {
     var jsonObject: [String: Any] {
         EncodablePaymentMethod(paymentMethod: self).jsonObject
     }
-}
\ No newline at end of file
+}
diff --git a/ios/Model/SubmitData.swift b/ios/Model/SubmitData.swift
index ee095af49..50d0444ab 100644
--- a/ios/Model/SubmitData.swift
+++ b/ios/Model/SubmitData.swift
@@ -7,8 +7,8 @@
 import Foundation
 
 internal struct SubmitData {
-    let paymentData: [String : Any]
-    let extra: [String : Any]?
+    let paymentData: [String: Any]
+    let extra: [String: Any]?
 
     var jsonObject: [String: Any] {
         [
@@ -16,9 +16,9 @@ internal struct SubmitData {
             Key.extra: extra
         ]
     }
-    
+
     private enum Key {
         static let paymentData = "paymentData"
         static let extra = "extra"
     }
-}
\ No newline at end of file
+}

From 479d8eb79748c5c7e8f268bcb6adfcff9f6debc4 Mon Sep 17 00:00:00 2001
From: vladimir <vladimir.abramichev@adyen.com>
Date: Wed, 13 Dec 2023 11:55:48 +0100
Subject: [PATCH 6/6] chore: make Xcode14 compatible

---
 ios/Configuration/ApplepayConfigurationParser.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ios/Configuration/ApplepayConfigurationParser.swift b/ios/Configuration/ApplepayConfigurationParser.swift
index 396108ba5..3068b8511 100644
--- a/ios/Configuration/ApplepayConfigurationParser.swift
+++ b/ios/Configuration/ApplepayConfigurationParser.swift
@@ -201,7 +201,7 @@ public struct ApplepayConfigurationParser {
         paymentRequest.billingContact = billingContact
         paymentRequest.requiredShippingContactFields = requiredShippingContactFields
         paymentRequest.requiredBillingContactFields = requiredBillingContactFields
-        paymentRequest.merchantCapabilities = [.threeDSecure]
+        paymentRequest.merchantCapabilities = [.capability3DS]
 
         return paymentRequest
     }