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

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

@@ -0,0 +1,240 @@
+#if RCT_NEW_ARCH_ENABLED
+
+#import "PaymentViewWrapper.h"
+
+#import <AVFoundation/AVFoundation.h>
+#import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>
+#import <React/RCTLog.h>
+
+#import <react/renderer/components/RNKlarnaMobileSDK/ComponentDescriptors.h>
+#import <react/renderer/components/RNKlarnaMobileSDK/EventEmitters.h>
+#import <react/renderer/components/RNKlarnaMobileSDK/Props.h>
+#import <react/renderer/components/RNKlarnaMobileSDK/RCTComponentViewHelpers.h>
+
+#import "RCTFabricComponentsPlugins.h"
+
+using namespace facebook::react;
+
+@interface PaymentViewWrapper () <KlarnaPaymentEventListener, RCTRNKlarnaPaymentViewViewProtocol>
+
+@property (nonatomic, strong) KlarnaPaymentView* actualPaymentView;
+
+@end
+
+@implementation PaymentViewWrapper
+
+#pragma mark - React Native Overrides
+
+- (void) initializeActualPaymentView:(NSString*)category withReturnUrl:(NSString*)returnUrl {
+    if (returnUrl.length > 0) {
+        self.actualPaymentView = [[KlarnaPaymentView alloc] initWithCategory:category returnUrl:[NSURL URLWithString:returnUrl]  eventListener:self];
+    } else {
+        self.actualPaymentView = [[KlarnaPaymentView alloc] initWithCategory:category eventListener:self];
+    }
+    self.actualPaymentView.translatesAutoresizingMaskIntoConstraints = NO;
+        
+    
+    [self addSubview:self.actualPaymentView];
+    
+    [NSLayoutConstraint activateConstraints:[[NSArray alloc] initWithObjects:
+                                             [self.actualPaymentView.topAnchor constraintEqualToAnchor:self.topAnchor],
+                                             [self.actualPaymentView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
+                                             [self.actualPaymentView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+                                             [self.actualPaymentView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor], nil
+                                            ]];
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    self.actualPaymentView.frame = self.bounds;
+    [self.actualPaymentView layoutSubviews];
+}
+
+#pragma mark - Payment View Methods
+
+- (void)initializePaymentViewWithClientToken:(NSString *)clientToken withReturnUrl:(NSString *)returnUrl{
+    if (returnUrl.length > 0) {
+        [self.actualPaymentView initializeWithClientToken:clientToken returnUrl:[NSURL URLWithString:returnUrl]];
+    } else {
+        [self.actualPaymentView initializeWithClientToken:clientToken];
+    }
+}
+
+- (void)loadPaymentViewWithSessionData:(NSString*)sessionData {
+    [self.actualPaymentView loadWithJsonData:sessionData.length > 0 ? sessionData : nil];
+}
+
+- (void)loadPaymentReviewPaymentView {
+    [self.actualPaymentView loadPaymentReview];
+}
+
+- (void)authorizePaymentViewWithAutoFinalize:(BOOL)autoFinalize sessionData:(NSString*)sessionData {
+    [self.actualPaymentView authorizeWithAutoFinalize:autoFinalize jsonData:sessionData.length > 0 ? sessionData : nil];
+}
+
+- (void)reauthorizePaymentViewWithSessionData:(NSString*)sessionData {
+    [self.actualPaymentView reauthorizeWithJsonData:sessionData.length > 0 ? sessionData : nil];
+}
+
+- (void)finalizePaymentViewWithSessionData:(NSString*)sessionData {
+    [self.actualPaymentView finaliseWithJsonData:sessionData.length > 0 ? sessionData : nil];
+
+}
+
+#pragma mark - Klarna PaymentEventListener
+
+- (void)klarnaInitializedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
+    if(_eventEmitter){
+        std::dynamic_pointer_cast<const RNKlarnaPaymentViewEventEmitter>(_eventEmitter)
+        ->onInitialized(RNKlarnaPaymentViewEventEmitter::OnInitialized{});
+    }
+}
+
+- (void)klarnaLoadedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
+    if(_eventEmitter){
+        std::dynamic_pointer_cast<const RNKlarnaPaymentViewEventEmitter>(_eventEmitter)
+        ->onLoaded(RNKlarnaPaymentViewEventEmitter::OnLoaded{});
+    }
+}
+
+- (void)klarnaLoadedPaymentReviewWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
+    if(_eventEmitter){
+        std::dynamic_pointer_cast<const RNKlarnaPaymentViewEventEmitter>(_eventEmitter)
+        ->onLoadedPaymentReview(RNKlarnaPaymentViewEventEmitter::OnLoadedPaymentReview{});
+    }
+}
+
+- (void)klarnaAuthorizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken finalizeRequired:(BOOL)finalizeRequired {
+    if(_eventEmitter){
+        std::dynamic_pointer_cast<const RNKlarnaPaymentViewEventEmitter>(_eventEmitter)
+        ->onAuthorized(RNKlarnaPaymentViewEventEmitter::OnAuthorized{
+            .approved = approved,
+            .authToken = authToken == nil ? "" : std::string([authToken UTF8String]),
+            .finalizeRequired = finalizeRequired
+        });
+    }
+}
+- (void)klarnaReauthorizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken {
+    if(_eventEmitter){
+        std::dynamic_pointer_cast<const RNKlarnaPaymentViewEventEmitter>(_eventEmitter)
+        ->onReauthorized(RNKlarnaPaymentViewEventEmitter::OnReauthorized{
+            .approved = approved,
+            .authToken = authToken == nil ? "" : std::string([authToken UTF8String]),
+        });
+    }
+}
+
+- (void)klarnaFinalizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken {
+    if(_eventEmitter){
+        std::dynamic_pointer_cast<const RNKlarnaPaymentViewEventEmitter>(_eventEmitter)
+        ->onFinalized(RNKlarnaPaymentViewEventEmitter::OnFinalized{
+            .approved = approved,
+            .authToken = authToken == nil ? "" : std::string([authToken UTF8String]),
+        });
+    }
+}
+
+- (void)klarnaFailedInPaymentView:(KlarnaPaymentView * _Nonnull)paymentView withError:(KlarnaPaymentError * _Nonnull)error {
+    if(_eventEmitter){
+        std::dynamic_pointer_cast<const RNKlarnaPaymentViewEventEmitter>(_eventEmitter)
+        ->onError(RNKlarnaPaymentViewEventEmitter::OnError{
+            .error = {
+                .action = std::string([error.action UTF8String]),
+                .isFatal = error.isFatal,
+                .message = std::string([error.message UTF8String]),
+                .name = std::string([error.name UTF8String]),
+            }
+        });
+    }
+}
+
+- (void)klarnaResizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView to:(CGFloat)newHeight {
+    if(_eventEmitter){
+        std::dynamic_pointer_cast<const RNKlarnaPaymentViewEventEmitter>(_eventEmitter)
+        ->onResized(RNKlarnaPaymentViewEventEmitter::OnResized{
+            .height = std::string([[[NSNumber numberWithFloat:newHeight] stringValue] UTF8String])
+        });
+    }
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        static const auto defaultProps = std::make_shared<const RNKlarnaPaymentViewProps>();
+        _props = defaultProps;
+        
+    }
+    
+    return self;
+}
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+    return concreteComponentDescriptorProvider<RNKlarnaPaymentViewComponentDescriptor>();
+}
+
+Class<RCTComponentViewProtocol> RNKlarnaPaymentViewCls(void)
+{
+    return PaymentViewWrapper.class;
+}
+
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
+{
+    const auto &oldViewProps = *std::static_pointer_cast<RNKlarnaPaymentViewProps const>(_props);
+    const auto &newViewProps = *std::static_pointer_cast<RNKlarnaPaymentViewProps const>(props);
+    
+    if (self.actualPaymentView == nil && newViewProps.category.length() > 0) {
+        NSString * categoryConver = [[NSString alloc] initWithUTF8String: newViewProps.category.c_str()];
+        NSString * returnUrlConver = [[NSString alloc] initWithUTF8String: newViewProps.returnUrl.c_str()];
+        [self initializeActualPaymentView:categoryConver withReturnUrl:returnUrlConver];
+    } else {
+        if (oldViewProps.category != newViewProps.category) {
+                NSString * categoryConver = [[NSString alloc] initWithUTF8String: newViewProps.category.c_str()];
+        //        not supported
+        //        self.actualPaymentView.category = newViewProps.category
+        }
+        
+        if (oldViewProps.returnUrl != newViewProps.returnUrl) {
+            NSString * returnUrlConver = [[NSString alloc] initWithUTF8String: newViewProps.returnUrl.c_str()];
+            self.actualPaymentView.returnURL = [NSURL URLWithString:returnUrlConver];
+        }
+    }
+    
+    
+    [super updateProps:props oldProps:oldProps];
+}
+
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args {
+    RCTRNKlarnaPaymentViewHandleCommand(self, commandName, args);
+}
+
+#pragma mark - RCTRNKlarnaPaymentViewViewProtocol
+
+- (void)initialize:(nonnull NSString *)clientToken returnUrl:(nonnull NSString *)returnUrl {
+    [self initializePaymentViewWithClientToken:clientToken withReturnUrl:returnUrl];
+}
+
+- (void)load:(nonnull NSString *)sessionData {
+    [self loadPaymentViewWithSessionData:sessionData];
+}
+
+- (void)loadPaymentReview {
+    [self loadPaymentReviewPaymentView];
+}
+
+- (void)authorize:(BOOL)autoFinalize sessionData:(nonnull NSString *)sessionData {
+    [self authorizePaymentViewWithAutoFinalize: autoFinalize sessionData:sessionData];
+}
+
+- (void)finalize:(nonnull NSString *)sessionData {
+    [self finalizePaymentViewWithSessionData:sessionData];
+}
+
+- (void)reauthorize:(nonnull NSString *)sessionData {
+    [self reauthorizePaymentViewWithSessionData:sessionData];
+}
+
+@end
+
+#endif

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

