From ea3dbd28faec4abc484a55b815d072e40e77d73f Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Fri, 23 Aug 2019 20:10:21 -0400 Subject: [PATCH 1/6] bump react-native-web3-webview --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 559429ebd5e..7eb95cd6e76 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "react-native-tcp": "3.3.0", "react-native-vector-icons": "6.4.2", "react-native-view-shot": "github:brunobar79/react-native-view-shot#androidx", - "react-native-web3-webview": "2.1.0", + "react-native-web3-webview": "2.1.1", "react-navigation": "3.11.1", "react-redux": "5.1.1", "readable-stream": "1.0.33", From f70b58e7f3acd161cf6b7edc00bf197d094089e5 Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Fri, 23 Aug 2019 20:11:09 -0400 Subject: [PATCH 2/6] update package-lock.json --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8f2f4e8a523..f86f093b51a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19142,9 +19142,9 @@ "from": "github:brunobar79/react-native-view-shot#androidx" }, "react-native-web3-webview": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/react-native-web3-webview/-/react-native-web3-webview-2.1.0.tgz", - "integrity": "sha512-YTJI5mtJUxzUFlzSFYeBaMbDA/794is8W85KEfk2UR4CinpAgKz29QAN00/DqNHlRhSjsca/vy8b2a44EwTIkw==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/react-native-web3-webview/-/react-native-web3-webview-2.1.1.tgz", + "integrity": "sha512-GNuLl7rJhUFoSdVnBs+9MqJLE3PTsD+GCb/ZCU9JoWyWci44sBbM0rEj7RICyukjgdqK3j2186/a2u5LrQBQtQ==", "requires": { "fbjs": "^0.8.3" }, From ce3320b66e985aaee5fb96ac59e712de1ee8dcce Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Sat, 24 Aug 2019 00:08:24 -0400 Subject: [PATCH 3/6] fix forkdelta.app --- app/components/Views/BrowserTab/index.js | 3 +++ package-lock.json | 6 +++--- package.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/components/Views/BrowserTab/index.js b/app/components/Views/BrowserTab/index.js index d627b141e1c..5cb35b721e3 100644 --- a/app/components/Views/BrowserTab/index.js +++ b/app/components/Views/BrowserTab/index.js @@ -1190,6 +1190,9 @@ export class BrowserTab extends PureComponent { const { ipfsGateway } = this.props; const data = {}; const urlObj = new URL(url); + if (urlObj.protocol.indexOf('http')) { + return; + } this.lastUrlBeforeHome = null; data.fullHostname = urlObj.hostname; diff --git a/package-lock.json b/package-lock.json index f86f093b51a..a2c548b74bf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19142,9 +19142,9 @@ "from": "github:brunobar79/react-native-view-shot#androidx" }, "react-native-web3-webview": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/react-native-web3-webview/-/react-native-web3-webview-2.1.1.tgz", - "integrity": "sha512-GNuLl7rJhUFoSdVnBs+9MqJLE3PTsD+GCb/ZCU9JoWyWci44sBbM0rEj7RICyukjgdqK3j2186/a2u5LrQBQtQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/react-native-web3-webview/-/react-native-web3-webview-2.1.2.tgz", + "integrity": "sha512-qIB4OQGRoc4E69VDmGWvYd+zpOdGcZht3kETsXlpUkBY42uCukuoZ7bNOlPe6XjbOq1KPHJvepKUaDmZ2sKcPw==", "requires": { "fbjs": "^0.8.3" }, diff --git a/package.json b/package.json index 7eb95cd6e76..ebebad55a86 100644 --- a/package.json +++ b/package.json @@ -129,7 +129,7 @@ "react-native-tcp": "3.3.0", "react-native-vector-icons": "6.4.2", "react-native-view-shot": "github:brunobar79/react-native-view-shot#androidx", - "react-native-web3-webview": "2.1.1", + "react-native-web3-webview": "2.1.2", "react-navigation": "3.11.1", "react-redux": "5.1.1", "readable-stream": "1.0.33", From ddf07c8bd293e392084d84ecf37e773fd5e8cf0a Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Mon, 26 Aug 2019 15:18:26 -0400 Subject: [PATCH 4/6] fix --- app/components/Views/BrowserTab/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/Views/BrowserTab/index.js b/app/components/Views/BrowserTab/index.js index 5cb35b721e3..e8fba813408 100644 --- a/app/components/Views/BrowserTab/index.js +++ b/app/components/Views/BrowserTab/index.js @@ -1190,7 +1190,7 @@ export class BrowserTab extends PureComponent { const { ipfsGateway } = this.props; const data = {}; const urlObj = new URL(url); - if (urlObj.protocol.indexOf('http')) { + if (urlObj.protocol.indexOf('http') === -1) { return; } this.lastUrlBeforeHome = null; From eeb9e9d2e78eca026d5290c94e38a1e749924b0b Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Mon, 26 Aug 2019 15:31:24 -0400 Subject: [PATCH 5/6] fix dep bs --- .circleci/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index d66224fd76f..a6caf4941c3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -21,6 +21,10 @@ aliases: | npm install + - &clear-bad-deps + | + rm -rf node_modules/websocket/.git + defaults: &defaults working_directory: ~/MetaMask @@ -33,6 +37,7 @@ jobs: steps: - checkout - restore_cache: *restore-cache + - run: *clear-bad-deps - run: *install-node-dependencies - persist_to_workspace: root: . From fede466e60b01068db37a31033ee1408798e307c Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Mon, 26 Aug 2019 15:35:38 -0400 Subject: [PATCH 6/6] fix --- .circleci/config.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6caf4941c3..2edcdd2fa8b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -19,11 +19,7 @@ aliases: - &install-node-dependencies | - npm install - - - &clear-bad-deps - | - rm -rf node_modules/websocket/.git + rm -rf node_modules/websocket/.git && npm install defaults: &defaults working_directory: ~/MetaMask @@ -37,7 +33,6 @@ jobs: steps: - checkout - restore_cache: *restore-cache - - run: *clear-bad-deps - run: *install-node-dependencies - persist_to_workspace: root: .