Merge branch 'main-upstream' into feature/passkey

# Conflicts:
#	web/src/components/settings/PersonalSetting.jsx
#	web/src/i18n/locales/en.json
#	web/src/i18n/locales/zh.json

web/src/components/settings/PersonalSetting.jsx

@@ -29,6 +29,7 @@ import {
   prepareCredentialCreationOptions,
   buildRegistrationResult,
   isPasskeySupported,
+  setUserData,
 } from '../../helpers';
 import { UserContext } from '../../context/User';
 import { Modal } from '@douyinfe/semi-ui';
@@ -253,6 +254,7 @@ const PersonalSetting = () => {
     const { success, message, data } = res.data;
     if (success) {
       userDispatch({ type: 'login', payload: data });
+      setUserData(data);
       await loadPasskeyStatus();
     } else {
       showError(message);