diff options
author | bitpshr <mail@bitpshr.net> | 2018-10-30 05:54:39 +0800 |
---|---|---|
committer | Dan Finlay <542863+danfinlay@users.noreply.github.com> | 2018-11-06 07:07:09 +0800 |
commit | cc1bab6ebbef8d8219f83039fdc3baca6de718fd (patch) | |
tree | 778e470a3a1cf50937492eb054693d3590bc3dda /app/scripts/inpage.js | |
parent | d7618bd5c6cffe02d8737fe6925a31484a1fc0b0 (diff) | |
download | tangerine-wallet-browser-cc1bab6ebbef8d8219f83039fdc3baca6de718fd.tar.gz tangerine-wallet-browser-cc1bab6ebbef8d8219f83039fdc3baca6de718fd.tar.zst tangerine-wallet-browser-cc1bab6ebbef8d8219f83039fdc3baca6de718fd.zip |
Differentiate locked and enabled
Diffstat (limited to 'app/scripts/inpage.js')
-rw-r--r-- | app/scripts/inpage.js | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/app/scripts/inpage.js b/app/scripts/inpage.js index a5e0118d4..a60d19480 100644 --- a/app/scripts/inpage.js +++ b/app/scripts/inpage.js @@ -35,11 +35,6 @@ var inpageProvider = new MetamaskInpageProvider(metamaskStream) // set a high max listener count to avoid unnecesary warnings inpageProvider.setMaxListeners(100) -// set up a listener for when MetaMask is locked -window.addEventListener('metamasksetlocked', () => { - isEnabled = false -}) - // augment the provider with its enable method inpageProvider.enable = function () { return new Promise((resolve, reject) => { @@ -50,13 +45,15 @@ inpageProvider.enable = function () { // wait for the publicConfig store to populate with an account const publicConfig = new Promise((resolve) => { const { selectedAddress } = inpageProvider.publicConfigStore.getState() - if (selectedAddress) { - resolve() - } else { - inpageProvider.publicConfigStore.on('update', ({ selectedAddress }) => { - selectedAddress && resolve() - }) - } + inpageProvider._metamask.isUnlocked().then(unlocked => { + if (!unlocked || selectedAddress) { + resolve() + } else { + inpageProvider.publicConfigStore.on('update', ({ selectedAddress }) => { + selectedAddress && resolve() + }) + } + }) }) // wait for the background to update with an accoount |