@@ -33,7 +33,7 @@ interface FormValues {
33
33
34
34
export const UserMenu = ( { userData } : { userData : LoggedUserData } ) => {
35
35
const [ isEditingUsername , setIsEditingUsername ] = useState ( false ) ;
36
- const [ name , setName ] = useState ( userData . username ) ;
36
+ const [ currentUsername , setCurrentUsername ] = useState ( userData . username ) ;
37
37
const [ error , setError ] = useState ( '' ) ;
38
38
39
39
const {
@@ -47,7 +47,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
47
47
try {
48
48
setError ( '' ) ;
49
49
50
- if ( data . username === name ) {
50
+ if ( data . username === currentUsername ) {
51
51
setIsEditingUsername ( false ) ;
52
52
return ;
53
53
}
@@ -58,7 +58,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
58
58
59
59
toast . success ( 'Username updated successfully!' ) ;
60
60
setIsEditingUsername ( false ) ;
61
- setName ( data . username ) ;
61
+ setCurrentUsername ( data . username ) ;
62
62
} catch ( error : unknown ) {
63
63
if ( ( error as any ) . isAxiosError ) {
64
64
const axiosError = error as AxiosError ;
@@ -91,11 +91,11 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
91
91
92
92
useEffect ( ( ) => {
93
93
if ( isEditingUsername ) {
94
- reset ( { username : name } ) ;
94
+ reset ( { username : currentUsername } ) ;
95
95
} else {
96
96
setError ( '' ) ;
97
97
}
98
- } , [ isEditingUsername , name , reset ] ) ;
98
+ } , [ isEditingUsername , currentUsername , reset ] ) ;
99
99
100
100
return (
101
101
< Popover onOpenChange = { ( ) => setIsEditingUsername ( false ) } >
@@ -128,7 +128,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
128
128
{ ! isEditingUsername ? (
129
129
< >
130
130
< h4 className = 'truncate font-semibold w-[155px] py-px' >
131
- { name }
131
+ { currentUsername }
132
132
</ h4 >
133
133
< button onClick = { ( ) => setIsEditingUsername ( true ) } >
134
134
< FontAwesomeIcon
@@ -143,7 +143,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
143
143
< form onSubmit = { handleSubmit ( onSubmit ) } >
144
144
< input
145
145
className = 'w-[calc(12rem-55.5px)] font-semibold bg-transparent border border-zinc-400 rounded-md px-1'
146
- defaultValue = { name }
146
+ defaultValue = { currentUsername }
147
147
{ ...register ( 'username' , {
148
148
required : 'Username is required' ,
149
149
pattern : {
@@ -153,7 +153,7 @@ export const UserMenu = ({ userData }: { userData: LoggedUserData }) => {
153
153
} ,
154
154
maxLength : {
155
155
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` ,
157
157
} ,
158
158
minLength : {
159
159
value : UserConst . USERNAME_MIN_LENGTH ,
0 commit comments