Fix metamask alert

poanetwork · Oct 24, 2018 · 67d0f39 · 67d0f39
1 parent 21bd713
commit 67d0f39
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/components/stepOne/index.js b/src/components/stepOne/index.js
@@ -75,7 +75,7 @@ export class stepOne extends React.Component {
   }
 
   componentDidMount() {
-    checkWeb3(this.props.web3Store.web3);
+    checkWeb3()
 
     let downloadContracts = this.getWhiteListWithCapCrowdsaleAssets();
 

diff --git a/src/utils/blockchainHelpers.js b/src/utils/blockchainHelpers.js
@@ -12,7 +12,9 @@ export function checkWeb3 () {
   if (!web3) {
     setTimeout(function () {
       web3Store.getWeb3(web3 => {
-        if (!web3) return noMetaMaskAlert()
+        if (!web3) {
+          return noMetaMaskAlert()
+        }
         checkMetaMask()
       })
     }, 500)
@@ -24,9 +26,8 @@ export function checkWeb3 () {
 
 const checkMetaMask = () => {
   const { web3 } = web3Store
-  console.log(web3.currentProvider)
 
-  if (!web3.currentProvider) {
+  if (!web3 || !web3.currentProvider) {
     return noMetaMaskAlert()
   }
 
@@ -477,4 +478,4 @@ export function getAllCrowdsaleAddresses () {
     .catch((err) => {
       console.log("err: ", err)
     })
-}
+}