From 3a2ade4e8490fa754b66e8f342a8308879e2f9ed Mon Sep 17 00:00:00 2001
From: bitpshr <mail@bitpshr.net>
Date: Wed, 17 Oct 2018 17:45:21 -0400
Subject: Update isEnabled check

---
 app/scripts/inpage.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'app')

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