From 445b307972e0ada2ef3a075544c007ea9e369961 Mon Sep 17 00:00:00 2001
From: Rajiv Sahal <sahalrajiv-extc@atharvacoe.ac.in>
Date: Thu, 9 Oct 2025 14:56:59 +0200
Subject: [PATCH] fix: week view and column view slots not fetching at end of
 month bug (#24374)

* fix: dont pick date value from url, use selectedDate value from booker store instead

* fix: replace month count logic with usePrefectch hook

* intialise booker layout as week view
---
 .../atoms/booker/BookerWebWrapper.tsx         |  2 +-
 .../wrappers/CalendarViewPlatformWrapper.tsx  | 25 ++++++-------------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/packages/platform/atoms/booker/BookerWebWrapper.tsx b/packages/platform/atoms/booker/BookerWebWrapper.tsx
index 5770ca9dfb..7d46f4c896 100644
--- a/packages/platform/atoms/booker/BookerWebWrapper.tsx
+++ b/packages/platform/atoms/booker/BookerWebWrapper.tsx
@@ -55,7 +55,7 @@ const BookerPlatformWrapperComponent = (props: BookerWebWrapperAtomProps) => {
     : clientFetchedEvent;
 
   const bookerLayout = useBookerLayout(event.data?.profile?.bookerLayouts);
-  const selectedDate = searchParams?.get("date");
+  const selectedDate = useBookerStoreContext((state) => state.selectedDate);
   const isRedirect = searchParams?.get("redirected") === "true" || false;
   const fromUserNameRedirected = searchParams?.get("username") || "";
   const rescheduleUid =
diff --git a/packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx b/packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx
index a94855f0bc..952d94d094 100644
--- a/packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx
+++ b/packages/platform/atoms/calendar-view/wrappers/CalendarViewPlatformWrapper.tsx
@@ -11,12 +11,12 @@ import {
 import { Header } from "@calcom/features/bookings/Booker/components/Header";
 import { BookerSection } from "@calcom/features/bookings/Booker/components/Section";
 import { useBookerLayout } from "@calcom/features/bookings/Booker/components/hooks/useBookerLayout";
+import { usePrefetch } from "@calcom/features/bookings/Booker/components/hooks/usePrefetch";
 import { useTimePreferences } from "@calcom/features/bookings/lib";
 import { LargeCalendar } from "@calcom/features/calendar-view/LargeCalendar";
 import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
 import { useTimesForSchedule } from "@calcom/features/schedules/lib/use-schedule/useTimesForSchedule";
 import { getRoutedTeamMemberIdsFromSearchParams } from "@calcom/lib/bookings/getRoutedTeamMemberIdsFromSearchParams";
-import { BookerLayouts } from "@calcom/prisma/zod-utils";
 
 import { formatUsername } from "../../booker/BookerPlatformWrapper";
 import type {
@@ -40,7 +40,6 @@ const CalendarViewPlatformWrapperComponent = (
     teamMemberEmail,
     crmAppSlug,
     crmOwnerRecordType,
-    view = "MONTH_VIEW",
   } = props;
 
   const teamId: number | undefined = props.isTeamEvent ? props.teamId : undefined;
@@ -73,22 +72,15 @@ const CalendarViewPlatformWrapperComponent = (
   );
   const selectedDate = useBookerStoreContext((state) => state.selectedDate);
   const date = dayjs(selectedDate).format("YYYY-MM-DD");
-  const monthCount =
-    ((bookerLayout.layout !== BookerLayouts.WEEK_VIEW && bookerState === "selecting_time") ||
-      bookerLayout.layout === BookerLayouts.COLUMN_VIEW) &&
-    dayjs(date).add(1, "month").month() !==
-      dayjs(date).add(bookerLayout.columnViewExtraDays.current, "day").month()
-      ? 2
-      : undefined;
   const month = useBookerStoreContext((state) => state.month);
   const [dayCount] = useBookerStoreContext((state) => [state.dayCount, state.setDayCount], shallow);
 
-  const prefetchNextMonth =
-    (bookerLayout.layout === BookerLayouts.WEEK_VIEW &&
-      !!bookerLayout.extraDays &&
-      dayjs(date).month() !== dayjs(date).add(bookerLayout.extraDays, "day").month()) ||
-    (bookerLayout.layout === BookerLayouts.COLUMN_VIEW &&
-      dayjs(date).month() !== dayjs(date).add(bookerLayout.columnViewExtraDays.current, "day").month());
+  const { prefetchNextMonth, monthCount } = usePrefetch({
+    date,
+    month,
+    bookerLayout,
+    bookerState,
+  });
 
   const [startTime, endTime] = useTimesForSchedule({
     month,
@@ -136,7 +128,6 @@ const CalendarViewPlatformWrapperComponent = (
   }, [props.routingFormSearchParams]);
   const bookingData = useBookerStoreContext((state) => state.bookingData);
   const setBookingData = useBookerStoreContext((state) => state.setBookingData);
-  const layout = BookerLayouts[view];
 
   useGetBookingForReschedule({
     uid: props.rescheduleUid ?? props.bookingUid ?? "",
@@ -154,7 +145,7 @@ const CalendarViewPlatformWrapperComponent = (
     eventId: event?.data?.id,
     rescheduleUid: props.rescheduleUid ?? null,
     bookingUid: props.bookingUid ?? null,
-    layout: layout,
+    layout: "week_view",
     org: props.entity?.orgSlug,
     username,
     bookingData,