Merge branch 'develop' of https://github.com/chronologic/eth-alarm-cl…

…ock-dapp into fix/make-faucet-mtamask-component
chronologic · Mar 3, 2018 · a8932f7 · a8932f7
2 parents a71427c + 8214059
commit a8932f7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/components/TransactionScanner/TransactionRow.js b/app/components/TransactionScanner/TransactionRow.js
@@ -53,9 +53,7 @@ class TransactionsRow extends Component {
     };
   }
 
-  async componentDidMount() {
-    this._isMounted = true;
-
+  async getUpdatedState() {
     const preparedState = await this.getPreparedState();
 
     if (!this._isMounted) {
@@ -65,11 +63,18 @@ class TransactionsRow extends Component {
     this.setState(preparedState);
   }
 
+  async componentDidMount() {
+    this._isMounted = true;
+
+    await this.getUpdatedState();
+  }
+
   async componentWillUnmount() {
     this._isMounted = false;
   }
 
   render() {
+    this.getUpdatedState();
     const { showStatus, transaction } = this.props;
     const { bounty, deposit, status, time, timeWindow, value } = this.state;
 

diff --git a/app/services/web3.js b/app/services/web3.js
@@ -124,7 +124,6 @@ export default class Web3Service {
                 this.connectedToMetaMask = false;
             }
 
-            window.web3 = web3;
             this.web3 = web3;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -124,7 +124,6 @@ export default class Web3Service { @@
                     this.connectedToMetaMask = false;
                 }
-                window.web3 = web3;
                 this.web3 = web3;
             }
@@ Expand Down @@