From 29ec985ffabd0919e4755f11d652cfb5a5eefced Mon Sep 17 00:00:00 2001
From: Dejan <panovskidejan@yahoo.com>
Date: Thu, 21 Nov 2024 23:53:18 +0100
Subject: [PATCH] - Fixed event coloring issue on the my view/family view

---
 components/pages/calendar/EventCalendar.tsx         | 3 ++-
 components/pages/calendar/ManuallyAddEventModal.tsx | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/pages/calendar/EventCalendar.tsx b/components/pages/calendar/EventCalendar.tsx
index a2bb06f..eeb40c1 100644
--- a/components/pages/calendar/EventCalendar.tsx
+++ b/components/pages/calendar/EventCalendar.tsx
@@ -104,7 +104,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
     const memoizedEventCellStyle = useCallback(
       (event: CalendarEvent) => {
           let eventColor = event.eventColor;
-          if (!isFamilyView && event.attendees?.includes(user?.uid)) {
+          if (!isFamilyView && (event.attendees?.includes(user?.uid) || event.creatorId === user?.uid)) {
               eventColor = profileData?.eventColor ?? colorMap.teal;
           }
 
@@ -283,6 +283,7 @@ export const EventCalendar: React.FC<EventCalendarProps> = React.memo(
                     // enrichedEventsByDate={enrichedEvents}
                     events={filteredEvents}
                     eventCellStyle={memoizedEventCellStyle}
+                    allDayEventCellStyle={memoizedEventCellStyle}
                     onPressEvent={handlePressEvent}
                     weekStartsOn={memoizedWeekStartsOn}
                     height={calendarHeight}
diff --git a/components/pages/calendar/ManuallyAddEventModal.tsx b/components/pages/calendar/ManuallyAddEventModal.tsx
index 4770af3..3a92335 100644
--- a/components/pages/calendar/ManuallyAddEventModal.tsx
+++ b/components/pages/calendar/ManuallyAddEventModal.tsx
@@ -67,6 +67,7 @@ export const ManuallyAddEventModal = () => {
       setDeleteModalVisible(false);
       setSelectedNewEndDate(undefined);
       setEditEvent(undefined);
+      setCreator(null)
     },
     initialDate: selectedNewEventDate || editEvent?.start,
   };
@@ -149,7 +150,7 @@ export const ManuallyAddEventModal = () => {
       const fullName = `${creatorMember?.firstName ?? ""}`;
       setCreator(fullName);
     }
-  }, [])
+  }, [members])
 
   const isLoading = isDeleting || isAdding;