aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorEsteban MiƱo <efmino@uc.cl>2018-08-08 05:50:58 +0800
committerGitHub <noreply@github.com>2018-08-08 05:50:58 +0800
commit3f57d5f66b3bcb744f918238bf1831dbf9abec9c (patch)
tree2d1f6149928a6efaa38cc3c55afec6b5e1a7709e /app/scripts/metamask-controller.js
parent00d1f6fec5457f05fb2e6aec1300dd2dbef51ec1 (diff)
parente9f74f005de581377bc0a605e4696840dfb95ba9 (diff)
downloadtangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.tar
tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.tar.gz
tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.tar.bz2
tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.tar.lz
tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.tar.xz
tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.tar.zst
tangerine-wallet-browser-3f57d5f66b3bcb744f918238bf1831dbf9abec9c.zip
Merge branch 'develop' into WatchTokenFeature
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 801363cb0..1464b16a6 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -88,6 +88,7 @@ module.exports = class MetamaskController extends EventEmitter {
initState: initState.PreferencesController,
initLangCode: opts.initLangCode,
showAddTokenUi: opts.showAddTokenUi,
+ network: this.networkController,
})
// currency controller
@@ -1439,7 +1440,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.