diff --git a/presentation/react-native/components/HabitsMainPage/HabitsList.tsx b/presentation/react-native/components/HabitsMainPage/HabitsList.tsx index beacc11..20738f3 100644 --- a/presentation/react-native/components/HabitsMainPage/HabitsList.tsx +++ b/presentation/react-native/components/HabitsMainPage/HabitsList.tsx @@ -92,10 +92,14 @@ export const HabitsList: React.FC = (props) => { > {habitsTracker.habitsHistory[frequency] .filter((habitItem) => { + const startDate = new Date(habitItem.habit.startDate) + startDate.setHours(0, 0, 0, 0) + return ( - (habitItem.habit.endDate != null && - habitItem.habit.endDate >= selectedDate) || - habitItem.habit.endDate == null + startDate <= selectedDate && + (habitItem.habit.endDate == null || + (habitItem.habit.endDate != null && + habitItem.habit.endDate >= selectedDate)) ) }) .map((item) => {