diff --git a/apps/web/components/Form/default-form.tsx b/apps/web/components/Form/default-form.tsx index 15f28a3..c1981e1 100644 --- a/apps/web/components/Form/default-form.tsx +++ b/apps/web/components/Form/default-form.tsx @@ -10,10 +10,10 @@ export function DefaultForm() { const { handleLogin } = useLogin(); const { - state: { step, user }, + state: { step }, } = useContext(FormStateContext); - if (step === 'login' && user) { + if (step === 'refresh-token') { return Подождите...; } diff --git a/apps/web/components/Form/hooks/token.ts b/apps/web/components/Form/hooks/token.ts index 057823c..0174bd0 100644 --- a/apps/web/components/Form/hooks/token.ts +++ b/apps/web/components/Form/hooks/token.ts @@ -23,6 +23,6 @@ export function useRefreshToken() { } useEffect(() => { - if (step === 'login' && user) handleRefreshToken(); + if (step === 'refresh-token') handleRefreshToken(); }, []); } diff --git a/apps/web/components/Form/telegram-form.tsx b/apps/web/components/Form/telegram-form.tsx index aaa03d9..baa00b1 100644 --- a/apps/web/components/Form/telegram-form.tsx +++ b/apps/web/components/Form/telegram-form.tsx @@ -12,10 +12,10 @@ export function TelegramForm() { useTelegramConfirm(); const { - state: { step, user }, + state: { step }, } = useContext(FormStateContext); - if (step === 'login' && user) { + if (step === 'refresh-token') { return Подождите...; } diff --git a/apps/web/context/form-state.tsx b/apps/web/context/form-state.tsx index 98674a4..906cddd 100644 --- a/apps/web/context/form-state.tsx +++ b/apps/web/context/form-state.tsx @@ -5,7 +5,7 @@ import { createContext, useMemo, useReducer } from 'react'; type State = { error: string | undefined; - step: 'login' | 'login-success' | 'telegram-notification'; + step: 'login' | 'login-success' | 'telegram-notification' | 'refresh-token'; tfa: boolean; user: LdapUser | undefined; }; @@ -67,7 +67,7 @@ type FormStateProviderProps = { export function FormStateProvider({ children, tfa, user = undefined }: FormStateProviderProps) { const [state, dispatch] = useReducer(reducer, { error: undefined, - step: 'login', + step: user ? 'refresh-token' : 'login', tfa, user, });