1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00

Update isEnabled check

This commit is contained in:
bitpshr 2018-10-17 17:45:21 -04:00 committed by Dan Finlay
parent c6e9caed22
commit 3a2ade4e84

View File

@ -29,6 +29,7 @@ var metamaskStream = new LocalMessageDuplexStream({
var inpageProvider = new MetamaskInpageProvider(metamaskStream) var inpageProvider = new MetamaskInpageProvider(metamaskStream)
// set a high max listener count to avoid unnecesary warnings // set a high max listener count to avoid unnecesary warnings
inpageProvider.setMaxListeners(100) inpageProvider.setMaxListeners(100)
var originApproved = false
// Augment the provider with its enable method // Augment the provider with its enable method
inpageProvider.enable = function () { inpageProvider.enable = function () {
@ -37,6 +38,7 @@ inpageProvider.enable = function () {
if (typeof detail.error !== 'undefined') { if (typeof detail.error !== 'undefined') {
reject(detail.error) reject(detail.error)
} else { } else {
originApproved = true
inpageProvider.sendAsync({ method: 'eth_accounts', params: [] }, (error, response) => { inpageProvider.sendAsync({ method: 'eth_accounts', params: [] }, (error, response) => {
if (error) { if (error) {
reject(error) reject(error)
@ -56,7 +58,7 @@ inpageProvider.isEnabled = function () {
if (typeof detail.error !== 'undefined') { if (typeof detail.error !== 'undefined') {
reject(detail.error) reject(detail.error)
} else { } else {
resolve(!!detail.isEnabled) resolve(originApproved && !!detail.isEnabled)
} }
}) })
window.postMessage({ type: 'ETHEREUM_QUERY_STATUS' }, '*') window.postMessage({ type: 'ETHEREUM_QUERY_STATUS' }, '*')