Add support for .test Ropsten ENS domains

3 files changed, 9 insertions, 3 deletions

diff --git a/app/manifest.json b/app/manifest.json
index a226adfb0..b67cef025 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -62,7 +62,8 @@
     "https://*.infura.io/",
     "activeTab",
     "webRequest",
-    "*://*.eth/"
+    "*://*.eth/",
+    "*://*.test/"
   ],
   "web_accessible_resources": [
     "inpage.js"
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 1479d9f72..3d3afdd4e 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -53,6 +53,7 @@ const isIE = !!document.documentMode
 // Edge 20+
 const isEdge = !isIE && !!window.StyleMedia
 
+let ipfsHandle
 let popupIsOpen = false
 let notificationIsOpen = false
 const openMetamaskTabsIDs = {}
@@ -158,7 +159,7 @@ async function initialize () {
   const initLangCode = await getFirstPreferredLangCode()
   await setupController(initState, initLangCode)
   log.debug('MetaMask initialization complete.')
-  ipfsContent(initState.NetworkController.provider)
+  ipfsHandle = ipfsContent(initState.NetworkController.provider)
 }
 
 //
@@ -262,6 +263,10 @@ function setupController (initState, initLangCode) {
   })
   global.metamaskController = controller
 
+  controller.networkController.on('networkDidChange', () => {
+    ipfsHandle && ipfsHandle.remove()
+    ipfsHandle = ipfsContent(controller.networkController.providerStore.getState())
+  })
 
   // report failed transactions to Sentry
   controller.txController.on(`tx:status-update`, (txId, status) => {
diff --git a/app/scripts/lib/resolver.js b/app/scripts/lib/resolver.js
index 6786929d8..cbda0c028 100644
--- a/app/scripts/lib/resolver.js
+++ b/app/scripts/lib/resolver.js
@@ -61,7 +61,7 @@ function getRegistrar (type) {
 module.exports.resolve = function (name, provider) {
   const path = name.split('.')
   const tld = path[path.length - 1]
-  if (tld === 'eth') {
+  if (tld === 'eth' || tld === 'test') {
     return ens(name, provider)
   } else {
     return new Promise((resolve, reject) => {