cheveguerra/whaticket-community
1
0
Fork 0
mirror of https://github.com/cheveguerra/whaticket-community.git synced 2026-04-19 12:19:16 +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

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

@@ -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>
} }

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

@@ -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';
@@ -155,16 +155,16 @@ const SignUp = () => {
label={i18n.t("signup.form.password")} label={i18n.t("signup.form.password")}
type={showPassword ? 'text' : 'password'} type={showPassword ? 'text' : 'password'}
InputProps={{ InputProps={{
endAdornment: ( endAdornment: (
<InputAdornment position="end"> <InputAdornment position="end">
<IconButton <IconButton
aria-label="toggle password visibility" aria-label="toggle password visibility"
onClick={() => setShowPassword((e) => !e)} onClick={() => setShowPassword((e) => !e)}
> >
{showPassword ? <VisibilityOff /> : <Visibility />} {showPassword ? <VisibilityOff /> : <Visibility />}
</IconButton> </IconButton>
</InputAdornment> </InputAdornment>
) )
}} }}
/> />
</Grid> </Grid>
@@ -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="#"