diff options
| author | Whymarrh Whitby <whymarrh.whitby@gmail.com> | 2019-08-21 02:52:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-21 02:52:00 +0800 |
| commit | e47448362de84e07905aac0f5bd418b92bbd7288 (patch) | |
| tree | bb66b6feac5218d8c01cde1936cb721246e8e6b4 /ui/app/selectors | |
| parent | 821529622e4baf095dc34c309b878d09f945da9b (diff) | |
| download | tangerine-wallet-browser-e47448362de84e07905aac0f5bd418b92bbd7288.tar.gz tangerine-wallet-browser-e47448362de84e07905aac0f5bd418b92bbd7288.tar.zst tangerine-wallet-browser-e47448362de84e07905aac0f5bd418b92bbd7288.zip | |
Bug fixes for incoming transactions (#7043)
* Fix styling of `.transaction-list`
* Filter `incomingTxListSelector` by network as well
* Start and stop block tracker polling in incoming tx controller
* Add fetch with abort in bg for `IncomingTxController`
Diffstat (limited to 'ui/app/selectors')
| -rw-r--r-- | ui/app/selectors/transactions.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/app/selectors/transactions.js b/ui/app/selectors/transactions.js index 5450978a6..d52170c34 100644 --- a/ui/app/selectors/transactions.js +++ b/ui/app/selectors/transactions.js @@ -16,9 +16,12 @@ import txHelper from '../../lib/tx-helper' export const shapeShiftTxListSelector = state => state.metamask.shapeShiftTxList export const incomingTxListSelector = state => { + const network = state.metamask.network const selectedAddress = state.metamask.selectedAddress return Object.values(state.metamask.incomingTransactions) - .filter(({ txParams }) => txParams.to === selectedAddress) + .filter(({ metamaskNetworkId, txParams }) => ( + txParams.to === selectedAddress && metamaskNetworkId === network + )) } export const unapprovedMsgsSelector = state => state.metamask.unapprovedMsgs export const selectedAddressTxListSelector = state => state.metamask.selectedAddressTxList |