Skip to content

Commit e6dda0a

Browse files
committed
refactor: rename name variable to currentUsername for clarity
1 parent 52a0e2b commit e6dda0a

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

web/src/modules/shared/components/layout/UserMenu.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ interface FormValues {
3333

3434
export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
3535
const [isEditingUsername, setIsEditingUsername] = useState(false);
36-
const [name, setName] = useState(userData.username);
36+
const [currentUsername, setCurrentUsername] = useState(userData.username);
3737
const [error, setError] = useState('');
3838

3939
const {
@@ -47,7 +47,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
4747
try {
4848
setError('');
4949

50-
if (data.username === name) {
50+
if (data.username === currentUsername) {
5151
setIsEditingUsername(false);
5252
return;
5353
}
@@ -58,7 +58,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
5858

5959
toast.success('Username updated successfully!');
6060
setIsEditingUsername(false);
61-
setName(data.username);
61+
setCurrentUsername(data.username);
6262
} catch (error: unknown) {
6363
if ((error as any).isAxiosError) {
6464
const axiosError = error as AxiosError;
@@ -91,11 +91,11 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
9191

9292
useEffect(() => {
9393
if (isEditingUsername) {
94-
reset({ username: name });
94+
reset({ username: currentUsername });
9595
} else {
9696
setError('');
9797
}
98-
}, [isEditingUsername, name, reset]);
98+
}, [isEditingUsername, currentUsername, reset]);
9999

100100
return (
101101
<Popover onOpenChange={() => setIsEditingUsername(false)}>
@@ -128,7 +128,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
128128
{!isEditingUsername ? (
129129
<>
130130
<h4 className='truncate font-semibold w-[155px] py-px'>
131-
{name}
131+
{currentUsername}
132132
</h4>
133133
<button onClick={() => setIsEditingUsername(true)}>
134134
<FontAwesomeIcon
@@ -143,7 +143,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
143143
<form onSubmit={handleSubmit(onSubmit)}>
144144
<input
145145
className='w-[calc(12rem-55.5px)] font-semibold bg-transparent border border-zinc-400 rounded-md px-1'
146-
defaultValue={name}
146+
defaultValue={currentUsername}
147147
{...register('username', {
148148
required: 'Username is required',
149149
pattern: {
@@ -153,7 +153,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
153153
},
154154
maxLength: {
155155
value: UserConst.USERNAME_MAX_LENGTH,
156-
message: `The username must be shorter than ${UserConst.USERNAME_MAX_LENGTH} characters`,
156+
message: `The username must have up to ${UserConst.USERNAME_MAX_LENGTH} characters`,
157157
},
158158
minLength: {
159159
value: UserConst.USERNAME_MIN_LENGTH,

0 commit comments

Comments
 (0)