Fix alert from iframes (#2143)

MetaMask · Jan 20, 2021 · 431eb9d · 431eb9d
1 parent b17b87f
commit 431eb9d
Showing 1 changed file with 23 additions and 0 deletions.
diff --git a/patches/react-native-webview+11.0.2.patch b/patches/react-native-webview+11.0.2.patch
@@ -296,3 +296,26 @@ index 2190ae7..cd05399 100644
        final String url = request.getUrl().toString();
        return this.shouldOverrideUrlLoading(view, url);
      }
+diff --git a/node_modules/react-native-webview/apple/RNCWebView.m b/node_modules/react-native-webview/apple/RNCWebView.m
+index 02005db..c9b51d9 100644
+--- a/node_modules/react-native-webview/apple/RNCWebView.m
++++ b/node_modules/react-native-webview/apple/RNCWebView.m
+@@ -801,11 +801,13 @@ - (void)                    webView:(WKWebView *)webView
+ - (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
+ {
+ #if !TARGET_OS_OSX
+-  UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"" message:message preferredStyle:UIAlertControllerStyleAlert];
+-  [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {
+-    completionHandler();
+-  }]];
+-  [[self topViewController] presentViewController:alert animated:YES completion:NULL];
++  dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.7 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{	
++    UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"" message:message preferredStyle:UIAlertControllerStyleAlert];	
++    [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDefault handler:^(UIAlertAction *action) {	
++      completionHandler();	
++    }]];	
++    [[self topViewController] presentViewController:alert animated:YES completion:NULL];	
++  });
+ #else
+   NSAlert *alert = [[NSAlert alloc] init];
+   [alert setMessageText:message];