fix race condition

README.md

@@ -1,6 +1,6 @@
 # status.im Simple Multisig
 
-v0.0.2 features:
+v0.0.2 features: 
 - bootstrap ui
 - Identify if account is owner
 - submit transaction
@@ -9,10 +9,10 @@ v0.0.2 features:
 - list owners
 - remove owner
 - add owner
-- routes (#wallet/0xYourMultiSigWallet)
+- routes (/#wallet/0xYourMultiSigWallet)
 
 ## Release
-[ipfs://QmTkeUd6ovXkhLGw4eL4Gje75shJ2Micwi5dDCgALqNTc9](ipfs://QmTkeUd6ovXkhLGw4eL4Gje75shJ2Micwi5dDCgALqNTc9) [@infura](https://ipfs.infura.io/ipfs/QmTkeUd6ovXkhLGw4eL4Gje75shJ2Micwi5dDCgALqNTc9/) [@ipfs.io](https://gateway.ipfs.io/ipfs/QmTkeUd6ovXkhLGw4eL4Gje75shJ2Micwi5dDCgALqNTc9/) [@cloudflare](https://cloudflare-ipfs.com/ipfs/QmTkeUd6ovXkhLGw4eL4Gje75shJ2Micwi5dDCgALqNTc9/)
+[ipfs://QmcCiUCELq2PuUunfVGKin1wLaukX1ZNVN7si9rvr8SXA4](ipfs://QmcCiUCELq2PuUunfVGKin1wLaukX1ZNVN7si9rvr8SXA4) [@infura](https://ipfs.infura.io/ipfs/QmcCiUCELq2PuUunfVGKin1wLaukX1ZNVN7si9rvr8SXA4/) [@ipfs.io](https://gateway.ipfs.io/ipfs/QmcCiUCELq2PuUunfVGKin1wLaukX1ZNVN7si9rvr8SXA4/) [@cloudflare](https://cloudflare-ipfs.com/ipfs/QmcCiUCELq2PuUunfVGKin1wLaukX1ZNVN7si9rvr8SXA4/)
 
 
 ## Build

app/components/multisigloader.js

@@ -18,13 +18,14 @@ class MultiSigLoader extends React.Component {
       contractSetError: null,
       contractAddress: props.address
     };
-    if (props.address) {
-      this.checkContractAddress(props.address)
-    }
+    
 
   }
 
   componentDidMount() {
+    if (this.props.address) {
+      this.checkContractAddress(this.props.address)
+    }
   }
 
   handleChange(instance, account = null, isOwner = false) {

app/dapp.js

@@ -41,6 +41,11 @@ class App extends React.Component {
   }
 
   render() {
+    if (!this.state.blockchainEnabled) {
+      return (
+        <div>Waiting for blockchain.</div>
+      )
+    }
     if (this.state.error) {
       return (<div>
         <div>Something went wrong connecting to ethereum. Please make sure you have a node running or are using metamask to connect to the ethereum network:</div>
@@ -54,7 +59,7 @@ class App extends React.Component {
             <MultiSigLoader onReady={this.onMultiSigReady}/>
           )} />
           <Route path="/wallet/:address" render={({match}) => (
-           <MultiSigLoader address={match.params.address} onReady={this.onMultiSigReady}/>
+            <MultiSigLoader address={match.params.address} onReady={this.onMultiSigReady}/>
           )} />
       </HashRouter>
       );