From d1bada84d2247c9327294525766840513f16dc2f Mon Sep 17 00:00:00 2001
From: Andre Pimenta <andrepimenta7@gmail.com>
Date: Wed, 10 Jun 2020 21:15:23 +0100
Subject: [PATCH] Fix browser intial load (#1623)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix browser intial load

* Fix unit testing

Co-authored-by: Esteban Miño <efmino@uc.cl>
---
 .../__snapshots__/index.test.js.snap          | 40 +------------------
 app/components/Views/BrowserTab/index.js      | 11 +----
 2 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/app/components/Views/BrowserTab/__snapshots__/index.test.js.snap b/app/components/Views/BrowserTab/__snapshots__/index.test.js.snap
index a282f7539f6..c0122cda94f 100644
--- a/app/components/Views/BrowserTab/__snapshots__/index.test.js.snap
+++ b/app/components/Views/BrowserTab/__snapshots__/index.test.js.snap
@@ -19,45 +19,7 @@ exports[`Browser should render correctly 1`] = `
         "zIndex": 1,
       }
     }
-  >
-    <WebView
-      allowsInlineMediaPlayback={true}
-      cacheEnabled={true}
-      injectedJavaScript={null}
-      javaScriptEnabled={true}
-      javascriptEnabled={true}
-      onError={[Function]}
-      onLoadEnd={[Function]}
-      onLoadProgress={[Function]}
-      onLoadStart={[Function]}
-      onMessage={[Function]}
-      onNavigationStateChange={[Function]}
-      onShouldStartLoadWithRequest={[Function]}
-      originWhitelist={
-        Array [
-          "http://*",
-          "https://*",
-        ]
-      }
-      renderError={[Function]}
-      sendCookies={true}
-      source={
-        Object {
-          "uri": null,
-        }
-      }
-      style={
-        Object {
-          "flex": 1,
-          "zIndex": 1,
-        }
-      }
-      testID="browser-webview"
-      useSharedProcessPool={true}
-      useWebkit={true}
-      userAgent="Mozilla/5.0 (iPhone; CPU iPhone OS 13_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/76.0.3809.123 Mobile/15E148 Safari/605.1"
-    />
-  </View>
+  />
   <View
     style={
       Object {
diff --git a/app/components/Views/BrowserTab/index.js b/app/components/Views/BrowserTab/index.js
index deef816cf76..c27aa12a671 100644
--- a/app/components/Views/BrowserTab/index.js
+++ b/app/components/Views/BrowserTab/index.js
@@ -1125,7 +1125,7 @@ export class BrowserTab extends PureComponent {
 		current && current.reload();
 	};
 
-	forceReload = initialReload => {
+	forceReload = () => {
 		this.isReloading = true;
 
 		this.toggleOptionsIfNeeded();
@@ -1133,13 +1133,6 @@ export class BrowserTab extends PureComponent {
 		this.approvalRequest = undefined;
 		const url2Reload = this.state.inputValue;
 
-		// If it is the first time the component is being mounted, there should be no cache problem and no need for remounting the component
-		if (initialReload) {
-			this.isReloading = false;
-			this.go(url2Reload);
-			return;
-		}
-
 		// Force unmount the webview to avoid caching problems
 		this.setState({ forceReload: true }, () => {
 			// Make sure we're not calling last mounted webview during this time threshold
@@ -1157,7 +1150,7 @@ export class BrowserTab extends PureComponent {
 		if (this.webview && this.webview.current) {
 			this.webview.current.stopLoading();
 		}
-		this.forceReload(true);
+		this.forceReload();
 		this.init();
 	};