aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-03-29 05:39:45 +0800
committerkumavis <aaron@kumavis.me>2017-03-29 05:39:45 +0800
commit067459da4c005ef89cc1ef4103b557e81e8927d7 (patch)
tree54d21fb0e9da80de7c09fd6700abda25d679461f /ui
parent6310a05daeb6a4934de6976a6a9a38be85044aa0 (diff)
downloadtangerine-wallet-browser-067459da4c005ef89cc1ef4103b557e81e8927d7.tar
tangerine-wallet-browser-067459da4c005ef89cc1ef4103b557e81e8927d7.tar.gz
tangerine-wallet-browser-067459da4c005ef89cc1ef4103b557e81e8927d7.tar.bz2
tangerine-wallet-browser-067459da4c005ef89cc1ef4103b557e81e8927d7.tar.lz
tangerine-wallet-browser-067459da4c005ef89cc1ef4103b557e81e8927d7.tar.xz
tangerine-wallet-browser-067459da4c005ef89cc1ef4103b557e81e8927d7.tar.zst
tangerine-wallet-browser-067459da4c005ef89cc1ef4103b557e81e8927d7.zip
Filter txs by txMeta network value in account detail
Diffstat (limited to 'ui')
-rw-r--r--ui/app/accounts/index.js2
-rw-r--r--ui/lib/tx-helper.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js
index e236a4e85..ae69d9297 100644
--- a/ui/app/accounts/index.js
+++ b/ui/app/accounts/index.js
@@ -11,7 +11,7 @@ module.exports = connect(mapStateToProps)(AccountsScreen)
function mapStateToProps (state) {
const pendingTxs = valuesFor(state.metamask.unapprovedTxs)
- .filter(tx => tx.txParams.metamaskNetworkId === state.metamask.network)
+ .filter(txMeta => txMeta.metamaskNetworkId === state.metamask.network)
const pendingMsgs = valuesFor(state.metamask.unapprovedMsgs)
const pending = pendingTxs.concat(pendingMsgs)
diff --git a/ui/lib/tx-helper.js b/ui/lib/tx-helper.js
index 6c549dbe3..ec19daf64 100644
--- a/ui/lib/tx-helper.js
+++ b/ui/lib/tx-helper.js
@@ -4,7 +4,7 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network)
log.debug('tx-helper called with params:')
log.debug({ unapprovedTxs, unapprovedMsgs, personalMsgs, network })
- const txValues = network ? valuesFor(unapprovedTxs).filter(tx => tx.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
+ const txValues = network ? valuesFor(unapprovedTxs).filter(txMeta => txMeta.metamaskNetworkId === network) : valuesFor(unapprovedTxs)
log.debug(`tx helper found ${txValues.length} unapproved txs`)
const msgValues = valuesFor(unapprovedMsgs)
log.debug(`tx helper found ${msgValues.length} unsigned messages`)
@@ -13,5 +13,5 @@ module.exports = function (unapprovedTxs, unapprovedMsgs, personalMsgs, network)
log.debug(`tx helper found ${personalValues.length} unsigned personal messages`)
allValues = allValues.concat(personalValues)
- return allValues.sort(tx => tx.time)
+ return allValues.sort(txMeta => txMeta.time)
}