diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-02-08 10:55:26 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-08 10:55:26 +0800 |
| commit | c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9 (patch) | |
| tree | 139d5dfad53652b50e0af07c3aec37394b3b654b /ui/app/components/transaction-list.js | |
| parent | ffe588365cb2dd84906613d13ad8e35b08a08dbb (diff) | |
| parent | ce57957aa0fdeb79efd6ede8b6e94b8f26131dcf (diff) | |
| download | tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.tar.gz tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.tar.zst tangerine-wallet-browser-c9aab2084ec7dd8b81b02c9053a8fcbb6038e0b9.zip | |
Merge pull request #1094 from MetaMask/dev
Version 3.2.0
Diffstat (limited to 'ui/app/components/transaction-list.js')
| -rw-r--r-- | ui/app/components/transaction-list.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index b055ca9d5..3ae953637 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -13,13 +13,13 @@ function TransactionList () { } TransactionList.prototype.render = function () { - const { transactions, network, unconfMsgs } = this.props + const { transactions, network, unapprovedMsgs } = this.props var shapeShiftTxList if (network === '1') { shapeShiftTxList = this.props.shapeShiftTxList } - const txsToRender = !shapeShiftTxList ? transactions.concat(unconfMsgs) : transactions.concat(unconfMsgs, shapeShiftTxList) + const txsToRender = !shapeShiftTxList ? transactions.concat(unapprovedMsgs) : transactions.concat(unapprovedMsgs, shapeShiftTxList) .sort((a, b) => b.time - a.time) return ( |