Merge branch 'develop' of https://gitlab.com/witel-front-end/loan-facilities/user into feature/Amin_loan_request

src/core/components/timelines/timelineManager.jsx

@@ -0,0 +1,16 @@
+import OpenTimeLine from "@/core/components/timelines/OpenTimeLine";
+import InProgressTimeLine from "@/core/components/timelines/InProgressTimeLine";
+import DoneTimeLine from "@/core/components/timelines/DoneTimeLine";
+
+const TimelineManager = (props) => {
+    switch (props.status) {
+        case 'open':
+            return <OpenTimeLine {...props} />
+        case 'in progress':
+            return <InProgressTimeLine {...props} />
+        case 'done':
+            return <DoneTimeLine {...props} />
+    }
+}
+
+export default TimelineManager

src/core/data/sidebarMenu.js

@@ -6,27 +6,30 @@ const sidebarMenu = [
     [
         {
             key: "sidebar.dashboard",
+            name: "sidebar.dashboard",
             type: "page",
             route: "/dashboard",
-            icon: <SpaceDashboardIcon/>,
+            icon: <SpaceDashboardIcon sx={{width: 'inherit', height: 'inherit'}}/>,
             selected: false,
-            permission_name: "all"
+            permission: "all"
         },
         {
             key: "sidebar.add-request-loan",
+            name: "sidebar.add-request-loan",
             type: "page",
             route: "/dashboard/navgan/add-request-loan",
-            icon: <DataSaverOnIcon/>,
+            icon: <DataSaverOnIcon sx={{width: 'inherit', height: 'inherit'}}/>,
             selected: false,
-            permission_name: "can_request_a_new_loan"
+            permission: "can_request_a_new_loan"
         },
         {
             key: "sidebar.followUp-loan",
+            name: "sidebar.followUp-loan",
             type: "page",
             route: "/dashboard/navgan/followUp-loan",
-            icon: <BookmarkAddedIcon/>,
+            icon: <BookmarkAddedIcon sx={{width: 'inherit', height: 'inherit'}}/>,
             selected: false,
-            permission_name: "all"
+            permission: "all"
         },
     ],
 ];