diff options
| author | Dan <danjm.com@gmail.com> | 2018-03-07 08:15:45 +0800 |
|---|---|---|
| committer | Dan <danjm.com@gmail.com> | 2018-03-07 08:15:45 +0800 |
| commit | 9d215bab0fe124f036d2ac41f375331c8d43b72b (patch) | |
| tree | 6bbbdb2e6a2dcd5948ee8473cad152232c73643b /ui/app/components/tx-list.js | |
| parent | f06bca1151b07d908cd90f6efd97064e288e5f27 (diff) | |
| parent | 9762a730413129361062804aa8dfc7be7cf74868 (diff) | |
| download | tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.tar.gz tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.tar.zst tangerine-wallet-browser-9d215bab0fe124f036d2ac41f375331c8d43b72b.zip | |
Merge branch 'master' into i18n
Diffstat (limited to 'ui/app/components/tx-list.js')
| -rw-r--r-- | ui/app/components/tx-list.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ui/app/components/tx-list.js b/ui/app/components/tx-list.js index 8343ec46b..34dc837ae 100644 --- a/ui/app/components/tx-list.js +++ b/ui/app/components/tx-list.js @@ -51,6 +51,7 @@ TxList.prototype.render = function () { TxList.prototype.renderTransaction = function () { const { txsToRender, conversionRate } = this.props + return txsToRender.length ? txsToRender.map((transaction, i) => this.renderTransactionListItem(transaction, conversionRate, i)) : [h( @@ -66,11 +67,7 @@ TxList.prototype.renderTransactionListItem = function (transaction, conversionRa // refer to transaction-list.js:line 58 if (transaction.key === 'shapeshift') { - return h('div', { - key: `shapeshift${index}`, - }, [ - h(ShiftListItem, transaction), - ]) + return h(ShiftListItem, { ...transaction, key: `shapeshift${index}` }) } const props = { |