From d65541fb3e2d6a470c2052831aa38614a98bb685 Mon Sep 17 00:00:00 2001
From: Mo Tarbin <mhed.t91@gmail.com>
Date: Sat, 31 May 2025 17:18:17 -0400
Subject: [PATCH] refactor: Simplify user data fetching in MyChores component
 and update performer assignment logic ( cause a racing condition where
 sometime no task shown)

---
 src/views/Chores/ChoreCard.jsx |  8 ++--
 src/views/Chores/MyChores.jsx  | 67 +++++-----------------------------
 2 files changed, 15 insertions(+), 60 deletions(-)

diff --git a/src/views/Chores/ChoreCard.jsx b/src/views/Chores/ChoreCard.jsx
index 64a5da2..4a9dc56 100644
--- a/src/views/Chores/ChoreCard.jsx
+++ b/src/views/Chores/ChoreCard.jsx
@@ -532,15 +532,17 @@ const ChoreCard = ({
               <Box display='flex' flexDirection='column'>
                 <Typography level='title-md'>{getName(chore.name)}</Typography>
                 {userProfile && chore.assignedTo !== userProfile.id && (
-                  <Typography level='body-md' color='text.disabled'>
-                    Assigned to{' '}
+                  <Box display='flex' alignItems='center' gap={0.5}>
+                    <Typography level='body-md' color='text.disabled'>
+                      Assigned to
+                    </Typography>
                     <Chip variant='outlined'>
                       {
                         performers.find(p => p.id === chore.assignedTo)
                           ?.displayName
                       }
                     </Chip>
-                  </Typography>
+                  </Box>
                 )}
                 <Box key={`${chore.id}-labels`}>
                   {chore.priority > 0 && (
diff --git a/src/views/Chores/MyChores.jsx b/src/views/Chores/MyChores.jsx
index d095e8f..1e64b24 100644
--- a/src/views/Chores/MyChores.jsx
+++ b/src/views/Chores/MyChores.jsx
@@ -34,12 +34,7 @@ import { useContext, useEffect, useRef, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { UserContext } from '../../contexts/UserContext'
 import { useChores } from '../../queries/ChoreQueries'
-import {
-  GetAllUsers,
-  GetArchivedChores,
-  GetChores,
-  GetUserProfile,
-} from '../../utils/Fetcher'
+import { GetArchivedChores } from '../../utils/Fetcher'
 import Priorities from '../../utils/Priorities'
 import LoadingComponent from '../components/Loading'
 import { useLabels } from '../Labels/LabelQueries'
@@ -47,6 +42,7 @@ import ChoreCard from './ChoreCard'
 import CompactChoreCard from './CompactChoreCard'
 import IconButtonWithMenu from './IconButtonWithMenu'
 
+import { useCircleMembers } from '../../queries/UserQueries'
 import { ChoreFilters, ChoresGrouper, ChoreSorter } from '../../utils/Chores'
 import TaskInput from '../components/AddTaskModal'
 import {
@@ -95,58 +91,11 @@ const MyChores = () => {
     isLoading: choresLoading,
     refetch: refetchChores,
   } = useChores()
+  const { data: membersData, isLoading: membersLoading } = useCircleMembers()
 
   useEffect(() => {
-    Promise.all([GetChores(), GetAllUsers(), GetUserProfile()]).then(
-      responses => {
-        const [choresResponse, usersResponse, userProfileResponse] = responses
-        if (!choresResponse.ok) {
-          throw new Error(choresResponse.statusText)
-        }
-        if (!usersResponse.ok) {
-          throw new Error(usersResponse.statusText)
-        }
-        if (!userProfileResponse.ok) {
-          throw new Error(userProfileResponse.statusText)
-        }
-        Promise.all([
-          userProfileResponse.json(),
-          choresResponse.json(),
-          usersResponse.json(),
-        ]).then(data => {
-          const [userProfileData, choresData, usersData] = data
-          setUserProfile(userProfileData.res)
-          setChores(choresData.res)
-          setFilteredChores(choresData.res)
-          setPerformers(usersData.res)
-          if (canScheduleNotification()) {
-            scheduleChoreNotification(
-              choresData.res,
-              userProfileData.res,
-              usersData.res,
-            )
-          }
-        })
-      },
-    )
-
-    // GetAllUsers()
-    //   .then(response => response.json())
-    //   .then(data => {
-    //     setPerformers(data.res)
-    //   })
-    // GetUserProfile().then(response => response.json()).then(data => {
-    //   setUserProfile(data.res)
-    // })
-
-    // const currentUser = JSON.parse(localStorage.getItem('user'))
-    // if (currentUser !== null) {
-    //   setActiveUserId(currentUser.id)
-    // }
-  }, [])
-
-  useEffect(() => {
-    if (choresData) {
+    if (!choresLoading && !membersLoading && userProfile) {
+      setPerformers(membersData.res)
       const sortedChores = choresData.res.sort(ChoreSorter)
       setChores(sortedChores)
       setFilteredChores(sortedChores)
@@ -165,8 +114,12 @@ const MyChores = () => {
           }, {}),
         )
       }
+
+      if (canScheduleNotification()) {
+        scheduleChoreNotification(choresData.res, userProfile, membersData.res)
+      }
     }
-  }, [choresData, choresLoading])
+  }, [membersLoading, choresLoading, userProfile])
 
   useEffect(() => {
     document.addEventListener('mousedown', handleMenuOutsideClick)