From f1a309e0cc110060cc56252ec5f7626ca6403fab Mon Sep 17 00:00:00 2001
From: Alexander Tseung <alextsg@gmail.com>
Date: Fri, 7 Sep 2018 13:59:05 -0700
Subject: Fix identicon address. Fix styling of New Contract recipient. Fix
 Activity Log initial ETH value. Add timestamps to Activity Log events

---
 .../transaction-activity-log.component.js          | 23 +++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'ui/app/components/transaction-activity-log/transaction-activity-log.component.js')

diff --git a/ui/app/components/transaction-activity-log/transaction-activity-log.component.js b/ui/app/components/transaction-activity-log/transaction-activity-log.component.js
index c0cf099d0..c4cf57d14 100644
--- a/ui/app/components/transaction-activity-log/transaction-activity-log.component.js
+++ b/ui/app/components/transaction-activity-log/transaction-activity-log.component.js
@@ -3,8 +3,9 @@ import PropTypes from 'prop-types'
 import classnames from 'classnames'
 import { getActivities } from './transaction-activity-log.util'
 import Card from '../card'
-import { getEthConversionFromWeiHex } from '../../helpers/conversions.util'
+import { getEthConversionFromWeiHex, getValueFromWeiHex } from '../../helpers/conversions.util'
 import { ETH } from '../../constants/common'
+import { formatDate } from '../../util'
 
 export default class TransactionActivityLog extends PureComponent {
   static contextTypes = {
@@ -41,8 +42,17 @@ export default class TransactionActivityLog extends PureComponent {
 
   renderActivity (activity, index) {
     const { conversionRate } = this.props
-    const { eventKey, value } = activity
-    const ethValue = getEthConversionFromWeiHex({ value, toCurrency: ETH, conversionRate })
+    const { eventKey, value, timestamp } = activity
+    const ethValue = index === 0
+      ? `${getValueFromWeiHex({
+        value,
+        toCurrency: ETH,
+        conversionRate,
+        numberOfDecimals: 6,
+      })} ${ETH}`
+      : getEthConversionFromWeiHex({ value, toCurrency: ETH, conversionRate })
+    const formattedTimestamp = formatDate(timestamp)
+    const activityText = this.context.t(eventKey, [ethValue, formattedTimestamp])
 
     return (
       <div
@@ -50,8 +60,11 @@ export default class TransactionActivityLog extends PureComponent {
         className="transaction-activity-log__activity"
       >
         <div className="transaction-activity-log__activity-icon" />
-        <div className="transaction-activity-log__activity-text">
-          { this.context.t(eventKey, [ethValue]) }
+        <div
+          className="transaction-activity-log__activity-text"
+          title={activityText}
+        >
+          { activityText }
         </div>
       </div>
     )
-- 
cgit