@@ -0,0 +1,42 @@
+#if !RCT_NEW_ARCH_ENABLED
+
+#import <React/RCTUIManager.h>
+
+#import <AVFoundation/AVFoundation.h>
+#import <UIKit/UIKit.h>
+#import <React/RCTView.h>
+#import <React/RCTUIManager.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface KlarnaStandaloneWebViewWrapper : UIView
+
+@property (nonatomic, copy) RCTDirectEventBlock onLoadStart;
+@property (nonatomic, copy) RCTDirectEventBlock onLoadEnd;
+@property (nonatomic, copy) RCTDirectEventBlock onError;
+@property (nonatomic, copy) RCTDirectEventBlock onLoadProgress;
+@property (nonatomic, copy) RCTDirectEventBlock onKlarnaMessage;
+
+@property (nonatomic, strong) NSString* returnUrl;
+
+#pragma mark - React Native Overrides
+
+- (void)initializeKlarnaStandaloneWebView;
+
+@property (nonatomic, weak) RCTUIManager* uiManager;
+
+- (void)load:(nonnull NSString*)url;
+
+- (void)goForward;
+
+- (void)goBack;
+
+- (void)reload;
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif
+
+

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

@@ -0,0 +1,195 @@
+#if !RCT_NEW_ARCH_ENABLED
+
+#import "KlarnaStandaloneWebViewWrapper.h"
+
+#import <KlarnaMobileSDK/KlarnaMobileSDK-Swift.h>
+#import <React/RCTLog.h>
+
+@interface KlarnaStandaloneWebViewWrapper () <KlarnaStandaloneWebViewDelegate, KlarnaEventHandler>
+
+@property (nonatomic, strong) KlarnaStandaloneWebView* klarnaStandaloneWebView;
+
+@end
+
+@implementation KlarnaStandaloneWebViewWrapper
+
+// The property name in KlarnaStandaloneWebView that we want to observe for changes
+NSString * const PROPERTY_NAME_ESTIMATED_PROGRESS = @"estimatedProgress";
+
+- (id)init {
+    self = [super init];
+    [self initializeKlarnaStandaloneWebView];
+    self.klarnaStandaloneWebView.delegate = self;
+    self.klarnaStandaloneWebView.eventHandler = self;
+    [self.klarnaStandaloneWebView addObserver:self forKeyPath:PROPERTY_NAME_ESTIMATED_PROGRESS options:NSKeyValueObservingOptionNew context:nil];
+    return self;
+}
+
+-(void)dealloc {
+    [self.klarnaStandaloneWebView removeObserver:self forKeyPath:PROPERTY_NAME_ESTIMATED_PROGRESS context:nil];
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
+    if ([keyPath isEqualToString:PROPERTY_NAME_ESTIMATED_PROGRESS]) {
+        // newProgress is a value in range [0..1].
+        NSNumber * newProgress = [change objectForKey:NSKeyValueChangeNewKey];
+        // We need to convert it to an int value in range [0..100]
+        int progress = (int) (newProgress.doubleValue * 100);
+        [self sendLoadProgressEvent:self.klarnaStandaloneWebView progress:progress];
+    } else {
+        [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+    }
+}
+
+- (void)sendLoadProgressEvent:(KlarnaStandaloneWebView * _Nonnull)webView progress:(int)progress {
+    if (!self.onLoadProgress) {
+        RCTLog(@"Missing 'onProgressChange' callback prop.");
+        return;
+    }
+    NSMutableDictionary<NSString *, id> *event = [self webViewDict:webView];
+    [event addEntriesFromDictionary:@{
+          @"progress": [NSNumber numberWithDouble: progress] // could use self.klarnaStandaloneWebView.estimatedProgress
+        }];
+    
+    self.onLoadProgress(@{@"progressEvent": event});
+
+}
+
+#pragma mark - React Native Overrides
+
+- (void)setReturnUrl:(NSString *)returnUrl {
+    _returnUrl = returnUrl;
+    if (returnUrl.length > 0) {
+        self.klarnaStandaloneWebView.returnURL = [NSURL URLWithString:self.returnUrl];
+    }
+}
+
+- (void)initializeKlarnaStandaloneWebView {
+    if (self.returnUrl != nil && self.returnUrl.length > 0) {
+        self.klarnaStandaloneWebView = [[KlarnaStandaloneWebView alloc] initWithReturnURL:[NSURL URLWithString:self.returnUrl]];
+    } else {
+        // TODO: initWithReturnURL expects a non-null URL. What should we do here if returnUrl is null?
+        self.klarnaStandaloneWebView = [[KlarnaStandaloneWebView alloc] initWithReturnURL:[NSURL URLWithString:@"returnUrl://"]];
+    }
+    
+    self.klarnaStandaloneWebView.translatesAutoresizingMaskIntoConstraints = NO;
+
+    [self addSubview:self.klarnaStandaloneWebView];
+    
+    [NSLayoutConstraint activateConstraints:[[NSArray alloc] initWithObjects:
+                                             [self.klarnaStandaloneWebView.topAnchor constraintEqualToAnchor:self.topAnchor],
+                                             [self.klarnaStandaloneWebView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
+                                             [self.klarnaStandaloneWebView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+                                             [self.klarnaStandaloneWebView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor], nil
+                                            ]];
+}
+
+- (void)layoutSubviews {
+    [super layoutSubviews];
+    self.klarnaStandaloneWebView.frame = self.bounds;
+    [self.klarnaStandaloneWebView layoutSubviews];
+}
+
+#pragma mark - Klarna Standalone Web View Methods
+
+- (void)load:(nonnull NSString *)url {
+    NSURL *urlToLoad = [NSURL URLWithString:url];
+    if ([urlToLoad scheme] && [urlToLoad host] && urlToLoad) {
+      [self.klarnaStandaloneWebView loadURL:urlToLoad];
+    } else {
+        RCTLogInfo(@"url is not a valid URL");
+    }
+}
+
+- (void)goForward {
+    [self.klarnaStandaloneWebView goForward];
+}
+
+- (void)goBack {
+    [self.klarnaStandaloneWebView goBack];
+}
+
+- (void)reload {
+    [self.klarnaStandaloneWebView reload];
+}
+
+#pragma mark - KlarnaStandaloneWebViewDelegate methods
+
+- (void)klarnaStandaloneWebView:(KlarnaStandaloneWebView * _Nonnull)webView didCommit:(WKNavigation * _Nonnull)navigation {
+    if (!self.onLoadStart) {
+        RCTLog(@"Missing 'onLoadStart' callback prop.");
+        return;
+    }
+    NSMutableDictionary<NSString *, id> *event = [self webViewDict:webView];
+    self.onLoadStart(@{@"navigationEvent": event});
+}
+
+- (void)klarnaStandaloneWebView:(KlarnaStandaloneWebView * _Nonnull)webView didFinish:(WKNavigation * _Nonnull)navigation {
+    if (!self.onLoadEnd) {
+        RCTLog(@"Missing 'onLoadEnd' callback prop.");
+        return;
+    }
+    NSMutableDictionary<NSString *, id> *event = [self webViewDict:webView];
+    self.onLoadEnd(@{@"navigationEvent": event});
+}
+
+- (void)klarnaStandaloneWebView:(KlarnaStandaloneWebView * _Nonnull)webView didFailProvisionalNavigation:(WKNavigation * _Nonnull)navigation withError:(NSError * _Nonnull)error {
+    if (!self.onError) {
+        RCTLog(@"Missing 'onError' callback prop.");
+        return;
+    }
+    NSMutableDictionary<NSString *, id> *event = [self webViewDict:webView];
+    [event addEntriesFromDictionary:@{
+            @"code": @(error.code),
+            @"description": error.description,
+        }];
+    self.onError(@{@"error": event});
+}
+
+- (void)klarnaStandaloneWebView:(KlarnaStandaloneWebView * _Nonnull)webView didFail:(WKNavigation * _Nonnull)navigation withError:(NSError * _Nonnull)error {
+    if (!self.onError) {
+        RCTLog(@"Missing 'onError' callback prop.");
+        return;
+    }
+    NSMutableDictionary<NSString *, id> *event = [self webViewDict:webView];
+    [event addEntriesFromDictionary:@{
+            @"code": @(error.code),
+            @"description": error.description,
+        }];
+    self.onError(@{@"error": error});
+}
+
+#pragma mark - KlarnaEventHandler methods
+
+- (void)klarnaComponent:(id <KlarnaComponent> _Nonnull)klarnaComponent dispatchedEvent:(KlarnaProductEvent * _Nonnull)event {
+    if (!self.onKlarnaMessage) {
+        RCTLog(@"Missing 'onKlarnaMessage' callback prop.");
+        return;
+    }
+    self.onKlarnaMessage(@{
+        @"klarnaMessageEvent": @{
+            @"action": event.action
+        }
+    });
+}
+
+- (void)klarnaComponent:(id <KlarnaComponent> _Nonnull)klarnaComponent encounteredError:(KlarnaError * _Nonnull)error {
+    // Not used as of now
+}
+
+#pragma mark - Events
+
+- (NSMutableDictionary<NSString *, id> *)webViewDict:(KlarnaStandaloneWebView * _Nonnull)webView {
+    NSDictionary *event = @{
+        @"url": webView.url.absoluteString ?: @"",
+        @"title": webView.title ?: @"",
+        @"loading" : @(webView.isLoading),
+        @"canGoBack": @(webView.canGoBack),
+        @"canGoForward" : @(webView.canGoForward)
+      };
+    return [[NSMutableDictionary alloc] initWithDictionary: event];
+}
+
+@end
+
+#endif

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

@@ -1,10 +1,8 @@
-//
-//  PaymentViewWrapper.h
-//  react-native-klarna-payment-view
-//
-//  Created by Gabriel Banfalvi on 2019-07-24.
-//
+#if !RCT_NEW_ARCH_ENABLED
 
+#import <React/RCTUIManager.h>
+
+#import <AVFoundation/AVFoundation.h>
 #import <UIKit/UIKit.h>
 #import <React/RCTView.h>
 #import <React/RCTUIManager.h>
@@ -20,8 +18,10 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, copy) RCTDirectEventBlock onReauthorized;
 @property (nonatomic, copy) RCTDirectEventBlock onFinalized;
 @property (nonatomic, copy) RCTDirectEventBlock onError;
+@property (nonatomic, copy) RCTDirectEventBlock onResized;
 
 @property (nonatomic, strong) NSString* category;
+@property (nonatomic, strong) NSString* returnUrl;
 
 #pragma mark - React Native Overrides
 - (void) setCategory:(NSString *)category;
@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, weak) RCTUIManager* uiManager;
 
-- (void) initializePaymentViewWithClientToken:(NSString*)clientToken withReturnUrl:(NSString*)returnUrl;
+- (void)initializePaymentViewWithClientToken:(NSString*)clientToken withReturnUrl:(NSString*)returnUrl;
 
 - (void)loadPaymentViewWithSessionData:(nullable NSString*)sessionData;
 
@@ -45,3 +45,5 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif

package/ios/Sources/view/{PaymentViewWrapper.m → oldarch/PaymentViewWrapper.mm}

@@ -1,9 +1,4 @@
-//
-//  PaymentViewWrapper.m
-//  react-native-klarna-payment-view
-//
-//  Created by Gabriel Banfalvi on 2019-07-24.
-//
+#if !RCT_NEW_ARCH_ENABLED
 
 #import "PaymentViewWrapper.h"
 
@@ -14,10 +9,8 @@
 
 @property (nonatomic, strong) KlarnaPaymentView* actualPaymentView;
 
-
 @end
 
-
 @implementation PaymentViewWrapper
 
 #pragma mark - React Native Overrides
@@ -27,6 +20,13 @@
     [self evaluateProps];
 }
 
