Merge branch 'dev'

# Conflicts:
#	components/pages/calendar/EventCalendar.tsx
#	components/pages/settings/user_settings_views/MyProfile.tsx
This commit is contained in:
Milan Paunovic
2024-11-05 13:44:42 +01:00
11 changed files with 994 additions and 903 deletions
+1 -2
View File
@@ -61,9 +61,8 @@ export const useCreateTodo = () => {
dates.push(newDate);
});
// TODO: for the next 52 weeks
let index = 1;
for (let i = 0; i < 4; i++) {
for (let i = 0; i < 52; i++) {
dates?.forEach((dateToAdd) => {
index ++;
let newTodoDate = addWeeks(dateToAdd, i);
+1 -1
View File
@@ -73,7 +73,7 @@ export const useUpdateTodo = () => {
dates.push(newDate);
});
let todosToAddCycles = 4;
let todosToAddCycles = 52;
if (firstTodo?.repeatType === REPEAT_TYPE.EVERY_WEEK) {
todosToAddCycles = filteredTodos?.length / firstTodo?.repeatDays?.length;
}