mirror of
https://github.com/cheveguerra/whaticket-community.git
synced 2026-04-17 19:37:02 +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: {
|
||||
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>
|
||||
}
|
||||
|
||||
@@ -18,10 +18,10 @@ import {
|
||||
InputAdornment,
|
||||
IconButton,
|
||||
Link
|
||||
} from '@material-ui/core';
|
||||
|
||||
} from '@material-ui/core';
|
||||
|
||||
import { LockOutlined, Visibility, VisibilityOff } from '@material-ui/icons';
|
||||
|
||||
|
||||
import { makeStyles } from "@material-ui/core/styles";
|
||||
|
||||
import { i18n } from "../../translate/i18n";
|
||||
@@ -155,16 +155,16 @@ const SignUp = () => {
|
||||
label={i18n.t("signup.form.password")}
|
||||
type={showPassword ? 'text' : 'password'}
|
||||
InputProps={{
|
||||
endAdornment: (
|
||||
<InputAdornment position="end">
|
||||
<IconButton
|
||||
aria-label="toggle password visibility"
|
||||
onClick={() => setShowPassword((e) => !e)}
|
||||
>
|
||||
{showPassword ? <VisibilityOff /> : <Visibility />}
|
||||
</IconButton>
|
||||
</InputAdornment>
|
||||
)
|
||||
endAdornment: (
|
||||
<InputAdornment position="end">
|
||||
<IconButton
|
||||
aria-label="toggle password visibility"
|
||||
onClick={() => setShowPassword((e) => !e)}
|
||||
>
|
||||
{showPassword ? <VisibilityOff /> : <Visibility />}
|
||||
</IconButton>
|
||||
</InputAdornment>
|
||||
)
|
||||
}}
|
||||
/>
|
||||
</Grid>
|
||||
@@ -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="#"
|
||||
|
||||
Reference in New Issue
Block a user