amy/donetick-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merging commit

Browse source
This commit is contained in:
Mo Tarbin 2024-11-03 23:46:48 -05:00
parent fc0f2fa2a1
commit 85631ad823
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/views/Chores/ChoreCard.jsx
View file

@ -446,11 +446,7 @@ const ChoreCard = ({
</Avatar> </Avatar>
<Box display='flex' flexDirection='column'> <Box display='flex' flexDirection='column'>
<Typography level='title-md'>{getName(chore.name)}</Typography> <Typography level='title-md'>{getName(chore.name)}</Typography>
<<<<<<< HEAD
{chore.assignedTo !== userProfile.id && (
=======
{userProfile && chore.assignedTo !== userProfile.id && ( {userProfile && chore.assignedTo !== userProfile.id && (
>>>>>>> dev
<Typography level='body-md' color='text.disabled'> <Typography level='body-md' color='text.disabled'>
Assigned to{' '} Assigned to{' '}
<Chip variant='outlined'> <Chip variant='outlined'>