diff options
| author | Alexander Tseung <alextsg@gmail.com> | 2018-02-09 08:44:02 +0800 |
|---|---|---|
| committer | Alexander Tseung <alextsg@gmail.com> | 2018-02-09 08:44:02 +0800 |
| commit | 2240688fd400504657a4dbe62d55ab2c7398c599 (patch) | |
| tree | 8d3e86857ac4c2badafe0b79cbad2f61b7082df2 /ui/app/components/tx-list.js | |
| parent | eb919f4710b37d09c9a3a68ed4c719e487cce9d9 (diff) | |
| parent | c8c2dfdc0f5d3cf68b5bd3b3ebf8bf6799c640c2 (diff) | |
| download | tangerine-wallet-browser-2240688fd400504657a4dbe62d55ab2c7398c599.tar.gz tangerine-wallet-browser-2240688fd400504657a4dbe62d55ab2c7398c599.tar.zst tangerine-wallet-browser-2240688fd400504657a4dbe62d55ab2c7398c599.zip | |
Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254
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 ca4fd81d6..f60053bef 100644 --- a/ui/app/components/tx-list.js +++ b/ui/app/components/tx-list.js @@ -56,6 +56,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( @@ -71,11 +72,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 = { |