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

Merge branch 'dev'

Browse source
This commit is contained in:
Mo Tarbin 2024-11-03 23:01:29 -05:00
commit fc0f2fa2a1
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "donetick", "name": "donetick",
"private": true, "private": true,
"version": "0.1.76", "version": "0.1.77",
"type": "module", "type": "module",
"lint-staged": { "lint-staged": {
"*.{js,jsx,ts,tsx}": [ "*.{js,jsx,ts,tsx}": [

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

@ -446,7 +446,11 @@ 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 && ( {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'>