mirror of
https://github.com/cheveguerra/whaticket-community.git
synced 2026-04-20 04:39:20 +00:00
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:
@@ -102,12 +102,12 @@ 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",
|
||||||
padding: 1,
|
padding: 1,
|
||||||
paddingLeft: 5,
|
paddingLeft: 5,
|
||||||
paddingRight: 5,
|
paddingRight: 5,
|
||||||
@@ -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>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import {
|
|||||||
InputAdornment,
|
InputAdornment,
|
||||||
IconButton,
|
IconButton,
|
||||||
Link
|
Link
|
||||||
} from '@material-ui/core';
|
} from '@material-ui/core';
|
||||||
|
|
||||||
import { LockOutlined, Visibility, VisibilityOff } from '@material-ui/icons';
|
import { LockOutlined, Visibility, VisibilityOff } from '@material-ui/icons';
|
||||||
|
|
||||||
@@ -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="#"
|
||||||
|
|||||||
Reference in New Issue
Block a user