From 0339922db86ba7a02dc238ffdd56e01beed97ced Mon Sep 17 00:00:00 2001 From: Skorpios <70910395+Skorpios604@users.noreply.github.com> Date: Fri, 26 Jul 2024 07:21:18 -0700 Subject: [PATCH] fix authState.user error. (#457) --- Client/src/Components/NavBar/index.jsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Client/src/Components/NavBar/index.jsx b/Client/src/Components/NavBar/index.jsx index e1501ea48..261c872ca 100644 --- a/Client/src/Components/NavBar/index.jsx +++ b/Client/src/Components/NavBar/index.jsx @@ -8,7 +8,6 @@ import Typography from "@mui/material/Typography"; import Menu from "@mui/material/Menu"; import MenuIcon from "@mui/icons-material/Menu"; import Container from "@mui/material/Container"; -import Avatar from "../Avatar"; import Tooltip from "@mui/material/Tooltip"; import MenuItem from "@mui/material/MenuItem"; import { useTheme } from "@mui/material/styles"; @@ -24,6 +23,7 @@ import TeamSvg from "../../assets/icons/user-two.svg?react"; import LogoutSvg from "../../assets/icons/logout.svg?react"; import BWULogo from "../../assets/Images/bwl-logo.svg?react"; +import Avatar from "../Avatar"; const icons = { Profile: , @@ -50,9 +50,11 @@ function NavBar() { const navigate = useNavigate(); const authState = useSelector((state) => state.auth); + // Initialize settings and update based on user role let settings = ["Profile", "Password", "Team", "Logout"]; - if (!authState.user.role.includes("admin")) + if (authState.user?.role && !authState.user.role.includes("admin")) { settings = ["Profile", "Password", "Logout"]; + } /** * Handles opening the user menu. @@ -154,7 +156,7 @@ function NavBar() {
- {authState.user.firstName} {authState.user.lastName} + {authState.user?.firstName} {authState.user?.lastName}