From 4b1b9b3a9ce000bbec58c26865e2fd4bd1b63d0a Mon Sep 17 00:00:00 2001 From: Ash D Date: Fri, 4 Oct 2024 09:59:44 +1000 Subject: [PATCH] fix: rescheduledBy to carry into success url redirect --- apps/web/modules/bookings/views/bookings-single-view.tsx | 6 +++++- .../bookings/Booker/components/hooks/useBookings.ts | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/web/modules/bookings/views/bookings-single-view.tsx b/apps/web/modules/bookings/views/bookings-single-view.tsx index ba1c4965e504c7..71e1ff14fed365 100644 --- a/apps/web/modules/bookings/views/bookings-single-view.tsx +++ b/apps/web/modules/bookings/views/bookings-single-view.tsx @@ -161,7 +161,11 @@ export default function Success(props: PageProps) { const [calculatedDuration, setCalculatedDuration] = useState(undefined); const [comment, setComment] = useState(""); const parsedRating = rating ? parseInt(rating, 10) : 3; - const currentUserEmail = searchParams?.get("cancelledBy") ?? session?.user?.email ?? undefined; + const currentUserEmail = + searchParams?.get("rescheduledBy") ?? + searchParams?.get("cancelledBy") ?? + session?.user?.email ?? + undefined; const defaultRating = isNaN(parsedRating) ? 3 : parsedRating > 5 ? 5 : parsedRating < 1 ? 1 : parsedRating; const [rateValue, setRateValue] = useState(defaultRating); diff --git a/packages/features/bookings/Booker/components/hooks/useBookings.ts b/packages/features/bookings/Booker/components/hooks/useBookings.ts index e0653cc50ba290..9480f3fb1d4240 100644 --- a/packages/features/bookings/Booker/components/hooks/useBookings.ts +++ b/packages/features/bookings/Booker/components/hooks/useBookings.ts @@ -108,6 +108,7 @@ export const useBookings = ({ event, hashedLink, bookingForm, metadata, teamMemb const isInstantMeeting = useBookerStore((state) => state.isInstantMeeting); const rescheduleUid = useBookerStore((state) => state.rescheduleUid); + const rescheduledBy = useBookerStore((state) => state.rescheduledBy); const bookingData = useBookerStore((state) => state.bookingData); const timeslot = useBookerStore((state) => state.selectedTimeslot); const { t } = useLocale(); @@ -260,6 +261,7 @@ export const useBookings = ({ event, hashedLink, bookingForm, metadata, teamMemb seatReferenceUid: "seatReferenceUid" in booking ? booking.seatReferenceUid : null, formerTime: isRescheduling && bookingData?.startTime ? dayjs(bookingData.startTime).toString() : undefined, + rescheduledBy, // ensure further reschedules performed on the success page are recorded correctly }; bookingSuccessRedirect({