diff --git a/.changelog/754.bugfix.md b/.changelog/754.bugfix.md new file mode 100644 index 000000000..57eb73848 --- /dev/null +++ b/.changelog/754.bugfix.md @@ -0,0 +1 @@ +Logo should not be clickable on homepage diff --git a/src/app/components/PageLayout/Header.tsx b/src/app/components/PageLayout/Header.tsx index 4a5ecb2e9..b041d35ed 100644 --- a/src/app/components/PageLayout/Header.tsx +++ b/src/app/components/PageLayout/Header.tsx @@ -3,7 +3,7 @@ import AppBar from '@mui/material/AppBar' import Grid from '@mui/material/Unstable_Grid2' import useScrollTrigger from '@mui/material/useScrollTrigger' import { useTheme } from '@mui/material/styles' -import { Logotype } from './Logotype' +import { HomePageLink } from './Logotype' import { NetworkSelector } from './NetworkSelector' import Box from '@mui/material/Box' import { useScopeParam } from '../../hooks/useScopeParam' @@ -44,7 +44,7 @@ export const Header: FC = () => { }} > - diff --git a/src/app/components/PageLayout/Logotype.tsx b/src/app/components/PageLayout/Logotype.tsx index b76401dfa..f55093d4b 100644 --- a/src/app/components/PageLayout/Logotype.tsx +++ b/src/app/components/PageLayout/Logotype.tsx @@ -2,6 +2,7 @@ import { FC } from 'react' import Link from '@mui/material/Link' import { useScreenSize } from '../../hooks/useScreensize' import { useTheme } from '@mui/material/styles' +import Box from '@mui/material/Box' import { Link as RouterLink } from 'react-router-dom' import { OasisIcon } from '../CustomIcons/OasisIcon' import Typography from '@mui/material/Typography' @@ -12,6 +13,14 @@ interface LogotypeProps { showText: boolean } +export const HomePageLink: FC = ({ color, showText }) => { + return ( + + + + ) +} + export const Logotype: FC = ({ color, showText }) => { const { t } = useTranslation() const theme = useTheme() @@ -19,9 +28,7 @@ export const Logotype: FC = ({ color, showText }) => { const logoSize = isMobile ? 32 : 40 return ( - = ({ color, showText }) => { {t('pageTitle')} )} - + ) } diff --git a/src/app/components/ParaTimePicker/index.tsx b/src/app/components/ParaTimePicker/index.tsx index c4f2ae50d..b767e5a3e 100644 --- a/src/app/components/ParaTimePicker/index.tsx +++ b/src/app/components/ParaTimePicker/index.tsx @@ -5,7 +5,7 @@ import Button from '@mui/material/Button' import Drawer from '@mui/material/Drawer' import Divider from '@mui/material/Divider' import Grid from '@mui/material/Unstable_Grid2' -import { Logotype } from '../PageLayout/Logotype' +import { HomePageLink } from '../PageLayout/Logotype' import { COLORS } from '../../../styles/theme/colors' import { Network } from '../../../types/network' import { Layer } from '../../../oasis-nexus/api' @@ -101,7 +101,7 @@ const ParaTimePickerContent: FC = ({ onClose, onConf return ( - + {isTablet && (