aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-08-08 04:30:26 +0800
committerGitHub <noreply@github.com>2018-08-08 04:30:26 +0800
commite9f74f005de581377bc0a605e4696840dfb95ba9 (patch)
treefc3c7dffa506f25231983a0a1f41a65354798915 /app/scripts/metamask-controller.js
parentd549c4b871b3e3ccbaaffd0616f2550e138d4ecf (diff)
parent66c76c04ef5d0bfbe3881ea1dadf7c43c93a262e (diff)
downloadtangerine-wallet-browser-e9f74f005de581377bc0a605e4696840dfb95ba9.tar
tangerine-wallet-browser-e9f74f005de581377bc0a605e4696840dfb95ba9.tar.gz
tangerine-wallet-browser-e9f74f005de581377bc0a605e4696840dfb95ba9.tar.bz2
tangerine-wallet-browser-e9f74f005de581377bc0a605e4696840dfb95ba9.tar.lz
tangerine-wallet-browser-e9f74f005de581377bc0a605e4696840dfb95ba9.tar.xz
tangerine-wallet-browser-e9f74f005de581377bc0a605e4696840dfb95ba9.tar.zst
tangerine-wallet-browser-e9f74f005de581377bc0a605e4696840dfb95ba9.zip
Merge pull request #4884 from MetaMask/TokensPerAccountBasis
Tokens per account & network basis
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bcc7075c2..db323e3fe 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -87,6 +87,7 @@ module.exports = class MetamaskController extends EventEmitter {
this.preferencesController = new PreferencesController({
initState: initState.PreferencesController,
initLangCode: opts.initLangCode,
+ network: this.networkController,
})
// currency controller
@@ -1436,7 +1437,7 @@ module.exports = class MetamaskController extends EventEmitter {
}
/**
- * A method for activating the retrieval of price data and auto detect tokens,
+ * A method for activating the retrieval of price data,
* which should only be fetched when the UI is visible.
* @private
* @param {boolean} active - True if price data should be getting fetched.