diff --git a/packages/features/bookings/Booker/Booker.tsx b/packages/features/bookings/Booker/Booker.tsx index eca7ba7dda..b69f11f83e 100644 --- a/packages/features/bookings/Booker/Booker.tsx +++ b/packages/features/bookings/Booker/Booker.tsx @@ -134,7 +134,7 @@ const BookerComponent = ({ } = calendars; useEffect(() => { - if (event.isLoading) return setBookerState("loading"); + if (event.isPending) return setBookerState("loading"); if (!selectedDate) return setBookerState("selecting_date"); if (!selectedTimeslot) return setBookerState("selecting_time"); return setBookerState("booking"); @@ -354,7 +354,7 @@ const BookerComponent = ({ /> )} - + {layout !== BookerLayouts.MONTH_VIEW && !(layout === "mobile" && bookerState === "booking") && (
@@ -392,7 +392,7 @@ const BookerComponent = ({ @@ -416,7 +416,7 @@ const BookerComponent = ({ extraDays={extraDays} limitHeight={layout === BookerLayouts.MONTH_VIEW} schedule={schedule?.data} - isLoading={schedule.isLoading} + isLoading={schedule.isPending} seatsPerTimeSlot={event.data?.seatsPerTimeSlot} showAvailableSeatsCount={event.data?.seatsShowAvailabilityCount} event={event} diff --git a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx index 0e73b13fa7..95c180cc2b 100644 --- a/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx +++ b/packages/features/bookings/Booker/components/BookEventForm/BookEventForm.tsx @@ -7,7 +7,7 @@ import type { FieldError } from "react-hook-form"; import { IS_CALCOM, WEBSITE_URL } from "@calcom/lib/constants"; import getPaymentAppData from "@calcom/lib/getPaymentAppData"; import { useLocale } from "@calcom/lib/hooks/useLocale"; -import { Alert, Button, EmptyScreen, Form } from "@calcom/ui"; +import { Alert, Button, EmptyScreen, Form, Icon } from "@calcom/ui"; import { useBookerStore } from "../../store"; import type { useEventReturnType } from "../../utils/event"; @@ -63,7 +63,7 @@ export const BookEventForm = ({ }, [eventType]); if (eventQuery.isError) return ; - if (eventQuery.isLoading || !eventQuery.data) return ; + if (eventQuery.isPending || !eventQuery.data) return ; if (!timeslot) return ( { setSelectedDate(date === null ? date : date.format("YYYY-MM-DD")); }} diff --git a/packages/features/bookings/Booker/components/EventMeta.tsx b/packages/features/bookings/Booker/components/EventMeta.tsx index 085f77f2fc..284ae0d66b 100644 --- a/packages/features/bookings/Booker/components/EventMeta.tsx +++ b/packages/features/bookings/Booker/components/EventMeta.tsx @@ -29,7 +29,7 @@ export const EventMeta = ({ isPlatform = true, }: { event: useEventReturnType["data"]; - isPending: useEventReturnType["isLoading"]; + isPending: useEventReturnType["isPending"]; isPlatform?: boolean; }) => { const { setTimezone, timeFormat, timezone } = useTimePreferences(); diff --git a/packages/features/bookings/Booker/utils/event.ts b/packages/features/bookings/Booker/utils/event.ts index 9ae6577dac..150166d407 100644 --- a/packages/features/bookings/Booker/utils/event.ts +++ b/packages/features/bookings/Booker/utils/event.ts @@ -33,7 +33,7 @@ export const useEvent = () => { data: event?.data, isSuccess: event?.isSuccess, isError: event?.isError, - isLoading: event?.isPending, + isPending: event?.isPending, }; }; @@ -104,6 +104,7 @@ export const useScheduleForEvent = ({ return { data: schedule?.data, + isPending: schedule?.isPending, isError: schedule?.isError, isSuccess: schedule?.isSuccess, isLoading: schedule?.isLoading, diff --git a/packages/features/embed/Embed.tsx b/packages/features/embed/Embed.tsx index a4ea9b320c..8134f4e1ad 100644 --- a/packages/features/embed/Embed.tsx +++ b/packages/features/embed/Embed.tsx @@ -240,7 +240,7 @@ const EmailEmbed = ({
{t("select_date")}
{ setSelectedDate(date === null ? date : date.format("YYYY-MM-DD")); }} diff --git a/packages/platform/atoms/availability/AvailabilitySettings.tsx b/packages/platform/atoms/availability/AvailabilitySettings.tsx index cfdcaab105..20f39f5626 100644 --- a/packages/platform/atoms/availability/AvailabilitySettings.tsx +++ b/packages/platform/atoms/availability/AvailabilitySettings.tsx @@ -178,7 +178,10 @@ const DateOverride = ({ onChange={(ranges) => ranges.forEach((range) => append({ ranges: [range] }))} userTimeFormat={userTimeFormat} Trigger={ - } @@ -321,7 +324,11 @@ export function AvailabilitySettings({ openSidebar ? "translate-x-0 opacity-100" : "translate-x-full opacity-0" )}>
-