scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

far lint fixes

Browse source
This commit is contained in:
tomlum 2023-08-04 18:25:39 -04:00
parent a1e2a9110b
commit 59fa9cd127
1 changed files with 30 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/views/bad-username-splash/bad-username-splash.jsx
View file

@ -26,7 +26,7 @@ const validateNewUsernameForm = values => {
};
// PII bans won't include the old username
const PIIUsernameMessage = 'New username: ';
const FARUsernameMessage = 'New username: ';
const BadUsernameMessage = 'Old username: ';
const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
@ -36,7 +36,9 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
const [apiError, setAPIError] = React.useState(false);
const [usernameChangeSuccess, setUsernameChangeSuccess] = React.useState(false);
const latestAdminMessage = adminMessages && adminMessages.find(message => message.message.includes('New username: '));
const latestAdminMessage = adminMessages && adminMessages.find(
message => message.message.includes(FARUsernameMessage)
);
React.useEffect(() => {
if (user && user.username && user.token){
@ -150,7 +152,10 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
headerImgSrc={usernameChangeSuccess ? '/images/join-flow/welcome-header.png' : null}
description={<FormattedMessage
className="test123"
id={usernameChangeSuccess ? 'renameAccount.welcomeBack' : 'renameAccount.makeSure'}
id={usernameChangeSuccess ?
'renameAccount.welcomeBack' :
'renameAccount.makeSure'
}
values={{
communityGuidelinesLink: (
<a href="/community_guidelines">
@ -161,15 +166,28 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
/>}
innerClassName="change-username-inner"
outerClassName="change-username-outer"
title={<FormattedMessage id={usernameChangeSuccess ? 'renameAccount.changeYourUsernameSuccess' : 'renameAccount.changeYourUsername'} />}
title={<FormattedMessage
id={usernameChangeSuccess ?
'renameAccount.changeYourUsernameSuccess' :
'renameAccount.changeYourUsername'}
/>}
waiting={isSubmitting}
onSubmit={!usernameChangeSuccess ? () => {
onSubmit={usernameChangeSuccess ? () => {
window.location = `${window.location.origin}/users/${values.newUsername}`;
} : handleSubmit}
nextButton={<React.Fragment><FormattedMessage id={usernameChangeSuccess ? 'renameAccount.goToProfile' : 'renameAccount.change'} /> <img
className="join-flow-next-button-arrow"
src="/svgs/project/r-arrow.svg"
/></React.Fragment>}
nextButton={
<React.Fragment>
<FormattedMessage
id={usernameChangeSuccess ?
'renameAccount.goToProfile' :
'renameAccount.change'}
/>
<img
className="join-flow-next-button-arrow"
src="/svgs/project/r-arrow.svg"
/>
</React.Fragment>
}
>
{usernameChangeSuccess ?
(<div />) :
@ -207,7 +225,9 @@ const BannedSplash = ({hasSession, user, adminMessages, getAdminMessages}) => {
spellCheck={false}
validationClassName="validation-left validation-full-width-input"
onChange={e => {
setFieldValue('newUsernameConfirm', e.target.value.substring(0, 30));
setFieldValue('newUsernameConfirm',
e.target.value.substring(0, 30)
);
setFieldTouched('newUsernameConfirm');
setFieldError('newUsernameConfirm', null);
setFieldValue('canValidate', false);