aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/transaction-list
diff options
context:
space:
mode:
authorDan Finlay <542863+danfinlay@users.noreply.github.com>2018-09-05 03:56:56 +0800
committerGitHub <noreply@github.com>2018-09-05 03:56:56 +0800
commit50434513569ad44fbd01a7e124b5f499b4d6f2e2 (patch)
tree8cd6147073660343e8aa0cc05c4902134c7983b9 /ui/app/components/transaction-list
parent86bb96aaaf106f1fa16fa93e749772524b5132b2 (diff)
parent879e10d44accbe9122e8b8514641b4fb2b986ad7 (diff)
downloadtangerine-wallet-browser-50434513569ad44fbd01a7e124b5f499b4d6f2e2.tar.gz
tangerine-wallet-browser-50434513569ad44fbd01a7e124b5f499b4d6f2e2.tar.zst
tangerine-wallet-browser-50434513569ad44fbd01a7e124b5f499b4d6f2e2.zip
Merge pull request #5167 from MetaMask/fix-watcAsset-images
Fix images for watched tokens
Diffstat (limited to 'ui/app/components/transaction-list')
-rw-r--r--ui/app/components/transaction-list/transaction-list.component.js5
-rw-r--r--ui/app/components/transaction-list/transaction-list.container.js3
2 files changed, 5 insertions, 3 deletions
diff --git a/ui/app/components/transaction-list/transaction-list.component.js b/ui/app/components/transaction-list/transaction-list.component.js
index e30476d8c..c864fea3b 100644
--- a/ui/app/components/transaction-list/transaction-list.component.js
+++ b/ui/app/components/transaction-list/transaction-list.component.js
@@ -21,6 +21,7 @@ export default class TransactionList extends PureComponent {
transactionToRetry: PropTypes.object,
selectedToken: PropTypes.object,
updateNetworkNonce: PropTypes.func,
+ assetImages: PropTypes.object,
}
componentDidMount () {
@@ -45,7 +46,6 @@ export default class TransactionList extends PureComponent {
renderTransactions () {
const { t } = this.context
const { pendingTransactions = [], completedTransactions = [] } = this.props
-
return (
<div className="transaction-list__transactions">
{
@@ -79,7 +79,7 @@ export default class TransactionList extends PureComponent {
}
renderTransaction (transaction, index) {
- const { selectedToken } = this.props
+ const { selectedToken, assetImages } = this.props
return transaction.key === TRANSACTION_TYPE_SHAPESHIFT
? (
@@ -93,6 +93,7 @@ export default class TransactionList extends PureComponent {
key={transaction.id}
showRetry={this.shouldShowRetry(transaction)}
token={selectedToken}
+ assetImages={assetImages}
/>
)
}
diff --git a/ui/app/components/transaction-list/transaction-list.container.js b/ui/app/components/transaction-list/transaction-list.container.js
index 1ec1f9ccf..2e946c67d 100644
--- a/ui/app/components/transaction-list/transaction-list.container.js
+++ b/ui/app/components/transaction-list/transaction-list.container.js
@@ -7,7 +7,7 @@ import {
submittedPendingTransactionsSelector,
completedTransactionsSelector,
} from '../../selectors/transactions'
-import { getSelectedAddress } from '../../selectors'
+import { getSelectedAddress, getAssetImages } from '../../selectors'
import { selectedTokenSelector } from '../../selectors/tokens'
import { getLatestSubmittedTxWithNonce } from '../../helpers/transactions.util'
import { updateNetworkNonce } from '../../actions'
@@ -23,6 +23,7 @@ const mapStateToProps = state => {
transactionToRetry: getLatestSubmittedTxWithNonce(submittedPendingTransactions, networkNonce),
selectedToken: selectedTokenSelector(state),
selectedAddress: getSelectedAddress(state),
+ assetImages: getAssetImages(state),
}
}