From b24c65e8bcd69470e328e93592eb0d2910de891c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Salgado?= <sergiodiassalgado@gmail.com>
Date: Thu, 29 Apr 2021 20:08:23 +0100
Subject: [PATCH] feat: timezone conversion in dashboard graph

---
 .../SystemPerformance/Graphs/RefScatterplot.js    | 10 +++++++---
 .../SystemPerformance/SystemPerformance.js        | 15 ++++++++++-----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js
index 4d7da250..6a37af37 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/Graphs/RefScatterplot.js
@@ -5,7 +5,7 @@ import React, { useEffect, useRef, useCallback } from 'react'
 
 import { backgroundColor, java, neon } from 'src/styling/variables'
 
-const RefScatterplot = ({ data: realData, timeFrame }) => {
+const RefScatterplot = ({ data: realData, timeFrame, timezone }) => {
   const svgRef = useRef()
   const cashIns = R.filter(R.propEq('txClass', 'cashIn'))(realData)
   const cashOuts = R.filter(R.propEq('txClass', 'cashOut'))(realData)
@@ -92,8 +92,11 @@ const RefScatterplot = ({ data: realData, timeFrame }) => {
       .domain([
         moment()
           .add(-xAxisSettings.subtractDays, 'day')
+          .add(timezone.dstOffset, 'minutes')
           .valueOf(),
-        moment().valueOf()
+        moment()
+          .add(timezone.dstOffset, 'minutes')
+          .valueOf()
       ])
       .range(xAxisSettings.timeRange)
       .nice(xAxisSettings.nice)
@@ -168,7 +171,8 @@ const RefScatterplot = ({ data: realData, timeFrame }) => {
       .enter()
       .append('circle')
       .attr('cx', function(d) {
-        return x(new Date(d.created))
+        const date = new Date(d.created)
+        return x(date.setMinutes(date.getMinutes() + timezone.dstOffset))
       })
       .attr('cy', function(d) {
         return y(d.fiat)
diff --git a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
index 817364ed..93026106 100644
--- a/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
+++ b/new-lamassu-admin/src/pages/Dashboard/SystemPerformance/SystemPerformance.js
@@ -76,21 +76,25 @@ const SystemPerformance = () => {
   const [selectedRange, setSelectedRange] = useState('Day')
   const { data, loading } = useQuery(GET_DATA)
   const fiatLocale = fromNamespace('locale')(data?.config).fiatCurrency
+  const timezone = fromNamespace('locale')(data?.config).timezone
 
   const isInRangeAndNoError = getLastTimePeriod => t => {
     if (t.error !== null) return false
     if (!getLastTimePeriod) {
       return (
         t.error === null &&
-        moment(t.created).isBetween(ranges[selectedRange].right, moment())
+        moment
+          .utc(t.created)
+          .utcOffset(timezone.dstOffset)
+          .isBetween(ranges[selectedRange].right, moment())
       )
     }
     return (
       t.error === null &&
-      moment(t.created).isBetween(
-        ranges[selectedRange].left,
-        ranges[selectedRange].right
-      )
+      moment
+        .utc(t.created)
+        .utcOffset(timezone.dstOffset)
+        .isBetween(ranges[selectedRange].left, ranges[selectedRange].right)
     )
   }
 
@@ -194,6 +198,7 @@ const SystemPerformance = () => {
               <Scatterplot
                 timeFrame={selectedRange}
                 data={transactionsToShow}
+                timezone={timezone}
               />
             </Grid>
           </Grid>