diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsx index c4d247f1..bf6a2c8d 100644 --- a/ui/src/pages/Admin/Users/index.tsx +++ b/ui/src/pages/Admin/Users/index.tsx @@ -58,6 +58,7 @@ const Users: FC = () => { const { agent: ucAgent } = userCenterStore(); const [adminUcAgent, setAdminUcAgent] = useState({ user_status_agent_enabled: false, + user_password_agent_enabled: false, }); const Toast = useToast(); const { @@ -258,7 +259,8 @@ const Users: FC = () => { - {!ucAgent?.enabled ? ( + {!ucAgent?.enabled || + !adminUcAgent.user_password_agent_enabled ? ( handleAction('password', user)}> {t('set_new_password')} diff --git a/ui/src/pages/Users/ConfirmNewEmail/index.tsx b/ui/src/pages/Users/ConfirmNewEmail/index.tsx index c99620db..0b979900 100644 --- a/ui/src/pages/Users/ConfirmNewEmail/index.tsx +++ b/ui/src/pages/Users/ConfirmNewEmail/index.tsx @@ -4,8 +4,9 @@ import { Link, useSearchParams } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { usePageTags } from '@/hooks'; -import { loggedUserInfoStore, siteInfoStore } from '@/stores'; +import { loggedUserInfoStore } from '@/stores'; import { changeEmailVerify } from '@/services'; +import { WelcomeTitle } from '@/components'; const Index: FC = () => { const { t } = useTranslation('translation', { keyPrefix: 'account_result' }); @@ -13,7 +14,6 @@ const Index: FC = () => { const [step, setStep] = useState('loading'); const updateUser = loggedUserInfoStore((state) => state.update); - const siteName = siteInfoStore((state) => state.siteInfo.name); useEffect(() => { const code = searchParams.get('code'); @@ -39,9 +39,7 @@ const Index: FC = () => { -

- {t('page_title', { site_name: siteName })} -

+ {step === 'success' && ( <>

{t('confirm_new_email')}

diff --git a/ui/src/services/user-center/index.ts b/ui/src/services/user-center/index.ts index 2039372e..8ec92d23 100644 --- a/ui/src/services/user-center/index.ts +++ b/ui/src/services/user-center/index.ts @@ -40,6 +40,7 @@ export interface UcBranding { export interface AdminUcAgent { user_status_agent_enabled: boolean; + user_password_agent_enabled: boolean; } export const getUcAgent = () => {