diff options
-rw-r--r-- | ui/app/components/transaction-list-item/transaction-list-item.component.js | 7 | ||||
-rw-r--r-- | ui/app/components/transaction-list/transaction-list.component.js | 37 |
2 files changed, 14 insertions, 30 deletions
diff --git a/ui/app/components/transaction-list-item/transaction-list-item.component.js b/ui/app/components/transaction-list-item/transaction-list-item.component.js index 8c2a0d04c..928d531f0 100644 --- a/ui/app/components/transaction-list-item/transaction-list-item.component.js +++ b/ui/app/components/transaction-list-item/transaction-list-item.component.js @@ -12,7 +12,6 @@ import { hexToDecimal } from '../../helpers/conversions.util' export default class TransactionListItem extends PureComponent { static propTypes = { history: PropTypes.object, - methodData: PropTypes.object, transaction: PropTypes.object, ethTransactionAmount: PropTypes.string, fiatDisplayValue: PropTypes.string, @@ -32,11 +31,7 @@ export default class TransactionListItem extends PureComponent { } render () { - const { - transaction, - ethTransactionAmount, - fiatDisplayValue, - } = this.props + const { transaction, ethTransactionAmount, fiatDisplayValue } = this.props const { txParams = {} } = transaction const nonce = hexToDecimal(txParams.nonce) diff --git a/ui/app/components/transaction-list/transaction-list.component.js b/ui/app/components/transaction-list/transaction-list.component.js index 48e731d24..d9b8e3cf8 100644 --- a/ui/app/components/transaction-list/transaction-list.component.js +++ b/ui/app/components/transaction-list/transaction-list.component.js @@ -30,14 +30,12 @@ export default class TransactionList extends PureComponent { { `${t('queue')} (${pendingTransactions.length})` } </div> { - pendingTransactions.map(transaction => { - return ( - <TransactionListItem - transaction={transaction} - key={transaction.id} - /> - ) - }) + pendingTransactions.map(transaction => ( + <TransactionListItem + transaction={transaction} + key={transaction.id} + /> + )) } </div> ) @@ -48,16 +46,12 @@ export default class TransactionList extends PureComponent { </div> { completedTransactions.length > 0 - ? ( - completedTransactions.map(transaction => { - return ( - <TransactionListItem - transaction={transaction} - key={transaction.id} - /> - ) - }) - ) + ? completedTransactions.map(transaction => ( + <TransactionListItem + transaction={transaction} + key={transaction.id} + /> + )) : this.renderEmpty() } </div> @@ -78,12 +72,7 @@ export default class TransactionList extends PureComponent { render () { return ( <div className="transaction-list"> - { - this.renderTransactions() - // pendingTransactions.length + completedTransactions.length > 0 - // ? this.renderTransactions() - // : this.renderEmpty() - } + { this.renderTransactions() } </div> ) } |