aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/transaction-list-item/transaction-list-item.component.js
diff options
context:
space:
mode:
authorAlexander Tseung <alextsg@gmail.com>2018-09-08 04:59:05 +0800
committerAlexander Tseung <alextsg@gmail.com>2018-09-13 10:48:52 +0800
commitf1a309e0cc110060cc56252ec5f7626ca6403fab (patch)
tree204da913ed98c7b5947cc74907335bd545f02213 /ui/app/components/transaction-list-item/transaction-list-item.component.js
parentc18c0e1c30bd7b2800e66288e21ee724e7314b30 (diff)
downloadtangerine-wallet-browser-f1a309e0cc110060cc56252ec5f7626ca6403fab.tar
tangerine-wallet-browser-f1a309e0cc110060cc56252ec5f7626ca6403fab.tar.gz
tangerine-wallet-browser-f1a309e0cc110060cc56252ec5f7626ca6403fab.tar.bz2
tangerine-wallet-browser-f1a309e0cc110060cc56252ec5f7626ca6403fab.tar.lz
tangerine-wallet-browser-f1a309e0cc110060cc56252ec5f7626ca6403fab.tar.xz
tangerine-wallet-browser-f1a309e0cc110060cc56252ec5f7626ca6403fab.tar.zst
tangerine-wallet-browser-f1a309e0cc110060cc56252ec5f7626ca6403fab.zip
Fix identicon address. Fix styling of New Contract recipient. Fix Activity Log initial ETH value. Add timestamps to Activity Log events
Diffstat (limited to 'ui/app/components/transaction-list-item/transaction-list-item.component.js')
-rw-r--r--ui/app/components/transaction-list-item/transaction-list-item.component.js9
1 files changed, 7 insertions, 2 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 d895b8e26..5564f0883 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
@@ -22,6 +22,7 @@ export default class TransactionListItem extends PureComponent {
nonceAndDate: PropTypes.string,
token: PropTypes.object,
assetImages: PropTypes.object,
+ tokenData: PropTypes.object,
}
state = {
@@ -106,9 +107,13 @@ export default class TransactionListItem extends PureComponent {
showRetry,
nonceAndDate,
assetImages,
+ tokenData,
} = this.props
const { txParams = {} } = transaction
const { showTransactionDetails } = this.state
+ const toAddress = tokenData
+ ? tokenData.params && tokenData.params[0] && tokenData.params[0].value || txParams.to
+ : txParams.to
return (
<div className="transaction-list-item">
@@ -118,9 +123,9 @@ export default class TransactionListItem extends PureComponent {
>
<Identicon
className="transaction-list-item__identicon"
- address={txParams.to}
+ address={toAddress}
diameter={34}
- image={assetImages[txParams.to]}
+ image={assetImages[toAddress]}
/>
<TransactionAction
transaction={transaction}