diff --git a/frontend/benefit/applicant/src/components/header/Header.tsx b/frontend/benefit/applicant/src/components/header/Header.tsx index 58860b9635..74c7ca1338 100644 --- a/frontend/benefit/applicant/src/components/header/Header.tsx +++ b/frontend/benefit/applicant/src/components/header/Header.tsx @@ -6,7 +6,7 @@ import { Button, IconLock, IconSpeechbubbleText } from 'hds-react'; import noop from 'lodash/noop'; import { useRouter } from 'next/router'; import * as React from 'react'; -import BaseHeader from 'shared/components/header/HeaderV3'; +import BaseHeader from 'shared/components/header/Header'; import { getFullName } from 'shared/utils/application.utils'; import Messenger from '../messenger/Messenger'; diff --git a/frontend/benefit/handler/src/components/header/Header.sc.ts b/frontend/benefit/handler/src/components/header/Header.sc.ts index 3c9dceac05..c007a4838a 100644 --- a/frontend/benefit/handler/src/components/header/Header.sc.ts +++ b/frontend/benefit/handler/src/components/header/Header.sc.ts @@ -1,4 +1,4 @@ -import BaseHeader from 'shared/components/header/HeaderV3'; +import BaseHeader from 'shared/components/header/Header'; import { respondAbovePx } from 'shared/styles/mediaQueries'; import styled from 'styled-components'; diff --git a/frontend/kesaseteli/employer/src/components/header/Header.tsx b/frontend/kesaseteli/employer/src/components/header/Header.tsx index c8dd75bdcc..250e2151f9 100644 --- a/frontend/kesaseteli/employer/src/components/header/Header.tsx +++ b/frontend/kesaseteli/employer/src/components/header/Header.tsx @@ -4,7 +4,7 @@ import useUserQuery from 'kesaseteli/employer/hooks/backend/useUserQuery'; import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; import React from 'react'; -import BaseHeader from 'shared/components/header/HeaderV3'; +import BaseHeader from 'shared/components/header/Header'; import { Language, SUPPORTED_LANGUAGES } from 'shared/i18n/i18n'; import { OptionType } from 'shared/types/common'; diff --git a/frontend/kesaseteli/handler/src/components/header/Header.tsx b/frontend/kesaseteli/handler/src/components/header/Header.tsx index 4a9bec313a..6bc98e3c2d 100644 --- a/frontend/kesaseteli/handler/src/components/header/Header.tsx +++ b/frontend/kesaseteli/handler/src/components/header/Header.tsx @@ -1,7 +1,7 @@ import { IconMover } from 'hds-react'; import { useTranslation } from 'next-i18next'; import React from 'react'; -import BaseHeader from 'shared/components/header/HeaderV3'; +import BaseHeader from 'shared/components/header/Header'; import useLocale from 'shared/hooks/useLocale'; const Header: React.FC = () => { diff --git a/frontend/kesaseteli/youth/src/components/header/Header.tsx b/frontend/kesaseteli/youth/src/components/header/Header.tsx index dee50b499d..46b7bd7260 100644 --- a/frontend/kesaseteli/youth/src/components/header/Header.tsx +++ b/frontend/kesaseteli/youth/src/components/header/Header.tsx @@ -1,7 +1,7 @@ import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; import React from 'react'; -import BaseHeader from 'shared/components/header/HeaderV3'; +import BaseHeader from 'shared/components/header/Header'; import { SUPPORTED_LANGUAGES } from 'shared/i18n/i18n'; import { OptionType } from 'shared/types/common'; diff --git a/frontend/shared/src/components/header/HeaderV3.tsx b/frontend/shared/src/components/header/Header.tsx similarity index 95% rename from frontend/shared/src/components/header/HeaderV3.tsx rename to frontend/shared/src/components/header/Header.tsx index 44c10f221f..289159afbe 100644 --- a/frontend/shared/src/components/header/HeaderV3.tsx +++ b/frontend/shared/src/components/header/Header.tsx @@ -45,7 +45,7 @@ export type HeaderProps = { customActiveItemFn?: (url: string) => boolean; }; -const HeaderV3: React.FC = ({ +const Header: React.FC = ({ className, customActiveItemFn, customItems, @@ -62,15 +62,8 @@ const HeaderV3: React.FC = ({ title, titleUrl, }) => { - const { - closeMenu, - handleLogin, - handleLogout, - locale, - logoLang, - t, - toggleMenu, - } = useHeader(login); + const { closeMenu, handleLogin, handleLogout, logoLang, t, toggleMenu } = + useHeader(login); const goToPage = useGoToPage(); @@ -140,7 +133,6 @@ const HeaderV3: React.FC = ({ onMenuClick={toggleMenu} > {customItems} - {login && !login?.isAuthenticated && !hideLogin && ( = ({ /> )} +
+ {login && login?.isAuthenticated && !hideLogin && ( = ({ ); }; -export default HeaderV3; +export default Header; diff --git a/frontend/shared/src/components/header/__tests__/Header.test.tsx b/frontend/shared/src/components/header/__tests__/Header.test.tsx index 12af7ce866..b943aa8b93 100644 --- a/frontend/shared/src/components/header/__tests__/Header.test.tsx +++ b/frontend/shared/src/components/header/__tests__/Header.test.tsx @@ -2,7 +2,7 @@ import { axe } from 'jest-axe'; import React from 'react'; import { render } from 'shared/__tests__/utils/test-utils'; -import Header from '../HeaderV3'; +import Header from '../Header'; // "svg elements with an img role have an alternative text (svg-img-alt)" test.skip('test for accessibility violations', async () => { diff --git a/frontend/shared/src/components/header/useHeader.ts b/frontend/shared/src/components/header/useHeader.ts index d0765a7763..80e7b40c62 100644 --- a/frontend/shared/src/components/header/useHeader.ts +++ b/frontend/shared/src/components/header/useHeader.ts @@ -1,6 +1,6 @@ import { TFunction, useTranslation } from 'next-i18next'; import { useState } from 'react'; -import { HeaderProps } from 'shared/components/header/HeaderV3'; +import { HeaderProps } from 'shared/components/header/Header'; import useLocale from 'shared/hooks/useLocale'; import { Language } from 'shared/i18n/i18n'; diff --git a/frontend/tet/admin/src/components/header/Header.tsx b/frontend/tet/admin/src/components/header/Header.tsx index f799a7a3a6..1bfd88ed38 100644 --- a/frontend/tet/admin/src/components/header/Header.tsx +++ b/frontend/tet/admin/src/components/header/Header.tsx @@ -1,7 +1,7 @@ import { useRouter } from 'next/router'; import { useTranslation } from 'next-i18next'; import React from 'react'; -import BaseHeader from 'shared/components/header/HeaderV3'; +import BaseHeader from 'shared/components/header/Header'; import { SUPPORTED_LANGUAGES } from 'shared/i18n/i18n'; import { OptionType } from 'shared/types/common'; import useLogin from 'tet/admin/hooks/backend/useLogin';