From 6b5a874db548cd786d5e24da63898326a884f8a5 Mon Sep 17 00:00:00 2001 From: Mo Tarbin Date: Tue, 26 Aug 2025 22:11:10 -0400 Subject: [PATCH] Refactor ChoreCard to remove unused circle members data and update approval logic to use performers --- src/views/Chores/ChoreCard.jsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/views/Chores/ChoreCard.jsx b/src/views/Chores/ChoreCard.jsx index f2fee7a..90dabd2 100644 --- a/src/views/Chores/ChoreCard.jsx +++ b/src/views/Chores/ChoreCard.jsx @@ -31,7 +31,7 @@ import moment from 'moment' import React from 'react' import { useNavigate } from 'react-router-dom' import { useImpersonateUser } from '../../contexts/ImpersonateUserContext.jsx' -import { useCircleMembers, useUserProfile } from '../../queries/UserQueries.jsx' +import { useUserProfile } from '../../queries/UserQueries.jsx' import { useNotification } from '../../service/NotificationProvider' import { notInCompletionWindow } from '../../utils/Chores.jsx' import { getTextColorFromBackgroundColor } from '../../utils/Colors.jsx' @@ -81,7 +81,6 @@ const ChoreCard = ({ const [secondsLeftToCancel, setSecondsLeftToCancel] = React.useState(null) const [timeoutId, setTimeoutId] = React.useState(null) const { data: userProfile } = useUserProfile() - const { data: circleMembersData } = useCircleMembers() const { impersonatedUser } = useImpersonateUser() @@ -264,9 +263,9 @@ const ChoreCard = ({ // Check if the current user can approve/reject (admin, manager, or task owner) const canApproveReject = () => { - if (!circleMembersData?.res || !chore) return false + if (!performers || !chore) return false - const currentUser = circleMembersData.res.find( + const currentUser = performers.find( member => member.userId === (impersonatedUser?.userId || userProfile?.id), )