diff --git a/client/src/Components/Sidebar/collapseButton.jsx b/client/src/Components/Sidebar/collapseButton.jsx
index 551bcf25d..b8f088669 100644
--- a/client/src/Components/Sidebar/collapseButton.jsx
+++ b/client/src/Components/Sidebar/collapseButton.jsx
@@ -5,7 +5,7 @@ import { useTheme } from "@mui/material/styles";
import { useDispatch } from "react-redux";
import { toggleSidebar } from "../../Features/UI/uiSlice";
-const CollapseButton = ({ collapsed, setOpen }) => {
+const CollapseButton = ({ collapsed }) => {
const theme = useTheme();
const dispatch = useDispatch();
return (
@@ -34,9 +34,6 @@ const CollapseButton = ({ collapsed, setOpen }) => {
},
}}
onClick={() => {
- setOpen((prev) =>
- Object.fromEntries(Object.keys(prev).map((key) => [key, false]))
- );
dispatch(toggleSidebar());
}}
>
diff --git a/client/src/Components/Sidebar/components/authFooter.jsx b/client/src/Components/Sidebar/components/authFooter.jsx
index e792cec12..dbc1ccfb0 100644
--- a/client/src/Components/Sidebar/components/authFooter.jsx
+++ b/client/src/Components/Sidebar/components/authFooter.jsx
@@ -87,82 +87,94 @@ const AuthFooter = ({ collapsed, accountMenuItems }) => {
px={theme.spacing(8)}
gap={theme.spacing(2)}
borderRadius={theme.shape.borderRadius}
+ boxSizing={"border-box"}
>
-
- {authState.user?.firstName} {authState.user?.lastName}
-
-
- {authState.user?.role?.includes("superadmin")
- ? t("roles.superAdmin")
- : authState.user?.role?.includes("admin")
- ? t("roles.admin")
- : authState.user?.role?.includes("user")
- ? t("roles.teamMember")
- : authState.user?.role?.includes("demo")
- ? t("roles.demoUser")
- : authState.user?.role}
-
-
-
-
-
- openPopup(event, "logout")}
>
-
-
-
+ {authState.user?.firstName} {authState.user?.lastName}
+
+
+ {authState.user?.role?.includes("superadmin")
+ ? t("roles.superAdmin")
+ : authState.user?.role?.includes("admin")
+ ? t("roles.admin")
+ : authState.user?.role?.includes("user")
+ ? t("roles.teamMember")
+ : authState.user?.role?.includes("demo")
+ ? t("roles.demoUser")
+ : authState.user?.role}
+
+
+
+
+
+ openPopup(event, "logout")}
+ >
+
+
+
+