aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEsteban MIno <efmino@uc.cl>2018-07-21 08:15:33 +0800
committerEsteban MIno <efmino@uc.cl>2018-07-21 08:15:33 +0800
commit9be22775c31699b49873a43820dc315067a567a9 (patch)
treec44f3a009ea4bc42984f122fd937a8a7622ef73f
parent110efa9ec1525b5fd925de5a0d9350c40823464b (diff)
downloadtangerine-wallet-browser-9be22775c31699b49873a43820dc315067a567a9.tar
tangerine-wallet-browser-9be22775c31699b49873a43820dc315067a567a9.tar.gz
tangerine-wallet-browser-9be22775c31699b49873a43820dc315067a567a9.tar.bz2
tangerine-wallet-browser-9be22775c31699b49873a43820dc315067a567a9.tar.lz
tangerine-wallet-browser-9be22775c31699b49873a43820dc315067a567a9.tar.xz
tangerine-wallet-browser-9be22775c31699b49873a43820dc315067a567a9.tar.zst
tangerine-wallet-browser-9be22775c31699b49873a43820dc315067a567a9.zip
fix merge
-rw-r--r--app/scripts/metamask-controller.js1
1 files changed, 0 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 18448961d..3b303a95c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1443,6 +1443,5 @@ module.exports = class MetamaskController extends EventEmitter {
*/
set isClientOpenAndUnlocked (active) {
this.tokenRatesController.isActive = active
- this.detectTokensController.isActive = active
}
}