Merge branch 'develop' into change-password
This commit is contained in:
3 files changed
+20
-5
No files matched your search
@@ -56,7 +56,14 @@ const Check = ({ text, noHighlightText, variant = "info", outlined = false }) =>
|
||||
fontWeight: 450,
|
||||
}}
|
||||
>
|
||||
{noHighlightText && <Typography component="span">{noHighlightText}</Typography>}{" "}
|
||||
{noHighlightText && (
|
||||
<Typography
|
||||
component="span"
|
||||
sx={{ color: "inherit" }}
|
||||
>
|
||||
{noHighlightText}
|
||||
</Typography>
|
||||
)}{" "}
|
||||
{text}
|
||||
</Typography>
|
||||
</Stack>
|
||||
|
||||
@@ -210,7 +210,11 @@ const ProfilePanel = () => {
|
||||
autoComplete="given-name"
|
||||
onChange={handleChange}
|
||||
error={errors[idToName["edit-first-name"]] ? true : false}
|
||||
helperText={errors[idToName["edit-first-name"]]}
|
||||
helperText={
|
||||
errors[idToName["edit-first-name"]]
|
||||
? t(errors[idToName["edit-first-name"]])
|
||||
: ""
|
||||
}
|
||||
flex={1}
|
||||
/>
|
||||
</Stack>
|
||||
@@ -228,7 +232,11 @@ const ProfilePanel = () => {
|
||||
value={localData.lastName}
|
||||
onChange={handleChange}
|
||||
error={errors[idToName["edit-last-name"]] ? true : false}
|
||||
helperText={errors[idToName["edit-last-name"]]}
|
||||
helperText={
|
||||
errors[idToName["edit-last-name"]]
|
||||
? t(errors[idToName["edit-last-name"]])
|
||||
: ""
|
||||
}
|
||||
flex={1}
|
||||
/>
|
||||
</Stack>
|
||||
|
||||
@@ -75,7 +75,7 @@ const PasswordTooltip = ({ feedback, form, children }) => {
|
||||
slotProps={{
|
||||
tooltip: {
|
||||
sx: {
|
||||
backgroundColor: theme.palette.tertiary.background,
|
||||
backgroundColor: theme.palette.tertiary.main,
|
||||
border: `0.5px solid ${theme.palette.primary.lowContrast}90`,
|
||||
borderRadius: theme.spacing(4),
|
||||
color: theme.palette.primary.contrastText,
|
||||
@@ -88,7 +88,7 @@ const PasswordTooltip = ({ feedback, form, children }) => {
|
||||
},
|
||||
arrow: {
|
||||
sx: {
|
||||
color: theme.palette.tertiary.background,
|
||||
color: theme.palette.tertiary.main,
|
||||
},
|
||||
},
|
||||
}}
|
||||
|
||||
Reference in new issue
Block a user