Merge branch 'development' into main

src/components/Home/index.jsx

@@ -4,38 +4,25 @@ import useStyles from "../useStyles";
 
 import { useUserContext } from "../Contexts/UserContext";
 import { useStatusContext } from "../Contexts/StatusContext";
-import { parsePayload } from "../../utils/jwt";
 import VehicleMap from "../VehicleMap";
-
-const DEFAULT_GREETING = "Welcome";
-
-const getGreeting = (token) => {
-  if (!token || !token.idToken || !token.idToken.jwtToken)
-    return DEFAULT_GREETING;
-
-  const payload = parsePayload(token.idToken.jwtToken);
-
-  if (!payload || !payload.given_name) return DEFAULT_GREETING;
-
-  return `Welcome ${payload.given_name}!`;
-};
+import { getName } from "../../utils/jwt";
 
 const Home = () => {
   const classes = useStyles();
   const { token } = useUserContext();
-  const greeting = getGreeting(token);
-  const { setTitle } = useStatusContext();
+  const { setTitle, setSitePath } = useStatusContext();
 
 
   useEffect(() => {
     setTitle("Home");
+    setSitePath([]);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
   return (
     <div className={classes.paper}>
       <Typography className={classes.homePageTitle} component="h1" variant="h5">
-        {greeting}
+        Welcome {getName(token)}!
       </Typography>
       <VehicleMap />
     </div>