From 58a04c63cd1f595af4d56260c1f21e1241e9a486 Mon Sep 17 00:00:00 2001 From: Luke Vella Date: Fri, 11 Aug 2023 10:18:51 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20date=20and=20time=20format?= =?UTF-8?q?ting=20and=20tz=20adjustment=20(#808)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web/src/components/event-card.tsx | 2 +- apps/web/src/pages/polls.tsx | 2 +- apps/web/src/utils/dayjs.tsx | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/web/src/components/event-card.tsx b/apps/web/src/components/event-card.tsx index e244a8966..ca99ed20d 100644 --- a/apps/web/src/components/event-card.tsx +++ b/apps/web/src/components/event-card.tsx @@ -71,7 +71,7 @@ export const EventCard = () => { : `${adjustTimeZone( poll.event.start, !poll.timeZone, - ).format("LLL")} - ${adjustTimeZone( + ).format("LL LT")} - ${adjustTimeZone( dayjs(poll.event.start).add( poll.event.duration, "minutes", diff --git a/apps/web/src/pages/polls.tsx b/apps/web/src/pages/polls.tsx index 1dbb4b574..75af7945c 100644 --- a/apps/web/src/pages/polls.tsx +++ b/apps/web/src/pages/polls.tsx @@ -121,7 +121,7 @@ const Page: NextPageWithLayout = () => { ? `${adjustTimeZone( poll.event.start, !poll.timeZone, - ).format("LLL")} - ${adjustTimeZone( + ).format("LL LT")} - ${adjustTimeZone( dayjs(poll.event.start).add( poll.event.duration, "minutes", diff --git a/apps/web/src/utils/dayjs.tsx b/apps/web/src/utils/dayjs.tsx index 9303aa50a..8a326a845 100644 --- a/apps/web/src/utils/dayjs.tsx +++ b/apps/web/src/utils/dayjs.tsx @@ -213,10 +213,11 @@ export const DayjsProvider: React.FunctionComponent<{ return ( - keepLocalTime - ? dayjs(date).tz("GMT") - : dayjs(date).tz(preferredTimeZone), + adjustTimeZone: (date, keepLocalTime) => { + return keepLocalTime + ? dayjs(date).utc() + : dayjs(date).tz(preferredTimeZone); + }, dayjs, locale, timeZone: preferredTimeZone,