aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/transaction-list.js
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/components/transaction-list.js')
-rw-r--r--ui/app/components/transaction-list.js8
1 files changed, 6 insertions, 2 deletions
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js
index 86abd9709..ed2e1ee0a 100644
--- a/ui/app/components/transaction-list.js
+++ b/ui/app/components/transaction-list.js
@@ -14,7 +14,8 @@ function TransactionList() {
TransactionList.prototype.render = function() {
const { txsToRender, network, unconfTxs, unconfMsgs } = this.props
- const transactions = txsToRender
+ const transactions = txsToRender.concat(unconfMsgs)
+ .sort((a, b) => b.time - a.time)
return (
@@ -51,7 +52,10 @@ TransactionList.prototype.render = function() {
transactions.length ?
transactions.map((transaction, i) => {
return h(TransactionListItem, {
- transaction, i
+ transaction, i, network,
+ showTx:(txId) => {
+ this.props.viewPendingTx(txId)
+ },
})
})
: