diff --git a/packages/mobile/src/page/Home/ScheduleContainer/index.tsx b/packages/mobile/src/page/Home/ScheduleContainer/index.tsx index bb15c42a..a7233e5d 100644 --- 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; }) ?? [];