aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorbitpshr <mail@bitpshr.net>2018-10-30 04:55:13 +0800
committerDan Finlay <542863+danfinlay@users.noreply.github.com>2018-11-06 07:07:09 +0800
commitba40fcbcb43c5adcb3a961afd4050cdb2025b7a6 (patch)
tree0e3d1fa0c609153cb0ca66dd89e9c9c3377672a4 /app/scripts/metamask-controller.js
parentf02e18dd80672a0b7440256cb7946feabf907ee1 (diff)
downloadtangerine-wallet-browser-ba40fcbcb43c5adcb3a961afd4050cdb2025b7a6.tar
tangerine-wallet-browser-ba40fcbcb43c5adcb3a961afd4050cdb2025b7a6.tar.gz
tangerine-wallet-browser-ba40fcbcb43c5adcb3a961afd4050cdb2025b7a6.tar.bz2
tangerine-wallet-browser-ba40fcbcb43c5adcb3a961afd4050cdb2025b7a6.tar.lz
tangerine-wallet-browser-ba40fcbcb43c5adcb3a961afd4050cdb2025b7a6.tar.xz
tangerine-wallet-browser-ba40fcbcb43c5adcb3a961afd4050cdb2025b7a6.tar.zst
tangerine-wallet-browser-ba40fcbcb43c5adcb3a961afd4050cdb2025b7a6.zip
Handle logout gracefully
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 8930a3f2d..bf1df7ff5 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -422,7 +422,7 @@ module.exports = class MetamaskController extends EventEmitter {
setAddressBook: nodeify(addressBookController.setAddressBook, addressBookController),
// KeyringController
- setLocked: nodeify(keyringController.setLocked, keyringController),
+ setLocked: nodeify(this.setLocked, this),
createNewVaultAndKeychain: nodeify(this.createNewVaultAndKeychain, this),
createNewVaultAndRestore: nodeify(this.createNewVaultAndRestore, this),
addNewKeyring: nodeify(keyringController.addNewKeyring, keyringController),
@@ -1576,4 +1576,9 @@ module.exports = class MetamaskController extends EventEmitter {
whitelistPhishingDomain (hostname) {
return this.blacklistController.whitelistDomain(hostname)
}
+
+ setLocked() {
+ this.providerApprovalController.setLocked()
+ return this.keyringController.setLocked()
+ }
}