diff --git a/src/components/navbar/navigation/DesktopSideBar.tsx b/src/components/navbar/navigation/DesktopSideBar.tsx index 4f4dab66..e4b396b0 100644 --- a/src/components/navbar/navigation/DesktopSideBar.tsx +++ b/src/components/navbar/navigation/DesktopSideBar.tsx @@ -9,6 +9,7 @@ import React from 'react'; import { ListItem, ListItemIcon, Tooltip } from '@mui/material'; import { Link, useLocation } from 'react-router-dom'; import { styled } from '@mui/system'; +import { useTheme } from '@mui/material/styles'; const SideNavBarContainer = styled('div')(({ theme }) => ({ height: '100vh', @@ -28,10 +29,11 @@ interface IProps { export default function DesktopSideBar({ navBarItems }: IProps) { const location = useLocation(); + const theme = useTheme(); const iconFor = (path: string, IconComponent: any, SelectedIconComponent: any) => { if (location.pathname === path) return ; - return ; + return ; }; return ( diff --git a/src/components/navbar/navigation/MobileBottomBar.tsx b/src/components/navbar/navigation/MobileBottomBar.tsx index 934e98b8..212a7986 100644 --- a/src/components/navbar/navigation/MobileBottomBar.tsx +++ b/src/components/navbar/navigation/MobileBottomBar.tsx @@ -6,11 +6,10 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ import React from 'react'; -import { - Box, ListItem, -} from '@mui/material'; -import { styled } from '@mui/system'; +import { ListItem } from '@mui/material'; +import { styled, Box } from '@mui/system'; import { Link as RRDLink, useLocation } from 'react-router-dom'; +import { useTheme } from '@mui/material/styles'; const BottomNavContainer = styled('div')(({ theme }) => ({ bottom: 0, @@ -39,10 +38,11 @@ interface IProps { export default function MobileBottomBar({ navBarItems }: IProps) { const location = useLocation(); + const theme = useTheme(); const iconFor = (path: string, IconComponent: any, SelectedIconComponent: any) => { if (location.pathname === path) return ; - return ; + return ; }; return ( @@ -55,18 +55,24 @@ export default function MobileBottomBar({ navBarItems }: IProps) { ) => ( - {iconFor(path, IconComponent, SelectedIconComponent)} -
{title}
+ + {title} +