Now present a viewController from the topmost viewController

wavyapp · Dec 19, 2018 · 0c7a1d8 · 0c7a1d8
1 parent b53fce6
commit 0c7a1d8
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/ios/RNSumUp.m b/ios/RNSumUp.m
@@ -60,6 +60,9 @@ - (NSDictionary *)constantsToExport
 {
     dispatch_sync(dispatch_get_main_queue(), ^{
         UIViewController *rootViewController = UIApplication.sharedApplication.delegate.window.rootViewController;
+        while (rootViewController.presentedViewController != nil) {
+            rootViewController = rootViewController.presentedViewController;
+        }
         [SMPSumUpSDK presentLoginFromViewController:rootViewController animated:YES completionBlock:^(BOOL success, NSError *error) {
             if (error) {
                 [rootViewController dismissViewControllerAnimated:YES completion:nil];
@@ -68,8 +71,7 @@ - (NSDictionary *)constantsToExport
                 SMPMerchant *merchantInfo = [SMPSumUpSDK currentMerchant];
                 NSString *merchantCode = [merchantInfo merchantCode];
                 NSString *currencyCode = [merchantInfo currencyCode];
-                if (merchantCode && currencyCode){
-                    RCTLogInfo(@"WavyError: success2");
+                if (merchantCode && currencyCode) {
                     return resolve(@{@"success": @(success), @"userAdditionalInfo": @{ @"merchantCode": merchantCode, @"currencyCode": currencyCode }});
                 }
                 return resolve(@{@"success": @(success) });
@@ -132,6 +134,9 @@ - (NSDictionary *)constantsToExport
     checkoutRequest.skipScreenOptions = skipScreen;
     dispatch_sync(dispatch_get_main_queue(), ^{
         UIViewController *rootViewController = UIApplication.sharedApplication.delegate.window.rootViewController;
+        while (rootViewController.presentedViewController != nil) {
+            rootViewController = rootViewController.presentedViewController;
+        }
         [SMPSumUpSDK checkoutWithRequest:checkoutRequest
                       fromViewController:rootViewController
                               completion:^(SMPCheckoutResult *result, NSError *error) {
@@ -157,6 +162,9 @@ - (NSDictionary *)constantsToExport
 {
     dispatch_sync(dispatch_get_main_queue(), ^{
         UIViewController *rootViewController = UIApplication.sharedApplication.delegate.window.rootViewController;
+        while (rootViewController.presentedViewController != nil) {
+            rootViewController = rootViewController.presentedViewController;
+        }
         [SMPSumUpSDK presentCheckoutPreferencesFromViewController:rootViewController
                                                          animated:YES
                                                        completion:^(BOOL success, NSError * _Nullable error) {