From 07d8a39829f2e8665ed50b96a10e3c3d81a9be69 Mon Sep 17 00:00:00 2001 From: "devin-ai-integration[bot]" <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Thu, 10 Apr 2025 13:28:00 +0000 Subject: [PATCH] feat: display year for bookings in different years (#20647) Conditionally displays the year in the date format for upcoming bookings on the /bookings page when the booking's year differs from the current year. Fixes CAL-5455 Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: eunjae@cal.com --- apps/web/components/booking/BookingListItem.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/web/components/booking/BookingListItem.tsx b/apps/web/components/booking/BookingListItem.tsx index 1aa309e2e8..65601e410e 100644 --- a/apps/web/components/booking/BookingListItem.tsx +++ b/apps/web/components/booking/BookingListItem.tsx @@ -387,10 +387,14 @@ function BookingListItem(booking: BookingItemProps) { ); }; + const bookingYear = dayjs(booking.startTime).year(); + const currentYear = dayjs().year(); + const isDifferentYear = bookingYear !== currentYear; + const startTime = dayjs(booking.startTime) .tz(userTimeZone) .locale(language) - .format(isUpcoming ? "ddd, D MMM" : "D MMMM YYYY"); + .format(isUpcoming ? (isDifferentYear ? "ddd, D MMM YYYY" : "ddd, D MMM") : "D MMMM YYYY"); const [isOpenRescheduleDialog, setIsOpenRescheduleDialog] = useState(false); const [isOpenReassignDialog, setIsOpenReassignDialog] = useState(false); const [isOpenSetLocationDialog, setIsOpenLocationDialog] = useState(false);