Merge pull request gitcoinco#4143 from gitcoinco/kevin/metamask-fixes-2

handle non-metamask web3 browsers
thelostone-mc · Apr 9, 2019 · 808072f · 808072f
2 parents 156dfd3 + 376df09
commit 808072f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/assets/v2/js/metamask-approval.js b/app/assets/v2/js/metamask-approval.js
@@ -3,7 +3,7 @@ var is_metamask_approved = is_metamask_approved || false;
 var is_metamask_unlocked = is_metamask_unlocked || false;
 
 async function metamaskApproval() {
-  if (window.ethereum) {
+  if (window.ethereum && window.ethereum._metamask) {
     window.web3 = new Web3(ethereum);
     is_metamask_approved = await window.ethereum._metamask.isApproved();
     is_metamask_unlocked = await window.ethereum._metamask.isUnlocked();

diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js
@@ -991,7 +991,7 @@ var listen_for_web3_changes = async function() {
     }
   }
 
-  if (window.ethereum && !document.has_checked_for_ethereum_enable) {
+  if (window.ethereum && !document.has_checked_for_ethereum_enable && window.ethereum._metamask) {
     document.has_checked_for_ethereum_enable = true;
     is_metamask_approved = await window.ethereum._metamask.isApproved();
     is_metamask_unlocked = await window.ethereum._metamask.isUnlocked();