aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components
diff options
context:
space:
mode:
Diffstat (limited to 'ui/app/components')
-rw-r--r--ui/app/components/shift-list-item.js7
-rw-r--r--ui/app/components/transaction-activity-log/transaction-activity-log.component.js2
2 files changed, 2 insertions, 7 deletions
diff --git a/ui/app/components/shift-list-item.js b/ui/app/components/shift-list-item.js
index 0461b615a..2d08bbddc 100644
--- a/ui/app/components/shift-list-item.js
+++ b/ui/app/components/shift-list-item.js
@@ -3,10 +3,9 @@ const Component = require('react').Component
const PropTypes = require('prop-types')
const h = require('react-hyperscript')
const connect = require('react-redux').connect
-const vreme = new (require('vreme'))()
const explorerLink = require('etherscan-link').createExplorerLink
const actions = require('../actions')
-const addressSummary = require('../util').addressSummary
+const { formatDate, addressSummary } = require('../util')
const CopyButton = require('./copyButton')
const EthBalance = require('./eth-balance')
@@ -67,10 +66,6 @@ ShiftListItem.prototype.render = function () {
])
}
-function formatDate (date) {
- return vreme.format(new Date(date), 'March 16 2014 14:30')
-}
-
ShiftListItem.prototype.renderUtilComponents = function () {
var props = this.props
const { conversionRate, currentCurrency } = props
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 d6f90860a..4e4e553c0 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
@@ -85,7 +85,7 @@ export default class TransactionActivityLog extends PureComponent {
conversionRate,
numberOfDecimals: 3,
})
- const formattedTimestamp = formatDate(timestamp, '14:30 on 3/16/2014')
+ const formattedTimestamp = formatDate(timestamp, 'T \'on\' M/d/y')
const activityText = this.context.t(eventKey, [ethValue, formattedTimestamp])
return (