diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-01-28 08:11:59 +0800 |
---|---|---|
committer | Frankie <frankie.diamond@gmail.com> | 2017-01-29 12:28:20 +0800 |
commit | 8be68575bbef1dcc89b51355abaee90dbf018387 (patch) | |
tree | c8da5e217b838bff46bcc9ddfb8300133022ca91 /ui/app/components/transaction-list.js | |
parent | a8ed780d9b3659474c59c7856ab2ee1430c17b42 (diff) | |
download | tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.tar.gz tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.tar.zst tangerine-wallet-browser-8be68575bbef1dcc89b51355abaee90dbf018387.zip |
Clean up message manger includes:
Provider egine bump
Remove presence of message manger in keyring controller
Change the status wording fom conf to approved
make Message manager a class
fix messages not being apart of the badge
re write message manger to better reflect controller pattern
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 ( |