cheveguerra/whaticket-community
1
0
Fork 0
mirror of https://github.com/cheveguerra/whaticket-community.git synced 2026-04-20 04:39:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #408 from macleysousa/name-props-error

Browse Source 
Evitar erro na propriedade 'justify' e quando o 'ticket.whatsapp.name' for null
This commit is contained in:
Cassio Santos
2022-03-22 09:17:34 -03:00
committed by GitHub
parent 4cc3afd3f0 95d0aed723
commit 2ceb06fdd1
2 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/TicketListItem/index.js
View File

@@ -102,9 +102,9 @@ const useStyles = makeStyles(theme => ({
userTag: { userTag: {
position: "absolute", position: "absolute",
marginRight: 35, marginRight: 5,
right: 10, right: 5,
bottom: 9, bottom: 5,
background: "#2576D2", background: "#2576D2",
color: "#ffffff", color: "#ffffff",
border: "1px solid #CCC", border: "1px solid #CCC",
@@ -211,8 +211,8 @@ const TicketListItem = ({ ticket }) => {
)} )}
</Typography> </Typography>
)} )}
{ticket?.whatsapp && ( {ticket.whatsappId && (
<div className={classes.userTag} title={i18n.t("ticketsList.connectionTitle")}>{ticket.whatsapp.name}</div> <div className={classes.userTag} title={i18n.t("ticketsList.connectionTitle")}>{ticket.whatsapp?.name}</div>
)} )}
</span> </span>
} }

2
frontend/src/pages/Signup/index.js
View File

@@ -178,7 +178,7 @@ const SignUp = () => {
> >
{i18n.t("signup.buttons.submit")} {i18n.t("signup.buttons.submit")}
</Button> </Button>
<Grid container justify="flex-end"> <Grid container justifyContent="flex-end">
<Grid item> <Grid item>
<Link <Link
href="#" href="#"