Allow ENS available TLDs that are not ENS names (#1017)

* fix * clear circleci cache
MetaMask · Aug 21, 2019 · bad5b0c · bad5b0c
1 parent 1489d38
commit bad5b0c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git 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
 

diff --git 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 };
 		}
 	}