Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix displayed time and date in the activity log. Remove vreme library… #5932

Merged
merged 1 commit into from
Dec 13, 2018
Merged

Fix displayed time and date in the activity log. Remove vreme library… #5932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions old-ui/app/components/shift-list-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const inherits = require('util').inherits
const Component = require('react').Component
const h = require('react-hyperscript')
const connect = require('react-redux').connect
const vreme = new (require('vreme'))()
const { DateTime } = require('luxon')
const explorerLink = require('etherscan-link').createExplorerLink
const actions = require('../../../ui/app/actions')
const addressSummary = require('../util').addressSummary
Expand Down Expand Up @@ -62,7 +62,7 @@ ShiftListItem.prototype.render = function () {
}

function formatDate (date) {
return vreme.format(new Date(date), 'March 16 2014 14:30')
return DateTime.fromMillis(date).toFormat('MMMM d y T')
}

ShiftListItem.prototype.renderUtilComponents = function () {
Expand Down
4 changes: 2 additions & 2 deletions old-ui/app/components/transaction-list-item.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const EthBalance = require('./eth-balance')
const addressSummary = require('../util').addressSummary
const explorerLink = require('etherscan-link').createExplorerLink
const CopyButton = require('./copyButton')
const vreme = new (require('vreme'))()
const { DateTime } = require('luxon')
const Tooltip = require('./tooltip')
const numberToBN = require('number-to-bn')
const actions = require('../../../ui/app/actions')
Expand Down Expand Up @@ -216,7 +216,7 @@ function recipientField (txParams, transaction, isTx, isMsg) {
}

function formatDate (date) {
return vreme.format(new Date(date), 'March 16 2014 14:30')
return DateTime.fromMillis(date).toFormat('MMMM d y T')
}

function renderErrorOrWarning (transaction) {
Expand Down
Loading