migrate gitcoin from web3js 0.2 to 1.0

gitcoinco · Oct 16, 2018 · 15aa3e6 · 15aa3e6
1 parent 13bc312
commit 15aa3e6
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/assets/v2/js/shared.js b/app/assets/v2/js/shared.js
@@ -824,7 +824,7 @@ var listen_for_web3_changes = function() {
     document.listen_for_web3_iterations += 1;
   }
 
-  if (typeof web3 == 'undefined') {
+  /* if (typeof web3 == 'undefined') {
     currentNetwork();
     trigger_form_hooks();
   } else if (typeof web3 == 'undefined' || typeof web3.eth == 'undefined' || typeof web3.eth.coinbase == 'undefined' || !web3.eth.coinbase) {
@@ -847,7 +847,15 @@ var listen_for_web3_changes = function() {
         trigger_form_hooks();
       }
     });
-  }
+  } */
+  web3.eth.net.getNetworkType().then(function(cb, err) {
+    if (err) {
+      currentNetwork();
+    } else {
+      currentNetwork(cb);
+      trigger_form_hooks();
+    }
+  });
 };
 
 var actions_page_warn_if_not_on_same_network = function() {