From e085e4c893f6f6a982a41117168320622633b96f Mon Sep 17 00:00:00 2001
From: Camille Moussu <66134347+Eriikah@users.noreply.github.com>
Date: Fri, 7 Nov 2025 08:08:16 +0100
Subject: [PATCH] [#276] remove false from all day date subtitle (#289)

Co-authored-by: Camille Moussu <cmoussu@linagora.com>
---
 .../features/Events/EventDisplay.test.tsx     | 45 +++++++++++++++++++
 __test__/utils/Renderwithproviders.tsx        |  3 ++
 src/features/Events/EventDisplayPreview.tsx   |  2 +-
 3 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/__test__/features/Events/EventDisplay.test.tsx b/__test__/features/Events/EventDisplay.test.tsx
index 14f9d83..4e7ea8f 100644
--- a/__test__/features/Events/EventDisplay.test.tsx
+++ b/__test__/features/Events/EventDisplay.test.tsx
@@ -797,6 +797,51 @@ describe("Event Preview Display", () => {
       }).not.toThrow();
     });
   });
+
+  describe("BUGFIX", () => {
+    it("doesnt render anything next to date of all day preview", () => {
+      const allDayState = {
+        ...preloadedState,
+        calendars: {
+          ...preloadedState.calendars,
+          list: {
+            ...preloadedState.calendars.list,
+            "667037022b752d0026472254/cal1": {
+              ...preloadedState.calendars.list["667037022b752d0026472254/cal1"],
+              events: {
+                event1: {
+                  ...preloadedState.calendars.list[
+                    "667037022b752d0026472254/cal1"
+                  ].events.event1,
+                  allday: true, // <-- the fix condition
+                },
+              },
+            },
+          },
+        },
+      };
+
+      renderWithProviders(
+        <EventPreviewModal
+          open={true}
+          onClose={mockOnClose}
+          calId={"667037022b752d0026472254/cal1"}
+          eventId={"event1"}
+        />,
+        allDayState
+      );
+      const dateElement =
+        screen.getByText(/January/i).closest("p") ??
+        screen.getByText(/January/i);
+
+      expect(dateElement).toBeInTheDocument();
+      console.log(dateElement.textContent);
+
+      const text = dateElement.textContent?.trim() ?? "";
+
+      expect(text).toMatch(/\d{4}$/);
+    });
+  });
 });
 
 describe("Event Full Display", () => {
diff --git a/__test__/utils/Renderwithproviders.tsx b/__test__/utils/Renderwithproviders.tsx
index 39214c4..bbe61c3 100644
--- a/__test__/utils/Renderwithproviders.tsx
+++ b/__test__/utils/Renderwithproviders.tsx
@@ -24,6 +24,9 @@ export function renderWithProviders(
       <I18nContext.Provider
         value={{
           t: (key: string, vars?: Record<string, string>) => {
+            if (key === "locale") {
+              return "en";
+            }
             if (vars) {
               const params = Object.entries(vars)
                 .map(([k, v]) => `${k}=${v}`)
diff --git a/src/features/Events/EventDisplayPreview.tsx b/src/features/Events/EventDisplayPreview.tsx
index 53d270a..b9d77de 100644
--- a/src/features/Events/EventDisplayPreview.tsx
+++ b/src/features/Events/EventDisplayPreview.tsx
@@ -306,7 +306,7 @@ export default function EventPreviewModal({
                 {formatDate(event.start, t, event.allday)}
                 {event.end &&
                   formatEnd(event.start, event.end, t, event.allday) &&
-                  ` – ${formatEnd(event.start, event.end, t, event.allday)} ${!event.allday && getTimezoneOffset(timezone)}`}
+                  ` – ${formatEnd(event.start, event.end, t, event.allday)} ${!event.allday ? getTimezoneOffset(timezone) : ""}`}
               </Typography>
             </>
           )