mirror
/
soapbox
kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge branch 'login-header-fix' into 'develop' 

Public layout header: fix weird error where the header can disappear

See merge request soapbox-pub/soapbox-fe!1616
environments/review-develop-3zknud/deployments/500
Alex Gleason 2022-07-08 19:04:54 +00:00
rodzic bb352a75d7 f37f4b9e6e
commit ef6608341f
1 zmienionych plików z 3 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

5
app/soapbox/features/public_layout/components/header.tsx
Wyświetl plik

@ -8,7 +8,7 @@ import { fetchInstance } from 'soapbox/actions/instance';
import { openModal } from 'soapbox/actions/modals';
import SiteLogo from 'soapbox/components/site-logo';
import { Button, Form, HStack, IconButton, Input, Tooltip } from 'soapbox/components/ui';
import { useAppSelector, useFeatures, useSoapboxConfig } from 'soapbox/hooks';
import { useAppSelector, useFeatures, useSoapboxConfig, useOwnAccount } from 'soapbox/hooks';
import Sonar from './sonar';
@ -27,6 +27,7 @@ const Header = () => {
const dispatch = useDispatch();
const intl = useIntl();
const account = useOwnAccount();
const soapboxConfig = useSoapboxConfig();
const pepeEnabled = soapboxConfig.getIn(['extensions', 'pepe', 'enabled']) === true;
const { links } = soapboxConfig;
@ -67,7 +68,7 @@ const Header = () => {
});
};
if (shouldRedirect) return <Redirect to='/' />;
if (account && shouldRedirect) return <Redirect to='/' />;
if (mfaToken) return <Redirect to={`/login?token=${encodeURIComponent(mfaToken)}`} />;
return (