Hotfix changes to develop

src/components/TreeSelectOption/treeSelectOption.settings.js

@@ -163,7 +163,23 @@ export const treeDynamicTaxonomyOptions = (concepts, user, calendarContentLangua
         }),
         value: concept?.id,
         ...(concept?.children && {
-          children: handleMultilevelTreeSelect(concept?.children, user),
+          children: handleMultilevelTreeSelect(
+            concept?.children,
+            user,
+            calendarContentLanguage,
+            contentLanguageBilingual({
+              en: concept?.name?.en,
+              fr: concept?.name?.fr,
+              interfaceLanguage: user?.interfaceLanguage?.toLowerCase(),
+              calendarContentLanguage: calendarContentLanguage,
+            }),
+          ),
+        }),
+        label: contentLanguageBilingual({
+          en: concept?.name?.en,
+          fr: concept?.name?.fr,
+          interfaceLanguage: user?.interfaceLanguage?.toLowerCase(),
+          calendarContentLanguage: calendarContentLanguage,
         }),
       };
     });

src/pages/Dashboard/AddEvent/AddEvent.jsx

@@ -180,10 +180,11 @@ function AddEvent() {
   let dynamicAdminOnlyFields = requiredFields?.adminOnlyFields?.dynamicFields ?? [];
   const calendarContentLanguage = currentCalendarData?.contentLanguage;
   const dateTimeConverter = (date, time) => {
-    let dateSelected = moment.tz(date, eventData?.scheduleTimezone ?? 'Canada/Eastern').format('DD-MM-YYYY');
-    let timeSelected = moment.tz(time, eventData?.scheduleTimezone ?? 'Canada/Eastern').format('hh:mm:ss a');
-    let dateTime = moment(dateSelected + ' ' + timeSelected, 'DD-MM-YYYY HH:mm a');
-    return moment(dateTime).toISOString();
+    let dateSelected = date.format('DD-MM-YYYY');
+    let timeSelected = time.format('hh:mm:ss a');
+    // Combine date and time and explicitly set the timezone to 'Canada/Eastern'
+    let dateTime = moment.tz(dateSelected + ' ' + timeSelected, 'DD-MM-YYYY HH:mm a', 'Canada/Eastern');
+    return dateTime.toISOString();
   };
 
   const calendar = user?.roles.filter((calendar) => {

src/pages/Dashboard/OrganizationsReadOnly/OrganizationsReadOnly.jsx

@@ -34,6 +34,13 @@ function OrganizationsReadOnly() {
   const navigate = useNavigate();
   const [currentCalendarData] = useOutletContext();
 
+  const { currentData: allTaxonomyData, isLoading: taxonomyLoading } = useGetAllTaxonomyQuery({
+    calendarId,
+    search: '',
+    taxonomyClass: taxonomyClass.ORGANIZATION,
+    includeConcepts: true,
+  });
+
   const {
     data: organizationData,
     isLoading: organizationLoading,
@@ -43,12 +50,6 @@ function OrganizationsReadOnly() {
     { id: organizationId, calendarId, sessionId: timestampRef },
     { skip: organizationId ? false : true },
   );
-  const { currentData: allTaxonomyData, isLoading: taxonomyLoading } = useGetAllTaxonomyQuery({
-    calendarId,
-    search: '',
-    taxonomyClass: taxonomyClass.ORGANIZATION,
-    includeConcepts: true,
-  });
 
   const [getPlace] = useLazyGetPlaceQuery();
   const [getAllTaxonomy] = useLazyGetAllTaxonomyQuery();