+- (void) setReturnUrl:(NSString *)returnUrl {
+    _returnUrl = returnUrl;
+    if (returnUrl.length > 0) {
+        self.actualPaymentView.returnURL = [NSURL URLWithString:self.returnUrl];
+    }
+}
+
 - (void) evaluateProps {
     if (self.category != nil) {
         [self initializeActualPaymentView];
@@ -34,19 +34,21 @@
 }
 
 - (void) initializeActualPaymentView {
-    self.actualPaymentView = [[KlarnaPaymentView alloc] initWithCategory:self.category eventListener:self];
+    if (self.returnUrl != nil && self.returnUrl.length > 0) {
+        self.actualPaymentView = [[KlarnaPaymentView alloc] initWithCategory:self.category returnUrl:[NSURL URLWithString:self.returnUrl]  eventListener:self];
+    } else {
+        self.actualPaymentView = [[KlarnaPaymentView alloc] initWithCategory:self.category eventListener:self];
+    }
     self.actualPaymentView.translatesAutoresizingMaskIntoConstraints = NO;
     
     [self addSubview:self.actualPaymentView];
 
     [NSLayoutConstraint activateConstraints:[[NSArray alloc] initWithObjects:
-        [self.actualPaymentView.topAnchor constraintEqualToAnchor:self.topAnchor],
-        [self.actualPaymentView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
-        [self.actualPaymentView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
-        [self.actualPaymentView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor], nil
-    ]];
-    
-
+                                             [self.actualPaymentView.topAnchor constraintEqualToAnchor:self.topAnchor],
+                                             [self.actualPaymentView.bottomAnchor constraintEqualToAnchor:self.bottomAnchor],
+                                             [self.actualPaymentView.leadingAnchor constraintEqualToAnchor:self.leadingAnchor],
+                                             [self.actualPaymentView.trailingAnchor constraintEqualToAnchor:self.trailingAnchor], nil
+                                            ]];
 }
 
 - (void)layoutSubviews {
@@ -58,12 +60,15 @@
 #pragma mark - Payment View Methods
 
 - (void)initializePaymentViewWithClientToken:(NSString *)clientToken withReturnUrl:(NSString *)returnUrl{
-    NSURL* url = [NSURL URLWithString:returnUrl];
-    [self.actualPaymentView initializeWithClientToken:clientToken returnUrl:url];
+    if (returnUrl.length > 0) {
+        [self.actualPaymentView initializeWithClientToken:clientToken returnUrl:[NSURL URLWithString:returnUrl]];
+    } else {
+        [self.actualPaymentView initializeWithClientToken:clientToken];
+    }
 }
 
 - (void)loadPaymentViewWithSessionData:(NSString*)sessionData {
-    [self.actualPaymentView loadWithJsonData:sessionData];
+    [self.actualPaymentView loadWithJsonData:sessionData.length > 0 ? sessionData : nil];
 }
 
 - (void)loadPaymentReview {
@@ -71,21 +76,20 @@
 }
 
 - (void)authorizePaymentViewWithAutoFinalize:(BOOL)autoFinalize sessionData:(NSString*)sessionData {
-    [self.actualPaymentView authorizeWithAutoFinalize:autoFinalize jsonData:sessionData];
+    [self.actualPaymentView authorizeWithAutoFinalize:autoFinalize jsonData:sessionData.length > 0 ? sessionData : nil];
 }
 
 - (void)reauthorizePaymentViewWithSessionData:(NSString*)sessionData {
-    [self.actualPaymentView reauthorizeWithJsonData:sessionData];
+    [self.actualPaymentView reauthorizeWithJsonData:sessionData.length > 0 ? sessionData : nil];
 }
 
 - (void)finalizePaymentViewWithSessionData:(NSString*)sessionData {
-    [self.actualPaymentView finaliseWithJsonData:sessionData];
+    [self.actualPaymentView finaliseWithJsonData:sessionData.length > 0 ? sessionData : nil];
 
 }
 
 #pragma mark - Klarna PaymentEventListener
 
-
 - (void)klarnaInitializedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView {
     if (!self.onInitialized) {
         RCTLog(@"Missing 'onInitialized' callback prop.");
@@ -126,6 +130,7 @@
     });
 
 }
+
 - (void)klarnaReauthorizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView approved:(BOOL)approved authToken:(NSString * _Nullable)authToken {
     if (!self.onReauthorized) {
         RCTLog(@"Missing 'onReauthorized' callback prop.");
@@ -151,11 +156,11 @@
 }
 
 - (void)klarnaFailedInPaymentView:(KlarnaPaymentView * _Nonnull)paymentView withError:(KlarnaPaymentError * _Nonnull)error {
-       if (!self.onError) {
+    if (!self.onError) {
         RCTLog(@"Missing 'onError' callback prop.");
         return;
     }
-
+    
     self.onError(@{
         @"error": @{
             @"action": error.action,
@@ -167,8 +172,16 @@
 }
 
 - (void)klarnaResizedWithPaymentView:(KlarnaPaymentView * _Nonnull)paymentView to:(CGFloat)newHeight {
-
-    [self.uiManager setIntrinsicContentSize:CGSizeMake(UIViewNoIntrinsicMetric, newHeight) forView:self];
+    if (!self.onResized) {
+        RCTLog(@"Missing 'onResized' callback prop.");
+        return;
+    }
+    
+    self.onResized(@{
+        @"height": [[NSNumber numberWithFloat:newHeight] stringValue]
+    });
 }
 
 @end
+
+#endif