Skip to content

fix: Recurring events set to "yearly" don't recur #24361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anikdhabal merged 9 commits into from
Nov 3, 2025
Merged

fix: Recurring events set to "yearly" don't recur #24361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d5a8b16
#fix: Recurring events set to “yearly” don’t recur
designed2code Oct 8, 2025
e070633
fix: handle yearly recurring events with explicit null check
designed2code Oct 8, 2025
5f6b994
fix: use explicit null check for recurring event frequency
designed2code Oct 8, 2025
6e1ff50
Merge branch 'main' into bug-16442
designed2code Oct 9, 2025
cbbffe2
Merge branch 'main' into bug-16442
designed2code Oct 13, 2025
544091f
Merge branch 'main' into bug-16442
designed2code Oct 25, 2025
4ed0f8c
Merge branch 'main' into bug-16442
designed2code Oct 28, 2025
534ee5f
Merge branch 'main' into bug-16442
designed2code Nov 2, 2025
cddc2d7
Merge branch 'main' into bug-16442
anikdhabal Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/web/components/booking/BookingListItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -903,7 +903,7 @@ const RecurringBookingsTooltip = ({

return (
(booking.recurringInfo &&
booking.eventType?.recurringEvent?.freq &&
booking.eventType?.recurringEvent?.freq != null &&
(booking.listingStatus === "recurring" ||
booking.listingStatus === "unconfirmed" ||
booking.listingStatus === "cancelled") && (
Expand Down
2 changes: 1 addition & 1 deletion packages/lib/recurringStrings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const getEveryFreqFor = ({
recurringCount?: number;
recurringFreq?: string;
}): string => {
if (recurringEvent.freq) {
if (recurringEvent.freq != null) {
return `${recurringFreq || getRecurringFreq({ t, recurringEvent })} ${
recurringCount || recurringEvent.count
} ${t("occurrence", {
Expand Down
8 changes: 4 additions & 4 deletions packages/platform/atoms/hooks/bookings/useHandleBookEvent.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { showToast } from "@calcom/ui/components/toast";
import { getUtmTrackingParameters } from "../../lib/getUtmTrackingParameters";
import type { UseCreateBookingInput } from "./useCreateBooking";

type Callbacks = { onSuccess?: () => void; onError?: (err: any) => void };
type Callbacks = { onSuccess?: () => void; onError?: (err: unknown) => void };
type UseHandleBookingProps = {
bookingForm: UseBookingFormReturnType["bookingForm"];
event?: {
Expand Down Expand Up @@ -64,8 +64,8 @@ export const useHandleBookEvent = ({
const crmAppSlug = useBookerStoreContext((state) => state.crmAppSlug);
const crmRecordId = useBookerStoreContext((state) => state.crmRecordId);
const verificationCode = useBookerStoreContext((state) => state.verificationCode);
const handleError = (err: any) => {
const errorMessage = err?.message ? t(err.message) : t("can_you_try_again");
const handleError = (err: unknown) => {
const errorMessage = err instanceof Error ? t(err.message) : t("can_you_try_again");
showToast(errorMessage, "error");
};
const searchParams = useSearchParams();
Expand Down Expand Up @@ -121,7 +121,7 @@ export const useHandleBookEvent = ({

if (isInstantMeeting) {
handleInstantBooking(mapBookingToMutationInput(bookingInput), callbacks);
} else if (event.data?.recurringEvent?.freq && recurringEventCount && !rescheduleUid) {
} else if (event.data?.recurringEvent?.freq != null && recurringEventCount && !rescheduleUid) {
handleRecBooking(
mapRecurringBookingToMutationInput(bookingInput, recurringEventCount, tracking),
callbacks
Expand Down
Loading