aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorbitpshr <mail@bitpshr.net>2018-10-30 05:28:59 +0800
committerDan Finlay <542863+danfinlay@users.noreply.github.com>2018-11-06 07:07:09 +0800
commitd7618bd5c6cffe02d8737fe6925a31484a1fc0b0 (patch)
treecc99f09a1a3b56f59ddb78a079542248293076db /app/scripts/metamask-controller.js
parentba40fcbcb43c5adcb3a961afd4050cdb2025b7a6 (diff)
downloadtangerine-wallet-browser-d7618bd5c6cffe02d8737fe6925a31484a1fc0b0.tar
tangerine-wallet-browser-d7618bd5c6cffe02d8737fe6925a31484a1fc0b0.tar.gz
tangerine-wallet-browser-d7618bd5c6cffe02d8737fe6925a31484a1fc0b0.tar.bz2
tangerine-wallet-browser-d7618bd5c6cffe02d8737fe6925a31484a1fc0b0.tar.lz
tangerine-wallet-browser-d7618bd5c6cffe02d8737fe6925a31484a1fc0b0.tar.xz
tangerine-wallet-browser-d7618bd5c6cffe02d8737fe6925a31484a1fc0b0.tar.zst
tangerine-wallet-browser-d7618bd5c6cffe02d8737fe6925a31484a1fc0b0.zip
Code bath
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index bf1df7ff5..33278db85 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -222,11 +222,11 @@ module.exports = class MetamaskController extends EventEmitter {
this.providerApprovalController = new ProviderApprovalController({
closePopup: opts.closePopup,
+ keyringController: this.keyringController,
openPopup: opts.openPopup,
platform: opts.platform,
preferencesController: this.preferencesController,
publicConfigStore: this.publicConfigStore,
- keyringController: this.keyringController,
})
this.store.updateStructure({
@@ -1577,6 +1577,9 @@ module.exports = class MetamaskController extends EventEmitter {
return this.blacklistController.whitelistDomain(hostname)
}
+ /**
+ * Locks MetaMask
+ */
setLocked() {
this.providerApprovalController.setLocked()
return this.keyringController.setLocked()