fix: formatDate working with timezone code

new-lamassu-admin/src/components/LogsDownloaderPopper.js

@@ -134,7 +134,10 @@ const LogsDownloaderPopover = ({ name, query, args, title, getLogs }) => {
   const [range, setRange] = useState({ from: null, until: null })
   const [anchorEl, setAnchorEl] = useState(null)
   const [fetchLogs] = useLazyQuery(query, {
-    onCompleted: data => createLogsFile(getLogs(data), range)
+    onCompleted: data => {
+      console.log(data)
+      return createLogsFile(getLogs(data), range)
+    }
   })
 
   const classes = useStyles()

new-lamassu-admin/src/pages/Customers/components/TransactionsList.js

@@ -47,7 +47,7 @@ const TransactionsList = ({ customer, data, loading, locale }) => {
         !R.isNil(timezone) &&
         ifNotNull(
           customer.lastActive,
-          formatDate(customer.lastActive, timezone.dstOffset, 'YYYY-MM-D')
+          formatDate(customer.lastActive, timezone, 'YYYY-MM-D')
         )
     },
     {
@@ -113,12 +113,12 @@ const TransactionsList = ({ customer, data, loading, locale }) => {
     {
       header: 'Date',
       width: 157,
-      view: it => formatDate(it.created, timezone.dstOffset, 'YYYY-MM-D')
+      view: it => formatDate(it.created, timezone, 'YYYY-MM-D')
     },
     {
       header: 'Time (h:m:s)',
       width: 134,
-      view: it => formatDate(it.created, timezone.dstOffset, 'HH:mm:ss')
+      view: it => formatDate(it.created, timezone, 'HH:mm:ss')
     }
   ]
 

new-lamassu-admin/src/pages/MachineLogs.js

@@ -144,11 +144,7 @@ const Logs = () => {
                   <TableRow key={idx} size="sm">
                     <TableCell>
                       {timezone &&
-                        formatDate(
+                        formatDate(log.timestamp, timezone, 'YYYY-MM-DD HH:mm')}
-                          log.timestamp,
-                          timezone.dstOffset,
-                          'YYYY-MM-DD HH:mm'
-                        )}
                     </TableCell>
                     <TableCell>{log.logLevel}</TableCell>
                     <TableCell>{log.message}</TableCell>

new-lamassu-admin/src/pages/Machines/MachineComponents/Details.js

@@ -15,11 +15,7 @@ const Details = ({ data, timezone }) => {
         <Label3 className={classes.label3}>Paired at</Label3>
         <P>
           {data.pairedAt
-            ? formatDate(
+            ? formatDate(data.pairedAt, timezone, 'YYYY-MM-DD HH:mm:ss')
-                data.pairedAt,
-                timezone.dstOffset,
-                'YYYY-MM-DD HH:mm:ss'
-              )
             : ''}
         </P>
       </div>

new-lamassu-admin/src/pages/Maintenance/MachineDetailsCard.js

@@ -215,11 +215,7 @@ const MachineDetailsRow = ({ it: machine, onActionSuccess, timezone }) => {
             <Label>Paired at</Label>
             <span>
               {timezone &&
-                formatDate(
+                formatDate(machine.pairedAt, timezone, 'YYYY-MM-DD HH:mm:ss')}
-                  machine.pairedAt,
-                  timezone.dstOffset,
-                  'YYYY-MM-DD HH:mm:ss'
-                )}
             </span>
           </Item>
           <Item xs={6}>

new-lamassu-admin/src/pages/ServerLogs.js

@@ -189,7 +189,7 @@ const Logs = () => {
                         {timezone &&
                           formatDate(
                             log.timestamp,
-                            timezone.dstOffset,
+                            timezone,
                             'YYYY-MM-DD HH:mm'
                           )}
                       </TableCell>

new-lamassu-admin/src/pages/Transactions/Transactions.js

@@ -153,8 +153,7 @@ const Transactions = () => {
     {
       header: 'Date (UTC)',
       view: it =>
-        timezone &&
+        timezone && formatDate(it.created, timezone, 'YYYY-MM-DD HH:mm:ss'),
-        formatDate(it.created, timezone.dstOffset, 'YYYY-MM-DD HH:mm:ss'),
       textAlign: 'right',
       size: 'sm',
       width: 195

new-lamassu-admin/src/utils/timezones.js

@@ -74,10 +74,12 @@ const getTzLabels = timezones =>
     getFinalTimezones(timezones)
   )
 
-const formatDate = (date, offset, format) =>
+const formatDate = (date, timezoneCode, format) => {
-  moment
+  const dstOffset = timezoneCode.split(':')[1]
+  return moment
     .utc(date)
-    .utcOffset(offset)
+    .utcOffset(parseInt(dstOffset))
     .format(format)
+}
 
 export { getTzLabels, formatDate }