Merge branch 'dev' into production

CMI-OSS · Dec 1, 2023 · a238a45 · a238a45
2 parents d5312c0 + 58499b6
commit a238a45
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/packages/mobile/src/page/Home/ScheduleContainer/index.tsx b/packages/mobile/src/page/Home/ScheduleContainer/index.tsx
@@ -15,10 +15,11 @@ export default function ScheduleContainer({ today }: Props) {
     data?.filter((schedule) => {
       const today = dayjs();
 
-      if (today.isSame(schedule.startDateTime, "date")) return true;
-      if (today.isBefore(schedule.startDateTime, "date")) return false;
-      if (schedule.endDateTime && today.isAfter(schedule.endDateTime, "date"))
-        return false;
+      const { startDateTime, endDateTime } = schedule;
+
+      if (endDateTime && today.isAfter(endDateTime, "date")) return false;
+      if (today.isBefore(startDateTime, "date")) return false;
+      if (!endDateTime && today.isAfter(startDateTime, "date")) return false;
 
       return true;
     }) ?? [];