From 2cf20e9655d2595bf10a16ae9153f0277c1b0b27 Mon Sep 17 00:00:00 2001
From: Camille Moussu <66134347+Eriikah@users.noreply.github.com>
Date: Mon, 3 Nov 2025 14:35:05 +0100
Subject: [PATCH] [#269] fix selection error (#273)

Co-authored-by: Camille Moussu <cmoussu@linagora.com>
---
 src/components/Event/EventFormFields.tsx | 2 +-
 src/features/Events/EventModal.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Event/EventFormFields.tsx b/src/components/Event/EventFormFields.tsx
index 0cef472..e0ecf0d 100644
--- a/src/components/Event/EventFormFields.tsx
+++ b/src/components/Event/EventFormFields.tsx
@@ -735,7 +735,7 @@ export default function EventFormFields({
           )}
           <Select
             labelId="calendar-select-label"
-            value={calendarid.toString()}
+            value={calendarid}
             label={!showMore ? "Calendar" : ""}
             displayEmpty
             onChange={(e: SelectChangeEvent) =>
diff --git a/src/features/Events/EventModal.tsx b/src/features/Events/EventModal.tsx
index aa863d9..53cdb3f 100644
--- a/src/features/Events/EventModal.tsx
+++ b/src/features/Events/EventModal.tsx
@@ -140,7 +140,7 @@ function EventPopover({
     setLocation("");
     setStart("");
     setEnd("");
-    setCalendarid(userPersonnalCalendars[0].id);
+    setCalendarid(userPersonnalCalendars[0]?.id);
     setAllDay(false);
     setRepetition({} as RepetitionObject);
     setAlarm("");