diff options
| author | kumavis <aaron@kumavis.me> | 2017-03-29 05:39:45 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-03-29 05:39:45 +0800 |
| commit | 067459da4c005ef89cc1ef4103b557e81e8927d7 (patch) | |
| tree | 54d21fb0e9da80de7c09fd6700abda25d679461f | |
| parent | 6310a05daeb6a4934de6976a6a9a38be85044aa0 (diff) | |
| download | dexon-wallet-067459da4c005ef89cc1ef4103b557e81e8927d7.tar.gz dexon-wallet-067459da4c005ef89cc1ef4103b557e81e8927d7.tar.zst dexon-wallet-067459da4c005ef89cc1ef4103b557e81e8927d7.zip | |
Filter txs by txMeta network value in account detail
| -rw-r--r-- | ui/app/accounts/index.js | 2 | ||||
| -rw-r--r-- | ui/lib/tx-helper.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/accounts/index.js b/ui/app/accounts/index.js index e236a4e8..ae69d929 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 6c549dbe..ec19daf6 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) } |