aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorbitpshr <mail@bitpshr.net>2018-10-02 08:52:31 +0800
committerDan Finlay <542863+danfinlay@users.noreply.github.com>2018-11-06 07:07:09 +0800
commit89b4aa5d62237f36fac9dcce9c546005ec18968b (patch)
tree38bb13f74680cff733c330b2009eddbf4770a098 /app/scripts/metamask-controller.js
parentc76c9ca2c86317f902f443db2c5704d4bf6311c0 (diff)
downloadtangerine-wallet-browser-89b4aa5d62237f36fac9dcce9c546005ec18968b.tar
tangerine-wallet-browser-89b4aa5d62237f36fac9dcce9c546005ec18968b.tar.gz
tangerine-wallet-browser-89b4aa5d62237f36fac9dcce9c546005ec18968b.tar.bz2
tangerine-wallet-browser-89b4aa5d62237f36fac9dcce9c546005ec18968b.tar.lz
tangerine-wallet-browser-89b4aa5d62237f36fac9dcce9c546005ec18968b.tar.xz
tangerine-wallet-browser-89b4aa5d62237f36fac9dcce9c546005ec18968b.tar.zst
tangerine-wallet-browser-89b4aa5d62237f36fac9dcce9c546005ec18968b.zip
EIP-1102: Add option to force-enable provider
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index cffc5797b..d8f8a4602 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -275,7 +275,8 @@ module.exports = class MetamaskController extends EventEmitter {
getAccounts: async ({ origin }) => {
// Expose no accounts if this origin has not been approved, preventing
// account-requring RPC methods from completing successfully
- if (origin !== 'MetaMask' && !this.providerApprovalController.isApproved(origin)) { return [] }
+ const isApproved = await this.providerApprovalController.isApproved(origin)
+ if (origin !== 'MetaMask' && !isApproved) { return [] }
const isUnlocked = this.keyringController.memStore.getState().isUnlocked
const selectedAddress = this.preferencesController.getSelectedAddress()
// only show address if account is unlocked
@@ -454,6 +455,7 @@ module.exports = class MetamaskController extends EventEmitter {
approveProviderRequest: providerApprovalController.approveProviderRequest.bind(providerApprovalController),
clearApprovedOrigins: providerApprovalController.clearApprovedOrigins.bind(providerApprovalController),
rejectProviderRequest: providerApprovalController.rejectProviderRequest.bind(providerApprovalController),
+ forceInjection: providerApprovalController.forceInjection.bind(providerApprovalController),
}
}