fix: Issue #3, serverTime ref, lastRefreshed

alairon · alairon · commit 308424167621 · 2022-05-19T02:14:52.000-04:00
diff --git a/pages/merchants.tsx b/pages/merchants.tsx
@@ -48,6 +48,7 @@ const Merchants: NextPage = (props) => {
     false
   )
   const [mSchedules, setMSchedules] = useState<{ [k: string]: Interval[] }>({})
+  const [mActive, setMActive] = useState(false)
 
   useEffect(() => {
     const timer = setInterval(() => {
@@ -56,7 +57,7 @@ const Merchants: NextPage = (props) => {
       setServerTime(now.setZone(regionTZ))
     }, 1000)
     return () => {
-      clearInterval(timer) // Return a funtion to clear the timer so that it will stop being called on unmount
+      clearInterval(timer) // Return a function to clear the timer so that it will stop being called on unmount
     }
   }, [regionTZName, regionTZ])
 
@@ -190,10 +191,16 @@ const Merchants: NextPage = (props) => {
     wanderingMerchants,
     merchantAPIData,
     mSchedules,
+    mActive
   ])
   useEffect(() => {
-    if (currDate.minute < 30 || currDate.minute >= 55) setMerchantAPIData({})
-  }, [currDate.minute])
+    // Changed to serverTime to prevent mActive from triggering early for time zones using 30 or 45 minute offsets
+    if (serverTime.minute < 30 || serverTime.minute >= 55) {
+      setMerchantAPIData({})
+      setMActive(false)
+    }
+    else { setMActive(true) }
+  }, [serverTime.minute])
   return (
     <>
       <Head>
@@ -316,7 +323,7 @@ const Merchants: NextPage = (props) => {
                   </a>
                   <div className="absolute right-5 top-7">
                     {t('last-updated')}:{' '}
-                    {dataLastRefreshed.toLocaleString(
+                    {(viewLocalizedTime ? dataLastRefreshed : dataLastRefreshed.setZone(regionTZ)).toLocaleString(
                       view24HrTime
                         ? DateTime.TIME_24_WITH_SECONDS
                         : DateTime.TIME_WITH_SECONDS
