m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fixes shapeshift txs so that they render in tx list. (#3208)

Browse Source
This commit is contained in:
Dan J Miller 2018-02-08 21:10:15 -03:30 committed by Alexander Tseung
parent f39222c9af
commit c8c2dfdc0f
2 changed files with 28 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ui/app/components/shift-list-item.js
View File

@ -29,10 +29,7 @@ function ShiftListItem () {
}
ShiftListItem.prototype.render = function () {
const { selectedAddress, receivingAddress } = this.props
return (
selectedAddress === receivingAddress
? h('div.tx-list-item.tx-list-clickable', {
return h('div.tx-list-item.tx-list-clickable', {
style: {
paddingTop: '20px',
paddingBottom: '20px',
@ -61,8 +58,6 @@ ShiftListItem.prototype.render = function () {
this.renderInfo(),
this.renderUtilComponents(),
])
: null
)
}
function formatDate (date) {

7
ui/app/components/tx-list.js
View File

@ -50,6 +50,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(
@ -65,11 +66,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 = {