Fix displayed time and date in the activity log. Remove vreme library, add luxon library. (#5932)

2 files changed, 4 insertions, 4 deletions

diff --git a/old-ui/app/components/shift-list-item.js b/old-ui/app/components/shift-list-item.js
index 5454a90bc..01b8d548f 100644
--- a/old-ui/app/components/shift-list-item.js
+++ b/old-ui/app/components/shift-list-item.js
@@ -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
@@ -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 () {
diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js
index 6ecf7d193..8d0e77f53 100644
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@@ -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')
@@ -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) {