aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/selectors.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/selectors.js')
-rw-r--r--ui/app/selectors.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/ui/app/selectors.js b/ui/app/selectors.js
index 400f5cd45..d8764b488 100644
--- a/ui/app/selectors.js
+++ b/ui/app/selectors.js
@@ -45,11 +45,16 @@ function conversionRateSelector (state) {
}
function transactionsSelector (state) {
- const { network } = state.metamask
+ const { network, selectedTokenAddress } = state.metamask
const unapprovedMsgs = valuesFor(state.metamask.unapprovedMsgs)
const shapeShiftTxList = (network === '1') ? state.metamask.shapeShiftTxList : undefined
const transactions = state.metamask.selectedAddressTxList || []
const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList)
- return txsToRender.sort((a, b) => b.time - a.time)
+ return selectedTokenAddress
+ ? txsToRender
+ .filter(({ to }) => to === selectedTokenAddress)
+ .sort((a, b) => b.time - a.time)
+ : txsToRender
+ .sort((a, b) => b.time - a.time)
}