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

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
2 changed files with 21 additions and 21 deletions

View File

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

View File

@@ -18,7 +18,7 @@ import {
InputAdornment,
IconButton,
Link
} from '@material-ui/core';
} from '@material-ui/core';
import { LockOutlined, Visibility, VisibilityOff } from '@material-ui/icons';
@@ -178,7 +178,7 @@ const SignUp = () => {
>
{i18n.t("signup.buttons.submit")}
</Button>
<Grid container justify="flex-end">
<Grid container justifyContent="flex-end">
<Grid item>
<Link
href="#"