diff options
author | kumavis <aaron@kumavis.me> | 2018-10-30 08:25:05 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-10-30 08:25:05 +0800 |
commit | ccbc2332829569b6bb416ced624ee3123c54b939 (patch) | |
tree | b865d8b499a00921b4b38f2839dfc6c631aa4666 /app/scripts/background.js | |
parent | f0602ca354a6d352c13a79a1cba884f54e5b9a83 (diff) | |
parent | 1bb4a8428c73c1f1137793b25900db159eec3fa8 (diff) | |
download | tangerine-wallet-browser-ccbc2332829569b6bb416ced624ee3123c54b939.tar.gz tangerine-wallet-browser-ccbc2332829569b6bb416ced624ee3123c54b939.tar.zst tangerine-wallet-browser-ccbc2332829569b6bb416ced624ee3123c54b939.zip |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into sentry-enhancements2
Diffstat (limited to 'app/scripts/background.js')
-rw-r--r-- | app/scripts/background.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/scripts/background.js b/app/scripts/background.js index 2455608aa..2a3c5b08b 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -29,7 +29,7 @@ const setupMetamaskMeshMetrics = require('./lib/setupMetamaskMeshMetrics') const EdgeEncryptor = require('./edge-encryptor') const getFirstPreferredLangCode = require('./lib/get-first-preferred-lang-code') const getObjStructure = require('./lib/getObjStructure') -const ipfsContent = require('./lib/ipfsContent.js') +const setupEnsIpfsResolver = require('./lib/ens-ipfs/setup') const { ENVIRONMENT_TYPE_POPUP, @@ -58,7 +58,6 @@ const isIE = !!document.documentMode // Edge 20+ const isEdge = !isIE && !!window.StyleMedia -let ipfsHandle let popupIsOpen = false let notificationIsOpen = false const openMetamaskTabsIDs = {} @@ -164,7 +163,6 @@ async function initialize () { const initLangCode = await getFirstPreferredLangCode() await setupController(initState, initLangCode) log.debug('MetaMask initialization complete.') - ipfsHandle = ipfsContent(initState.NetworkController.provider) } // @@ -269,10 +267,8 @@ function setupController (initState, initLangCode) { }) global.metamaskController = controller - controller.networkController.on('networkDidChange', () => { - ipfsHandle && ipfsHandle.remove() - ipfsHandle = ipfsContent(controller.networkController.providerStore.getState()) - }) + const provider = controller.provider + setupEnsIpfsResolver({ provider }) // report failed transactions to Sentry controller.txController.on(`tx:status-update`, (txId, status) => { |