diff options
author | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-07-21 09:50:49 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 09:50:49 +0800 |
commit | c5520de1159718466ab846add99e0fea1da1cb06 (patch) | |
tree | c44f3a009ea4bc42984f122fd937a8a7622ef73f /app/scripts/metamask-controller.js | |
parent | e094d4ad1fb84a9bc663c328d0650bd9d8bf8716 (diff) | |
parent | 9be22775c31699b49873a43820dc315067a567a9 (diff) | |
download | tangerine-wallet-browser-c5520de1159718466ab846add99e0fea1da1cb06.tar tangerine-wallet-browser-c5520de1159718466ab846add99e0fea1da1cb06.tar.gz tangerine-wallet-browser-c5520de1159718466ab846add99e0fea1da1cb06.tar.bz2 tangerine-wallet-browser-c5520de1159718466ab846add99e0fea1da1cb06.tar.lz tangerine-wallet-browser-c5520de1159718466ab846add99e0fea1da1cb06.tar.xz tangerine-wallet-browser-c5520de1159718466ab846add99e0fea1da1cb06.tar.zst tangerine-wallet-browser-c5520de1159718466ab846add99e0fea1da1cb06.zip |
Merge pull request #4844 from MetaMask/detectTokenFeature
Detect token feature
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index e629d1359..3b303a95c 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -1432,6 +1432,7 @@ module.exports = class MetamaskController extends EventEmitter { set isClientOpen (open) { this._isClientOpen = open this.isClientOpenAndUnlocked = this.getState().isUnlocked && open + this.detectTokensController.isOpen = open } /** @@ -1442,6 +1443,5 @@ module.exports = class MetamaskController extends EventEmitter { */ set isClientOpenAndUnlocked (active) { this.tokenRatesController.isActive = active - this.detectTokensController.isActive = active } } |