react-native-klarna-inapp-sdk 2.1.13 → 2.2.1

package/android/src/main/java/com/klarna/mobile/sdk/reactnative/standalonewebview/KlarnaStandaloneWebViewManager.java

@@ -0,0 +1,205 @@
+package com.klarna.mobile.sdk.reactnative.standalonewebview;
+
+import android.app.Application;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.webkit.RenderProcessGoneDetail;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.uimanager.ThemedReactContext;
+import com.facebook.react.uimanager.UIManagerHelper;
+import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.uimanager.events.EventDispatcher;
+import com.klarna.mobile.sdk.KlarnaMobileSDKError;
+import com.klarna.mobile.sdk.api.KlarnaEventHandler;
+import com.klarna.mobile.sdk.api.KlarnaProductEvent;
+import com.klarna.mobile.sdk.api.component.KlarnaComponent;
+import com.klarna.mobile.sdk.api.standalonewebview.KlarnaStandaloneWebView;
+import com.klarna.mobile.sdk.api.standalonewebview.KlarnaStandaloneWebViewClient;
+import com.klarna.mobile.sdk.reactnative.spec.RNKlarnaStandaloneWebViewSpec;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+public class KlarnaStandaloneWebViewManager extends RNKlarnaStandaloneWebViewSpec<KlarnaStandaloneWebView> {
+
+    // Commands that can be triggered from React Native side
+    public static final String COMMAND_LOAD = "load";
+    public static final String COMMAND_GO_FORWARD = "goForward";
+    public static final String COMMAND_GO_BACK = "goBack";
+    public static final String COMMAND_RELOAD = "reload";
+
+    private static final String REACT_CLASS = "RNKlarnaStandaloneWebView";
+
+    // Store a list of views to event dispatchers so we send up events via the right views.
+    private final Map<WeakReference<KlarnaStandaloneWebView>, EventDispatcher> viewToDispatcher;
+    private final KlarnaStandaloneWebViewEventSender klarnaStandaloneWebViewEventSender;
+    private final KlarnaEventHandler klarnaEventHandler = new KlarnaEventHandler() {
+        @Override
+        public void onEvent(@NonNull KlarnaComponent klarnaComponent, @NonNull KlarnaProductEvent klarnaProductEvent) {
+            if (klarnaComponent instanceof KlarnaStandaloneWebView) {
+                klarnaStandaloneWebViewEventSender.sendKlarnaMessageEvent((KlarnaStandaloneWebView) klarnaComponent, klarnaProductEvent);
+            }
+        }
+
+        @Override
+        public void onError(@NonNull KlarnaComponent klarnaComponent, @NonNull KlarnaMobileSDKError klarnaMobileSDKError) {
+            // Not used as of now
+        }
+    };
+    private final KlarnaStandaloneWebViewClient klarnaStandaloneWebViewClient = new KlarnaStandaloneWebViewClient() {
+        @Override
+        public void onPageStarted(@Nullable KlarnaStandaloneWebView view, @Nullable String url, @Nullable Bitmap favicon) {
+            klarnaStandaloneWebViewEventSender.sendNavigationEvent(view, KlarnaStandaloneWebViewEvent.Event.ON_LOAD_START, url);
+        }
+
+        @Override
+        public void onPageFinished(@Nullable KlarnaStandaloneWebView view, @Nullable String url) {
+            klarnaStandaloneWebViewEventSender.sendNavigationEvent(view, KlarnaStandaloneWebViewEvent.Event.ON_LOAD_END, url);
+        }
+
+        @Override
+        public void onReceivedError(@Nullable KlarnaStandaloneWebView view, @Nullable WebResourceRequest request, @Nullable WebResourceError error) {
+            if (error != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                klarnaStandaloneWebViewEventSender.sendErrorEvent(view, error.getErrorCode(), error.getDescription().toString());
+            }
+        }
+
+        @Override
+        public void onReceivedError(@Nullable KlarnaStandaloneWebView view, int errorCode, @Nullable String description, @Nullable String failingUrl) {
+            klarnaStandaloneWebViewEventSender.sendErrorEvent(view, errorCode, description);
+        }
+
+        @Override
+        public void onProgressChanged(@Nullable KlarnaStandaloneWebView view, int newProgress) {
+            klarnaStandaloneWebViewEventSender.sendLoadProgressEvent(view, newProgress);
+        }
+
+        @Override
+        public void onRenderProcessGone(@Nullable KlarnaStandaloneWebView view, @Nullable RenderProcessGoneDetail detail) {
+            boolean didCrash = false;
+            if (detail != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                didCrash = detail.didCrash();
+            }
+            klarnaStandaloneWebViewEventSender.sendRenderProcessGoneEvent(view, didCrash);
+        }
+    };
+
+    public KlarnaStandaloneWebViewManager(ReactApplicationContext reactContext, Application applicationContext) {
+        super();
+        viewToDispatcher = new HashMap<>();
+        klarnaStandaloneWebViewEventSender = new KlarnaStandaloneWebViewEventSender(viewToDispatcher);
+    }
+
+    @ReactProp(name = "returnUrl")
+    @Override
+    public void setReturnUrl(KlarnaStandaloneWebView view, @Nullable String returnUrl) {
+        if (!Objects.equals(returnUrl, view.getReturnURL())) {
+            view.setReturnURL(returnUrl);
+        }
+    }
+
+    @NonNull
+    @Override
+    public String getName() {
+        return REACT_CLASS;
+    }
+
+    /**
+     * Handles commands received from RN to a specific view.
+     *
+     * @param root      view receiving the command
+     * @param commandId identifier of the command
+     * @param args      array of command arguments
+     */
+    @Override
+    public void receiveCommand(@NonNull KlarnaStandaloneWebView root, String commandId, @Nullable ReadableArray args) {
+        switch (commandId) {
+            case COMMAND_LOAD:
+                if (args != null && args.size() > 0) {
+                    String url = args.getString(0);
+                    load(root, url);
+                }
+                break;
+            case COMMAND_GO_FORWARD:
+                goForward(root);
+                break;
+            case COMMAND_GO_BACK:
+                goBack(root);
+                break;
+            case COMMAND_RELOAD:
+                reload(root);
+                break;
+        }
+    }
+
+    @Override
+    public void load(KlarnaStandaloneWebView view, String url) {
+        view.loadUrl(url);
+    }
+
+    @Override
+    public void goForward(KlarnaStandaloneWebView view) {
+        view.goForward();
+    }
+
+    @Override
+    public void goBack(KlarnaStandaloneWebView view) {
+        view.goBack();
+    }
+
+    @Override
+    public void reload(KlarnaStandaloneWebView view) {
+        view.reload();
+    }
+
+    /**
+     * Exposes direct event types that will be accessible as prop "callbacks" from RN.
+     * <p>
+     * Structure must follow:
+     * { "<eventName>": {"registrationName": "<eventName>"} }
+     */
+    @Nullable
+    @Override
+    public Map<String, Object> getExportedCustomDirectEventTypeConstants() {
+        MapBuilder.Builder<String, Object> builder = MapBuilder.builder();
+        builder.put(KlarnaStandaloneWebViewEvent.Event.ON_LOAD_START.name, MapBuilder.of("registrationName", KlarnaStandaloneWebViewEvent.Event.ON_LOAD_START.name));
+        builder.put(KlarnaStandaloneWebViewEvent.Event.ON_LOAD_END.name, MapBuilder.of("registrationName", KlarnaStandaloneWebViewEvent.Event.ON_LOAD_END.name));
+        builder.put(KlarnaStandaloneWebViewEvent.Event.ON_ERROR.name, MapBuilder.of("registrationName", KlarnaStandaloneWebViewEvent.Event.ON_ERROR.name));
+        builder.put(KlarnaStandaloneWebViewEvent.Event.ON_LOAD_PROGRESS.name, MapBuilder.of("registrationName", KlarnaStandaloneWebViewEvent.Event.ON_LOAD_PROGRESS.name));
+        builder.put(KlarnaStandaloneWebViewEvent.Event.ON_KLARNA_MESSAGE.name, MapBuilder.of("registrationName", KlarnaStandaloneWebViewEvent.Event.ON_KLARNA_MESSAGE.name));
+        builder.put(KlarnaStandaloneWebViewEvent.Event.ON_RENDER_PROCESS_GONE.name, MapBuilder.of("registrationName", KlarnaStandaloneWebViewEvent.Event.ON_RENDER_PROCESS_GONE.name));
+        return builder.build();
+    }
+
+    @NonNull
+    @Override
+    protected KlarnaStandaloneWebView createViewInstance(@NonNull ThemedReactContext themedReactContext) {
+        KlarnaStandaloneWebView klarnaStandaloneWebView = new KlarnaStandaloneWebView(
+                /* context */ themedReactContext,
+                /* attrs */ null,
+                /* defStyleAttr */ 0,
+                /* webViewClient */ klarnaStandaloneWebViewClient,
+                /* eventHandler */ klarnaEventHandler,
+                /* environment */ null,
+                /* region */ null,
+                /* theme */ null,
+                /* resourceEndpoint */ null,
+                /* returnURL */ null);
+        // Each view has its own event dispatcher.
+        EventDispatcher dispatcher = UIManagerHelper.getEventDispatcherForReactTag((ReactContext) klarnaStandaloneWebView.getContext(), klarnaStandaloneWebView.getId());
+        viewToDispatcher.put(new WeakReference<>(klarnaStandaloneWebView), dispatcher);
+        return klarnaStandaloneWebView;
+    }
+
+}

