aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/transaction-list
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-08-06 13:25:58 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-08-24 07:45:27 +0800
commit33a94332e48b280fcf4c9fb23aa4d349eaa8a54d (patch)
treed90d6c353334211a07cd2c552e0c5a890e88e694 /ui/app/components/transaction-list
parent13c4ecd6101e57b9184b14f4e0136206843f51eb (diff)
downloadtangerine-wallet-browser-33a94332e48b280fcf4c9fb23aa4d349eaa8a54d.tar.gz
tangerine-wallet-browser-33a94332e48b280fcf4c9fb23aa4d349eaa8a54d.tar.zst
tangerine-wallet-browser-33a94332e48b280fcf4c9fb23aa4d349eaa8a54d.zip
Show token amounts in TransactionListItem for token transfers
Diffstat (limited to 'ui/app/components/transaction-list')
-rw-r--r--ui/app/components/transaction-list/transaction-list.component.js9
-rw-r--r--ui/app/components/transaction-list/transaction-list.container.js2
2 files changed, 10 insertions, 1 deletions
diff --git a/ui/app/components/transaction-list/transaction-list.component.js b/ui/app/components/transaction-list/transaction-list.component.js
index fb23ece7a..953b07217 100644
--- a/ui/app/components/transaction-list/transaction-list.component.js
+++ b/ui/app/components/transaction-list/transaction-list.component.js
@@ -17,6 +17,7 @@ export default class TransactionList extends PureComponent {
pendingTransactions: PropTypes.array,
completedTransactions: PropTypes.array,
transactionToRetry: PropTypes.object,
+ selectedToken: PropTypes.object,
}
shouldShowRetry = transaction => {
@@ -27,7 +28,11 @@ export default class TransactionList extends PureComponent {
renderTransactions () {
const { t } = this.context
- const { pendingTransactions = [], completedTransactions = [] } = this.props
+ const {
+ pendingTransactions = [],
+ completedTransactions = [],
+ selectedToken,
+ } = this.props
return (
<div className="transaction-list__transactions">
@@ -43,6 +48,7 @@ export default class TransactionList extends PureComponent {
transaction={transaction}
key={transaction.id}
showRetry={this.shouldShowRetry(transaction)}
+ token={selectedToken}
/>
))
}
@@ -59,6 +65,7 @@ export default class TransactionList extends PureComponent {
<TransactionListItem
transaction={transaction}
key={transaction.id}
+ token={selectedToken}
/>
))
: this.renderEmpty()
diff --git a/ui/app/components/transaction-list/transaction-list.container.js b/ui/app/components/transaction-list/transaction-list.container.js
index 97a94b981..5a63d916d 100644
--- a/ui/app/components/transaction-list/transaction-list.container.js
+++ b/ui/app/components/transaction-list/transaction-list.container.js
@@ -6,6 +6,7 @@ import {
pendingTransactionsSelector,
completedTransactionsSelector,
} from '../../selectors/transactions'
+import { selectedTokenSelector } from '../../selectors/tokens'
import { getLatestSubmittedTxWithEarliestNonce } from '../../helpers/transactions.util'
const mapStateToProps = state => {
@@ -15,6 +16,7 @@ const mapStateToProps = state => {
completedTransactions: completedTransactionsSelector(state),
pendingTransactions,
transactionToRetry: getLatestSubmittedTxWithEarliestNonce(pendingTransactions),
+ selectedToken: selectedTokenSelector(state),
}
}