Merge branch 'develop' into 'feature/profile_and_icons'

# Conflicts: # src/components/layouts/dashboard/headerWithSidebar/index.jsx # src/core/components/SidebarMenu.jsx
2024-08-19 10:15:36 +00:00
parent 090e6d0b37 63d284a64f
commit 5186b33a28
45 changed files with 848 additions and 430 deletions
--- a/src/core/components/SidebarMenu.jsx
+++ b/src/core/components/SidebarMenu.jsx
@@ -117,7 +117,7 @@ const SidebarMenu = () => {
            <Profile />
            {
                userPermissions && (
-                    <List sx={{ overflow: "auto" }} disablePadding dense>
+                    <List sx={{ overflow: "auto", flex: 1  }} disablePadding dense>
                        {menuItems.map((menuItem) => {
                            return <SidebarListItems dispatch={dispatch} key={menuItem.id} menuItem={menuItem} />;
                        })}