From 33ff50aab0c10a0fb5584a9f220640ebe50f1566 Mon Sep 17 00:00:00 2001
From: "gpt-engineer-app[bot]"
 <159125892+gpt-engineer-app[bot]@users.noreply.github.com>
Date: Sat, 18 Apr 2026 22:54:08 +0000
Subject: [PATCH] Changes

Co-authored-by: renee-png <262607627+renee-png@users.noreply.github.com>
---
 src/routes/calendar.index.tsx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/routes/calendar.index.tsx b/src/routes/calendar.index.tsx
index 60a71e3..5083497 100644
--- a/src/routes/calendar.index.tsx
+++ b/src/routes/calendar.index.tsx
@@ -301,7 +301,8 @@ function CalendarPage() {
   const eventsByDay = useMemo(() => {
     const m = new Map<string, Evt[]>();
     for (const e of visibleEvents) {
-      const key = e.start.slice(0, 10);
+      // Bucket events by their EST calendar day, not the raw UTC ISO date.
+      const key = e.all_day ? e.start.slice(0, 10) : formatInEST(e.start, "yyyy-MM-dd");
       const arr = m.get(key) ?? [];
       arr.push(e);
       m.set(key, arr);
@@ -875,7 +876,7 @@ function MonthGrid({
                       )}
                       title={e.title}
                     >
-                      {!e.all_day && format(parseISO(e.start), "h:mma ")}
+                      {!e.all_day && formatInEST(e.start, "h:mma ")}
                       {e.title}
                     </div>
                   );
@@ -942,7 +943,7 @@ function WeekStrip({
                     className={cn("text-[11px] px-1.5 py-1 rounded truncate text-white", meta.bg)}
                     title={e.title}
                   >
-                    {!e.all_day && format(parseISO(e.start), "h:mma ")}
+                    {!e.all_day && formatInEST(e.start, "h:mma ")}
                     {e.title}
                   </div>
                 );
@@ -1010,8 +1011,8 @@ function EventRow({
           </Badge>
         </div>
         <div className="text-xs text-muted-foreground flex items-center gap-3 flex-wrap mt-0.5">
-          {showDate && <span>{format(parseISO(evt.start), "EEE, MMM d")}</span>}
-          {!evt.all_day && <span>{format(parseISO(evt.start), "h:mm a")}</span>}
+          {showDate && <span>{formatInEST(evt.start, "EEE, MMM d")}</span>}
+          {!evt.all_day && <span>{formatInEST(evt.start, "h:mm a")} EST</span>}
           {evt.all_day && <span>All day</span>}
           {evt.case_label && <span className="truncate">· {evt.case_label}</span>}
           {evt.client_label && !evt.case_label && (