[#25] changed loading order + added condition to keep loading screen while loading calendar list

src/features/Events/EventModal.tsx

@@ -28,7 +28,7 @@ function EventPopover({
   const dispatch = useAppDispatch();
 
   const organizer = useAppSelector((state) => state.user.organiserData);
-  const calendars = useAppSelector((state) => state.calendars);
+  const calendars = useAppSelector((state) => state.calendars.list);
   const [title, setTitle] = useState("");
   const [description, setDescription] = useState("");
   const [location, setLocation] = useState("");
@@ -46,8 +46,8 @@ function EventPopover({
   const handleSave = () => {
     const newEvent: CalendarEvent = {
       title,
-      start: new Date(start || ""),
-      end: new Date(end || ""),
+      start: new Date(start ?? ""),
+      end: new Date(end ?? ""),
       uid: Date.now().toString(36),
       description,
       location,

src/features/Events/eventUtils.ts

@@ -40,22 +40,22 @@ export function parseCalendarEvent(
         break;
       case "organizer":
         event.organizer = {
-          cn: params?.cn || "",
+          cn: params?.cn ?? "",
           cal_address: value.replace(/^mailto:/, ""),
         };
         break;
       case "attendee":
         (event.attendee as userAttendee[]).push({
-          cn: params?.cn || "",
+          cn: params?.cn ?? "",
           cal_address: value.replace(/^mailto:/, ""),
-          partstat: params?.partstat || "",
-          rsvp: params?.rsvp || "",
-          role: params?.role || "",
-          cutype: params?.cutype || "",
+          partstat: params?.partstat ?? "",
+          rsvp: params?.rsvp ?? "",
+          role: params?.role ?? "",
+          cutype: params?.cutype ?? "",
         });
         break;
       case "dtstamp":
-        event.stamp = new Date(value);
+        event.stamp = value;
         break;
       case "sequence":
         event.sequence = Number(value);