diff options
author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-08-10 06:39:48 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-10 06:39:48 +0800 |
commit | ef7e638dda63a715c796c210dadbe82430537b6a (patch) | |
tree | 23b5b62ac378f5cc302a0d9019fba8a7c622cf04 /app/scripts/metamask-controller.js | |
parent | 0601df9dae488d997277bb6b52c28df27546e27c (diff) | |
parent | 06633da1b395829b475ccafb429af040256d863c (diff) | |
download | tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.gz tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.bz2 tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.lz tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.xz tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.tar.zst tangerine-wallet-browser-ef7e638dda63a715c796c210dadbe82430537b6a.zip |
Merge pull request #5025 from MetaMask/v4.9.2v4.9.2.1
v4.9.2
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 3 |
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. |