diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-04-28 09:04:33 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-04-28 09:04:33 +0800 |
commit | d017c2844165939f41613e1ae6141c8531422c44 (patch) | |
tree | e32920e8885c3ac318e6c535bad44c0de4c189f7 /ui | |
parent | 29718a82b6bae5957b6f772585419ebdc2c851cb (diff) | |
download | tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.gz tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.bz2 tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.lz tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.xz tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.tar.zst tangerine-wallet-browser-d017c2844165939f41613e1ae6141c8531422c44.zip |
Filter transaction list for current blockchain network
When starting up, we now create a `web3` inside the `background.js` process, which we pass to the `idStore` and ask for the current `network`.
We include the `network` on `app.metamask.network` in the state object.
We re-request the network when changing provider.
We filter the transaction list for transactions that match the current network.
Diffstat (limited to 'ui')
-rw-r--r-- | ui/app/account-detail.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/app/account-detail.js b/ui/app/account-detail.js index 57f932a2b..250e7318c 100644 --- a/ui/app/account-detail.js +++ b/ui/app/account-detail.js @@ -16,7 +16,7 @@ function mapStateToProps(state) { address: state.appState.currentView.context, accountDetail: state.appState.accountDetail, transactions: state.metamask.transactions, - networkVersion: state.networkVersion, + networkVersion: state.metamask.network, } } @@ -79,6 +79,7 @@ AccountDetailScreen.prototype.render = function() { transactionList(transactions .filter(tx => tx.txParams.from === state.address) + .filter(tx => tx.txParams.metamaskNetworkId === state.networkVersion) .sort((a, b) => b.time - a.time), state.networkVersion), this.exportedAccount(accountDetail), |