diff --git a/src/views/ChoreEdit/ChoreView.jsx b/src/views/ChoreEdit/ChoreView.jsx index 52dda97c..8d2f92bd 100644 --- a/src/views/ChoreEdit/ChoreView.jsx +++ b/src/views/ChoreEdit/ChoreView.jsx @@ -118,11 +118,11 @@ const ChoreView = () => { icon: , title: 'Assignment', text: `Assigned: ${ - performers.find(p => p.id === chore.assignedTo)?.displayName || 'N/A' + performers.find(p => p.userId === chore.assignedTo)?.displayName || 'N/A' }`, subtext: ` Last: ${ chore.lastCompletedDate - ? performers.find(p => p.id === chore.lastCompletedBy)?.displayName + ? performers.find(p => p.userId === chore.lastCompletedBy)?.displayName : '--' }`, }, @@ -150,7 +150,7 @@ const ChoreView = () => { icon: , title: 'Details', subtext: `Created By: ${ - performers.find(p => p.id === chore.createdBy)?.displayName || 'N/A' + performers.find(p => p.userId === chore.createdBy)?.displayName || 'N/A' }`, }, ] diff --git a/src/views/Chores/ChoreCard.jsx b/src/views/Chores/ChoreCard.jsx index 058e11c5..4f172ee6 100644 --- a/src/views/Chores/ChoreCard.jsx +++ b/src/views/Chores/ChoreCard.jsx @@ -471,7 +471,7 @@ const ChoreCard = ({ {getName(chore.name)} - {userProfile && chore.assignedTo !== userProfile.id && ( + {userProfile && chore.assignedTo !== userProfile.userId && ( Assigned to diff --git a/src/views/Chores/CompactChoreCard.jsx b/src/views/Chores/CompactChoreCard.jsx index 016068d6..1fe92076 100644 --- a/src/views/Chores/CompactChoreCard.jsx +++ b/src/views/Chores/CompactChoreCard.jsx @@ -358,7 +358,7 @@ const CompactChoreCard = ({ // Assignee (if not current user) if (userProfile && chore.assignedTo !== userProfile.id) { const assignee = performers.find( - p => p.id === chore.assignedTo, + p => p.userId === chore.assignedTo, )?.displayName if (assignee) parts.push(assignee) } diff --git a/src/views/ChoresOverview.jsx b/src/views/ChoresOverview.jsx index a4d77da4..1c236beb 100644 --- a/src/views/ChoresOverview.jsx +++ b/src/views/ChoresOverview.jsx @@ -205,7 +205,7 @@ const ChoresOverview = () => { {chore.assignedTo > 0 ? ( p.id === chore.assignedTo) + performers.find(p => p.userId === chore.assignedTo) ?.displayName } size='sm' @@ -214,13 +214,13 @@ const ChoresOverview = () => { startDecorator={ { - performers.find(p => p.id === chore.assignedTo) + performers.find(p => p.userId === chore.assignedTo) ?.displayName[0] } } > - {performers.find(p => p.id === chore.assignedTo)?.name} + {performers.find(p => p.userId === chore.assignedTo)?.name} ) : (