Merge branch 'develop' into 'feature/TF-84_implemention_expert_management'

# Conflicts:
#   public/locales/fa/app.json
#   src/core/components/DataTable.jsx
#   src/core/data/apiRoutes.js
#   src/core/data/sidebarMenu.jsx

src/core/data/sidebarMenu.jsx

@@ -11,6 +11,7 @@ import SupervisedUserCircleIcon from '@mui/icons-material/SupervisedUserCircle';
 import Diversity3Icon from '@mui/icons-material/Diversity3';
 import PaidIcon from '@mui/icons-material/Paid';
 import ManageAccountsIcon from '@mui/icons-material/ManageAccounts';
+import PersonIcon from '@mui/icons-material/Person';
 
 const sidebarMenu = [
     [
@@ -146,6 +147,15 @@ const sidebarMenu = [
             selected: false,
             permission: "manage_navgan_loan",
         },
+        {
+            key: "sidebar.user-management",
+            name: "user_management",
+            type: "page",
+            route: "/dashboard/user-management",
+            icon: <PersonIcon/>,
+            selected: false,
+            permission: "manage_users",
+        },
     ],
 ];