From 447def5849a3192e1a7dd877c5297df46eecd72e Mon Sep 17 00:00:00 2001
From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Date: Tue, 8 Feb 2022 21:31:18 +0530
Subject: [PATCH] Timeslot selectable times fix for not UTC timezones in
 Availability (#1721)

* --wip

* fix for event type availability tz mismatch

* cleanup

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
---
 components/ui/Scheduler.tsx     | 24 ++++++++++++++++--------
 components/ui/form/Schedule.tsx |  4 ++--
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/components/ui/Scheduler.tsx b/components/ui/Scheduler.tsx
index d773c42b..4251325b 100644
--- a/components/ui/Scheduler.tsx
+++ b/components/ui/Scheduler.tsx
@@ -73,9 +73,17 @@ export const Scheduler = ({ availability, setAvailability, timeZone, setTimeZone
           className="px-3 py-2 text-sm rounded-sm bg-neutral-100"
           type="button"
           onClick={() => setEditSchedule(idx)}>
-          {item.startTime.toLocaleTimeString(i18n.language, { hour: "numeric", minute: "2-digit" })}
+          {item.startTime.toLocaleTimeString(i18n.language, {
+            hour: "numeric",
+            minute: "2-digit",
+            timeZone: "UTC",
+          })}
           &nbsp;{t("until")}&nbsp;
-          {item.endTime.toLocaleTimeString(i18n.language, { hour: "numeric", minute: "2-digit" })}
+          {item.endTime.toLocaleTimeString(i18n.language, {
+            hour: "numeric",
+            minute: "2-digit",
+            timeZone: "UTC",
+          })}
         </button>
       </div>
       <button
@@ -118,24 +126,24 @@ export const Scheduler = ({ availability, setAvailability, timeZone, setTimeZone
         <SetTimesModal
           startTime={
             openingHours[editSchedule]
-              ? new Date(openingHours[editSchedule].startTime).getHours() * 60 +
-                new Date(openingHours[editSchedule].startTime).getMinutes()
+              ? new Date(openingHours[editSchedule].startTime).getUTCHours() * 60 +
+                new Date(openingHours[editSchedule].startTime).getUTCMinutes()
               : 540
           }
           endTime={
             openingHours[editSchedule]
-              ? new Date(openingHours[editSchedule].endTime).getHours() * 60 +
-                new Date(openingHours[editSchedule].endTime).getMinutes()
+              ? new Date(openingHours[editSchedule].endTime).getUTCHours() * 60 +
+                new Date(openingHours[editSchedule].endTime).getUTCMinutes()
               : 1020
           }
           onChange={(times: { startTime: number; endTime: number }) =>
             applyEditSchedule({
               ...(openingHours[editSchedule] || {}),
               startTime: new Date(
-                new Date().setHours(Math.floor(times.startTime / 60), times.startTime % 60, 0, 0)
+                new Date().setUTCHours(Math.floor(times.startTime / 60), times.startTime % 60, 0, 0)
               ),
               endTime: new Date(
-                new Date().setHours(Math.floor(times.endTime / 60), times.endTime % 60, 0, 0)
+                new Date().setUTCHours(Math.floor(times.endTime / 60), times.endTime % 60, 0, 0)
               ),
             })
           }
diff --git a/components/ui/form/Schedule.tsx b/components/ui/form/Schedule.tsx
index 9487f63d..588d78b3 100644
--- a/components/ui/form/Schedule.tsx
+++ b/components/ui/form/Schedule.tsx
@@ -24,8 +24,8 @@ const increment = 15;
  * 23:45:00 (End of day with enough time for 15 min booking)
  */
 const TIMES = (() => {
-  const end = dayjs().endOf("day");
-  let t: Dayjs = dayjs().startOf("day");
+  const end = dayjs().utc().endOf("day");
+  let t: Dayjs = dayjs().utc().startOf("day");
 
   const times = [];
   while (t.isBefore(end)) {