diff options
author | Frankie <frankie.diamond@gmail.com> | 2017-01-11 03:52:25 +0800 |
---|---|---|
committer | Frankie <frankie.diamond@gmail.com> | 2017-01-12 04:16:37 +0800 |
commit | 0fae263a9acb1f4023070b37ee1b91815e34de86 (patch) | |
tree | 06ce3969f56a2b6d2c5d4316dc6367b79540cb44 /ui/app/components/transaction-list.js | |
parent | af312bdc90139f99a9a08f9d0f67d63e005e2a20 (diff) | |
download | tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.tar.gz tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.tar.zst tangerine-wallet-browser-0fae263a9acb1f4023070b37ee1b91815e34de86.zip |
Take some of the tx Logic out of the UI and create a visble state for pending and unaproved transactions
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..105b34c90 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) : txsToRender.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': |