src/components/Activities/Attendance.jsx

@@ -10,6 +10,7 @@ import { useAttendance } from "../../hooks/useAttendance";
 import { useSelector } from "react-redux";
 import { useQueryClient } from "@tanstack/react-query";
 import eventBus from "../../services/eventBus";
+import { useSelectedproject } from "../../slices/apiDataManager";
 
 const Attendance = ({ getRole, handleModalData, searchTerm }) => {
   const queryClient = useQueryClient();
@@ -17,9 +18,10 @@ const Attendance = ({ getRole, handleModalData, searchTerm }) => {
   const navigate = useNavigate();
   const [todayDate, setTodayDate] = useState(new Date());
   const [ShowPending, setShowPending] = useState(false);
-  const selectedProject = useSelector(
+  // const selectedProject = useSelector(
-    (store) => store.localVariables.projectId
+  //   (store) => store.localVariables.projectId
-  );
+  // );
+  const selectedProject = useSelectedproject();
   const {
     attendance,
     loading: attLoading,

src/components/Activities/AttendcesLogs.jsx

@@ -6,7 +6,7 @@ import RenderAttendanceStatus from "./RenderAttendanceStatus";
 import { useSelector, useDispatch } from "react-redux";
 import { fetchAttendanceData } from "../../slices/apiSlice/attedanceLogsSlice";
 import DateRangePicker from "../common/DateRangePicker";
-import { clearCacheKey, getCachedData } from "../../slices/apiDataManager";
+import { clearCacheKey, getCachedData, useSelectedproject } from "../../slices/apiDataManager";
 import eventBus from "../../services/eventBus";
 import AttendanceRepository from "../../repositories/AttendanceRepository";
 import { useAttendancesLogs } from "../../hooks/useAttendance";
@@ -34,9 +34,10 @@ const usePagination = (data, itemsPerPage) => {
 };
 
 const AttendanceLog = ({ handleModalData, searchTerm }) => {
-  const selectedProject = useSelector(
+  // const selectedProject = useSelector(
-    (store) => store.localVariables.projectId
+  //   (store) => store.localVariables.projectId
-  );
+  // );
+  const selectedProject = useSelectedproject();
   const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
   const dispatch = useDispatch();
   const [loading, setLoading] = useState(false);

src/components/Activities/Regularization.jsx

@@ -7,12 +7,13 @@ import { useRegularizationRequests } from "../../hooks/useAttendance";
 import moment from "moment";
 import usePagination from "../../hooks/usePagination";
 import eventBus from "../../services/eventBus";
-import { cacheData, clearCacheKey } from "../../slices/apiDataManager";
+import { cacheData, clearCacheKey, useSelectedproject } from "../../slices/apiDataManager";
 import { useQueryClient } from "@tanstack/react-query";
 
 const Regularization = ({ handleRequest, searchTerm }) => {
   const queryClient = useQueryClient();
-  var selectedProject = useSelector((store) => store.localVariables.projectId);
+  // var selectedProject = useSelector((store) => store.localVariables.projectId);
+  const selectedProject = useSelectedproject();
   const [regularizesList, setregularizedList] = useState([]);
   const { regularizes, loading, error, refetch } =
     useRegularizationRequests(selectedProject);

src/components/Layout/Header.jsx

@@ -43,8 +43,9 @@ const Header = () => {
       /^\/employee\/[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/.test(
         pathname
       );
+    const isExpensePage = /^\/expenses$/.test(pathname);
 
-    return !(isDirectoryPath || isProfilePage);
+    return !(isDirectoryPath || isProfilePage || isExpensePage);
   };
   const allowedProjectStatusIds = [
     "603e994b-a27f-4e5d-a251-f3d69b0498ba",
@@ -475,4 +476,4 @@ const Header = () => {
     </nav>
   );
 };
-export default Header;
+export default Header;

src/pages/Activities/AttendancePage.jsx

@@ -4,6 +4,7 @@ import {
   clearCacheKey,
   getCachedData,
   getCachedProfileData,
+  useSelectedproject,
 } from "../../slices/apiDataManager";
 import Breadcrumb from "../../components/common/Breadcrumb";
 import AttendanceLog from "../../components/Activities/AttendcesLogs";
@@ -28,7 +29,8 @@ const AttendancePage = () => {
   const [searchTerm, setSearchTerm] = useState(""); // 🔹 New state for search
   const queryClient = useQueryClient();
   const loginUser = getCachedProfileData();
-  const selectedProject = useSelector((store) => store.localVariables.projectId);
+  // const selectedProject = useSelector((store) => store.localVariables.projectId);
+  const selectedProject = useSelectedproject();
   const dispatch = useDispatch();
 
   const [attendances, setAttendances] = useState();

src/pages/employee/EmployeeList.jsx

@@ -18,7 +18,7 @@ import {
   VIEW_ALL_EMPLOYEES,
   VIEW_TEAM_MEMBERS,
 } from "../../utils/constants";
-import { clearCacheKey } from "../../slices/apiDataManager";
+import { clearCacheKey, useSelectedproject } from "../../slices/apiDataManager";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import SuspendEmp from "../../components/Employee/SuspendEmp"; // Keep if you use SuspendEmp
 import {
@@ -38,9 +38,10 @@ import usePagination from "../../hooks/usePagination";
 import { setProjectId } from "../../slices/localVariablesSlice";
 
 const EmployeeList = () => {
-  const selectedProjectId = useSelector(
+  // const selectedProjectId = useSelector(
-    (store) => store.localVariables.projectId
+  //   (store) => store.localVariables.projectId
-  );
+  // );
+  const selectedProjectId = useSelectedproject();
   const { projectNames, loading: projectLoading, fetchData } = useProjectName();
 
   const dispatch = useDispatch();