From 328f00a9b53f626b3bb156836be6e06ef8ad1806 Mon Sep 17 00:00:00 2001 From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Date: Thu, 3 Nov 2022 17:58:39 +0530 Subject: [PATCH] fix: add hour12 (#5349) * fix: add hour12 * fix: timeformat variable Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../components/v2/eventtype/AvailabilityTab.tsx | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/web/components/v2/eventtype/AvailabilityTab.tsx b/apps/web/components/v2/eventtype/AvailabilityTab.tsx index c6fad16b1f..797e4ccec8 100644 --- a/apps/web/components/v2/eventtype/AvailabilityTab.tsx +++ b/apps/web/components/v2/eventtype/AvailabilityTab.tsx @@ -7,6 +7,7 @@ import classNames from "@calcom/lib/classNames"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { weekdayNames } from "@calcom/lib/weekday"; import { trpc } from "@calcom/trpc/react"; +import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery"; import { Icon } from "@calcom/ui"; import { Badge } from "@calcom/ui/v2"; import Button from "@calcom/ui/v2/core/Button"; @@ -91,15 +92,16 @@ const AvailabilitySelect = ({ ); }; -const format = (date: Date) => - Intl.DateTimeFormat(undefined, { hour: "numeric", minute: "numeric" }).format( +const format = (date: Date, hour12: boolean) => + Intl.DateTimeFormat(undefined, { hour: "numeric", minute: "numeric", hour12 }).format( new Date(dayjs.utc(date).format("YYYY-MM-DDTHH:mm:ss")) ); export const AvailabilityTab = () => { const { t, i18n } = useLocale(); const { watch } = useFormContext(); - + const me = useMeQuery(); + const timeFormat = me?.data?.timeFormat; const scheduleId = watch("schedule"); const { isLoading, data: schedule } = trpc.useQuery(["viewer.availability.schedule", { scheduleId }]); @@ -148,9 +150,11 @@ export const AvailabilityTab = () => {
{filterDays(index).map((dayRange, i) => (
- {format(dayRange.startTime)} - - -
{format(dayRange.endTime)}
+ + {format(dayRange.startTime, timeFormat === 12)} + + - +
{format(dayRange.endTime, timeFormat === 12)}
))}