aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2019-05-16 23:52:53 +0800
committerGitHub <noreply@github.com>2019-05-16 23:52:53 +0800
commite880e2790f23d0608367dceba72549a0242b8e28 (patch)
treedf8f879ef74cb46a7ccea59c2ae46fa18e37b160
parenta34103987a5a3b75588eb23ab4e1a73d6669cbc2 (diff)
parent8c0bc7b3e2ecf945aa0a2de721a11e725e531a05 (diff)
downloadtangerine-wallet-browser-e880e2790f23d0608367dceba72549a0242b8e28.tar
tangerine-wallet-browser-e880e2790f23d0608367dceba72549a0242b8e28.tar.gz
tangerine-wallet-browser-e880e2790f23d0608367dceba72549a0242b8e28.tar.bz2
tangerine-wallet-browser-e880e2790f23d0608367dceba72549a0242b8e28.tar.lz
tangerine-wallet-browser-e880e2790f23d0608367dceba72549a0242b8e28.tar.xz
tangerine-wallet-browser-e880e2790f23d0608367dceba72549a0242b8e28.tar.zst
tangerine-wallet-browser-e880e2790f23d0608367dceba72549a0242b8e28.zip
Merge pull request #6619 from MetaMask/bugfix/enable-locked
bugfix: show extension window if locked regardless of approval
-rw-r--r--app/scripts/controllers/provider-approval.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/scripts/controllers/provider-approval.js b/app/scripts/controllers/provider-approval.js
index 8206b2f8a..06c499780 100644
--- a/app/scripts/controllers/provider-approval.js
+++ b/app/scripts/controllers/provider-approval.js
@@ -38,7 +38,8 @@ class ProviderApprovalController extends SafeEventEmitter {
// only handle requestAccounts
if (req.method !== 'eth_requestAccounts') return next()
// if already approved or privacy mode disabled, return early
- if (this.shouldExposeAccounts(origin)) {
+ const isUnlocked = this.keyringController.memStore.getState().isUnlocked
+ if (this.shouldExposeAccounts(origin) && isUnlocked) {
res.result = [this.preferencesController.getSelectedAddress()]
return
}