From 5df07752fc790b173d54f5c49338c4ab9ba2208a Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Wed, 21 Aug 2019 16:50:18 -0400 Subject: [PATCH 1/2] fix --- app/components/Views/BrowserTab/index.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/app/components/Views/BrowserTab/index.js b/app/components/Views/BrowserTab/index.js index 2115f7cc5c6..d627b141e1c 100644 --- a/app/components/Views/BrowserTab/index.js +++ b/app/components/Views/BrowserTab/index.js @@ -389,6 +389,7 @@ export class BrowserTab extends PureComponent { webview = React.createRef(); inputRef = React.createRef(); + ensIgnoreList = []; snapshotTimer = null; lastUrlBeforeHome = null; goingBack = false; @@ -816,7 +817,10 @@ export class BrowserTab extends PureComponent { const { hostname } = urlObj; const tld = hostname.split('.').pop(); if (AppConstants.supportedTLDs.indexOf(tld.toLowerCase()) !== -1) { - return true; + // Make sure it's not in the ignore list + if (this.ensIgnoreList.indexOf(hostname) === -1) { + return true; + } } return false; } @@ -921,9 +925,16 @@ export class BrowserTab extends PureComponent { type }; } catch (err) { + // This is a TLD that might be a normal website + // For example .XYZ and might be more in the future + if (hostname.substr(-4) !== '.eth' && err.toString().indexOf('is not standard') !== -1) { + this.ensIgnoreList.push(hostname); + this.go(fullUrl); + return { url: null }; + } Logger.error('Failed to resolve ENS name', err); Alert.alert(strings('browser.error'), strings('browser.failed_to_resolve_ens_name')); - return null; + return { url: null }; } } From 7ab7dc888c87b2f866ca6f0e84dd897af846380b Mon Sep 17 00:00:00 2001 From: Bruno Barbieri Date: Wed, 21 Aug 2019 17:10:05 -0400 Subject: [PATCH 2/2] clear circleci cache --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e114505097a..d66224fd76f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,19 +1,19 @@ aliases: - &restore-cache keys: - - v1.0.3-{{ .Branch }}-{{ checksum "package.json" }} - - v1.0.3-{{ .Branch }} + - v1.0.4-{{ .Branch }}-{{ checksum "package.json" }} + - v1.0.4-{{ .Branch }} - &save-cache - key: v1.0.3-{{ .Branch }}-{{ checksum "package.json" }} + key: v1.0.4-{{ .Branch }}-{{ checksum "package.json" }} paths: - node_modules - &restore-node-cache keys: - - v1.0.3-node-{{ .Branch }}-{{ checksum "package.json" }} - - v1.0.3-node-{{ .Branch }} + - v1.0.4-node-{{ .Branch }}-{{ checksum "package.json" }} + - v1.0.4-node-{{ .Branch }} - &save-node-cache - key: v1.0.3-node-{{ .Branch }}-{{ checksum "package.json" }} + key: v1.0.4-node-{{ .Branch }}-{{ checksum "package.json" }} paths: - node_modules