react-native-klarna-inapp-sdk 2.3.1 → 2.3.2

package/android/build.gradle

@@ -113,13 +113,8 @@ dependencies {
     testImplementation "junit:junit:4.13.2"
     testImplementation 'androidx.test:core:1.5.0'
     testImplementation "org.robolectric:robolectric:4.11.1"
-    testImplementation "org.mockito:mockito-core:2.28.2"
-    testImplementation "org.mockito:mockito-inline:2.28.2"
-    testImplementation "org.powermock:powermock-core:2.0.9"
-    testImplementation "org.powermock:powermock-api-mockito2:2.0.9"
-    testImplementation "org.powermock:powermock-module-junit4:2.0.9"
-    testImplementation "org.powermock:powermock-module-junit4-rule:2.0.9"
-    testImplementation "org.powermock:powermock-classloading-xstream:2.0.9"
+    testImplementation "org.mockito:mockito-core:3.12.4"
+    testImplementation "org.mockito:mockito-inline:3.12.4"
 }
 
 // removed from the docs but we can keep it

package/android/src/test/java/com/klarna/mobile/sdk/reactnative/common/event/ComponentEventSenderTest.java

@@ -7,14 +7,14 @@ import com.facebook.react.bridge.WritableMap;
 import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.events.EventDispatcher;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
@@ -22,10 +22,11 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({UIManagerHelper.class, SystemClock.class})
+@RunWith(MockitoJUnitRunner.class)
 public class ComponentEventSenderTest {
 
+    private MockedStatic<UIManagerHelper> mockedStaticUiManagerHelper;
+    private MockedStatic<SystemClock> mockedStaticSystemClock;
     private TestEventSender testEventSender;
     private View view;
     private EventDispatcher eventDispatcher;
@@ -40,9 +41,15 @@ public class ComponentEventSenderTest {
         }};
         testEventSender = new TestEventSender(viewToDispatcher);
 
-        PowerMockito.mockStatic(UIManagerHelper.class);
+        mockedStaticUiManagerHelper = Mockito.mockStatic(UIManagerHelper.class);
         Mockito.when(UIManagerHelper.getEventDispatcherForReactTag(Mockito.any(), Mockito.anyInt())).thenAnswer(invocation -> eventDispatcher);
-        PowerMockito.mockStatic(SystemClock.class);
+        mockedStaticSystemClock = Mockito.mockStatic(SystemClock.class);
+    }
+
+    @After
+    public void teardown() {
+        mockedStaticUiManagerHelper.close();
+        mockedStaticSystemClock.close();
     }
 
     @Test

package/android/src/test/java/com/klarna/mobile/sdk/reactnative/common/event/ComponentEventTest.java

@@ -11,32 +11,32 @@ import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.MockedStatic;
+import org.mockito.Mockito;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({Arguments.class, SystemClock.class})
 public class ComponentEventTest {
 
+    private MockedStatic<Arguments> mockedStaticArguments;
+    private MockedStatic<SystemClock> mockedStaticSystemClock;
+
     @Before
     public void setup() {
-        PowerMockito.mockStatic(Arguments.class);
-        PowerMockito.when(Arguments.createArray())
+        mockedStaticArguments = Mockito.mockStatic(Arguments.class);
+        Mockito.when(Arguments.createArray())
                 .thenAnswer(invocation -> {
                     return new JavaOnlyArray();
                 });
-        PowerMockito.when(Arguments.createMap())
+        Mockito.when(Arguments.createMap())
                 .thenAnswer(invocation -> {
                     return new JavaOnlyMap();
                 });
-        PowerMockito.mockStatic(SystemClock.class);
+        mockedStaticSystemClock = Mockito.mockStatic(SystemClock.class);
     }
 
     @After
     public void teardown() {
-
+        mockedStaticArguments.close();
+        mockedStaticSystemClock.close();
     }
 
     @Test

package/android/src/test/java/com/klarna/mobile/sdk/reactnative/common/event/KlarnaEventHandlerEventsUtilTest.java

@@ -7,22 +7,22 @@ import com.klarna.mobile.sdk.api.KlarnaProduct;
 import com.klarna.mobile.sdk.api.KlarnaProductEvent;
 import com.klarna.mobile.sdk.reactnative.common.util.ArgumentsUtil;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ArgumentsUtil.class})
+@RunWith(MockitoJUnitRunner.class)
 public class KlarnaEventHandlerEventsUtilTest {
 
+    private MockedStatic<ArgumentsUtil> mockedStaticArgumentsUtil;
     private ComponentEventSender componentEventSender;
     private View view;
 
@@ -31,10 +31,15 @@ public class KlarnaEventHandlerEventsUtilTest {
         componentEventSender = Mockito.mock(ComponentEventSender.class);
         view = Mockito.mock(View.class);
 
-        PowerMockito.mockStatic(ArgumentsUtil.class);
+        mockedStaticArgumentsUtil = Mockito.mockStatic(ArgumentsUtil.class);
         Mockito.when(ArgumentsUtil.createMap(Mockito.anyMap())).thenAnswer(invocation -> null);
     }
 
+    @After
+    public void teardown() {
+        mockedStaticArgumentsUtil.close();
+    }
+
     @Test
     public void sendKlarnaProductEvent() {
         // Given

package/android/src/test/java/com/klarna/mobile/sdk/reactnative/payments/KlarnaPaymentEventTest.java

@@ -1,5 +1,14 @@
 package com.klarna.mobile.sdk.reactnative.payments;
 
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_AUTHORIZE;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_ERROR;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_FINALIZE;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_INITIALIZE;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_LOAD;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_LOAD_PAYMENT_REVIEW;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_REAUTHORIZE;
+import static org.mockito.Mockito.mock;
+
 import android.os.SystemClock;
 
 import com.facebook.react.bridge.Arguments;
@@ -18,40 +27,23 @@ import com.facebook.react.uimanager.events.RCTEventEmitter;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.rule.PowerMockRule;
-import org.robolectric.RobolectricTestRunner;
 
-import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_AUTHORIZE;
-import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_ERROR;
-import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_FINALIZE;
-import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_INITIALIZE;
-import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_LOAD;
-import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_LOAD_PAYMENT_REVIEW;
-import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentEvent.EVENT_NAME_ON_REAUTHORIZE;
-import static org.mockito.Mockito.mock;
-import static org.powermock.api.mockito.PowerMockito.when;
-
-@PrepareForTest({ReactChoreographer.class, Arguments.class, SystemClock.class})
-@RunWith(RobolectricTestRunner.class)
-@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*", "com.android.*"})
+@RunWith(MockitoJUnitRunner.class)
 public class KlarnaPaymentEventTest {
 
-    @Rule
-    public PowerMockRule rule = new PowerMockRule();
+    private MockedStatic<ReactChoreographer> mockedStaticReactChoreographer;
+    private MockedStatic<Arguments> mockedStaticArguments;
+    private MockedStatic<SystemClock> mockedStaticSystemClock;
 
     private CatalystInstance catalystInstance;
     private ReactApplicationContext reactContext;
-
-    private UIManagerModule uiManagerModuleMock;
     private EventDispatcher eventDispatcherMock;
 
     @Before
@@ -59,22 +51,19 @@ public class KlarnaPaymentEventTest {
         reactContext = mock(ReactApplicationContext.class);
         catalystInstance = mock(CatalystInstance.class);
 
-        uiManagerModuleMock = mock(UIManagerModule.class);
         eventDispatcherMock = new EventDispatcherImpl(reactContext);
-        when(uiManagerModuleMock.getEventDispatcher())
-                .thenReturn(eventDispatcherMock);
 
         final ReactChoreographer choreographerMock = mock(ReactChoreographer.class);
-        PowerMockito.mockStatic(ReactChoreographer.class);
-        when(ReactChoreographer.getInstance()).thenAnswer(new Answer<Object>() {
+        mockedStaticReactChoreographer = Mockito.mockStatic(ReactChoreographer.class);
+        Mockito.when(ReactChoreographer.getInstance()).thenAnswer(new Answer<Object>() {
             @Override
             public Object answer(InvocationOnMock invocation) throws Throwable {
                 return choreographerMock;
             }
         });
 
-        PowerMockito.mockStatic(Arguments.class);
-        PowerMockito.when(Arguments.createArray())
+        mockedStaticArguments = Mockito.mockStatic(Arguments.class);
+        Mockito.when(Arguments.createArray())
                 .thenAnswer(
                         new Answer<Object>() {
                             @Override
@@ -82,7 +71,7 @@ public class KlarnaPaymentEventTest {
                                 return new JavaOnlyArray();
                             }
                         });
-        PowerMockito.when(Arguments.createMap())
+        Mockito.when(Arguments.createMap())
                 .thenAnswer(
                         new Answer<Object>() {
                             @Override
@@ -90,12 +79,15 @@ public class KlarnaPaymentEventTest {
                                 return new JavaOnlyMap();
                             }
                         });
-        PowerMockito.mockStatic(SystemClock.class);
+        mockedStaticSystemClock = Mockito.mockStatic(SystemClock.class);
     }
 
     @After
     public void teardown() {
-        Mockito.reset(reactContext, catalystInstance, uiManagerModuleMock);
+        Mockito.reset(reactContext, catalystInstance);
+        mockedStaticReactChoreographer.close();
+        mockedStaticArguments.close();
+        mockedStaticSystemClock.close();
     }
 
     @Test

package/android/src/test/java/com/klarna/mobile/sdk/reactnative/payments/KlarnaPaymentViewManagerTest.java

@@ -23,26 +23,19 @@ import com.klarna.mobile.sdk.api.payments.KlarnaPaymentsSDKError;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.rule.PowerMockRule;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.robolectric.RobolectricTestRunner;
 
 import java.util.Collections;
 
-@PrepareForTest({Arguments.class})
 @RunWith(RobolectricTestRunner.class)
-@PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*", "com.android.*"})
 public class KlarnaPaymentViewManagerTest {
 
-    @Rule
-    public PowerMockRule rule = new PowerMockRule();
-
+    private MockedStatic<Arguments> mockedStaticArguments;
     private KlarnaPaymentViewManager manager;
     private PaymentViewWrapper wrapper;
 
@@ -56,16 +49,17 @@ public class KlarnaPaymentViewManagerTest {
         wrapper = Mockito.mock(PaymentViewWrapper.class);
         wrapper.paymentView = Mockito.mock(KlarnaPaymentView.class);
 
-        PowerMockito.mockStatic(Arguments.class);
-        PowerMockito.when(Arguments.createArray())
+        mockedStaticArguments = Mockito.mockStatic(Arguments.class);
+        Mockito.when(Arguments.createArray())
                 .thenAnswer(invocation -> new JavaOnlyArray());
-        PowerMockito.when(Arguments.createMap())
+        Mockito.when(Arguments.createMap())
                 .thenAnswer(invocation -> new JavaOnlyMap());
     }
 
     @After
     public void teardown() {
         Mockito.reset(wrapper, wrapper.paymentView);
+        mockedStaticArguments.close();
     }
 
     @Test

package/ios/RNKlarnaMobileSDK.xcodeproj/project.pbxproj

@@ -51,25 +51,23 @@
 		3FC0A2F5614F1B06C1249CA3 /* Pods-RNKlarnaMobileSDK-RNKlarnaMobileSDKTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNKlarnaMobileSDK-RNKlarnaMobileSDKTests.debug.xcconfig"; path = "Target Support Files/Pods-RNKlarnaMobileSDK-RNKlarnaMobileSDKTests/Pods-RNKlarnaMobileSDK-RNKlarnaMobileSDKTests.debug.xcconfig"; sourceTree = "<group>"; };
 		42BC05FD2AC57D950044A9FE /* KlarnaStandaloneWebViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KlarnaStandaloneWebViewManager.h; sourceTree = "<group>"; };
 		42BC05FE2AC57E110044A9FE /* KlarnaStandaloneWebViewManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = KlarnaStandaloneWebViewManager.mm; sourceTree = "<group>"; };
-		42BC06002AC585950044A9FE /* KlarnaStandaloneWebViewWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KlarnaStandaloneWebViewWrapper.h; sourceTree = "<group>"; };
-		42BC06012AC5866B0044A9FE /* KlarnaStandaloneWebViewWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KlarnaStandaloneWebViewWrapper.h; sourceTree = "<group>"; };
 		42BC06022AC586C50044A9FE /* KlarnaStandaloneWebViewWrapper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = KlarnaStandaloneWebViewWrapper.mm; sourceTree = "<group>"; };
 		42BC06042AC588180044A9FE /* KlarnaStandaloneWebViewWrapper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = KlarnaStandaloneWebViewWrapper.mm; sourceTree = "<group>"; };
 		7917D752255C45FB00E16799 /* RNKlarnaMobileSDKTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = RNKlarnaMobileSDKTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		7917D754255C45FB00E16799 /* PaymentViewWrapperTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = PaymentViewWrapperTests.m; sourceTree = "<group>"; };
 		7917D756255C45FB00E16799 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		792F67BB2AB8AD7D00675E18 /* PaymentViewWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PaymentViewWrapper.mm; sourceTree = "<group>"; };
-		792F67BC2AB8AD7D00675E18 /* PaymentViewWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentViewWrapper.h; sourceTree = "<group>"; };
 		792F67BE2AB8AD7D00675E18 /* PaymentViewWrapper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PaymentViewWrapper.mm; sourceTree = "<group>"; };
-		792F67BF2AB8AD7D00675E18 /* PaymentViewWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PaymentViewWrapper.h; sourceTree = "<group>"; };
+		796795862C1B39E700BAB0C1 /* KlarnaCheckoutViewWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KlarnaCheckoutViewWrapper.h; sourceTree = "<group>"; };
+		796795872C1B39F100BAB0C1 /* KlarnaStandaloneWebViewWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KlarnaStandaloneWebViewWrapper.h; sourceTree = "<group>"; };
+		796795882C1B39FB00BAB0C1 /* PaymentViewWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaymentViewWrapper.h; sourceTree = "<group>"; };
 		79BD25F82BC97A0100D2D92A /* KlarnaCheckoutViewManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KlarnaCheckoutViewManager.h; sourceTree = "<group>"; };
 		79BD25F92BC97A3000D2D92A /* KlarnaCheckoutViewManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = KlarnaCheckoutViewManager.mm; sourceTree = "<group>"; };
 		79BD25FB2BC97B0900D2D92A /* KlarnaCheckoutViewWrapper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = KlarnaCheckoutViewWrapper.mm; sourceTree = "<group>"; };
-		79BD25FD2BC97B2200D2D92A /* KlarnaCheckoutViewWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KlarnaCheckoutViewWrapper.h; sourceTree = "<group>"; };
-		79BD25FE2BCD4F5A00D2D92A /* KlarnaCheckoutViewWrapper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = KlarnaCheckoutViewWrapper.h; sourceTree = "<group>"; };
 		79BD25FF2BCD4F6C00D2D92A /* KlarnaCheckoutViewWrapper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = KlarnaCheckoutViewWrapper.mm; sourceTree = "<group>"; };
 		79BD26022BCD56D400D2D92A /* RNMobileSDKUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RNMobileSDKUtils.h; sourceTree = "<group>"; };
 		79BD26032BCD572600D2D92A /* RNMobileSDKUtils.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = RNMobileSDKUtils.mm; sourceTree = "<group>"; };
+		79E2A0B02BFBA653002923A5 /* PrefixHeader.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrefixHeader.pch; sourceTree = "<group>"; };
 		7A4208B9D3B0F45669A2E06F /* Pods-RNKlarnaMobileSDK.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNKlarnaMobileSDK.release.xcconfig"; path = "Target Support Files/Pods-RNKlarnaMobileSDK/Pods-RNKlarnaMobileSDK.release.xcconfig"; sourceTree = "<group>"; };
 		B074D4744315BBCD94D119E9 /* Pods-RNKlarnaMobileSDK.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNKlarnaMobileSDK.debug.xcconfig"; path = "Target Support Files/Pods-RNKlarnaMobileSDK/Pods-RNKlarnaMobileSDK.debug.xcconfig"; sourceTree = "<group>"; };
 		B3E7B5881CC2AC0600A0062D /* KlarnaPaymentViewManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KlarnaPaymentViewManager.h; sourceTree = "<group>"; };
@@ -135,13 +133,14 @@
 			isa = PBXGroup;
 			children = (
 				79BD26012BCD56C000D2D92A /* common */,
+				9CDEDC2923475BAC006C9C97 /* view */,
 				79BD25F82BC97A0100D2D92A /* KlarnaCheckoutViewManager.h */,
 				79BD25F92BC97A3000D2D92A /* KlarnaCheckoutViewManager.mm */,
 				B3E7B5881CC2AC0600A0062D /* KlarnaPaymentViewManager.h */,
 				B3E7B5891CC2AC0600A0062D /* KlarnaPaymentViewManager.mm */,
 				42BC05FD2AC57D950044A9FE /* KlarnaStandaloneWebViewManager.h */,
 				42BC05FE2AC57E110044A9FE /* KlarnaStandaloneWebViewManager.mm */,
-				9CDEDC2923475BAC006C9C97 /* view */,
+				79E2A0B02BFBA653002923A5 /* PrefixHeader.pch */,
 			);
 			path = Sources;
 			sourceTree = "<group>";
@@ -173,11 +172,8 @@
 		792F67BA2AB8AD7D00675E18 /* newarch */ = {
 			isa = PBXGroup;
 			children = (
-				79BD25FE2BCD4F5A00D2D92A /* KlarnaCheckoutViewWrapper.h */,
 				79BD25FF2BCD4F6C00D2D92A /* KlarnaCheckoutViewWrapper.mm */,
 				792F67BB2AB8AD7D00675E18 /* PaymentViewWrapper.mm */,
-				792F67BC2AB8AD7D00675E18 /* PaymentViewWrapper.h */,
-				42BC06012AC5866B0044A9FE /* KlarnaStandaloneWebViewWrapper.h */,
 				42BC06022AC586C50044A9FE /* KlarnaStandaloneWebViewWrapper.mm */,
 			);
 			path = newarch;
@@ -186,11 +182,8 @@
 		792F67BD2AB8AD7D00675E18 /* oldarch */ = {
 			isa = PBXGroup;
 			children = (
-				79BD25FD2BC97B2200D2D92A /* KlarnaCheckoutViewWrapper.h */,
 				79BD25FB2BC97B0900D2D92A /* KlarnaCheckoutViewWrapper.mm */,
 				792F67BE2AB8AD7D00675E18 /* PaymentViewWrapper.mm */,
-				792F67BF2AB8AD7D00675E18 /* PaymentViewWrapper.h */,
-				42BC06002AC585950044A9FE /* KlarnaStandaloneWebViewWrapper.h */,
 				42BC06042AC588180044A9FE /* KlarnaStandaloneWebViewWrapper.mm */,
 			);
 			path = oldarch;
@@ -208,6 +201,9 @@
 		9CDEDC2923475BAC006C9C97 /* view */ = {
 			isa = PBXGroup;
 			children = (
+				796795862C1B39E700BAB0C1 /* KlarnaCheckoutViewWrapper.h */,
+				796795872C1B39F100BAB0C1 /* KlarnaStandaloneWebViewWrapper.h */,
+				796795882C1B39FB00BAB0C1 /* PaymentViewWrapper.h */,
 				792F67BA2AB8AD7D00675E18 /* newarch */,
 				792F67BD2AB8AD7D00675E18 /* oldarch */,
 			);

package/ios/Sources/KlarnaCheckoutViewManager.mm

@@ -3,11 +3,7 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTLog.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "view/newarch/KlarnaCheckoutViewWrapper.h"
-#else
-#import "view/oldarch/KlarnaCheckoutViewWrapper.h"
-#endif
+#import "view/KlarnaCheckoutViewWrapper.h"
 
 @implementation KlarnaCheckoutViewManager
 

package/ios/Sources/KlarnaPaymentViewManager.mm

@@ -3,11 +3,7 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTLog.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "view/newarch/PaymentViewWrapper.h"
-#else
-#import "view/oldarch/PaymentViewWrapper.h"
-#endif
+#import "view/PaymentViewWrapper.h"
 
 @implementation KlarnaPaymentViewManager
 

package/ios/Sources/KlarnaStandaloneWebViewManager.mm

@@ -3,11 +3,7 @@
 #import <React/RCTUIManager.h>
 #import <React/RCTLog.h>
 
-#ifdef RCT_NEW_ARCH_ENABLED
-#import "view/newarch/KlarnaStandaloneWebViewWrapper.h"
-#else
-#import "view/oldarch/KlarnaStandaloneWebViewWrapper.h"
-#endif
+#import "view/KlarnaStandaloneWebViewWrapper.h"
 
 @implementation KlarnaStandaloneWebViewManager
 

package/ios/Sources/PrefixHeader.pch

@@ -0,0 +1,4 @@
+/* PrefixHeader_h */
+#ifdef __OBJC__
+#import <WebKit/WebKit.h>
+#endif

package/ios/Sources/view/{oldarch/KlarnaCheckoutViewWrapper.h → KlarnaCheckoutViewWrapper.h}

@@ -1,14 +1,20 @@
-#if !RCT_NEW_ARCH_ENABLED
-
 #import <React/RCTUIManager.h>
+#import <UIKit/UIKit.h>
 
+#if RCT_NEW_ARCH_ENABLED
+#import <React/RCTViewComponentView.h>
+#else
 #import <AVFoundation/AVFoundation.h>
-#import <UIKit/UIKit.h>
 #import <React/RCTView.h>
-#import <React/RCTUIManager.h>
+#endif
+
 
 NS_ASSUME_NONNULL_BEGIN
 
+
+#if RCT_NEW_ARCH_ENABLED
+@interface KlarnaCheckoutViewWrapper : RCTViewComponentView
+#else
 @interface KlarnaCheckoutViewWrapper : UIView
 
 @property (nonatomic, copy) RCTDirectEventBlock onEvent;
@@ -17,10 +23,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) NSString* returnUrl;
 
-#pragma mark - React Native Overrides
 - (void) setReturnUrl:(NSString * _Nonnull)returnUrl;
-- (void) evaluateProps;
-- (void) initializeActualCheckoutView;
+#endif
+
+#pragma mark - React Native Overrides
 
 @property (nonatomic, weak) RCTUIManager* uiManager;
 
@@ -32,6 +38,5 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
 
-#endif
+NS_ASSUME_NONNULL_END

package/ios/Sources/view/{oldarch/KlarnaStandaloneWebViewWrapper.h → KlarnaStandaloneWebViewWrapper.h}

@@ -1,14 +1,18 @@
-#if !RCT_NEW_ARCH_ENABLED
-
 #import <React/RCTUIManager.h>
+#import <UIKit/UIKit.h>
 
+#if RCT_NEW_ARCH_ENABLED
+#import <React/RCTViewComponentView.h>
+#else
 #import <AVFoundation/AVFoundation.h>
-#import <UIKit/UIKit.h>
 #import <React/RCTView.h>
-#import <React/RCTUIManager.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
+#if RCT_NEW_ARCH_ENABLED
+@interface KlarnaStandaloneWebViewWrapper : RCTViewComponentView
+#else
 @interface KlarnaStandaloneWebViewWrapper : UIView
 
 @property (nonatomic, copy) RCTDirectEventBlock onLoadStart;
@@ -18,11 +22,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) RCTDirectEventBlock onKlarnaMessage;
 
 @property (nonatomic, strong) NSString* returnUrl;
+#endif
 
 #pragma mark - React Native Overrides
 
-- (void)initializeKlarnaStandaloneWebView;
-
 @property (nonatomic, weak) RCTUIManager* uiManager;
 
 - (void)load:(nonnull NSString*)url;
@@ -36,7 +39,3 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
-
-#endif
-
-

package/ios/Sources/view/{oldarch/PaymentViewWrapper.h → PaymentViewWrapper.h}

@@ -1,14 +1,18 @@
-#if !RCT_NEW_ARCH_ENABLED
-
 #import <React/RCTUIManager.h>
+#import <UIKit/UIKit.h>
 
+#if RCT_NEW_ARCH_ENABLED
+#import <React/RCTViewComponentView.h>
+#else
 #import <AVFoundation/AVFoundation.h>
-#import <UIKit/UIKit.h>
 #import <React/RCTView.h>
-#import <React/RCTUIManager.h>
+#endif
 
 NS_ASSUME_NONNULL_BEGIN
 
+#if RCT_NEW_ARCH_ENABLED
+@interface PaymentViewWrapper : RCTViewComponentView
+#else
 @interface PaymentViewWrapper : UIView
 
 @property (nonatomic, copy) RCTDirectEventBlock onInitialized;
@@ -23,10 +27,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, strong) NSString* category;
 @property (nonatomic, strong) NSString* returnUrl;
 
-#pragma mark - React Native Overrides
 - (void) setCategory:(NSString *)category;
-- (void) evaluateProps;
-- (void) initializeActualPaymentView;
+#endif
+
+#pragma mark - React Native Overrides
 
 @property (nonatomic, weak) RCTUIManager* uiManager;
 
@@ -44,6 +48,5 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
-NS_ASSUME_NONNULL_END
 
-#endif
+NS_ASSUME_NONNULL_END

package/ios/Sources/view/newarch/KlarnaCheckoutViewWrapper.mm

@@ -1,6 +1,6 @@
 #if RCT_NEW_ARCH_ENABLED
 
-#import "KlarnaCheckoutViewWrapper.h"
+#import "../KlarnaCheckoutViewWrapper.h"
 #import "../../common/RNMobileSDKUtils.h"
 
 #import <AVFoundation/AVFoundation.h>

package/ios/Sources/view/newarch/KlarnaStandaloneWebViewWrapper.mm

@@ -1,6 +1,6 @@
 #if RCT_NEW_ARCH_ENABLED
 
-#import "KlarnaStandaloneWebViewWrapper.h"
+#import "../KlarnaStandaloneWebViewWrapper.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>

package/ios/Sources/view/newarch/PaymentViewWrapper.mm

@@ -1,6 +1,6 @@
 #if RCT_NEW_ARCH_ENABLED
 
-#import "PaymentViewWrapper.h"
+#import "../PaymentViewWrapper.h"
 
 #import <AVFoundation/AVFoundation.h>
 #import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>

package/ios/Sources/view/oldarch/KlarnaCheckoutViewWrapper.mm

@@ -1,6 +1,6 @@
 #if !RCT_NEW_ARCH_ENABLED
 
-#import "KlarnaCheckoutViewWrapper.h"
+#import "../KlarnaCheckoutViewWrapper.h"
 #import "../../common/RNMobileSDKUtils.h"
 
 #import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>

package/ios/Sources/view/oldarch/KlarnaStandaloneWebViewWrapper.mm

@@ -1,6 +1,6 @@
 #if !RCT_NEW_ARCH_ENABLED
 
-#import "KlarnaStandaloneWebViewWrapper.h"
+#import "../KlarnaStandaloneWebViewWrapper.h"
 
 #import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>
 #import <React/RCTLog.h>

package/ios/Sources/view/oldarch/PaymentViewWrapper.mm

@@ -1,6 +1,6 @@
 #if !RCT_NEW_ARCH_ENABLED
 
-#import "PaymentViewWrapper.h"
+#import "../PaymentViewWrapper.h"
 
 #import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>
 #import <React/RCTLog.h>