package/android/src/newarch/java/com/klarna/mobile/sdk/reactnative/spec/RNKlarnaPaymentViewSpec.java

@@ -0,0 +1,32 @@
+package com.klarna.mobile.sdk.reactnative.spec;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.SimpleViewManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNKlarnaPaymentViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNKlarnaPaymentViewManagerInterface;
+
+public abstract class RNKlarnaPaymentViewSpec<T extends View> extends SimpleViewManager<T> implements RNKlarnaPaymentViewManagerInterface<T> {
+  private final ViewManagerDelegate<T> mDelegate;
+
+  public RNKlarnaPaymentViewSpec() {
+    mDelegate = new RNKlarnaPaymentViewManagerDelegate<>(this);
+  }
+
+  @Nullable
+  @Override
+  protected ViewManagerDelegate<T> getDelegate() {
+    return mDelegate;
+  }
+
+  @Override
+  public void receiveCommand(@NonNull T root, String commandId, @Nullable ReadableArray args) {
+    mDelegate.receiveCommand(root, commandId, args);
+  }
+
+}

package/android/src/newarch/java/com/klarna/mobile/sdk/reactnative/spec/RNKlarnaStandaloneWebViewSpec.java

@@ -0,0 +1,33 @@
+package com.klarna.mobile.sdk.reactnative.spec;
+
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.uimanager.SimpleViewManager;
+import com.facebook.react.uimanager.ViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNKlarnaStandaloneWebViewManagerDelegate;
+import com.facebook.react.viewmanagers.RNKlarnaStandaloneWebViewManagerInterface;
+
+public abstract class RNKlarnaStandaloneWebViewSpec<T extends View> extends SimpleViewManager<T> implements RNKlarnaStandaloneWebViewManagerInterface<T> {
+
+    private final ViewManagerDelegate<T> viewManagerDelegate;
+
+    public RNKlarnaStandaloneWebViewSpec() {
+        viewManagerDelegate = new RNKlarnaStandaloneWebViewManagerDelegate<>(this);
+    }
+
+    @Nullable
+    @Override
+    protected ViewManagerDelegate<T> getDelegate() {
+        return viewManagerDelegate;
+    }
+
+    @Override
+    public void receiveCommand(@NonNull T root, String commandId, @Nullable ReadableArray args) {
+        viewManagerDelegate.receiveCommand(root, commandId, args);
+    }
+
+}

