diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-08-15 01:44:42 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-08-15 01:44:42 +0800 |
| commit | 96d789d2cffa91da9d65be0de75d2e864d309305 (patch) | |
| tree | b3cea0eb6a4638244fd99bf64509c69b0b720a7a /app/scripts/metamask-controller.js | |
| parent | 7918240833871648dea6f9787519ba20f1e51899 (diff) | |
| parent | 742aa8bb11c1273151ad907171061d4c5e4d1dca (diff) | |
| download | tangerine-wallet-browser-96d789d2cffa91da9d65be0de75d2e864d309305.tar.gz tangerine-wallet-browser-96d789d2cffa91da9d65be0de75d2e864d309305.tar.zst tangerine-wallet-browser-96d789d2cffa91da9d65be0de75d2e864d309305.zip | |
Merge branch 'develop' into network-remove-provider-engine
Override package-lock and fix merge conflicts
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 12daf1603..81bb080ab 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -86,6 +86,7 @@ module.exports = class MetamaskController extends EventEmitter { this.preferencesController = new PreferencesController({ initState: initState.PreferencesController, initLangCode: opts.initLangCode, + network: this.networkController, }) // currency controller @@ -1405,7 +1406,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. |