diff options
author | kumavis <kumavis@users.noreply.github.com> | 2017-01-17 07:02:24 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-17 07:02:24 +0800 |
commit | ee62a6a3913967a6840d28ca812b94bbfa7a5779 (patch) | |
tree | cac32de6cc520917db9621ce93f7f4ad9abd787e /ui/app/components/transaction-list.js | |
parent | e8e06542e47b41668f196b6db54290490003845b (diff) | |
parent | 88fabdd2de78d0dd4be86b02c94a64d9748667fa (diff) | |
download | tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.gz tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.tar.zst tangerine-wallet-browser-ee62a6a3913967a6840d28ca812b94bbfa7a5779.zip |
Merge pull request #1005 from MetaMask/dev
Merge dev into master!
Diffstat (limited to 'ui/app/components/transaction-list.js')
-rw-r--r-- | ui/app/components/transaction-list.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index 7e1bedb05..b055ca9d5 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -13,12 +13,13 @@ function TransactionList () { } TransactionList.prototype.render = function () { - const { txsToRender, network, unconfMsgs } = this.props + const { transactions, network, unconfMsgs } = this.props + var shapeShiftTxList if (network === '1') { shapeShiftTxList = this.props.shapeShiftTxList } - const transactions = !shapeShiftTxList ? txsToRender.concat(unconfMsgs) : txsToRender.concat(unconfMsgs, shapeShiftTxList) + const txsToRender = !shapeShiftTxList ? transactions.concat(unconfMsgs) : transactions.concat(unconfMsgs, shapeShiftTxList) .sort((a, b) => b.time - a.time) return ( @@ -55,8 +56,8 @@ TransactionList.prototype.render = function () { }, }, [ - transactions.length - ? transactions.map((transaction, i) => { + txsToRender.length + ? txsToRender.map((transaction, i) => { let key switch (transaction.key) { case 'shapeshift': |