Merge remote-tracking branch 'origin/dev' into dev

whycq

2025-02-17 128dfa5e1407751bc208c1999930b14c3eb864d8

 rsf-admin/src/page/settings/BaseSettings.jsx

@@ -37,7 +37,9 @@
        formState: {
            errors,
            isDirty,
        }
        },
        setError,
        clearErrors,
    } = useForm();

    const [loading, setLoading] = useState(false);
@@ -69,6 +71,10 @@
                    username: data.username
                }
                localStorage.setItem("user", JSON.stringify(userToPersist));
            } else if (code === 10005 || code === 10006) {
                setError('email', {
                    message: msg
                })
            } else {
                notify(msg, { type: 'error', messageArgs: { _: msg } });
            }
@@ -97,7 +103,6 @@
                    }}
                />
            )}
            {/* https://github.com/themeselection/materio-mui-nextjs-admin-template-free/blob/main/javascript-version/src/views/account-settings/account/AccountDetails.jsx */}
            <form onSubmit={handleSubmit(onSubmit)} noValidate>
                <Stack
                    direction='column'