package/android/src/oldarch/java/com/klarna/mobile/sdk/reactnative/spec/RNKlarnaPaymentViewSpec.java

@@ -0,0 +1,25 @@
+package com.klarna.mobile.sdk.reactnative.spec;
+
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.uimanager.SimpleViewManager;
+
+public abstract class RNKlarnaPaymentViewSpec<T extends View> extends SimpleViewManager<T> {
+    public abstract void setCategory(T view, @Nullable String value);
+
+    public abstract void setReturnUrl(T view, @Nullable String value);
+
+    public abstract void initialize(T view, String clientToken, String returnUrl);
+
+    public abstract void load(T view, String sessionData);
+
+    public abstract void loadPaymentReview(T view);
+
+    public abstract void authorize(T view, boolean autoFinalize, String sessionData);
+
+    public abstract void reauthorize(T view, String sessionData);
+
+    public abstract void finalize(T view, String sessionData);
+}

package/android/src/oldarch/java/com/klarna/mobile/sdk/reactnative/spec/RNKlarnaStandaloneWebViewSpec.java

@@ -0,0 +1,19 @@
+package com.klarna.mobile.sdk.reactnative.spec;
+
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+import com.facebook.react.uimanager.SimpleViewManager;
+
+public abstract class RNKlarnaStandaloneWebViewSpec<T extends View> extends SimpleViewManager<T> {
+    public abstract void setReturnUrl(T view, @Nullable String returnUrl);
+
+    public abstract void load(T view, String url);
+
+    public abstract void goForward(T view);
+
+    public abstract void goBack(T view);
+
+    public abstract void reload(T view);
+}

