diff options
| author | Akihiro <an0326ja@gmail.com> | 2018-07-21 10:29:48 +0800 |
|---|---|---|
| committer | Akihiro <an0326ja@gmail.com> | 2018-07-21 10:29:48 +0800 |
| commit | 3e6d13d309b27644f6e3050d0c7e62dfacda6072 (patch) | |
| tree | cee2d031f710ae1f9d1c78c28d8b65d7ddc36fb2 /app/scripts/metamask-controller.js | |
| parent | 8c77e998e0491dfb48c91d2938644c9f855a2532 (diff) | |
| parent | c5520de1159718466ab846add99e0fea1da1cb06 (diff) | |
| download | tangerine-wallet-browser-3e6d13d309b27644f6e3050d0c7e62dfacda6072.tar.gz tangerine-wallet-browser-3e6d13d309b27644f6e3050d0c7e62dfacda6072.tar.zst tangerine-wallet-browser-3e6d13d309b27644f6e3050d0c7e62dfacda6072.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
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 } } |