Merge pull request #1583 from lumi-tip/development-lumi-7639

🐛 when editting attendance user will not experience a reset of the attendance after 30-50seconds
breatheco-de · Sep 3, 2024 · d9b2861 · d9b2861
2 parents 4454902 + b6f1c38
commit d9b2861
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/src/common/components/AttendanceModal/index.jsx b/src/common/components/AttendanceModal/index.jsx
@@ -449,7 +449,7 @@ AttendanceModal.defaultProps = {
   title: '',
   message: '',
   isOpen: true,
-  onClose: () => {},
+  onClose: () => { },
 };
 
 export default AttendanceModal;
diff --git a/src/common/components/LiveEvent/index.jsx b/src/common/components/LiveEvent/index.jsx
@@ -233,15 +233,16 @@ function LiveEvent({
 
   useEffect(() => {
     let intervalVar;
-    // applyFilters();
     updateTimes();
 
-    setTimeout(() => {
+    const timeoutId = setTimeout(() => {
       updateTimes();
-      intervalVar = setInterval(updateTimes(), 60 * 1000);
+      intervalVar = setInterval(updateTimes, 60 * 1000);
     }, secondsToNextMinute * 1000);
+
     return () => {
       clearInterval(intervalVar);
+      clearTimeout(timeoutId);
     };
   }, [mainClasses, otherEvents]);
 

diff --git a/src/pages/cohort/[cohortSlug]/[slug]/[version]/index.jsx b/src/pages/cohort/[cohortSlug]/[slug]/[version]/index.jsx
@@ -35,7 +35,6 @@ import {
   includesToLowerCase,
   getStorageItem,
   sortToNearestTodayDate,
-  syncInterval,
   getBrowserSize,
   calculateDifferenceDays,
   adjustNumberBeetwenMinMax,
@@ -266,16 +265,6 @@ function Dashboard() {
           },
         });
       });
-    syncInterval(() => {
-      setLiveClasses((prev) => {
-        const validatedEventList = prev?.length > 0
-          ? prev?.filter((l) => isValidDate(l?.starting_at) && isValidDate(l?.ending_at))
-          : [];
-        const sortDateToLiveClass = sortToNearestTodayDate(validatedEventList, TwelveHours);
-        const existentLiveClasses = sortDateToLiveClass?.filter((l) => l?.hash && l?.starting_at && l?.ending_at);
-        return existentLiveClasses;
-      });
-    });
   }, []);
 
   // Fetch cohort data with pathName structure