package/android/src/test/java/com/klarna/{inapp/sdk/KlarnaPaymentViewPackageTest.java → mobile/sdk/reactnative/KlarnaMobileSDKPackageTest.java}

@@ -1,4 +1,4 @@
-package com.klarna.inapp.sdk;
+package com.klarna.mobile.sdk.reactnative;
 
 import android.app.Application;
 
@@ -7,6 +7,9 @@ import androidx.test.core.app.ApplicationProvider;
 import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.uimanager.ViewManager;
+import com.klarna.mobile.sdk.reactnative.KlarnaMobileSDKPackage;
+import com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager;
+import com.klarna.mobile.sdk.reactnative.standalonewebview.KlarnaStandaloneWebViewManager;
 
 import org.junit.Assert;
 import org.junit.Before;
@@ -17,7 +20,7 @@ import org.robolectric.RobolectricTestRunner;
 import java.util.List;
 
 @RunWith(RobolectricTestRunner.class)
-public class KlarnaPaymentViewPackageTest {
+public class KlarnaMobileSDKPackageTest {
 
     private Application application;
     private ReactApplicationContext reactContext;
@@ -30,7 +33,7 @@ public class KlarnaPaymentViewPackageTest {
 
     @Test
     public void testCreateNativeModules() {
-        KlarnaPaymentViewPackage paymentViewPackage = new KlarnaPaymentViewPackage();
+        KlarnaMobileSDKPackage paymentViewPackage = new KlarnaMobileSDKPackage();
         List<NativeModule> nativeModules = paymentViewPackage.createNativeModules(reactContext);
         Assert.assertNotNull(nativeModules);
         Assert.assertTrue(nativeModules.isEmpty());
@@ -38,10 +41,12 @@ public class KlarnaPaymentViewPackageTest {
 
     @Test
     public void testCreateViewManagers() {
-        KlarnaPaymentViewPackage paymentViewPackage = new KlarnaPaymentViewPackage();
+        KlarnaMobileSDKPackage paymentViewPackage = new KlarnaMobileSDKPackage();
         List<ViewManager> nativeModules = paymentViewPackage.createViewManagers(reactContext);
         Assert.assertNotNull(nativeModules);
         Assert.assertFalse(nativeModules.isEmpty());
+        Assert.assertEquals(2, nativeModules.size());
         Assert.assertTrue(nativeModules.get(0) instanceof KlarnaPaymentViewManager);
+        Assert.assertTrue(nativeModules.get(1) instanceof KlarnaStandaloneWebViewManager);
     }
 }

package/android/src/test/java/com/klarna/{inapp/sdk → mobile/sdk/reactnative/payments}/KlarnaPaymentEventTest.java

@@ -1,4 +1,4 @@
-package com.klarna.inapp.sdk;
+package com.klarna.mobile.sdk.reactnative.payments;
 
 import android.os.SystemClock;
 
@@ -30,17 +30,13 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.rule.PowerMockRule;
 import org.robolectric.RobolectricTestRunner;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import static com.klarna.inapp.sdk.KlarnaPaymentEvent.EVENT_NAME_ON_AUTHORIZE;
-import static com.klarna.inapp.sdk.KlarnaPaymentEvent.EVENT_NAME_ON_ERROR;
-import static com.klarna.inapp.sdk.KlarnaPaymentEvent.EVENT_NAME_ON_FINALIZE;
-import static com.klarna.inapp.sdk.KlarnaPaymentEvent.EVENT_NAME_ON_INITIALIZE;
-import static com.klarna.inapp.sdk.KlarnaPaymentEvent.EVENT_NAME_ON_LOAD;
-import static com.klarna.inapp.sdk.KlarnaPaymentEvent.EVENT_NAME_ON_LOAD_PAYMENT_REVIEW;
-import static com.klarna.inapp.sdk.KlarnaPaymentEvent.EVENT_NAME_ON_REAUTHORIZE;
+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;
 
@@ -118,12 +114,13 @@ public class KlarnaPaymentEventTest {
         EventDispatcherListener listener = mock(EventDispatcherListener.class);
         eventDispatcherMock.addListener(listener);
 
+        WritableMap map = Arguments.createMap();
+        map.putString("testKey", "testValue");
+
         KlarnaPaymentEvent event = new KlarnaPaymentEvent(
                 23,
                 "testEventName",
-                new HashMap<String, Object>() {{
-                    put("testKey", "testValue");
-                }}
+                map
         );
 
         eventDispatcherMock.dispatchEvent(event);
@@ -133,18 +130,18 @@ public class KlarnaPaymentEventTest {
 
     @Test
     public void testDispatch() {
-        Map<String, Object> additionalParams = Collections.singletonMap("testKey", (Object) "testValue");
+        WritableMap map = Arguments.createMap();
+        map.putString("testKey", "testValue");
+
         KlarnaPaymentEvent event = new KlarnaPaymentEvent(
                 23,
                 "testEventName",
-                additionalParams
+                map
         );
 
-        WritableMap eventData = Arguments.makeNativeMap(additionalParams);
-
         RCTEventEmitter emitter = mock(RCTEventEmitter.class);
         event.dispatch(emitter);
         Mockito.verify(emitter, Mockito.times(1))
-                .receiveEvent(event.getViewTag(), "testEventName", eventData);
+                .receiveEvent(event.getViewTag(), "testEventName", map);
     }
 }

package/android/src/test/java/com/klarna/{inapp/sdk → mobile/sdk/reactnative/payments}/KlarnaPaymentViewManagerTest.java

@@ -1,12 +1,24 @@
-package com.klarna.inapp.sdk;
+package com.klarna.mobile.sdk.reactnative.payments;
+
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager.COMMAND_AUTHORIZE;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager.COMMAND_FINALIZE;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager.COMMAND_INITIALIZE;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager.COMMAND_LOAD;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager.COMMAND_LOAD_PAYMENT_REVIEW;
+import static com.klarna.mobile.sdk.reactnative.payments.KlarnaPaymentViewManager.COMMAND_REAUTHORIZE;
 
 import android.app.Application;
 
 import androidx.test.core.app.ApplicationProvider;
 
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.JavaOnlyArray;
+import com.facebook.react.bridge.JavaOnlyMap;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
 import com.klarna.mobile.sdk.api.payments.KlarnaPaymentView;
+import com.klarna.mobile.sdk.api.payments.KlarnaPaymentsSDKError;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -15,21 +27,15 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 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.robolectric.RobolectricTestRunner;
 
-import java.util.Map;
-
-import static com.klarna.inapp.sdk.KlarnaPaymentViewManager.COMMAND_AUTHORIZE;
-import static com.klarna.inapp.sdk.KlarnaPaymentViewManager.COMMAND_FINALIZE;
-import static com.klarna.inapp.sdk.KlarnaPaymentViewManager.COMMAND_INITIALIZE;
-import static com.klarna.inapp.sdk.KlarnaPaymentViewManager.COMMAND_LOAD;
-import static com.klarna.inapp.sdk.KlarnaPaymentViewManager.COMMAND_LOAD_PAYMENT_REVIEW;
-import static com.klarna.inapp.sdk.KlarnaPaymentViewManager.COMMAND_REAUTHORIZE;
+import java.util.Collections;
 
-@PrepareForTest()
+@PrepareForTest({Arguments.class})
 @RunWith(RobolectricTestRunner.class)
 @PowerMockIgnore({"org.mockito.*", "org.robolectric.*", "androidx.*", "android.*", "com.android.*"})
 public class KlarnaPaymentViewManagerTest {
@@ -37,21 +43,24 @@ public class KlarnaPaymentViewManagerTest {
     @Rule
     public PowerMockRule rule = new PowerMockRule();
 
-    private Application application;
-    private ReactApplicationContext reactContext;
-
     private KlarnaPaymentViewManager manager;
     private PaymentViewWrapper wrapper;
 
     @Before
     public void setup() {
-        application = ApplicationProvider.getApplicationContext();
-        reactContext = new ReactApplicationContext(application);
+        Application application = ApplicationProvider.getApplicationContext();
+        ReactApplicationContext reactContext = new ReactApplicationContext(application);
 
-        manager = new KlarnaPaymentViewManager(reactContext, application);
+        manager = new KlarnaPaymentViewManager(reactContext);
 
         wrapper = Mockito.mock(PaymentViewWrapper.class);
         wrapper.paymentView = Mockito.mock(KlarnaPaymentView.class);
+
+        PowerMockito.mockStatic(Arguments.class);
+        PowerMockito.when(Arguments.createArray())
+                .thenAnswer(invocation -> new JavaOnlyArray());
+        PowerMockito.when(Arguments.createMap())
+                .thenAnswer(invocation -> new JavaOnlyMap());
     }
 
     @After
@@ -61,22 +70,20 @@ public class KlarnaPaymentViewManagerTest {
 
     @Test
     public void testReactClassName() {
-        Assert.assertEquals("KlarnaPaymentView", manager.getName());
-        Assert.assertEquals("KlarnaPaymentView", KlarnaPaymentViewManager.REACT_CLASS);
+        Assert.assertEquals("RNKlarnaPaymentView", manager.getName());
+        Assert.assertEquals("RNKlarnaPaymentView", KlarnaPaymentViewManager.REACT_CLASS);
     }
 
     @Test
-    public void testCommandsMap() {
-        Map<String, Integer> commandsMap = manager.getCommandsMap();
-
-        Assert.assertNotNull(commandsMap);
-        Assert.assertEquals(6, commandsMap.size());
-        Assert.assertEquals(Integer.valueOf(COMMAND_INITIALIZE), commandsMap.get("initialize"));
-        Assert.assertEquals(Integer.valueOf(COMMAND_LOAD), commandsMap.get("load"));
-        Assert.assertEquals(Integer.valueOf(COMMAND_LOAD_PAYMENT_REVIEW), commandsMap.get("loadPaymentReview"));
-        Assert.assertEquals(Integer.valueOf(COMMAND_AUTHORIZE), commandsMap.get("authorize"));
-        Assert.assertEquals(Integer.valueOf(COMMAND_REAUTHORIZE), commandsMap.get("reauthorize"));
-        Assert.assertEquals(Integer.valueOf(COMMAND_FINALIZE), commandsMap.get("finalize"));
+    public void testSetCategory() {
+        manager.setCategory(wrapper, "testCategory");
+        Mockito.verify(wrapper.paymentView).setCategory("testCategory");
+    }
+
+    @Test
+    public void testSetReturnUrl() {
+        manager.setReturnUrl(wrapper, "testReturnUrl://");
+        Mockito.verify(wrapper.paymentView).setReturnURL("testReturnUrl://");
     }
 
     @Test
@@ -92,11 +99,10 @@ public class KlarnaPaymentViewManagerTest {
         Mockito.verify(wrapper.paymentView, Mockito.times(1)).initialize("testToken", "testReturnUrl");
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
     public void testReceiveCommandInitializeThrows() {
         final JavaOnlyArray args = new JavaOnlyArray();
-        args.pushString("testToken");
         manager.receiveCommand(wrapper, COMMAND_INITIALIZE, args);
+        Mockito.verify(wrapper.paymentView, Mockito.times(0)).initialize(Mockito.anyString(), Mockito.anyString());
     }
 
     @Test
@@ -119,7 +125,7 @@ public class KlarnaPaymentViewManagerTest {
     @Test
     public void testReceiveCommandAuthorize() {
         manager.receiveCommand(wrapper, COMMAND_AUTHORIZE, null);
-        Mockito.verify(wrapper.paymentView, Mockito.times(0)).authorize(Mockito.anyBoolean(), (String) Mockito.isNull());
+        Mockito.verify(wrapper.paymentView, Mockito.times(1)).authorize(Mockito.anyBoolean(), (String) Mockito.isNull());
 
         final JavaOnlyArray args = new JavaOnlyArray();
         args.pushBoolean(true);
@@ -128,11 +134,11 @@ public class KlarnaPaymentViewManagerTest {
         Mockito.verify(wrapper.paymentView, Mockito.times(1)).authorize(true, "testSessionData");
     }
 
-    @Test(expected = IndexOutOfBoundsException.class)
     public void testReceiveCommandAuthorizeThrows() {
         final JavaOnlyArray args = new JavaOnlyArray();
         args.pushBoolean(true);
         manager.receiveCommand(wrapper, COMMAND_AUTHORIZE, args);
+        Mockito.verify(wrapper.paymentView, Mockito.times(1)).authorize(true, null);
     }
 
     @Test
@@ -158,8 +164,28 @@ public class KlarnaPaymentViewManagerTest {
     }
 
     @Test
-    public void testSetCategory() {
-        manager.setCategory(wrapper, "testCategory");
-        Mockito.verify(wrapper.paymentView).setCategory("testCategory");
+    public void testErrorMapFieldsAndValues() {
+        KlarnaPaymentsSDKError error = new KlarnaPaymentsSDKError(
+                "testName",
+                "testMessage",
+                false,
+                "testAction",
+                Collections.singletonList("testInvalidField"),
+                "testSessionId"
+        );
+
+        ReadableMap map = manager.buildErrorMap(error);
+
+        Assert.assertEquals("testName", map.getString("name"));
+        Assert.assertEquals("testMessage", map.getString("message"));
+        Assert.assertFalse(map.getBoolean("isFatal"));
+        Assert.assertEquals("testAction", map.getString("action"));
+
+        ReadableArray invalidFields = map.getArray("invalidFields");
+        Assert.assertNotNull(invalidFields);
+        Assert.assertEquals(1, invalidFields.size());
+        Assert.assertEquals("testInvalidField", invalidFields.getString(0));
+
+        Assert.assertEquals("testSessionId", map.getString("sessionId"));
     }
 }