diff options
author | Kevin Serrano <kevgagser@gmail.com> | 2016-08-24 05:51:09 +0800 |
---|---|---|
committer | Kevin Serrano <kevgagser@gmail.com> | 2016-08-24 05:51:09 +0800 |
commit | 4bceda37a8dfa414d4e5ff2b315b9968120d0d37 (patch) | |
tree | 4ed708d8f1db35b5373389b7c005ff2b9bfc4807 /ui/app/components/transaction-list.js | |
parent | 00e8db31cebaf7af42660e828cc912b2b6af5b5d (diff) | |
parent | 9dad3a5917308cb6d9ee56aa183298b8eaad1c5f (diff) | |
download | tangerine-wallet-browser-4bceda37a8dfa414d4e5ff2b315b9968120d0d37.tar tangerine-wallet-browser-4bceda37a8dfa414d4e5ff2b315b9968120d0d37.tar.gz tangerine-wallet-browser-4bceda37a8dfa414d4e5ff2b315b9968120d0d37.tar.bz2 tangerine-wallet-browser-4bceda37a8dfa414d4e5ff2b315b9968120d0d37.tar.lz tangerine-wallet-browser-4bceda37a8dfa414d4e5ff2b315b9968120d0d37.tar.xz tangerine-wallet-browser-4bceda37a8dfa414d4e5ff2b315b9968120d0d37.tar.zst tangerine-wallet-browser-4bceda37a8dfa414d4e5ff2b315b9968120d0d37.zip |
Merge branch 'master' into fox-sub
Diffstat (limited to 'ui/app/components/transaction-list.js')
-rw-r--r-- | ui/app/components/transaction-list.js | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/ui/app/components/transaction-list.js b/ui/app/components/transaction-list.js index 9bf0f6d81..7e1bedb05 100644 --- a/ui/app/components/transaction-list.js +++ b/ui/app/components/transaction-list.js @@ -15,7 +15,7 @@ function TransactionList () { TransactionList.prototype.render = function () { const { txsToRender, network, unconfMsgs } = this.props var shapeShiftTxList - if (network === '1'){ + if (network === '1') { shapeShiftTxList = this.props.shapeShiftTxList } const transactions = !shapeShiftTxList ? txsToRender.concat(unconfMsgs) : txsToRender.concat(unconfMsgs, shapeShiftTxList) @@ -43,33 +43,46 @@ TransactionList.prototype.render = function () { paddingBottom: '4px', }, }, [ - 'Transactions', + 'History', ]), h('.tx-list', { style: { overflowY: 'auto', - height: '305px', + height: '300px', padding: '0 20px', textAlign: 'center', }, - }, ( + }, [ transactions.length ? transactions.map((transaction, i) => { + let key + switch (transaction.key) { + case 'shapeshift': + const { depositAddress, time } = transaction + key = `shift-tx-${depositAddress}-${time}-${i}` + break + default: + key = `tx-${transaction.id}-${i}` + } return h(TransactionListItem, { - transaction, i, network, + transaction, i, network, key, showTx: (txId) => { this.props.viewPendingTx(txId) }, }) }) - : [h('.flex-center', { + : h('.flex-center', { style: { + flexDirection: 'column', height: '100%', }, - }, 'No transaction history...')] - )), + }, [ + 'No transaction history.', + ]), + ]), ]) ) } + |