jonas/donetick
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Refactor ChoreCard to remove unused circle members data and update approval logic to use performers

Browse Source
This commit is contained in:
Mo Tarbin
2025-08-26 22:11:10 -04:00
parent defc7a8fa4
commit 6b5a874db5
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/views/Chores/ChoreCard.jsx
View File

@@ -31,7 +31,7 @@ import moment from 'moment'
import React from 'react' import React from 'react'
import { useNavigate } from 'react-router-dom' import { useNavigate } from 'react-router-dom'
import { useImpersonateUser } from '../../contexts/ImpersonateUserContext.jsx' 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 { useNotification } from '../../service/NotificationProvider'
import { notInCompletionWindow } from '../../utils/Chores.jsx' import { notInCompletionWindow } from '../../utils/Chores.jsx'
import { getTextColorFromBackgroundColor } from '../../utils/Colors.jsx' import { getTextColorFromBackgroundColor } from '../../utils/Colors.jsx'
@@ -81,7 +81,6 @@ const ChoreCard = ({
const [secondsLeftToCancel, setSecondsLeftToCancel] = React.useState(null) const [secondsLeftToCancel, setSecondsLeftToCancel] = React.useState(null)
const [timeoutId, setTimeoutId] = React.useState(null) const [timeoutId, setTimeoutId] = React.useState(null)
const { data: userProfile } = useUserProfile() const { data: userProfile } = useUserProfile()
const { data: circleMembersData } = useCircleMembers()
const { impersonatedUser } = useImpersonateUser() const { impersonatedUser } = useImpersonateUser()
@@ -264,9 +263,9 @@ const ChoreCard = ({
// Check if the current user can approve/reject (admin, manager, or task owner) // Check if the current user can approve/reject (admin, manager, or task owner)
const canApproveReject = () => { 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), member => member.userId === (impersonatedUser?.userId || userProfile?.id),
) )