diff --git a/src/utils/Chores.jsx b/src/utils/Chores.jsx index 729a9ac..b85ad4b 100644 --- a/src/utils/Chores.jsx +++ b/src/utils/Chores.jsx @@ -179,9 +179,9 @@ export const notInCompletionWindow = chore => { export const ChoreFilters = userProfile => ({ anyone: () => true, assigned_to_me: chore => { - return chore.assignedTo && chore.assignedTo === userProfile.id + return chore.assignedTo && chore.assignedTo === userProfile?.id }, assigned_to_others: chore => { - return chore.assignedTo && chore.assignedTo !== userProfile.id + return chore.assignedTo && chore.assignedTo !== userProfile?.id }, }) diff --git a/src/views/Chores/MyChores.jsx b/src/views/Chores/MyChores.jsx index 7373b25..ae4497e 100644 --- a/src/views/Chores/MyChores.jsx +++ b/src/views/Chores/MyChores.jsx @@ -98,13 +98,12 @@ const MyChores = () => { throw new Error(userProfileResponse.statusText) } Promise.all([ + userProfileResponse.json(), choresResponse.json(), usersResponse.json(), - userProfileResponse.json(), ]).then(data => { - const [choresData, usersData, userProfileData] = data + const [userProfileData, choresData, usersData] = data setUserProfile(userProfileData.res) - choresData.res.sort(ChoreSorter) setChores(choresData.res) setFilteredChores(choresData.res) setPerformers(usersData.res)