diff --git a/index.html b/index.html
index 1b2b7575..5bc1c55b 100644
--- a/index.html
+++ b/index.html
@@ -27,7 +27,6 @@
   <link rel="stylesheet" href="/assets/vendor/css/theme-default.css" class="template-customizer-theme-css" />
   <link rel="stylesheet" href="/assets/css/core-extend.css" />
   <link rel="stylesheet" href="/assets/css/default.css" />
-  <link rel="stylesheet" href="/assets/css/skeleton.css" />
 
   <link rel="stylesheet" href="/assets/vendor/libs/perfect-scrollbar/perfect-scrollbar.css" />
 
diff --git a/public/assets/css/skeleton.css b/public/assets/css/skeleton.css
deleted file mode 100644
index 2ee909d2..00000000
--- a/public/assets/css/skeleton.css
+++ /dev/null
@@ -1,32 +0,0 @@
-/* skeleton.css */
-.skeleton {
-  background-color: #e2e8f0;  /* Tailwind's gray-300 */
-  border-radius: 0.25rem;     /* Tailwind's rounded */
-  position: relative;
-  overflow: hidden;
-}
-
-.skeleton::after {
-  content: '';
-  display: block;
-  position: absolute;
-  top: 0; left: -150px;
-  height: 100%;
-  width: 150px;
-  background: linear-gradient(
-    90deg,
-    transparent,
-    rgba(255, 255, 255, 0.4),
-    transparent
-  );
-  animation: pulse 1.5s infinite;
-}
-
-@keyframes pulse {
-  0% {
-    left: -150px;
-  }
-  100% {
-    left: 100%;
-  }
-}
\ No newline at end of file
diff --git a/src/Context/FabContext.jsx b/src/Context/FabContext.jsx
index d78d4078..7151e6d7 100644
--- a/src/Context/FabContext.jsx
+++ b/src/Context/FabContext.jsx
@@ -4,30 +4,9 @@ const FabContext = createContext();
 
 export const FabProvider = ({ children }) => {
   const [actions, setActions] = useState([]);
-  const [showTrigger, setShowTrigger] = useState(true);
-    const [isOffcanvasOpen, setIsOffcanvasOpen] = useState(false); 
-    const [offcanvas, setOffcanvas] = useState({
-    isOpen: false,
-    title: "",
-    content: null,
-  });
-
-  const openOffcanvas = (title, content) => {
-    setOffcanvas({ isOpen: true, title, content });
-    setTimeout(() => {
-      const offcanvasElement = document.getElementById("globalOffcanvas");
-      if (offcanvasElement) {
-        const bsOffcanvas = new window.bootstrap.Offcanvas(offcanvasElement);
-        bsOffcanvas.show();
-      }
-    }, 100); 
-  };
-const setOffcanvasContent = (title, content) => {
-  setOffcanvas(prev => ({ ...prev, title, content }));
-};
 
   return (
-    <FabContext.Provider value={{ actions, setActions, offcanvas, openOffcanvas, showTrigger, setShowTrigger,isOffcanvasOpen, setIsOffcanvasOpen, setOffcanvasContent,  }}>
+    <FabContext.Provider value={{ actions, setActions }}>
       {children}
     </FabContext.Provider>
   );
diff --git a/src/components/Activities/Attendance.jsx b/src/components/Activities/Attendance.jsx
index 16315099..75979e7b 100644
--- a/src/components/Activities/Attendance.jsx
+++ b/src/components/Activities/Attendance.jsx
@@ -6,27 +6,34 @@ import RenderAttendanceStatus from "./RenderAttendanceStatus";
 import usePagination from "../../hooks/usePagination";
 import { useNavigate } from "react-router-dom";
 import { ITEMS_PER_PAGE } from "../../utils/constants";
-import { useAttendance } from "../../hooks/useAttendance"; // This hook is already providing data
+import { useAttendance } from "../../hooks/useAttendance";
 import { useSelector } from "react-redux";
 import { useQueryClient } from "@tanstack/react-query";
 import eventBus from "../../services/eventBus";
 
-const Attendance = ({ getRole, handleModalData, attendance: filteredAndSearchedAttendanceFromParent, showOnlyCheckout, setshowOnlyCheckout }) => {
+const Attendance = ({ getRole, handleModalData }) => {
   const queryClient = useQueryClient();
+  const [loading, setLoading] = useState(false);
   const navigate = useNavigate();
   const [todayDate, setTodayDate] = useState(new Date());
-
+  const [ShowPending, setShowPending] = useState(false);
   const selectedProject = useSelector(
     (store) => store.localVariables.projectId
   );
   const {
+    attendance,
     loading: attLoading,
     recall: attrecall,
     isFetching
-  } = useAttendance(selectedProject); // Keep this hook to manage recall and fetching status
+  } = useAttendance(selectedProject);
+  const filteredAttendance = ShowPending
+    ? attendance?.filter(
+        (att) => att?.checkInTime !== null && att?.checkOutTime === null
+      )
+    : attendance;
 
-  const attendanceList = Array.isArray(filteredAndSearchedAttendanceFromParent)
-    ? filteredAndSearchedAttendanceFromParent
+  const attendanceList = Array.isArray(filteredAttendance)
+    ? filteredAttendance
     : [];
 
   const sortByName = (a, b) => {
@@ -34,7 +41,6 @@ const Attendance = ({ getRole, handleModalData, attendance: filteredAndSearchedA
     const nameB = (b.firstName + b.lastName).toLowerCase();
     return nameA?.localeCompare(nameB);
   };
-
   const group1 = attendanceList
     .filter((d) => d.activity === 1 || d.activity === 4)
     .sort(sortByName);
@@ -42,39 +48,41 @@ const Attendance = ({ getRole, handleModalData, attendance: filteredAndSearchedA
     .filter((d) => d.activity === 0)
     .sort(sortByName);
 
-  const finalFilteredDataForPagination = [...group1, ...group2];
-
+  const filteredData = [...group1, ...group2];
   const { currentPage, totalPages, currentItems, paginate } = usePagination(
-    finalFilteredDataForPagination, // Use the data that's already been searched and grouped
+    filteredData,
     ITEMS_PER_PAGE
   );
 
   const handler = useCallback(
     (msg) => {
-      if (selectedProject === msg.projectId) {
+      if (selectedProject == msg.projectId) {
+        // const updatedAttendance = attendances.map((item) =>
+        //   item.employeeId === msg.response.employeeId
+        //     ? { ...item, ...msg.response }
+        //     : item
+        // );
         queryClient.setQueryData(["attendance", selectedProject], (oldData) => {
           if (!oldData) {
-            queryClient.invalidateQueries({ queryKey: ["attendance"] });
-            return; // Exit to avoid mapping on undefined oldData
-          }
+            queryClient.invalidateQueries({queryKey:["attendance"]})
+          };
           return oldData.map((record) =>
             record.employeeId === msg.response.employeeId ? { ...record, ...msg.response } : record
           );
         });
       }
     },
-    [selectedProject, queryClient] // Added queryClient to dependencies
+    [selectedProject, attrecall]
   );
 
   const employeeHandler = useCallback(
     (msg) => {
-      if (attrecall) { // Check if attrecall function exists
+      if (attendances.some((item) => item.employeeId == msg.employeeId)) {
         attrecall();
       }
     },
-    [attrecall] // Dependency should be attrecall, not `selectedProject` or `attendance` here
+    [selectedProject, attendance]
   );
-
   useEffect(() => {
     eventBus.on("attendance", handler);
     return () => eventBus.off("attendance", handler);
@@ -97,14 +105,13 @@ const Attendance = ({ getRole, handleModalData, attendance: filteredAndSearchedA
               role="switch"
               id="inactiveEmployeesCheckbox"
               disabled={isFetching}
-              checked={showOnlyCheckout} // Use prop for checked state
-              onChange={(e) => setshowOnlyCheckout(e.target.checked)} // Use prop for onChange
+              checked={ShowPending}
+              onChange={(e) => setShowPending(e.target.checked)}
             />
             <label className="form-check-label ms-0">Show Pending</label>
           </div>
         </div>
-        {/* Use `filteredAndSearchedAttendanceFromParent` for the initial check of data presence */}
-        {Array.isArray(filteredAndSearchedAttendanceFromParent) && filteredAndSearchedAttendanceFromParent.length > 0 ? (
+        {Array.isArray(attendance) && attendance.length > 0 ? (
           <>
             <table className="table ">
               <thead>
@@ -122,7 +129,7 @@ const Attendance = ({ getRole, handleModalData, attendance: filteredAndSearchedA
                 </tr>
               </thead>
               <tbody className="table-border-bottom-0 ">
-                {currentItems && currentItems.length > 0 ? ( // Check currentItems length before mapping
+                {currentItems &&
                   currentItems
                     .sort((a, b) => {
                       const checkInA = a?.checkInTime
@@ -179,22 +186,18 @@ const Attendance = ({ getRole, handleModalData, attendance: filteredAndSearchedA
                           />
                         </td>
                       </tr>
-                    ))
-                ) : (
-                  <tr>
-                    <td colSpan="6" className="text-center text-muted py-4">
-                      No matching records found.
-                    </td>
-                  </tr>
+                    ))}
+                {!attendance && (
+                  <span className="text-secondary m-4">No employees assigned to the project!</span>
                 )}
               </tbody>
             </table>
 
-            {!attLoading && finalFilteredDataForPagination.length > ITEMS_PER_PAGE && ( // Use the data before pagination for total count check
+            {!loading && filteredData.length > 20 && (
               <nav aria-label="Page ">
                 <ul className="pagination pagination-sm justify-content-end py-1">
                   <li
-                    className={`page-item ${
+                    className={`page-item  ${
                       currentPage === 1 ? "disabled" : ""
                     }`}
                   >
@@ -240,20 +243,18 @@ const Attendance = ({ getRole, handleModalData, attendance: filteredAndSearchedA
           <div>Loading...</div>
         ) : (
           <div className="text-muted">
-            {/* Check the actual prop passed for initial data presence */}
-            {Array.isArray(filteredAndSearchedAttendanceFromParent) && filteredAndSearchedAttendanceFromParent.length === 0
-              ? ""
-              : "Attendance data unavailable."}
+            {Array.isArray(attendance)
+              ? "No employees assigned to the project"
+              : "Attendance data unavailable"}
           </div>
         )}
 
-        {/* This condition should check `currentItems` or `finalFilteredDataForPagination` */}
-        {currentItems?.length === 0 && finalFilteredDataForPagination.length > 0 && showOnlyCheckout && (
-          <div className="my-4"><span className="text-secondary">No Pending Record Available for your search!</span></div>
+        {currentItems?.length == 0 && attendance.length > 0 && (
+          <div className="my-4"><span className="text-secondary">No Pending Record Available !</span></div>
         )}
       </div>
     </>
   );
 };
 
-export default Attendance;
\ No newline at end of file
+export default Attendance;
diff --git a/src/components/Activities/AttendcesLogs.jsx b/src/components/Activities/AttendcesLogs.jsx
index c410ee01..0a28ffd3 100644
--- a/src/components/Activities/AttendcesLogs.jsx
+++ b/src/components/Activities/AttendcesLogs.jsx
@@ -4,31 +4,24 @@ import Avatar from "../common/Avatar";
 import { convertShortTime } from "../../utils/dateUtils";
 import RenderAttendanceStatus from "./RenderAttendanceStatus";
 import { useSelector, useDispatch } from "react-redux";
-import { fetchAttendanceData, setAttendanceData } from "../../slices/apiSlice/attedanceLogsSlice";
+import { fetchAttendanceData } from "../../slices/apiSlice/attedanceLogsSlice";
 import DateRangePicker from "../common/DateRangePicker";
+import { clearCacheKey, getCachedData } from "../../slices/apiDataManager";
 import eventBus from "../../services/eventBus";
+import AttendanceRepository from "../../repositories/AttendanceRepository";
+import { useAttendancesLogs } from "../../hooks/useAttendance";
+import { queryClient } from "../../layouts/AuthLayout";
 
 const usePagination = (data, itemsPerPage) => {
   const [currentPage, setCurrentPage] = useState(1);
-  const totalItems = Array.isArray(data) ? data.length : 0;
-  const maxPage = Math.ceil(totalItems / itemsPerPage);
-
+  const maxPage = Math.ceil(data.length / itemsPerPage);
   const currentItems = useMemo(() => {
-    if (!Array.isArray(data) || data.length === 0) {
-      return [];
-    }
     const startIndex = (currentPage - 1) * itemsPerPage;
     const endIndex = startIndex + itemsPerPage;
     return data.slice(startIndex, endIndex);
   }, [data, currentPage, itemsPerPage]);
 
-  const paginate = useCallback((pageNumber) => {
-    if (pageNumber > 0 && pageNumber <= maxPage) {
-      setCurrentPage(pageNumber);
-    }
-  }, [maxPage]);
-
-  // Ensure resetPage is returned by the hook
+  const paginate = useCallback((pageNumber) => setCurrentPage(pageNumber), []);
   const resetPage = useCallback(() => setCurrentPage(1), []);
 
   return {
@@ -42,91 +35,60 @@ const usePagination = (data, itemsPerPage) => {
 
 const AttendanceLog = ({
   handleModalData,
-  projectId,
-  setshowOnlyCheckout,
-  showOnlyCheckout,
-  searchQuery, // Prop for search query
 }) => {
+  const selectedProject = useSelector(
+    (store) => store.localVariables.projectId
+  );
   const [dateRange, setDateRange] = useState({ startDate: "", endDate: "" });
   const dispatch = useDispatch();
-  const { data, loading, error } = useSelector((store) => store.attendanceLogs);
+  const [loading, setLoading] = useState(false);
+  const [showPending,setShowPending] = useState(false)
+
   const [isRefreshing, setIsRefreshing] = useState(false);
+  const [processedData, setProcessedData] = useState([]);
 
-  const today = useMemo(() => {
-    const d = new Date();
-    d.setHours(0, 0, 0, 0);
-    return d;
-  }, []);
+  const today = new Date();
+  today.setHours(0, 0, 0, 0);
 
-  const yesterday = useMemo(() => {
-    const d = new Date();
-    d.setDate(d.getDate() - 1);
-    return d;
-  }, []);
+  const yesterday = new Date();
+  yesterday.setDate(yesterday.getDate() - 1);
 
-  const isSameDay = useCallback((dateStr) => {
+  const isSameDay = (dateStr) => {
     if (!dateStr) return false;
     const d = new Date(dateStr);
     d.setHours(0, 0, 0, 0);
     return d.getTime() === today.getTime();
-  }, [today]);
+  };
 
-  const isBeforeToday = useCallback((dateStr) => {
+  const isBeforeToday = (dateStr) => {
     if (!dateStr) return false;
     const d = new Date(dateStr);
     d.setHours(0, 0, 0, 0);
     return d.getTime() < today.getTime();
-  }, [today]);
+  };
 
-  const sortByName = useCallback((a, b) => {
-    const nameA = `${a.firstName || ""} ${a.lastName || ""}`.toLowerCase();
-    const nameB = `${b.firstName || ""} ${b.lastName || ""}`.toLowerCase();
-    return nameA.localeCompare(nameB);
-  }, []);
+  const sortByName = (a, b) => {
+    const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase();
+    const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
+    return nameA?.localeCompare(nameB);
+  };
 
-  useEffect(() => {
-    const { startDate, endDate } = dateRange;
-    dispatch(
-      fetchAttendanceData({
-        projectId,
-        fromDate: startDate,
-        toDate: endDate,
-      })
-    );
-    setIsRefreshing(false);
-  }, [dateRange, projectId, dispatch, isRefreshing]);
-
-  const processedData = useMemo(() => {
-    let filteredData = showOnlyCheckout
+  const {
+    data = [],
+    isLoading,
+    error,
+    refetch,
+    isFetching,
+  } = useAttendancesLogs(
+    selectedProject,
+    dateRange.startDate,
+    dateRange.endDate
+  );
+  const filtering = (data) => {
+    const filteredData = showPending
       ? data.filter((item) => item.checkOutTime === null)
       : data;
 
-    // Apply search query filter
-    if (searchQuery) {
-      const lowerCaseSearchQuery = searchQuery.toLowerCase().trim(); // Trim whitespace
-
-      filteredData = filteredData.filter((att) => {
-        // Option 1: Combine firstName, middleName, lastName
-        const fullName = [att.firstName, att.middleName, att.lastName]
-          .filter(Boolean) // This removes null, undefined, or empty string parts
-          .join(" ")
-          .toLowerCase();
-
-        // Option 2: Check `employeeName` if it exists and is reliable
-        const employeeName = att.employeeName?.toLowerCase() || "";
-
-        // Option 3: Check `employeeId`
-        const employeeId = att.employeeId?.toLowerCase() || "";
-
-        // Check if the search query is included in any of the relevant fields
-        return (
-          fullName.includes(lowerCaseSearchQuery) ||
-          employeeName.includes(lowerCaseSearchQuery) ||
-          employeeId.includes(lowerCaseSearchQuery)
-        );
-      });
-    }
-
     const group1 = filteredData
       .filter((d) => d.activity === 1 && isSameDay(d.checkInTime))
       .sort(sortByName);
@@ -165,46 +127,53 @@ const AttendanceLog = ({
       return acc;
     }, {});
 
-    // Sort dates in descending order
     const sortedDates = Object.keys(groupedByDate).sort(
       (a, b) => new Date(b) - new Date(a)
     );
 
-    // Create the final sorted array
-    return sortedDates.flatMap((date) => groupedByDate[date]);
-  }, [data, showOnlyCheckout, searchQuery, isSameDay, isBeforeToday, sortByName]);
+    const finalData = sortedDates.flatMap((date) => groupedByDate[date]);
+    setProcessedData(finalData);
+  };
+
+  useEffect(() => {
+    filtering(data);
+  }, [data, showPending]);
 
   const {
     currentPage,
     totalPages,
     currentItems: paginatedAttendances,
     paginate,
-    resetPage, // Destructure resetPage here
+    resetPage,
   } = usePagination(processedData, 20);
 
-  // Effect to reset pagination when search query changes
   useEffect(() => {
     resetPage();
-  }, [searchQuery, resetPage]); // Add resetPage to dependencies
+  }, [processedData, resetPage]);
 
   const handler = useCallback(
     (msg) => {
       const { startDate, endDate } = dateRange;
       const checkIn = msg.response.checkInTime.substring(0, 10);
       if (
-        projectId === msg.projectId &&
+        selectedProject === msg.projectId &&
         startDate <= checkIn &&
         checkIn <= endDate
       ) {
-        const updatedAttendance = data.map((item) =>
-          item.id === msg.response.id
-            ? { ...item, ...msg.response }
-            : item
+        queryClient.setQueriesData(["attendanceLogs"],(oldData)=>{
+          if(!oldData) {
+            queryClient.invalidateQueries({queryKey:["attendanceLogs"]})
+          }
+          return oldData.map((record) =>
+          record.id === msg.response.id ? { ...record, ...msg.response } : record
         );
-        dispatch(setAttendanceData(updatedAttendance)); // Update Redux store
+        })
+
+        filtering(updatedAttendance);
+        resetPage();
       }
     },
-    [projectId, dateRange, data, dispatch]
+    [selectedProject, dateRange, data, filtering, resetPage]
   );
 
   useEffect(() => {
@@ -215,15 +184,19 @@ const AttendanceLog = ({
   const employeeHandler = useCallback(
     (msg) => {
       const { startDate, endDate } = dateRange;
-      dispatch(
-        fetchAttendanceData({
-          projectId,
-          fromDate: startDate,
-          toDate: endDate,
-        })
-      );
+      if (data.some((item) => item.employeeId == msg.employeeId)) {
+        // dispatch(
+        //   fetchAttendanceData({
+        //     ,
+        //     fromDate: startDate,
+        //     toDate: endDate,
+        //   })
+        // );
+
+        refetch()
+      }
     },
-    [projectId, dateRange, dispatch]
+    [selectedProject, dateRange, data]
   );
 
   useEffect(() => {
@@ -247,27 +220,28 @@ const AttendanceLog = ({
               type="checkbox"
               className="form-check-input"
               role="switch"
+              disabled={isFetching}
               id="inactiveEmployeesCheckbox"
-              checked={showOnlyCheckout}
-              onChange={(e) => setshowOnlyCheckout(e.target.checked)}
+              checked={showPending}
+              onChange={(e) => setShowPending(e.target.checked)}
             />
             <label className="form-check-label ms-0">Show Pending</label>
           </div>
         </div>
         <div className="col-md-2 m-0 text-end">
           <i
-            className={`bx bx-refresh cursor-pointer fs-4 ${loading || isRefreshing ? "spin" : ""
-              }`}
+            className={`bx bx-refresh cursor-pointer fs-4 ${
+              isFetching ? "spin" : ""
+            }`}
             title="Refresh"
-            onClick={() => setIsRefreshing(true)}
+            onClick={() => refetch()}
           />
         </div>
       </div>
-      <div
-        className="table-responsive text-nowrap"
-        style={{ minHeight: "200px", display: 'flex' }}
-      >
-        {processedData && processedData.length > 0 ? (
+      <div className="table-responsive text-nowrap">
+        {isLoading ? (
+          <div><p className="text-secondary">Loading...</p></div>
+        ) : data?.length > 0 ? (
           <table className="table mb-0">
             <thead>
               <tr>
@@ -286,96 +260,82 @@ const AttendanceLog = ({
               </tr>
             </thead>
             <tbody>
-              {(loading || isRefreshing) && (
-                <tr>
-                  <td colSpan={6}>Loading...</td>
-                </tr>
-              )}
-              {!loading &&
-                !isRefreshing &&
-                paginatedAttendances.reduce((acc, attendance, index, arr) => {
-                  const currentDate = moment(
-                    attendance.checkInTime || attendance.checkOutTime
-                  ).format("YYYY-MM-DD");
-                  const previousAttendance = arr[index - 1];
-                  const previousDate = previousAttendance
-                    ? moment(
+              {paginatedAttendances.reduce((acc, attendance, index, arr) => {
+                const currentDate = moment(
+                  attendance.checkInTime || attendance.checkOutTime
+                ).format("YYYY-MM-DD");
+                const previousAttendance = arr[index - 1];
+                const previousDate = previousAttendance
+                  ? moment(
                       previousAttendance.checkInTime ||
-                      previousAttendance.checkOutTime
+                        previousAttendance.checkOutTime
                     ).format("YYYY-MM-DD")
-                    : null;
+                  : null;
 
-                  if (!previousDate || currentDate !== previousDate) {
-                    acc.push(
-                      <tr
-                        key={`header-${currentDate}`}
-                        className="table-row-header"
-                      >
-                        <td colSpan={6} className="text-start">
-                          <strong>
-                            {moment(currentDate).format("DD-MM-YYYY")}
-                          </strong>
-                        </td>
-                      </tr>
-                    );
-                  }
+                if (!previousDate || currentDate !== previousDate) {
                   acc.push(
-                    <tr key={attendance.id || index}>
-                      <td colSpan={2}>
-                        <div className="d-flex justify-content-start align-items-center">
-                          <Avatar
-                            firstName={attendance.firstName}
-                            lastName={attendance.lastName}
-                          />
-                          <div className="d-flex flex-column">
-                            <a href="#" className="text-heading text-truncate">
-                              <span className="fw-normal">
-                                {attendance.firstName} {attendance.lastName}
-                              </span>
-                            </a>
-                          </div>
-                        </div>
-                      </td>
-                      <td>
-                        {moment(
-                          attendance.checkInTime || attendance.checkOutTime
-                        ).format("DD-MMM-YYYY")}
-                      </td>
-                      <td>{convertShortTime(attendance.checkInTime)}</td>
-                      <td>
-                        {attendance.checkOutTime
-                          ? convertShortTime(attendance.checkOutTime)
-                          : "--"}
-                      </td>
-                      <td className="text-center">
-                        <RenderAttendanceStatus
-                          attendanceData={attendance}
-                          handleModalData={handleModalData}
-                          Tab={2}
-                          currentDate={today.toLocaleDateString("en-CA")}
-                        />
+                    <tr
+                      key={`header-${currentDate}`}
+                      className="table-row-header"
+                    >
+                      <td colSpan={6} className="text-start">
+                        <strong>
+                          {moment(currentDate).format("DD-MM-YYYY")}
+                        </strong>
                       </td>
                     </tr>
                   );
-                  return acc;
-                }, [])}
+                }
+                acc.push(
+                  <tr key={index}>
+                    <td colSpan={2}>
+                      <div className="d-flex justify-content-start align-items-center">
+                        <Avatar
+                          firstName={attendance.firstName}
+                          lastName={attendance.lastName}
+                        />
+                        <div className="d-flex flex-column">
+                          <a href="#" className="text-heading text-truncate">
+                            <span className="fw-normal">
+                              {attendance.firstName} {attendance.lastName}
+                            </span>
+                          </a>
+                        </div>
+                      </div>
+                    </td>
+                    <td>
+                      {moment(
+                        attendance.checkInTime || attendance.checkOutTime
+                      ).format("DD-MMM-YYYY")}
+                    </td>
+                    <td>{convertShortTime(attendance.checkInTime)}</td>
+                    <td>
+                      {attendance.checkOutTime
+                        ? convertShortTime(attendance.checkOutTime)
+                        : "--"}
+                    </td>
+                    <td className="text-center">
+                      <RenderAttendanceStatus
+                        attendanceData={attendance}
+                        handleModalData={handleModalData}
+                        Tab={2}
+                        currentDate={today.toLocaleDateString("en-CA")}
+                      />
+                    </td>
+                  </tr>
+                );
+                return acc;
+              }, [])}
             </tbody>
           </table>
         ) : (
-          !loading &&
-          !isRefreshing && (
-            <div
-              className="d-flex justify-content-center align-items-center text-muted"
-              style={{
-                width: "100%",
-              }}
-            >
-              No employee logs.
-            </div>
-          )
+           <div className="my-4"><span className="text-secondary">No Record Available !</span></div>
         )}
       </div>
-      {!loading && !isRefreshing && processedData.length > 20 && (
+        {paginatedAttendances?.length == 0 && data?.length > 0 && (
+          <div className="my-4"><span className="text-secondary">No Pending Record Available !</span></div>
+        )}
+      {processedData.length > 10 && (
         <nav aria-label="Page ">
           <ul className="pagination pagination-sm justify-content-end py-1">
             <li className={`page-item ${currentPage === 1 ? "disabled" : ""}`}>
@@ -390,8 +350,9 @@ const AttendanceLog = ({
               (pageNumber) => (
                 <li
                   key={pageNumber}
-                  className={`page-item ${currentPage === pageNumber ? "active" : ""
-                    }`}
+                  className={`page-item ${
+                    currentPage === pageNumber ? "active" : ""
+                  }`}
                 >
                   <button
                     className="page-link"
@@ -403,8 +364,9 @@ const AttendanceLog = ({
               )
             )}
             <li
-              className={`page-item ${currentPage === totalPages ? "disabled" : ""
-                }`}
+              className={`page-item ${
+                currentPage === totalPages ? "disabled" : ""
+              }`}
             >
               <button
                 className="page-link"
@@ -420,4 +382,4 @@ const AttendanceLog = ({
   );
 };
 
-export default AttendanceLog;
\ No newline at end of file
+export default AttendanceLog;
diff --git a/src/components/Activities/CheckCheckOutForm.jsx b/src/components/Activities/CheckCheckOutForm.jsx
index 853b91bd..11dfab8e 100644
--- a/src/components/Activities/CheckCheckOutForm.jsx
+++ b/src/components/Activities/CheckCheckOutForm.jsx
@@ -11,43 +11,10 @@ import { checkIfCurrentDate } from "../../utils/dateUtils";
 import { useMarkAttendance } from "../../hooks/useAttendance";
 
 
-// const schema = z.object({
-//   markTime: z.string().nonempty({ message: "Time is required" }),
-//   description: z.string().max(200, "description should less than 200 chracters").optional()
-// });
-
-const createSchema = (modeldata) => {
-  return z
-    .object({
-      markTime: z.string().nonempty({ message: "Time is required" }),
-      description: z
-        .string()
-        .max(200, "Description should be less than 200 characters")
-        .optional(),
-    })
-    .refine((data) => {
-      if (modeldata?.checkInTime && !modeldata?.checkOutTime) {
-        const checkIn = new Date(modeldata.checkInTime);
-        const [time, modifier] = data.markTime.split(" ");
-        const [hourStr, minuteStr] = time.split(":");
-        let hour = parseInt(hourStr, 10);
-        const minute = parseInt(minuteStr, 10);
-
-        if (modifier === "PM" && hour !== 12) hour += 12;
-        if (modifier === "AM" && hour === 12) hour = 0;
-
-        const checkOut = new Date(checkIn);
-        checkOut.setHours(hour, minute, 0, 0);
-
-        return checkOut > checkIn;
-      }
-      return true;
-    }, {
-      message: "Checkout time must be later than check-in time",
-      path: ["markTime"],
-    });
-};
-
+const schema = z.object({
+  markTime: z.string().nonempty({ message: "Time is required" }),
+  description: z.string().max(200, "description should less than 200 chracters").optional()
+});
 
 const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
 
@@ -66,38 +33,38 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
     return `${day}-${month}-${year}`;
   };
 
-  // const {
-  //   register,
-  //   handleSubmit,
-  //   formState: { errors },
-  //   reset,
-  //   setValue,
-  // } = useForm({
-  //   resolver: zodResolver(schema),
-  //   mode: "onChange"
-  // });
-
   const {
-  register,
-  handleSubmit,
-  formState: { errors },
-  reset,
-  setValue,
-} = useForm({
-  resolver: zodResolver(createSchema(modeldata)),
-  mode: "onChange",
-});
-
+    register,
+    handleSubmit,
+    formState: { errors },
+    reset,
+    setValue,
+  } = useForm({
+    resolver: zodResolver(schema),
+    mode: "onChange"
+  });
 
   const onSubmit = (data) => {
     let record = { ...data, date: new Date().toLocaleDateString(), latitude: coords.latitude, longitude: coords.longitude, employeeId: modeldata.employeeId, action: modeldata.action, id: modeldata?.id || null }
-    if (modeldata.forWhichTab === 1) {
-      handleSubmitForm(record)
-    } else {
-
-      dispatch(markAttendance(record))
-        .unwrap()
-        .then((data) => {
+    // if (modeldata.forWhichTab === 1 || modeldata.forWhichTab === 2) {
+      // handleSubmitForm(record)
+          const payload = {
+          Id: modeldata?.id || null,
+          comment: data.description,
+          employeeID: modeldata.employeeId,
+          projectId: projectId,
+          date: new Date().toISOString(),
+          markTime: data.markTime,
+          latitude: coords.latitude.toString(),
+          longitude: coords.longitude.toString(),
+          action: modeldata.action,
+          image: null,
+        };
+      MarkAttendance({payload,forWhichTab:modeldata.forWhichTab})
+    // } else {
+    //   dispatch(markAttendance(record))
+    //     .unwrap()
+    //     .then((data) => {
 
     //       showToast("Attendance Marked Successfully", "success");
     //     })
@@ -105,8 +72,8 @@ const CheckCheckOutmodel = ({ modeldata, closeModal, handleSubmitForm, }) => {
 
     //       showToast(error, "error");
 
-        });
-    }
+    //     });
+    // }
 
     closeModal()
   };
diff --git a/src/components/Activities/Regularization.jsx b/src/components/Activities/Regularization.jsx
index 6c0edfac..04a546b3 100644
--- a/src/components/Activities/Regularization.jsx
+++ b/src/components/Activities/Regularization.jsx
@@ -7,37 +7,63 @@ import { useRegularizationRequests } from "../../hooks/useAttendance";
 import moment from "moment";
 import usePagination from "../../hooks/usePagination";
 import eventBus from "../../services/eventBus";
-import { cacheData } from "../../slices/apiDataManager";
+import { cacheData, clearCacheKey } from "../../slices/apiDataManager";
+import { useQueryClient } from "@tanstack/react-query";
 
-const Regularization = ({ handleRequest, searchQuery }) => {
-  const selectedProject = useSelector((store) => store.localVariables.projectId);
-  const [regularizesList, setRegularizedList] = useState([]);
-  const { regularizes, loading, refetch } = useRegularizationRequests(selectedProject);
+const Regularization = ({ handleRequest }) => {
+  const queryClient = useQueryClient();
+  var selectedProject = useSelector((store) => store.localVariables.projectId);
+  const [regularizesList, setregularizedList] = useState([]);
+  const { regularizes, loading, error, refetch } =
+    useRegularizationRequests(selectedProject);
 
   useEffect(() => {
-    setRegularizedList(regularizes);
+    setregularizedList(regularizes);
   }, [regularizes]);
 
   const sortByName = (a, b) => {
-    const nameA = (a.firstName + a.lastName).toLowerCase();
-    const nameB = (b.firstName + b.lastName).toLowerCase();
-    return nameA.localeCompare(nameB);
+    const nameA = a.firstName.toLowerCase() + a.lastName.toLowerCase();
+    const nameB = b.firstName.toLowerCase() + b.lastName.toLowerCase();
+    return nameA?.localeCompare(nameB);
   };
 
   const handler = useCallback(
     (msg) => {
       if (selectedProject == msg.projectId) {
-        const updatedAttendance = regularizes?.filter(item => item.id !== msg.response.id);
-        cacheData("regularizedList", {
-          data: updatedAttendance,
-          projectId: selectedProject,
-        });
-        refetch();
+        // const updatedAttendance = regularizes?.filter(
+        //   (item) => item.id !== msg.response.id
+        // );
+        // cacheData("regularizedList", {
+        //   data: updatedAttendance,
+        //   projectId: selectedProject,
+        // });
+        // refetch();
+
+        queryClient.setQueryData(
+          ["regularizedList", selectedProject],
+          (oldData) => {
+            if (!oldData) {
+              queryClient.invalidateQueries({ queryKey: ["regularizedList"] });
+            }
+            return oldData.filter((record) => record.id !== msg.response.id);
+          }
+        ),
+          queryClient.invalidateQueries({ queryKey: ["attendanceLogs"] });
       }
     },
     [selectedProject, regularizes]
   );
-  
+
+  const filteredData = [...regularizesList]?.sort(sortByName);
+
+  const { currentPage, totalPages, currentItems, paginate } = usePagination(
+    filteredData,
+    20
+  );
+  useEffect(() => {
+    eventBus.on("regularization", handler);
+    return () => eventBus.off("regularization", handler);
+  }, [handler]);
 
   const employeeHandler = useCallback(
     (msg) => {
@@ -48,57 +74,41 @@ const Regularization = ({ handleRequest, searchQuery }) => {
     [regularizes]
   );
 
-  useEffect(() => {
-    eventBus.on("regularization", handler);
-    return () => eventBus.off("regularization", handler);
-  }, [handler]);
-
   useEffect(() => {
     eventBus.on("employee", employeeHandler);
     return () => eventBus.off("employee", employeeHandler);
   }, [employeeHandler]);
 
-  // ✅ Search filter logic added here
-  const filteredData = [...regularizesList]
-    ?.filter((item) => {
-      if (!searchQuery) return true;
-      const lowerSearch = searchQuery.toLowerCase();
-      const fullName = `${item.firstName || ""} ${item.lastName || ""}`.toLowerCase();
-
-      return (
-        item.firstName?.toLowerCase().includes(lowerSearch) ||
-        item.lastName?.toLowerCase().includes(lowerSearch) ||
-        fullName.includes(lowerSearch) ||
-        item.employeeId?.toLowerCase().includes(lowerSearch)
-      );
-    })
-    .sort(sortByName);
-
-  const { currentPage, totalPages, currentItems, paginate } = usePagination(filteredData, 20);
-
   return (
     <div className="table-responsive text-nowrap pb-4">
-      <table className="table mb-0">
-        <thead>
-          <tr>
-            <th colSpan={2}>Name</th>
-            <th>Date</th>
-            <th>
-              <i className="bx bxs-down-arrow-alt text-success"></i>Check-In
-            </th>
-            <th>
-              <i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
-            </th>
-            <th>Action</th>
-          </tr>
-        </thead>
-        <tbody>
-          {!loading && currentItems?.length > 0 ? (
-            currentItems.map((att, index) => (
+      {loading ? (
+        <div className="my-2">
+          <p className="text-secondary">Loading...</p>
+        </div>
+      ) : currentItems?.length > 0 ? (
+        <table className="table mb-0">
+          <thead>
+            <tr>
+              <th colSpan={2}>Name</th>
+              <th>Date</th>
+              <th>
+                <i className="bx bxs-down-arrow-alt text-success"></i>Check-In
+              </th>
+              <th>
+                <i className="bx bxs-up-arrow-alt text-danger"></i>Check-Out
+              </th>
+              <th>Action</th>
+            </tr>
+          </thead>
+          <tbody>
+            {currentItems?.map((att, index) => (
               <tr key={index}>
                 <td colSpan={2}>
                   <div className="d-flex justify-content-start align-items-center">
-                    <Avatar firstName={att.firstName} lastName={att.lastName} />
+                    <Avatar
+                      firstName={att.firstName}
+                      lastName={att.lastName}
+                    ></Avatar>
                     <div className="d-flex flex-column">
                       <a href="#" className="text-heading text-truncate">
                         <span className="fw-normal">
@@ -113,33 +123,24 @@ const Regularization = ({ handleRequest, searchQuery }) => {
                 <td>
                   {att.checkOutTime ? convertShortTime(att.checkOutTime) : "--"}
                 </td>
-                <td className="text-center">
+                <td className="text-center ">
                   <RegularizationActions
                     attendanceData={att}
                     handleRequest={handleRequest}
                     refresh={refetch}
                   />
+                  {/* </div> */}
                 </td>
               </tr>
-            ))
-          ) : (
-            <tr>
-              <td
-                colSpan={6}
-                className="text-center"
-                style={{
-                  height: "200px",
-                  verticalAlign: "middle",
-                  borderBottom: "none",
-                }}
-              >
-                {loading ? "Loading..." : "No Record Found"}
-              </td>
-            </tr>
-          )}
-        </tbody>
-      </table>
-
+            ))}
+          </tbody>
+        </table>
+      ) : (
+        <div className="my-4">
+          {" "}
+          <span className="text-secondary">No Requests Found !</span>
+        </div>
+      )}
       {!loading && totalPages > 1 && (
         <nav aria-label="Page ">
           <ul className="pagination pagination-sm justify-content-end py-1 mt-3">
@@ -154,18 +155,25 @@ const Regularization = ({ handleRequest, searchQuery }) => {
             {[...Array(totalPages)].map((_, index) => (
               <li
                 key={index}
-                className={`page-item ${currentPage === index + 1 ? "active" : ""}`}
+                className={`page-item ${
+                  currentPage === index + 1 ? "active" : ""
+                }`}
               >
-                <button className="page-link" onClick={() => paginate(index + 1)}>
+                <button
+                  className="page-link "
+                  onClick={() => paginate(index + 1)}
+                >
                   {index + 1}
                 </button>
               </li>
             ))}
             <li
-              className={`page-item ${currentPage === totalPages ? "disabled" : ""}`}
+              className={`page-item ${
+                currentPage === totalPages ? "disabled" : ""
+              }`}
             >
               <button
-                className="page-link"
+                className="page-link "
                 onClick={() => paginate(currentPage + 1)}
               >
                 &raquo;
diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
index 2f52dd7f..311fa763 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/components/Dashboard/Dashboard.jsx
@@ -1,4 +1,4 @@
-import React,{useEffect} from "react";
+import React from "react";
 import { useSelector } from "react-redux";
 import {
     useDashboardProjectsCardData,
@@ -14,25 +14,16 @@ import ProjectCompletionChart from "./ProjectCompletionChart";
 import ProjectProgressChart from "./ProjectProgressChart";
 import ProjectOverview from "../Project/ProjectOverview";
 import AttendanceOverview from "./AttendanceChart";
-import { useFab } from "../../Context/FabContext";
 
 const Dashboard = () => {
     const { projectsCardData } = useDashboardProjectsCardData();
     const { teamsCardData } = useDashboardTeamsCardData();
     const { tasksCardData } = useDashboardTasksCardData();
-    const {setShowTrigger} = useFab()
 
     // Get the selected project ID from Redux store
     const projectId = useSelector((store) => store.localVariables.projectId);
     const isAllProjectsSelected = projectId === null;
 
-
-     useEffect(() => {
-    setShowTrigger(false);          
-    console.log("OffCanvas")
-    return () => setShowTrigger(true);
-  }, [setShowTrigger])
-
     return (
         <div className="container-fluid mt-5">
             <div className="row gy-4">
diff --git a/src/components/Dashboard/Tasks.jsx b/src/components/Dashboard/Tasks.jsx
index 2513e061..725f5e69 100644
--- a/src/components/Dashboard/Tasks.jsx
+++ b/src/components/Dashboard/Tasks.jsx
@@ -5,6 +5,7 @@ import { useDashboardTasksCardData } from "../../hooks/useDashboard_Data";
 const TasksCard = () => {
   const projectId = useSelector((store) => store.localVariables?.projectId);
   const { tasksCardData, loading, error } = useDashboardTasksCardData(projectId);
+  console.log(tasksCardData);
 
   return (
     <div className="card p-3 h-100 text-center d-flex justify-content-between">
diff --git a/src/components/Directory/CardViewDirectory.jsx b/src/components/Directory/CardViewDirectory.jsx
index b623ef0e..9be8663a 100644
--- a/src/components/Directory/CardViewDirectory.jsx
+++ b/src/components/Directory/CardViewDirectory.jsx
@@ -107,13 +107,13 @@ const CardViewDirectory = ({
           {/* <li className="list-inline-item me-1 small">
             <i className="fa-solid fa-briefcase me-2"></i>
           </li> */}
-          <li className="list-inline-item text-break small px-1 ms-5">
+          <li className="list-inline-item text-break small ms-5">
             {contact.organization}
           </li>
         </ul>
       </div>
       <div
-        className={`card-footer text-start px-9 py-1 ${IsActive && "cursor-pointer"
+        className={`card-footer text-start px-1 py-1 ${IsActive && "cursor-pointer"
           }`}
         onClick={() => {
           if (IsActive) {
@@ -123,16 +123,6 @@ const CardViewDirectory = ({
         }}
       >
         <hr className="my-0" />
-        {contact.designation && (
-          <ul className="list-unstyled my-1 d-flex align-items-start  ms-2">
-            <li className="me-2">
-              <i class="fa-solid fa-id-badge ms-1"></i>
-            </li>
-            <li className="flex-grow-1 text-break small">
-              {contact.designation}
-            </li>
-          </ul>
-        )}
         {contact.contactEmails[0] && (
           <ul className="list-unstyled my-1 d-flex align-items-start   ms-2">
             <li className="me-2">
diff --git a/src/components/Directory/DirectorySchema.js b/src/components/Directory/DirectorySchema.js
index 22a66526..cd3e2384 100644
--- a/src/components/Directory/DirectorySchema.js
+++ b/src/components/Directory/DirectorySchema.js
@@ -6,7 +6,6 @@ export const ContactSchema = z
     contactCategoryId: z.string().nullable().optional(),
     address: z.string().optional(),
     description: z.string().min(1, { message: "Description is required" }),
-    designation: z.string().min(1, {message:"Designation is requried"}),
     projectIds: z.array(z.string()).nullable().optional(), // min(1, "Project is required")
     contactEmails: z
       .array(
diff --git a/src/components/Directory/ListViewDirectory.jsx b/src/components/Directory/ListViewDirectory.jsx
index a216a3b0..801d9915 100644
--- a/src/components/Directory/ListViewDirectory.jsx
+++ b/src/components/Directory/ListViewDirectory.jsx
@@ -15,10 +15,6 @@ const ListViewDirectory = ({
 }) => {
   const { dirActions, setDirActions } = useDir();
 
-  // Get the first email and phone number if they exist
-  const firstEmail = contact.contactEmails?.[0];
-  const firstPhone = contact.contactPhones?.[0];
-
   return (
     <tr className={!IsActive ? "bg-light" : ""}>
       <td
@@ -51,38 +47,36 @@ const ListViewDirectory = ({
 
       <td className="px-2" style={{ width: "20%" }}>
         <div className="d-flex flex-column align-items-start text-truncate">
-          {firstEmail ? (
-            <span key={firstEmail.id} className="text-truncate">
+         {contact.contactEmails.length > 0 ? (contact.contactEmails?.map((email, index) => (
+            <span key={email.id} className="text-truncate">
               <i
-                className={getEmailIcon(firstEmail.label)}
+                className={getEmailIcon(email.label)}
                 style={{ fontSize: "12px" }}
               ></i>
               <a
-                href={`mailto:${firstEmail.emailAddress}`}
+                href={`mailto:${email.emailAddress}`}
                 className="text-decoration-none ms-1"
               >
-                {firstEmail.emailAddress}
+                {email.emailAddress}
               </a>
             </span>
-          ) : (
-            <span className="small-text m-0 px-2">NA</span>
-          )}
+          ))):(<span className="small-text m-0 px-2">NA</span>)}
         </div>
       </td>
 
       <td className="px-2" style={{ width: "20%" }}>
         <div className="d-flex flex-column align-items-start text-truncate">
-          {firstPhone ? (
-            <span key={firstPhone.id}>
+           {contact.contactPhones?.length > 0 ? (
+            contact.contactPhones?.map((phone, index) => (
+            <span key={phone.id}>
               <i
-                className={getPhoneIcon(firstPhone.label)}
+                className={getPhoneIcon(phone.label)}
                 style={{ fontSize: "12px" }}
               ></i>
-              <span className="ms-1">{firstPhone.phoneNumber}</span>
+              <span className="ms-1">{phone.phoneNumber}</span>
             </span>
-          ) : (
-            <span className="text-small m-0 px-2">NA</span>
-          )}
+          ))
+          ):(<span className="text-small m-0 px-2">NA</span>)}
         </div>
       </td>
 
@@ -94,6 +88,12 @@ const ListViewDirectory = ({
         {contact.organization}
       </td>
 
+      {/* <td className="px-2" style={{ width: "10%" }}>
+        <span className="badge badge-outline-secondary">
+          {contact?.contactCategory?.name || "Other"}
+        </span>
+      </td> */}
+      
       <td className="px-2" style={{ width: "10%" }}>
         <span className="text-truncate">
           {contact?.contactCategory?.name || "Other"}
@@ -118,10 +118,9 @@ const ListViewDirectory = ({
         )}
         {!IsActive && (
           <i
-            className={`bx ${
-              dirActions.action && dirActions.id === contact.id
-                ? "bx-loader-alt bx-spin"
-                : "bx-recycle"
+            className={`bx  ${
+              dirActions.action && dirActions.id === contact.id ?  "bx-loader-alt bx-spin"
+                    : "bx-recycle"
             } me-1 text-primary cursor-pointer`}
             title="Restore"
             onClick={() => {
diff --git a/src/components/Directory/ManageDirectory.jsx b/src/components/Directory/ManageDirectory.jsx
index 5c858815..285b74f2 100644
--- a/src/components/Directory/ManageDirectory.jsx
+++ b/src/components/Directory/ManageDirectory.jsx
@@ -14,11 +14,7 @@ import useMaster, {
 } from "../../hooks/masterHook/useMaster";
 import { useDispatch, useSelector } from "react-redux";
 import { changeMaster } from "../../slices/localVariablesSlice";
-import {
-  useBuckets,
-  useDesignation,
-  useOrganization,
-} from "../../hooks/useDirectory";
+import { useBuckets, useOrganization } from "../../hooks/useDirectory";
 import { useProjects } from "../../hooks/useProjects";
 import SelectMultiple from "../common/SelectMultiple";
 import { ContactSchema } from "./DirectorySchema";
@@ -37,11 +33,8 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
   const { contactCategory, loading: contactCategoryLoading } =
     useContactCategory();
   const { organizationList, loading: orgLoading } = useOrganization();
-  const { designationList, loading: designloading } = useDesignation();
   const { contactTags, loading: Tagloading } = useContactTags();
   const [IsSubmitting, setSubmitting] = useState(false);
-  const [showSuggestions,setShowSuggestions] = useState(false);
-  const [filteredDesignationList, setFilteredDesignationList] = useState([]);
   const dispatch = useDispatch();
 
   const methods = useForm({
@@ -52,7 +45,6 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
       contactCategoryId: null,
       address: "",
       description: "",
-      designation: "",
       projectIds: [],
       contactEmails: [],
       contactPhones: [],
@@ -114,25 +106,6 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
 
   const watchBucketIds = watch("bucketIds");
 
-  // handle logic when input of desgination is changed
-  const handleDesignationChange = (e) => {
-    const val = e.target.value;
-
-    const matches = designationList.filter((org) =>
-      org.toLowerCase().includes(val.toLowerCase())
-    );
-    setFilteredDesignationList(matches);
-    setShowSuggestions(true);
-    setTimeout(() => setShowSuggestions(false), 5000);
-  };
-
-  // handle logic when designation is selected
-  const handleSelectDesignation = (val) => {
-    setShowSuggestions(false);
-    setValue("designation", val);
-  };
-
-
   const toggleBucketId = (id) => {
     const updated = watchBucketIds?.includes(id)
       ? watchBucketIds.filter((val) => val !== id)
@@ -195,55 +168,6 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
             />
           </div>
         </div>
-        <div className="row mt-1">
-          <div className="col-md-6  text-start">
-            <label className="form-label">Designation</label>
-            <input
-              className="form-control form-control-sm"
-              {...register("designation")}
-              onChange={handleDesignationChange}
-            />
-            {showSuggestions && filteredDesignationList.length > 0 && (
-              <ul
-                className="list-group shadow-sm position-absolute bg-white border w-50 zindex-tooltip"
-                style={{
-                  maxHeight: "180px",
-                  overflowY: "auto",
-                  marginTop: "2px",
-                  zIndex: 1000,
-                  borderRadius: "0px",
-                }}
-              >
-                {filteredDesignationList.map((designation) => (
-                  <li
-                    key={designation}
-                    className="list-group-item list-group-item-action border-none "
-                    style={{
-                      cursor: "pointer",
-                      padding: "5px 12px",
-                      fontSize: "14px",
-                      transition: "background-color 0.2s",
-                    }}
-                    onMouseDown={() => handleSelectDesignation(designation)}
-                    onMouseEnter={(e) =>
-                      (e.currentTarget.style.backgroundColor = "#f8f9fa")
-                    }
-                    onMouseLeave={(e) =>
-                      (e.currentTarget.style.backgroundColor = "transparent")
-                    }
-                  >
-                    {designation}
-                  </li>
-                ))}
-              </ul>
-            )}
-            {errors.designation && (
-              <small className="danger-text">
-                {errors.designation.message}
-              </small>
-            )}
-          </div>
-        </div>
         <div className="row mt-1">
           <div className="col-md-6">
             {emailFields.map((field, index) => (
@@ -457,12 +381,13 @@ const ManageDirectory = ({ submitContact, onCLosed }) => {
                   </div>
                 </li>
               ))}
+            
             </ul>
-            {errors.bucketIds && (
-              <small className="danger-text mt-0">
-                {errors.bucketIds.message}
-              </small>
-            )}
+              {errors.bucketIds && (
+                <small className="danger-text mt-0">
+                  {errors.bucketIds.message}
+                </small>
+              )}
           </div>
         </div>
 
diff --git a/src/components/Directory/NoteCardDirectoryEditable.jsx b/src/components/Directory/NoteCardDirectoryEditable.jsx
index 5ccfefdf..de91ad69 100644
--- a/src/components/Directory/NoteCardDirectoryEditable.jsx
+++ b/src/components/Directory/NoteCardDirectoryEditable.jsx
@@ -153,7 +153,7 @@ const NoteCardDirectoryEditable = ({
                       .utc(noteItem?.createdAt)
                       .add(5, "hours")
                       .add(30, "minutes")
-                      .format("DD MMMM, YYYY [at] hh:mm A")}
+                      .format("MMMM DD, YYYY [at] hh:mm A")}
                   </span>
                 </span>
 
diff --git a/src/components/Directory/NotesDirectory.jsx b/src/components/Directory/NotesDirectory.jsx
index cccfd8ef..61908853 100644
--- a/src/components/Directory/NotesDirectory.jsx
+++ b/src/components/Directory/NotesDirectory.jsx
@@ -4,6 +4,7 @@ import Avatar from "../common/Avatar";
 import { useForm } from "react-hook-form";
 import { z } from "zod";
 import { zodResolver } from "@hookform/resolvers/zod";
+import { showText } from "pdf-lib";
 import { DirectoryRepository } from "../../repositories/DirectoryRepository";
 import moment from "moment";
 import { cacheData, getCachedData } from "../../slices/apiDataManager";
@@ -18,17 +19,15 @@ const schema = z.object({
 const NotesDirectory = ({
   refetchProfile,
   isLoading,
-  contactProfile, // This contactProfile now reliably includes firstName, middleName, lastName, and fullName
+  contactProfile,
   setProfileContact,
 }) => {
   const [IsActive, setIsActive] = useState(true);
-  const { contactNotes, refetch } = useContactNotes(
-    contactProfile?.id,
-    IsActive
-  );
+  const { contactNotes, refetch } = useContactNotes(contactProfile?.id, true);
 
+  const [NotesData, setNotesData] = useState();
   const [IsSubmitting, setIsSubmitting] = useState(false);
-  const [showEditor, setShowEditor] = useState(false);
+  const [addNote, setAddNote] = useState(true);
   const {
     register,
     handleSubmit,
@@ -68,122 +67,102 @@ const NotesDirectory = ({
       ) {
         const updatedProfile = {
           ...cached_contactProfile.data,
-          notes: [...(cached_contactProfile.data.notes || []), createdNote],
+          notes: [...(cached_contactProfile.notes || []), createdNote],
         };
-        cacheData("Contact Profile", {
-          contactId: contactProfile?.id,
-          data: updatedProfile,
-        });
+        cacheData("Contact Profile", updatedProfile);
       }
 
       setValue("note", "");
       setIsSubmitting(false);
       showToast("Note added successfully!", "success");
-      setShowEditor(false);
+      setAddNote(true);
       setIsActive(true);
-      refetch(contactProfile?.id, true);
     } catch (error) {
       setIsSubmitting(false);
       const msg =
-        error.response?.data?.message ||
+        error.response.data.message ||
         error.message ||
-        "Error occurred during API calling";
+        "Error occured during API calling";
       showToast(msg, "error");
     }
   };
 
   const onCancel = () => {
-    setValue("note", "");
-    setShowEditor(false);
+    setValue( "note", "" );
+    
   };
-
   const handleSwitch = () => {
-    setIsActive((prevIsActive) => {
-      const newState = !prevIsActive;
-      refetch(contactProfile?.id, newState);
-      return newState;
-    });
+    setIsActive(!IsActive);
+    if (IsActive) {
+      refetch(contactProfile?.id, false);
+    }
   };
 
-  // Use the fullName from contactProfile, which now includes middle and last names if available
-  const contactName =
-    contactProfile?.fullName || contactProfile?.firstName || "Contact";
-  const noNotesMessage = `Be the first to share your insights! ${contactName} currently has no notes.`;
-
-  const notesToDisplay = IsActive
-    ? contactProfile?.notes || []
-    : contactNotes || [];
-
   return (
-    <div className="text-start mt-10">
+    <div className="text-start">
       <div className="d-flex align-items-center justify-content-between">
-        <div className="row w-100 align-items-center">
-          <div className="col col-2">
-            <p className="fw-semibold m-0 ms-3">Notes :</p>
-          </div>
-          <div className="col d-flex justify-content-end gap-2 pe-0">
-            {" "}
-            <div className="d-flex align-items-center justify-content-between">
-              <label
-                className="switch switch-primary"
-                style={{
-                  visibility:
-                    contactProfile?.notes?.length > 0 ||
-                    contactNotes?.length > 0
-                      ? "visible"
-                      : "hidden",
-                }}
-              >
-              <input
-                  type="checkbox"
-                  className="switch-input"
-                  onChange={() => handleSwitch(!IsActive)}
-                  value={IsActive}
-                />
-                <input type="checkbox" className="switch-input" />
-                <span className="switch-toggle-slider">
-                  <span className="switch-on"></span>
-                  <span className="switch-off"></span>
-                </span>
-                <span className="switch-label">Include Deleted Notes</span>
-              </label>
-
-              {!showEditor && (
-                <div className="d-flex justify-content-end">
-                  <button
-                    type="button"
-                    className="btn btn-sm d-flex align-items-center"
-                    onClick={() => setShowEditor(true)}
-                    style={{
-                      color: "#6c757d",
-                      backgroundColor: "transparent",
-                      boxShadow: "none",
-                      border: "none",
-                    }}
-                  >
-                    <i
-                      className="bx bx-plus-circle me-0 text-primary"
-                      style={{ fontSize: "1.5rem", color: "#6c757d" }}
-                    ></i>
-                    Add a Note
-                  </button>
-                </div>
-              )}
-            </div>
-          </div>
-        </div>
+        <p className="fw-semibold m-0">Notes :</p>
       </div>
-
-      {showEditor && (
-        <div className="card m-2 mb-5 position-relative">
-          <span
-            type="button"
-            className="position-absolute top-0 end-0  mt-3 bg-secondary rounded-circle"
-            aria-label="Close"
-            onClick={() => setShowEditor(false)}
-          >
-            <i className="bx bx-x fs-5  p-1 text-white"></i>
+      <div className="d-flex align-items-center justify-content-between mb-5">
+  <div className="m-0 d-flex align-items-center">
+    {contactNotes?.length > 0 ? (
+      <label className="switch switch-primary">
+        <input
+          type="checkbox"
+          className="switch-input"
+          onChange={() => handleSwitch(!IsActive)}
+          value={IsActive}
+        />
+        <span className="switch-toggle-slider">
+          <span className="switch-on"></span>
+          <span className="switch-off"></span>
+        </span>
+        <span className="switch-label">Include Deleted Notes</span>
+      </label>
+    ) : (
+      <div style={{ visibility: "hidden" }}>
+        <label className="switch switch-primary">
+          <input type="checkbox" className="switch-input" />
+          <span className="switch-toggle-slider">
+            <span className="switch-on"></span>
+            <span className="switch-off"></span>
           </span>
+          <span className="switch-label">Include Deleted Notes</span>
+        </label>
+      </div>
+    )}
+  </div>
+
+  <div className="d-flex justify-content-end">
+    <span
+       className={`btn btn-sm ${addNote ? "btn-secondary" : "btn-primary"}`}
+      onClick={() => setAddNote(!addNote)}
+    >
+      {addNote ? "Hide Editor" : "Add a Note"}
+    </span>
+  </div>
+</div>
+
+
+      {addNote && (
+        <div className="card m-2 mb-5">
+          <button
+            type="button"
+            class="btn  btn-close btn-secondary position-absolute top-0 end-0 m-2 mt-3 rounded-circle"
+            aria-label="Close"
+            style={{ backgroundColor: "#eee", color: "white" }}
+            onClick={() => setAddNote(!addNote)}
+          ></button>
+          {/* <div className="d-flex justify-content-end px-2">
+            <span
+              className={`btn btn-sm   ${
+                addNote ? "btn-danger" : "btn-primary"
+              }`}
+              onClick={() => setAddNote(!addNote)}
+            >
+              {addNote ? "Hide Editor" : "Add Note"}
+            </span>
+          </div> */}
           <form onSubmit={handleSubmit(onSubmit)}>
             <Editor
               value={noteValue}
@@ -192,39 +171,49 @@ const NotesDirectory = ({
               onCancel={onCancel}
               onSubmit={handleSubmit(onSubmit)}
             />
-            {errors.note && (
+            {errors.notes && (
               <p className="text-danger small mt-1">{errors.note.message}</p>
             )}
           </form>
         </div>
       )}
 
-      <div className=" justify-content-start px-1 mt-1">
+      <div className=" justify-content-start  px-1 mt-1">
         {isLoading && (
           <div className="text-center">
             {" "}
             <p>Loading...</p>{" "}
           </div>
         )}
-        {!isLoading && notesToDisplay.length > 0
-          ? notesToDisplay
-              .slice()
-              .reverse()
-              .map((noteItem) => (
-                <NoteCardDirectory
-                  refetchProfile={refetchProfile}
-                  refetchNotes={refetch}
-                  refetchContact={refetch}
-                  noteItem={noteItem}
-                  contactId={contactProfile?.id}
-                  setProfileContact={setProfileContact}
-                  key={noteItem.id}
-                />
-              ))
-          : !isLoading &&
-            !showEditor && (
-              <div className="text-center mt-5">{noNotesMessage}</div>
+        {!isLoading &&
+          [...(IsActive ? contactProfile?.notes || [] : contactNotes || [])]
+            .reverse()
+            .map((noteItem) => (
+              <NoteCardDirectory
+                refetchProfile={refetchProfile}
+                refetchNotes={refetch}
+                refetchContact={refetch}
+                noteItem={noteItem}
+                contactId={contactProfile?.id}
+                setProfileContact={setProfileContact}
+                key={noteItem.id}
+              />
+            ))}
+
+        {IsActive && (
+          <div>
+            {!isLoading && contactProfile?.notes.length == 0 && !addNote && (
+              <div className="text-center mt-5">No Notes Found</div>
             )}
+          </div>
+        )}
+        {!IsActive && (
+          <div>
+            {!isLoading && contactNotes.length == 0 && !addNote && (
+              <div className="text-center  mt-5">No Notes Found</div>
+            )}
+          </div>
+        )}
       </div>
     </div>
   );
diff --git a/src/components/Directory/ProfileContactDirectory.jsx b/src/components/Directory/ProfileContactDirectory.jsx
index f7e8c456..256e2ea8 100644
--- a/src/components/Directory/ProfileContactDirectory.jsx
+++ b/src/components/Directory/ProfileContactDirectory.jsx
@@ -8,10 +8,9 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
   const { contactProfile, loading, refetch } = useContactProfile(contact?.id);
   const [copiedIndex, setCopiedIndex] = useState(null);
 
-  const [profileContactState, setProfileContactState] = useState(null);
+  const [profileContact, setProfileContact] = useState();
   const [expanded, setExpanded] = useState(false);
-
-  const description = profileContactState?.description || "";
+  const description = contactProfile?.description || "";
   const limit = 500;
 
   const toggleReadMore = () => setExpanded(!expanded);
@@ -20,51 +19,14 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
   const displayText = expanded
     ? description
     : description.slice(0, limit) + (isLong ? "..." : "");
-
   useEffect(() => {
-    if (contactProfile) {
-      const names = (contact?.name || "").trim().split(" ");
-      let firstName = "";
-      let middleName = "";
-      let lastName = "";
-      let fullName = contact?.name || "";
-
-      // Logic to determine first, middle, and last names
-      if (names.length === 1) {
-        firstName = names[0];
-      } else if (names.length === 2) {
-        firstName = names[0];
-        lastName = names[1];
-      } else if (names.length >= 3) {
-        firstName = names[0];
-        middleName = names[1]; // This was an error in the original prompt, corrected to names[1]
-        lastName = names[names.length - 1];
-        // Reconstruct full name to be precise with spacing
-        fullName = `${firstName} ${middleName ? middleName + ' ' : ''}${lastName}`;
-      } else {
-        // Fallback if no names or empty string
-        firstName = "Contact";
-        fullName = "Contact";
-      }
-
-
-      setProfileContactState({
-        ...contactProfile,
-        firstName: contactProfile.firstName || firstName,
-        // Adding middleName and lastName to the state for potential future use or more granular access
-        middleName: contactProfile.middleName || middleName,
-        lastName: contactProfile.lastName || lastName,
-        fullName: contactProfile.fullName || fullName, // Prioritize fetched fullName, fallback to derived
-      });
-    }
-  }, [contactProfile, contact?.name]);
-
+    setProfileContact(contactProfile);
+  }, [contactProfile]);
   const handleCopy = (email, index) => {
     navigator.clipboard.writeText(email);
     setCopiedIndex(index);
-    setTimeout(() => setCopiedIndex(null), 2000);
+    setTimeout(() => setCopiedIndex(null), 2000); // Reset after 2 seconds
   };
-
   return (
     <div className="p-1">
       <div className="text-center m-0 p-0">
@@ -85,35 +47,31 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
           <div className="d-flex flex-column text-start ms-1">
             <span className="m-0 fw-semibold">{contact?.name}</span>
             <small className="text-secondary small-text">
-              {profileContactState?.designation}
+              {contactProfile?.tags?.map((tag) => tag.name).join(" | ")}
             </small>
           </div>
         </div>
-        <div className="row ms-9">
+        <div className="row">
           <div className="col-12 col-md-6 d-flex flex-column text-start">
-            {profileContactState?.contactEmails?.length > 0 && (
-              <div className="d-flex mb-2 align-items-start">
-                <div
-                  className="d-flex align-items-start"
-                  style={{ width: "100px", minWidth: "130px" }}
-                >
-                  <span className="d-flex">
-                    <i className="bx bx-envelope bx-xs me-2 mt-1"></i>
-                    <span>Email</span>
-                  </span>
-                  <span style={{ marginLeft: "45px" }}>:</span>
+            {contactProfile?.contactEmails?.length > 0 && (
+              <div className="d-flex mb-2">
+                <div style={{ width: "100px", minWidth: "100px" }}>
+                  <p className="m-0">Email:</p>
                 </div>
-
                 <div style={{ flex: 1 }}>
                   <ul className="list-unstyled mb-0">
-                    {profileContactState.contactEmails.map((email, idx) => (
+                    {contactProfile.contactEmails.map((email, idx) => (
                       <li className="d-flex align-items-center mb-1" key={idx}>
-                        <span className="me-1 text-break overflow-wrap">
+                        <i className="bx bx-envelope bx-xs me-1 mt-1"></i>
+                        <span className="me-1 flex-grow text-break overflow-wrap">
                           {email.emailAddress}
                         </span>
                         <i
-                          className={`bx bx-copy-alt cursor-pointer bx-xs text-start ${copiedIndex === idx ? "text-secondary" : "text-primary"
-                            }`}
+                          className={`bx bx-copy-alt cursor-pointer bx-xs text-start ${
+                            copiedIndex === idx
+                              ? "text-secondary"
+                              : "text-primary"
+                          }`}
                           title={copiedIndex === idx ? "Copied!" : "Copy Email"}
                           style={{ flexShrink: 0 }}
                           onClick={() => handleCopy(email.emailAddress, idx)}
@@ -125,22 +83,17 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
               </div>
             )}
 
-            {profileContactState?.contactPhones?.length > 0 && (
-              <div className="d-flex mb-2 align-items-start">
-                <div className="d-flex" style={{ minWidth: "130px" }}>
-                  <span className="d-flex align-items-center">
-                    <i className="bx bx-phone bx-xs me-2"></i>
-                    <span>Phone</span>
-                  </span>
-                  <span style={{ marginLeft: "40px" }}>:</span>
+            {contactProfile?.contactPhones?.length > 0 && (
+              <div className="d-flex mb-2">
+                <div style={{ width: "100px", minWidth: "100px" }}>
+                  <p className="m-0">Phone : </p>
                 </div>
-
                 <div>
                   <ul className="list-inline mb-0">
-                    {profileContactState.contactPhones.map((phone, idx) => (
-                      <li className="list-inline-item me-1" key={idx}>
+                    {contactProfile?.contactPhones.map((phone, idx) => (
+                      <li className="list-inline-item me-3" key={idx}>
+                        <i className="bx bx-phone bx-xs me-1"></i>
                         {phone.phoneNumber}
-                        {idx < profileContactState.contactPhones.length - 1 && ","}
                       </li>
                     ))}
                   </ul>
@@ -148,93 +101,74 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
               </div>
             )}
 
-            {profileContactState?.createdAt && (
-              <div className="d-flex mb-2 align-items-start">
-                <div className="d-flex" style={{ minWidth: "130px" }}>
-                  <span className="d-flex align-items-center">
-                    <i className="bx bx-calendar-week bx-xs me-2"></i>
-                    <span>Created</span>
-                  </span>
-                  <span style={{ marginLeft: "30px" }}>:</span>
+            {contactProfile?.createdAt && (
+              <div className="d-flex  mb-2">
+                <div style={{ width: "100px", minWidth: "100px" }}>
+                  <p className="m-0">Created : </p>
                 </div>
-
                 <div className="d-flex align-items-center">
-                  <span>
-                    {moment(profileContactState.createdAt).format("DD MMMM, YYYY")}
-                  </span>
+                  <li className="list-inline-item">
+                    <i className="bx bx-calendar-week bx-xs me-1"></i>
+                    {moment(contactProfile.createdAt).format("MMMM, DD YYYY")}
+                  </li>
                 </div>
               </div>
             )}
-
-            {profileContactState?.address && (
-              <div className="d-flex mb-2 align-items-start">
-                <div className="d-flex" style={{ minWidth: "130px" }}>
-                  <span className="d-flex align-items-start">
-                    <i className="bx bx-map bx-xs me-2 mt-1"></i>
-                    <span>Location</span>
-                  </span>
-                  <span style={{ marginLeft: "26px" }}>:</span>
+            {contactProfile?.address && (
+              <div className="d-flex mb-2">
+                <div style={{ width: "100px", minWidth: "100px" }}>
+                  <p className="m-0">Location:</p>
                 </div>
-                <div>
-                  <span className="text-break small">{profileContactState.address}</span>
+                <div className="d-flex align-items-center">
+                  <i className="bx bx-map bx-xs me-1 "></i>
+                  <span className="text-break small">
+                    {contactProfile.address}
+                  </span>
                 </div>
               </div>
             )}
           </div>
 
           <div className="col-12 col-md-6 d-flex flex-column text-start">
-            {profileContactState?.organization && (
-              <div className="d-flex mb-2 align-items-start">
-                <div className="d-flex" style={{ minWidth: "130px" }}>
-                  <span className="d-flex align-items-center">
-                    <i className="fa-solid fa-briefcase me-2"></i>
-                    <span>Organization</span>
-                  </span>
-                  <span className="ms-2">:</span>
+            {contactProfile?.organization && (
+              <div className="d-flex mb-2">
+                <div style={{ width: "100px", minWidth: "100px" }}>
+                  <p className="m-0">Orgnization : </p>
                 </div>
-
                 <div className="d-flex align-items-center">
+                  <i className="fa-solid fa-briefcase me-2"></i>
+
                   <span style={{ wordBreak: "break-word" }}>
-                    {profileContactState.organization}
+                    {contactProfile.organization}
                   </span>
                 </div>
               </div>
             )}
-
-            {profileContactState?.contactCategory && (
-              <div className="d-flex mb-2 align-items-start">
-                <div className="d-flex" style={{ minWidth: "130px" }}>
-                  <span className="d-flex align-items-center">
-                    <i className="bx bx-user bx-xs me-2"></i>
-                    <span>Category</span>
-                  </span>
-                  <span style={{ marginLeft: "28px" }}>:</span>
+            {contactProfile?.contactCategory && (
+              <div className="d-flex mb-2">
+                <div style={{ width: "100px", minWidth: "100px" }}>
+                  <p className="m-0">Category : </p>
                 </div>
-
                 <div>
                   <ul className="list-inline mb-0">
                     <li className="list-inline-item">
-                      {profileContactState.contactCategory.name}
+                      <i className="bx bx-user bx-xs me-1"></i>
+                      {contactProfile.contactCategory.name}
                     </li>
                   </ul>
                 </div>
               </div>
             )}
-
-            {profileContactState?.tags?.length > 0 && (
-              <div className="d-flex mb-2 align-items-start">
-                <div className="d-flex" style={{ minWidth: "130px" }}>
-                  <span className="d-flex align-items-center">
-                    <i className="fa-solid fa-tag me-2"></i>
-                    <span>Tags</span>
-                  </span>
-                  <span style={{ marginLeft: "60px" }}>:</span>
+             {contactProfile?.tags?.length > 0 && (
+              <div className="d-flex mb-2">
+                <div style={{ width: "100px", minWidth: "100px" }}>
+                  <p className="m-0">Tags : </p>
                 </div>
-
                 <div>
                   <ul className="list-inline mb-0">
-                    {profileContactState.tags.map((tag, index) => (
+                    {contactProfile.tags.map((tag, index) => (
                       <li key={index} className="list-inline-item">
+                        <i className="fa-solid fa-tag  me-1"></i>
                         {tag.name}
                       </li>
                     ))}
@@ -243,91 +177,75 @@ const ProfileContactDirectory = ({ contact, setOpen_contact, closeModal }) => {
               </div>
             )}
 
-            {profileContactState?.buckets?.length > 0 && (
-              <div className="d-flex mb-2 align-items-start">
-                <div className="d-flex" style={{ minWidth: "130px" }}>
-                  <span className="d-flex align-items-center">
-                    <i className="bx bx-layer me-1"></i>
-                    <span>Buckets</span>
-                  </span>
-                  <span style={{ marginLeft: "35px" }}>:</span>
-                </div>
-
-                <div>
-                  <ul className="list-inline mb-0">
-                    {profileContactState.buckets.map((bucket) => (
-                      <li className="list-inline-item me-2" key={bucket.id}>
-                        <span className="badge bg-label-primary my-1">
-                          {bucket.name}
-                        </span>
-                      </li>
-                    ))}
-                  </ul>
-                </div>
+            {contactProfile?.buckets?.length > 0 && (
+              <div className="d-flex ">
+                {contactProfile?.contactEmails?.length > 0 && (
+                  <div className="d-flex mb-2 align-items-center">
+                    <div style={{ width: "100px", minWidth: "100px" }}>
+                      <p className="m-0">Buckets : </p>
+                    </div>
+                    <div>
+                      <ul className="list-inline mb-0">
+                        {contactProfile.buckets.map((bucket) => (
+                          <li className="list-inline-item me-2" key={bucket.id}>
+                            <span className="badge bg-label-primary my-1">
+                              {bucket.name}
+                            </span>
+                          </li>
+                        ))}
+                      </ul>
+                    </div>
+                  </div>
+                )}
               </div>
             )}
           </div>
-
-          {profileContactState?.projects?.length > 0 && (
-            <div className="d-flex mb-2 align-items-start">
-              <div className="d-flex" style={{ minWidth: "130px" }}>
-                <span className="d-flex align-items-center">
-                  <i className="bx bx-building-house me-1"></i>
-                  <span>Projects</span>
-                </span>
-                <span style={{ marginLeft: "28px" }}>:</span>
-              </div>
-
-              <div className="text-start">
-                <ul className="list-inline mb-0">
-                  {profileContactState.projects.map((project, index) => (
-                    <li className="list-inline-item me-2" key={project.id}>
-                      {project.name}
-                      {index < profileContactState.projects.length - 1 && ","}
-                    </li>
-                  ))}
-                </ul>
-              </div>
-            </div>
-          )}
         </div>
-
-        <div className="d-flex mb-2 align-items-start" style={{ marginLeft: "3rem" }}>
-          <div className="d-flex" style={{ minWidth: "130px" }}>
-            <span className="d-flex align-items-start">
-              <i className="bx bx-book me-1"></i>
-              <span>Description</span>
-            </span>
-            <span style={{ marginLeft: "10px" }}>:</span>
+        {contactProfile?.projects?.length > 0 && (
+          <div className="d-flex mb-2 align-items-start">
+            <div style={{ minWidth: "100px" }}>
+              <p className="m-0 text-start">Projects :</p>
+            </div>
+            <div className="text-start">
+              <ul className="list-inline mb-0">
+                {contactProfile.projects.map((project, index) => (
+                  <li className="list-inline-item me-2" key={project.id}>
+                    {project.name}
+                    {index < contactProfile.projects.length - 1 && ","}
+                  </li>
+                ))}
+              </ul>
+            </div>
           </div>
+        )}
 
+        <div className="d-flex mb-2 align-items-start">
+          <div style={{ minWidth: "100px" }}>
+            <p className="m-0 text-start">Description :</p>
+          </div>
           <div className="text-start">
             {displayText}
             {isLong && (
-              <>
-                <br />
-                <span
-                  onClick={toggleReadMore}
-                  className="text-primary mx-1 cursor-pointer"
-                >
-                  {expanded ? "Read less" : "Read more"}
-                </span>
-              </>
+              <span
+                onClick={toggleReadMore}
+                className="text-primary mx-1 cursor-pointer"
+              >
+                {expanded ? "Read less" : "Read more"}
+              </span>
             )}
           </div>
         </div>
 
-
         <hr className="my-1" />
         <NotesDirectory
           refetchProfile={refetch}
           isLoading={loading}
-          contactProfile={profileContactState}
-          setProfileContact={setProfileContactState}
+          contactProfile={profileContact}
+          setProfileContact={setProfileContact}
         />
       </div>
     </div>
   );
 };
 
-export default ProfileContactDirectory;
\ No newline at end of file
+export default ProfileContactDirectory;
diff --git a/src/components/Directory/UpdateContact.jsx b/src/components/Directory/UpdateContact.jsx
index 9d74fc35..985229a3 100644
--- a/src/components/Directory/UpdateContact.jsx
+++ b/src/components/Directory/UpdateContact.jsx
@@ -14,11 +14,7 @@ import useMaster, {
 } from "../../hooks/masterHook/useMaster";
 import { useDispatch, useSelector } from "react-redux";
 import { changeMaster } from "../../slices/localVariablesSlice";
-import {
-  useBuckets,
-  useDesignation,
-  useOrganization,
-} from "../../hooks/useDirectory";
+import { useBuckets, useOrganization } from "../../hooks/useDirectory";
 import { useProjects } from "../../hooks/useProjects";
 import SelectMultiple from "../common/SelectMultiple";
 import { ContactSchema } from "./DirectorySchema";
@@ -36,13 +32,10 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
   const { contactCategory, loading: contactCategoryLoading } =
     useContactCategory();
   const { contactTags, loading: Tagloading } = useContactTags();
-  const [IsSubmitting, setSubmitting] = useState(false);
+  const [ IsSubmitting, setSubmitting ] = useState( false );
   const [isInitialized, setIsInitialized] = useState(false);
   const dispatch = useDispatch();
-  const { organizationList } = useOrganization();
-  const { designationList } = useDesignation();
-  const [showSuggestions, setShowSuggestions] = useState(false);
-  const [filteredDesignationList, setFilteredDesignationList] = useState([]);
+  const {organizationList} = useOrganization()
 
   const methods = useForm({
     resolver: zodResolver(ContactSchema),
@@ -52,7 +45,6 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
       contactCategoryId: null,
       address: "",
       description: "",
-      designation: "",
       projectIds: [],
       contactEmails: [],
       contactPhones: [],
@@ -103,24 +95,6 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
     }
   };
 
-  // handle logic when input of desgination is changed
-  const handleDesignationChange = (e) => {
-    const val = e.target.value;
-
-    const matches = designationList.filter((org) =>
-      org.toLowerCase().includes(val.toLowerCase())
-    );
-    setFilteredDesignationList(matches);
-    setShowSuggestions(true);
-    setTimeout(() => setShowSuggestions(false), 5000);
-  };
-
-  // handle logic when designation is selected
-  const handleSelectDesignation = (val) => {
-    setShowSuggestions(false);
-    setValue("designation", val);
-  };
-
   const watchBucketIds = watch("bucketIds");
 
   const toggleBucketId = (id) => {
@@ -139,28 +113,33 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
   };
 
   const onSubmit = async (data) => {
-    const cleaned = {
-      ...data,
-      contactEmails: (data.contactEmails || [])
-        .filter((e) => e.emailAddress?.trim() !== "")
-        .map((email, index) => {
-          const existingEmail = existingContact.contactEmails?.[index];
-          return existingEmail ? { ...email, id: existingEmail.id } : email;
-        }),
-      contactPhones: (data.contactPhones || [])
-        .filter((p) => p.phoneNumber?.trim() !== "")
-        .map((phone, index) => {
-          const existingPhone = existingContact.contactPhones?.[index];
-          return existingPhone ? { ...phone, id: existingPhone.id } : phone;
-        }),
-    };
+const cleaned = {
+  ...data,
+  contactEmails: (data.contactEmails || [])
+    .filter((e) => e.emailAddress?.trim() !== "")
+    .map((email, index) => {
+      const existingEmail = existingContact.contactEmails?.[index];
+      return existingEmail
+        ? { ...email, id: existingEmail.id } 
+        : email;
+    }),
+  contactPhones: (data.contactPhones || [])
+    .filter((p) => p.phoneNumber?.trim() !== "")
+    .map((phone, index) => {
+      const existingPhone = existingContact.contactPhones?.[index];
+      return existingPhone
+        ? { ...phone, id: existingPhone.id }
+        : phone;
+    }),
+};
 
-    setSubmitting(true);
-    await submitContact({ ...cleaned, id: existingContact.id });
+setSubmitting(true);
+await submitContact({ ...cleaned, id: existingContact.id });
 
     setSubmitting(false);
+    
   };
-  const orgValue = watch("organization");
+ const orgValue = watch("organization")
   const handleClosed = () => {
     onCLosed();
   };
@@ -170,7 +149,7 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
       typeof existingContact === "object" &&
       !Array.isArray(existingContact);
 
-    if (!isInitialized && isValidContact && TagsData) {
+    if (!isInitialized &&isValidContact && TagsData) {
       reset({
         name: existingContact.name || "",
         organization: existingContact.organization || "",
@@ -179,30 +158,24 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
         contactCategoryId: existingContact.contactCategory?.id || null,
         address: existingContact.address || "",
         description: existingContact.description || "",
-        designation: existingContact.designation || "",
         projectIds: existingContact.projectIds || null,
         tags: existingContact.tags || [],
         bucketIds: existingContact.bucketIds || [],
-      });
-
-      if (
-        !existingContact.contactPhones ||
-        existingContact.contactPhones.length === 0
-      ) {
-        appendPhone({ label: "Office", phoneNumber: "" });
-      }
-
-      if (
-        !existingContact.contactEmails ||
-        existingContact.contactEmails.length === 0
-      ) {
-        appendEmail({ label: "Work", emailAddress: "" });
-      }
-      setIsInitialized(true);
+      } );
+      
+      if (!existingContact.contactPhones || existingContact.contactPhones.length === 0) {
+      appendPhone({ label: "Office", phoneNumber: "" });
     }
 
+    if (!existingContact.contactEmails || existingContact.contactEmails.length === 0) {
+      appendEmail({ label: "Work", emailAddress: "" });
+      }
+      setIsInitialized(true)
+    }
+    
     // return()=> reset()
-  }, [existingContact, buckets, projects]);
+  }, [ existingContact, buckets, projects ] );
+  
 
   return (
     <FormProvider {...methods}>
@@ -222,14 +195,15 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
             )}
           </div>
 
+         
           <div className="col-md-6  text-start">
             <label className="form-label">Organization</label>
             <InputSuggestions
-              organizationList={organizationList}
-              value={getValues("organization") || ""}
-              onChange={(val) => setValue("organization", val)}
-              error={errors.organization?.message}
-            />
+          organizationList={organizationList}
+          value={getValues("organization") || ""}
+          onChange={(val) => setValue("organization", val)}
+          error={errors.organization?.message}
+        />
             {errors.organization && (
               <small className="danger-text">
                 {errors.organization.message}
@@ -237,55 +211,6 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
             )}
           </div>
         </div>
-        <div className="row mt-1">
-          <div className="col-md-6  text-start">
-            <label className="form-label">Designation</label>
-            <input
-              className="form-control form-control-sm"
-              {...register("designation")}
-              onChange={handleDesignationChange}
-            />
-            {showSuggestions && filteredDesignationList.length > 0 && (
-              <ul
-                className="list-group shadow-sm position-absolute w-50 bg-white border  zindex-tooltip"
-                style={{
-                  maxHeight: "180px",
-                  overflowY: "auto",
-                  marginTop: "2px",
-                  zIndex: 1000,
-                  borderRadius: "0px",
-                }}
-              >
-                {filteredDesignationList.map((designation) => (
-                  <li
-                    key={designation}
-                    className="list-group-item list-group-item-action border-none "
-                    style={{
-                      cursor: "pointer",
-                      padding: "5px 12px",
-                      fontSize: "14px",
-                      transition: "background-color 0.2s",
-                    }}
-                    onMouseDown={() => handleSelectDesignation(designation)}
-                    onMouseEnter={(e) =>
-                      (e.currentTarget.style.backgroundColor = "#f8f9fa")
-                    }
-                    onMouseLeave={(e) =>
-                      (e.currentTarget.style.backgroundColor = "transparent")
-                    }
-                  >
-                    {designation}
-                  </li>
-                ))}
-              </ul>
-            )}
-            {errors.designation && (
-              <small className="danger-text">
-                {errors.designation.message}
-              </small>
-            )}
-          </div>
-        </div>
         <div className="row mt-1">
           <div className="col-md-6">
             {emailFields.map((field, index) => (
@@ -322,13 +247,11 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
                       // <button
                       //   type="button"
                       //   className="btn btn-xs btn-primary ms-1"
-
+                        
                       //   style={{ width: "24px", height: "24px" }}
                       // >
-                      <i
-                        className="bx bx-plus-circle bx-xs ms-1 cursor-pointer text-primary"
-                        onClick={handleAddEmail}
-                      />
+                        <i className="bx bx-plus-circle bx-xs ms-1 cursor-pointer text-primary" onClick={handleAddEmail}/>
+                 
                     ) : (
                       // <button
                       //   type="button"
@@ -336,10 +259,8 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
                       //   onClick={() => removeEmail(index)}
                       //   style={{ width: "24px", height: "24px" }}
                       // >
-                      <i
-                        className="bx bx-minus-circle bx-xs ms-1 cursor-pointer text-danger"
-                        onClick={() => removeEmail(index)}
-                      />
+                        <i className="bx bx-minus-circle bx-xs ms-1 cursor-pointer text-danger" onClick={() => removeEmail(index)}/>
+              
                     )}
                   </div>
                   {errors.contactEmails?.[index]?.emailAddress && (
@@ -389,10 +310,7 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
                       //   onClick={handleAddPhone}
                       //   style={{ width: "24px", height: "24px" }}
                       // >
-                      <i
-                        className="bx bx-plus-circle bx-xs ms-1 cursor-pointer text-primary"
-                        onClick={handleAddPhone}
-                      />
+                        <i className="bx bx-plus-circle bx-xs ms-1 cursor-pointer text-primary" onClick={handleAddPhone} />
                     ) : (
                       // <button
                       //   type="button"
@@ -400,10 +318,7 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
                       //   onClick={() => removePhone(index)}
                       //   style={{ width: "24px", height: "24px" }}
                       // >
-                      <i
-                        className="bx bx-minus-circle bx-xs ms-1 cursor-pointer text-danger"
-                        onClick={() => removePhone(index)}
-                      />
+                        <i className="bx bx-minus-circle bx-xs ms-1 cursor-pointer text-danger" onClick={() => removePhone(index)} />
                     )}
                   </div>
                   {errors.contactPhones?.[index]?.phoneNumber && (
@@ -433,7 +348,7 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
                 </option>
               ) : (
                 <>
-                  <option disabled value="">
+                  <option disabled  value="">
                     Select Category
                   </option>
                   {contactCategory?.map((cate) => (
@@ -472,7 +387,7 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
           )}
         </div>
         <div className="row">
-          <div className="col-md-12 mt-1 text-start">
+         <div className="col-md-12 mt-1 text-start">
             <label className="form-label ">Select Label</label>
 
             <ul className="d-flex flex-wrap px-1 list-unstyled  mb-0">
@@ -530,11 +445,7 @@ const UpdateContact = ({ submitContact, existingContact, onCLosed }) => {
         </div>
 
         <div className="d-flex justify-content-center gap-1 py-2">
-          <button
-            className="btn btn-sm btn-primary"
-            type="submit"
-            disabled={IsSubmitting}
-          >
+          <button className="btn btn-sm btn-primary" type="submit" disabled={IsSubmitting}>
             {IsSubmitting ? "Please Wait..." : "Update"}
           </button>
           <button
diff --git a/src/components/Employee/ManageEmployee.jsx b/src/components/Employee/ManageEmployee.jsx
index 1f1b3a62..a377ea14 100644
--- a/src/components/Employee/ManageEmployee.jsx
+++ b/src/components/Employee/ManageEmployee.jsx
@@ -469,7 +469,7 @@ const { mutate: updateEmployee, isPending } = useUpdateEmployee();
         </div>
         <div className="row mb-3">
           <div className="col-sm-4">
-            <div className="form-text text-start">Official Designation</div>
+            <div className="form-text text-start">Role</div>
             <div className="input-group input-group-merge ">
               <select
                 className="form-select form-select-sm"
diff --git a/src/components/Expenses/ExpenseFilterPanel.jsx b/src/components/Expenses/ExpenseFilterPanel.jsx
deleted file mode 100644
index 44a03780..00000000
--- a/src/components/Expenses/ExpenseFilterPanel.jsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import React, { useEffect, useState,useMemo } from "react";
-import { FormProvider, useForm, Controller } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { defaultFilter, SearchSchema } from "./ExpenseSchema";
-
-import DateRangePicker, { DateRangePicker1 } from "../common/DateRangePicker";
-import SelectMultiple from "../common/SelectMultiple";
-
-import { useProjectName } from "../../hooks/useProjects";
-import { useExpenseStatus } from "../../hooks/masterHook/useMaster";
-import { useEmployeesAllOrByProjectId } from "../../hooks/useEmployees";
-import { useSelector } from "react-redux";
-import moment from "moment";
-import { useExpenseFilter } from "../../hooks/useExpense";
-import { ExpenseFilterSkeleton } from "./ExpenseSkeleton";
-
-
-
-const ExpenseFilterPanel = ({ onApply, handleGroupBy }) => {
-  const selectedProjectId = useSelector((store) => store.localVariables.projectId);
-  const { data, isLoading,isError,error,isFetching , isFetched} = useExpenseFilter();
-
-  const groupByList = useMemo(() => [
-    { id: "transactionDate", name: "Transaction Date" },
-    { id: "status", name: "Status" },
-    { id: "paidBy", name: "Paid By" },
-    { id: "project", name: "Project" },
-    { id: "paymentMode", name: "Payment Mode" },
-    { id: "expensesType", name: "Expense Type" },
-    {id: "createdAt",name:"Submitted"}
-  ], []);
-
-  const [selectedGroup, setSelectedGroup] = useState(groupByList[0]);
-  const [resetKey, setResetKey] = useState(0);
-
-  const methods = useForm({
-    resolver: zodResolver(SearchSchema),
-    defaultValues: defaultFilter,
-  });
-
-  const { control, register, handleSubmit, reset, watch } = methods;
-  const isTransactionDate = watch("isTransactionDate");
-
-  const closePanel = () => {
-    document.querySelector(".offcanvas.show .btn-close")?.click();
-  };
-
-  const handleGroupChange = (e) => {
-    const group = groupByList.find((g) => g.id === e.target.value);
-    if (group) setSelectedGroup(group);
-  };
-
-  const onSubmit = (formData) => {
-    onApply({
-      ...formData,
-      startDate: moment.utc(formData.startDate, "DD-MM-YYYY").toISOString(),
-      endDate: moment.utc(formData.endDate, "DD-MM-YYYY").toISOString(),
-    });
-    handleGroupBy(selectedGroup.id);
-    closePanel();
-  };
-
-  const onClear = () => {
-    reset(defaultFilter);
-    setResetKey((prev) => prev + 1);
-    setSelectedGroup(groupByList[0]);
-    onApply(defaultFilter);
-    handleGroupBy(groupByList[0].id);
-    closePanel();
-  };
-
-  if (isLoading || isFetching) return <ExpenseFilterSkeleton />;
-  if(isError && isFetched) return <div>Something went wrong Here- {error.message} </div>
-  return (
-    <>
-
-      <FormProvider {...methods}>
-        <form onSubmit={handleSubmit(onSubmit)} className="p-2 text-start">
-          <div className="mb-3 w-100">
-            <div className="d-flex align-items-center mb-2">
-              <label className="form-label me-2">Choose Date:</label>
-              <div className="form-check form-switch m-0">
-                <input
-                  className="form-check-input"
-                  type="checkbox"
-                  id="switchOption1"
-                  {...register("isTransactionDate")}
-                />
-              </div>
-              <label className="form-label mb-0 ms-2">
-                {isTransactionDate ? "Submitted": "Transaction" }
-              </label>
-            </div>
-
-            <DateRangePicker1
-              placeholder="DD-MM-YYYY To DD-MM-YYYY"
-              startField="startDate"
-              endField="endDate"
-              resetSignal={resetKey}
-            />
-          </div>
-
-          <div className="row g-2">
-            <SelectMultiple
-              name="projectIds"
-              label="Projects :"
-              options={data.projects}
-              labelKey="name"
-              valueKey="id"
-            />
-            <SelectMultiple
-              name="createdByIds"
-              label="Submitted By :"
-              options={data.createdBy}
-              labelKey={(item) => item.name}
-              valueKey="id"
-            />
-            <SelectMultiple
-              name="paidById"
-              label="Paid By :"
-              options={data.paidBy}
-              labelKey={(item) => item.name}
-              valueKey="id"
-            />
-
-            <div className="mb-3">
-              <label className="form-label">Status :</label>
-              <div className="row flex-wrap">
-                {data?.status
-                  ?.slice()
-                  .sort((a, b) => a.name.localeCompare(b.name))
-                  .map((status) => (
-                    <div className="col-6" key={status.id}>
-                      <Controller
-                        control={control}
-                        name="statusIds"
-                        render={({ field: { value = [], onChange } }) => (
-                          <div className="d-flex align-items-center me-3 mb-2">
-                            <input
-                              type="checkbox"
-                              className="form-check-input"
-                              value={status.id}
-                              checked={value.includes(status.id)}
-                              onChange={(e) => {
-                                const checked = e.target.checked;
-                                onChange(
-                                  checked
-                                    ? [...value, status.id]
-                                    : value.filter((v) => v !== status.id)
-                                );
-                              }}
-                            />
-                            <label className="ms-2 mb-0">{status.name}</label>
-                          </div>
-                        )}
-                      />
-                    </div>
-                  ))}
-              </div>
-            </div>
-          </div>
-            <div className="mb-2 text-start ">
-        <label htmlFor="groupBySelect" className="form-label">Group By :</label>
-        <select
-          id="groupBySelect"
-          className="form-select form-select-sm"
-          value={selectedGroup?.id || ""}
-          onChange={handleGroupChange}
-        >
-          {groupByList.map((group) => (
-            <option key={group.id} value={group.id}>
-              {group.name}
-            </option>
-          ))}
-        </select>
-      </div>
-
-          <div className="d-flex justify-content-end py-3 gap-2">
-            <button
-              type="button"
-              className="btn btn-secondary btn-xs"
-              onClick={onClear}
-            >
-              Clear
-            </button>
-            <button type="submit" className="btn btn-primary btn-xs">
-              Apply
-            </button>
-          </div>
-        </form>
-      </FormProvider>
-      
-    </>
-  );
-};
-
-export default ExpenseFilterPanel;
\ No newline at end of file
diff --git a/src/components/Expenses/ExpenseList.jsx b/src/components/Expenses/ExpenseList.jsx
deleted file mode 100644
index 58a6cf22..00000000
--- a/src/components/Expenses/ExpenseList.jsx
+++ /dev/null
@@ -1,321 +0,0 @@
-import React, { useState } from "react";
-import { useDeleteExpense, useExpenseList } from "../../hooks/useExpense";
-import Avatar from "../common/Avatar";
-import { useExpenseContext } from "../../pages/Expense/ExpensePage";
-import { formatDate, formatUTCToLocalTime } from "../../utils/dateUtils";
-import Pagination from "../common/Pagination";
-import { APPROVE_EXPENSE, EXPENSE_DRAFT, EXPENSE_REJECTEDBY } from "../../utils/constants";
-import { getColorNameFromHex, useDebounce } from "../../utils/appUtils";
-import { ExpenseTableSkeleton } from "./ExpenseSkeleton";
-import ConfirmModal from "../common/ConfirmModal";
-import { useHasUserPermission } from "../../hooks/useHasUserPermission";
-import { useSelector } from "react-redux";
-
-const ExpenseList = ({ filters, groupBy = "transactionDate",searchText }) => {
-  const [deletingId, setDeletingId] = useState(null);
-  const [IsDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
-  const { setViewExpense, setManageExpenseModal } = useExpenseContext();
-  const IsExpenseEditable = useHasUserPermission();
-  const IsExpesneApprpve = useHasUserPermission(APPROVE_EXPENSE);
-  const [currentPage, setCurrentPage] = useState(1);
-  const pageSize = 20;
-  const debouncedSearch = useDebounce(searchText, 500);
-
-  const { mutate: DeleteExpense, isPending } = useDeleteExpense();
-  const { data, isLoading, isError, isInitialLoading, error } = useExpenseList(
-    pageSize,
-    currentPage,
-    filters,
-    debouncedSearch
-  );
-
-  const SelfId = useSelector(
-    (store) => store?.globalVariables?.loginUser?.employeeInfo?.id
-  );
-
-  const handleDelete = (id) => {
-    setDeletingId(id);
-    DeleteExpense(
-      { id },
-      {
-        onSettled: () => {
-          setDeletingId(null);
-          setIsDeleteModalOpen(false);
-        },
-      }
-    );
-  };
-
-  const paginate = (page) => {
-    if (page >= 1 && page <= (data?.totalPages ?? 1)) {
-      setCurrentPage(page);
-    }
-  };
-
-  const groupByField = (items, field) => {
-    return items.reduce((acc, item) => {
-      let key;
-      switch (field) {
-        case "transactionDate":
-          key = item.transactionDate?.split("T")[0];
-          break;
-        case "status":
-          key = item.status?.displayName || "Unknown";
-          break;
-        case "paidBy":
-          key = `${item.paidBy?.firstName ?? ""} ${
-            item.paidBy?.lastName ?? ""
-          }`.trim();
-          break;
-        case "project":
-          key = item.project?.name || "Unknown Project";
-          break;
-        case "paymentMode":
-          key = item.paymentMode?.name || "Unknown Mode";
-          break;
-        case "expensesType":
-          key = item.expensesType?.name || "Unknown Type";
-          break;
-         case "createdAt":
-          key = item.createdAt?.split("T")[0] || "Unknown Type";
-          break;
-        default:
-          key = "Others";
-      }
-      if (!acc[key]) acc[key] = [];
-      acc[key].push(item);
-      return acc;
-    }, {});
-  };
-
-  const expenseColumns = [
-    {
-      key: "expensesType",
-      label: "Expense Type",
-      getValue: (e) => e.expensesType?.name || "N/A",
-      align: "text-start",
-    },
-    {
-      key: "paymentMode",
-      label: "Payment Mode",
-      getValue: (e) => e.paymentMode?.name || "N/A",
-      align: "text-start",
-    },
-    {
-      key: "paidBy",
-      label: "Paid By",
-      align: "text-start",
-      getValue: (e) =>
-        `${e.paidBy?.firstName ?? ""} ${e.paidBy?.lastName ?? ""}`.trim() ||
-        "N/A",
-      customRender: (e) => (
-        <div className="d-flex align-items-center">
-          <Avatar
-            size="xs"
-            classAvatar="m-0"
-            firstName={e.paidBy?.firstName}
-            lastName={e.paidBy?.lastName}
-          />
-          <span>
-            {`${e.paidBy?.firstName ?? ""} ${
-              e.paidBy?.lastName ?? ""
-            }`.trim() || "N/A"}
-          </span>
-        </div>
-      ),
-    },
-    {
-      key: "submitted",
-      label: "Submitted",
-      getValue: (e) => formatUTCToLocalTime(e?.createdAt),
-      isAlwaysVisible: true,
-    },
-    {
-      key: "amount",
-      label: "Amount",
-      getValue: (e) => (
-        <>
-          <i className="bx bx-rupee b-xs"></i> {e?.amount}
-        </>
-      ),
-      isAlwaysVisible: true,
-      align: "text-end",
-    },
-    {
-      key: "status",
-      label: "Status",
-      align: "text-center",
-      getValue: (e) => (
-        <span
-          className={`badge bg-label-${
-            getColorNameFromHex(e?.status?.color) || "secondary"
-          }`}
-        >
-          {e.status?.name || "Unknown"}
-        </span>
-      ),
-    },
-  ];
-
-  if (isInitialLoading) return <ExpenseTableSkeleton />;
-  if (isError) return <div>{error}</div>;
-
-  const grouped = groupBy
-    ? groupByField(data?.data ?? [], groupBy)
-    : { All: data?.data ?? [] };
-  const IsGroupedByDate = ["transactionDate", "createdAt"].includes(groupBy);
-const canEditExpense = (expense) => {
-  return (
-    (expense.status.id === EXPENSE_DRAFT ||
-      EXPENSE_REJECTEDBY.includes(expense.status.id)) &&
-    expense.createdBy?.id === SelfId
-  );
-};
-
-const canDetetExpense = (expense)=>{
-  return (expense.status.id === EXPENSE_DRAFT && expense.createdBy.id === SelfId )
-}
-
-                              
-  return (
-    <>
-      {IsDeleteModalOpen && (
-        <div
-          className={`modal fade show`}
-          tabIndex="-1"
-          role="dialog"
-          style={{
-            display: "block",
-            backgroundColor: "rgba(0,0,0,0.5)",
-          }}
-          aria-hidden="false"
-        >
-          <ConfirmModal
-            type="delete"
-            header="Delete Expense"
-            message="Are you sure you want delete?"
-            onSubmit={handleDelete}
-            onClose={() => setIsDeleteModalOpen(false)}
-            loading={isPending}
-            paramData={deletingId}
-          />
-        </div>
-      )}
-
-      <div className="card">
-        <div
-          className="card-datatable table-responsive "
-          id="horizontal-example"
-        >
-          <div className="dataTables_wrapper no-footer px-2 ">
-            <table className="table border-top dataTable text-nowrap">
-              <thead>
-                <tr>
-                  {expenseColumns.map(
-                    (col) =>
-                      (col.isAlwaysVisible || groupBy !== col.key) && (
-                        <th
-                          key={col.key}
-                          className={`sorting d-table-cell`}
-                          aria-sort="descending"
-                        >
-                          <div className={`${col.align}`}>{col.label}</div>
-                        </th>
-                      )
-                  )}
-                  <th className="sticky-action-column bg-white text-center">
-                    Action
-                  </th>
-                </tr>
-              </thead>
-              <tbody>
-                {Object.keys(grouped).length > 0 ? (
-                  Object.entries(grouped).map(([group, expenses]) => (
-                    <React.Fragment key={group}>
-                      <tr className="tr-group text-dark">
-                        <td colSpan={8} className="text-start">
-                          <strong>
-                            {IsGroupedByDate
-                              ? formatUTCToLocalTime(group)
-                              : group}
-                          </strong>
-                        </td>
-                      </tr>
-                      {expenses.map((expense) => (
-                        <tr key={expense.id}>
-                          {expenseColumns.map(
-                            (col) =>
-                              (col.isAlwaysVisible || groupBy !== col.key) && (
-                                <td
-                                  key={col.key}
-                                  className={`d-table-cell ${col.align ?? ""}`}
-                                >
-                                  {col.customRender
-                                    ? col.customRender(expense)
-                                    : col.getValue(expense)}
-                                </td>
-                              )
-                          )}
-                          <td className="sticky-action-column bg-white">
-                            <div className="d-flex justify-content-center gap-2">
-                              <i
-                                className="bx bx-show text-primary cursor-pointer"
-                                onClick={() =>
-                                  setViewExpense({
-                                    expenseId: expense.id,
-                                    view: true,
-                                  })
-                                }
-                              ></i>
-                             {canEditExpense(expense) && (
-  <i
-    className="bx bx-edit text-secondary cursor-pointer"
-    onClick={() =>
-      setManageExpenseModal({
-        IsOpen: true,
-        expenseId: expense.id,
-      })
-    }
-  ></i>
-)}
- 
-                                  {canDetetExpense(expense) && (
-                                        <i
-                                    className="bx bx-trash text-danger cursor-pointer"
-                                    onClick={() => {
-                                      setIsDeleteModalOpen(true);
-                                      setDeletingId(expense.id);
-                                    }}
-                                  ></i>
-                                  )}
-
-                            </div>
-                          </td>
-                        </tr>
-                      ))}
-                    </React.Fragment>
-                  ))
-                ) : (
-                  <tr>
-                    <td colSpan={8} className="text-center py-4">
-                      No Expense Found
-                    </td>
-                  </tr>
-                )}
-              </tbody>
-            </table>
-            {data?.data?.length > 0 && (
-              <Pagination
-                currentPage={currentPage}
-                totalPages={data.totalPages}
-                onPageChange={paginate}
-              />
-            )}
-          </div>
-        </div>
-      </div>
-    </>
-  );
-};
-
-export default ExpenseList;
diff --git a/src/components/Expenses/ExpenseSchema.js b/src/components/Expenses/ExpenseSchema.js
deleted file mode 100644
index f1e6320b..00000000
--- a/src/components/Expenses/ExpenseSchema.js
+++ /dev/null
@@ -1,164 +0,0 @@
-import { z } from "zod";
-
-const MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
-const ALLOWED_TYPES = [
-  "application/pdf",
-  "image/png",
-  "image/jpg",
-  "image/jpeg",
-];
-
-export const ExpenseSchema = (expenseTypes) => {
-  return z
-    .object({
-      projectId: z.string().min(1, { message: "Project is required" }),
-      expensesTypeId: z
-        .string()
-        .min(1, { message: "Expense type is required" }),
-      paymentModeId: z.string().min(1, { message: "Payment mode is required" }),
-      paidById: z.string().min(1, { message: "Employee name is required" }),
-      transactionDate: z
-        .string()
-        .min(1, { message: "Date is required" })
-      ,
-      transactionId: z.string().optional(),
-      description: z.string().min(1, { message: "Description is required" }),
-      location: z.string().min(1, { message: "Location is required" }),
-      supplerName: z.string().min(1, { message: "Supplier name is required" }),
-      amount: z.coerce
-        .number({
-          invalid_type_error: "Amount is required and must be a number",
-        })
-        .min(1, "Amount must be Enter")
-        .refine((val) => /^\d+(\.\d{1,2})?$/.test(val.toString()), {
-          message: "Amount must have at most 2 decimal places",
-        }),
-      noOfPersons: z.coerce.number().optional(),
-      billAttachments: z
-        .array(
-          z.object({
-            fileName: z.string().min(1, { message: "Filename is required" }),
-            base64Data: z.string().nullable(),
-            contentType: z
-              .string()
-              .refine((val) => ALLOWED_TYPES.includes(val), {
-                message: "Only PDF, PNG, JPG, or JPEG files are allowed",
-              }),
-            documentId: z.string().optional(),
-            fileSize: z.number().max(MAX_FILE_SIZE, {
-              message: "File size must be less than or equal to 5MB",
-            }),
-            description: z.string().optional(),
-            isActive: z.boolean().default(true),
-          })
-        )
-        .nonempty({ message: "At least one file attachment is required" }),
-         
- 
-    })
-    .refine(
-      (data) => {
-        return (
-          !data.projectId || (data.paidById && data.paidById.trim() !== "")
-        );
-      },
-      {
-        message: "Please select who paid (employee)",
-        path: ["paidById"],
-      }
-    )
-   .superRefine((data, ctx) => {
-      const expenseType = expenseTypes.find((et) => et.id === data.expensesTypeId);
-      if (expenseType?.noOfPersonsRequired && (!data.noOfPersons || data.noOfPersons < 1)) {
-        ctx.addIssue({
-          code: z.ZodIssueCode.custom,
-          message: "No. of Persons is required and must be at least 1",
-          path: ["noOfPersons"],
-        });
-      }
-    });
-};
-
-export const defaultExpense = {
-  projectId: "",
-  expensesTypeId: "",
-  paymentModeId: "",
-  paidById: "",
-  transactionDate: "",
-  transactionId: "",
-  description: "",
-  location: "",
-  supplerName: "",
-  amount: "",
-  noOfPersons: "",
-  billAttachments: [],
-};
-
-
-export const ExpenseActionScheam = (isReimbursement = false) => {
-  return z
-    .object({
-      comment: z.string().min(1, { message: "Please leave comment" }),
-      statusId: z.string().min(1, { message: "Please select a status" }),
-      reimburseTransactionId: z.string().nullable().optional(),
-      reimburseDate: z.string().nullable().optional(),
-      reimburseById: z.string().nullable().optional(),
-    })
-    .superRefine((data, ctx) => {
-      if (isReimbursement) {
-        if (!data.reimburseTransactionId?.trim()) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            path: ["reimburseTransactionId"],
-            message: "Reimburse Transaction ID is required",
-          });
-        }
-        if (!data.reimburseDate) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            path: ["reimburseDate"],
-            message: "Reimburse Date is required",
-          });
-        }
-        if (!data.reimburseById) {
-          ctx.addIssue({
-            code: z.ZodIssueCode.custom,
-            path: ["reimburseById"],
-            message: "Reimburse By is required",
-          });
-        }
-      }
-    });
-};
-
-  export const defaultActionValues = {
-  comment: "",
-  statusId: "",
-
-  reimburseTransactionId: null,
-  reimburseDate: null,
-  reimburseById: null,
-};
-
-
-
-export const SearchSchema = z.object({
-  projectIds: z.array(z.string()).optional(),
-  statusIds: z.array(z.string()).optional(),
-  createdByIds: z.array(z.string()).optional(),
-  paidById: z.array(z.string()).optional(),
-  startDate: z.string().optional(),
-  endDate: z.string().optional(),
-  isTransactionDate: z.boolean().default(true),
-});
-
-export const defaultFilter = {
-  projectIds: [],
-  statusIds: [],
-  createdByIds: [],
-  paidById: [],
-  isTransactionDate: true,
-  startDate: null,
-  endDate: null,
-};
-
diff --git a/src/components/Expenses/ExpenseSkeleton.jsx b/src/components/Expenses/ExpenseSkeleton.jsx
deleted file mode 100644
index 8f73db5c..00000000
--- a/src/components/Expenses/ExpenseSkeleton.jsx
+++ /dev/null
@@ -1,283 +0,0 @@
-import React from "react";
-
-
-const SkeletonLine = ({ height = 20, width = "100%", className = "" }) => (
-  <div
-    className={`skeleton mb-2 ${className}`}
-    style={{
-      height,
-      width,
-    }}
-  ></div>
-);
-
-
-const ExpenseSkeleton = () => {
-  return (
-    <div className="container p-3">
-<div className="d-flex justify-content-center">
-  <SkeletonLine height={20} width="200px" />
-</div>
-
-      {[...Array(5)].map((_, idx) => (
-        <div className="row my-2" key={idx}>
-          <div className="col-md-6">
-            <SkeletonLine />
-          </div>
-          <div className="col-md-6">
-            <SkeletonLine />
-          </div>
-        </div>
-      ))}
-
-      <div className="row my-2">
-        <div className="col-md-12">
-          <SkeletonLine height={60} />
-        </div>
-      </div>
-
-      <div className="row my-2">
-        <div className="col-md-12">
-          <SkeletonLine height={120} />
-        </div>
-      </div>
-
-      <div className="d-flex justify-content-center gap-2 mt-3">
-        <SkeletonLine height={35} width="100px" />
-        <SkeletonLine height={35} width="100px" />
-      </div>
-    </div>
-  );
-};
-
-export default ExpenseSkeleton;
-
-
-
-
-export const ExpenseDetailsSkeleton = () => {
-  return (
-      <div className="container px-3">
-      <div className="row mb-3">
-        <div className="d-flex justify-content-center mb-3">
-          <SkeletonLine height={20} width="180px" className="mb-2" />
-        </div>
-
-        {[...Array(3)].map((_, i) => (
-          <div className="col-12 col-md-4 mb-3" key={`row-1-${i}`}>
-            <SkeletonLine height={14}  className="mb-1" />
-            <SkeletonLine />
-          </div>
-        ))}
-
-        {[...Array(6)].map((_, i) => (
-          <div className="col-12 col-md-4 mb-3" key={`row-2-${i}`}>
-            <SkeletonLine height={14} className="mb-1" />
-            <SkeletonLine />
-          </div>
-        ))}
-
-     
-
-        <div className="col-12 my-2">
-          <SkeletonLine height={14} width="100px" className="mb-2" />
-          {[...Array(2)].map((_, i) => (
-            <div
-              className="list-group-item d-flex align-items-center mb-2"
-              key={i}
-            >
-              <div
-                className="rounded me-2"
-                style={{
-                  height: "50px",
-                  width: "80px",
-                  backgroundColor: "#dcdcdc",
-                  borderRadius: "4px",
-                }}
-              />
-              <div className="w-100">
-                <SkeletonLine height={14} width="60%" className="mb-1" />
-                <SkeletonLine height={14} width="20%" />
-              </div>
-            </div>
-          ))}
-        </div>
-
-        <hr className="divider my-1" />
-
-        <div className="col-12 mb-3">
-          <SkeletonLine height={14} width="80px" className="mb-1" />
-          <SkeletonLine height={60} className="mb-2" />
-          <div className="d-flex gap-2 flex-wrap">
-            {[...Array(2)].map((_, i) => (
-              <SkeletonLine
-                key={i}
-                height={30}
-                width="100px"
-                className="rounded"
-              />
-            ))}
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-const SkeletonCell = ({ width = "100%", height = 20, className = "", style = {} }) => (
-  <div
-    className={`skeleton ${className}`}
-    style={{
-      width,
-      height,
-      borderRadius: 4,
-      ...style,
-    }}
-  />
-);
-
-export const ExpenseTableSkeleton = ({ groups = 3, rowsPerGroup = 3 }) => {
-  return (
-  <div className="card px-2">
-      <table
-      className="card-body table border-top dataTable no-footer dtr-column text-nowrap"
-      aria-describedby="DataTables_Table_0_info"
-      id="horizontal-example"
-    >
-      <thead>
-        <tr>
-          <th className="d-none d-sm-table-cell">
-            <div className="text-start ms-5">Expense Type</div>
-          </th>
-          <th className="d-none d-sm-table-cell">
-            <div className="text-start ms-5">Payment Mode</div>
-          </th>
-          <th className="d-none d-sm-table-cell">Paid By</th>
-          <th className="d-none d-md-table-cell">Amount</th>
-          <th>Status</th>
-          <th>Action</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        {[...Array(groups)].map((_, groupIdx) => (
-          <React.Fragment key={`group-${groupIdx}`}>
-            {/* Fake Date Group Header Row */}
-            <tr className="bg-light">
-              <td colSpan={8}>
-                <SkeletonCell width="150px" height={20} />
-              </td>
-            </tr>
-
-            {/* Rows under this group */}
-            {[...Array(rowsPerGroup)].map((__, rowIdx) => (
-              <tr key={`row-${groupIdx}-${rowIdx}`} className={rowIdx % 2 === 0 ? "odd" : "even"}>
-                {/* Expense Type */}
-                <td className="text-start d-none d-sm-table-cell ms-5">
-                  <SkeletonCell width="90px" height={16} />
-                </td>
-
-                {/* Payment Mode */}
-                <td className="text-start d-none d-sm-table-cell ms-5">
-                  <SkeletonCell width="90px" height={16} />
-                </td>
-
-                {/* Paid By (Avatar + name) */}
-                <td className="text-start d-none d-sm-table-cell ms-5">
-                  <div className="d-flex align-items-center gap-2">
-                    <SkeletonCell width="30px" height={30} className="rounded-circle" />
-                    <SkeletonCell width="80px" height={16} />
-                  </div>
-                </td>
-
-                {/* Amount */}
-                <td className="d-none d-md-table-cell text-end">
-                  <SkeletonCell width="60px" height={16} />
-                </td>
-
-                {/* Status */}
-                <td>
-                  <SkeletonCell width="80px" height={22} className="rounded" />
-                </td>
-
-                {/* Action */}
-                <td>
-                  <div className="d-flex justify-content-center align-items-center gap-2">
-                    {[...Array(3)].map((__, i) => (
-                      <SkeletonCell
-                        key={i}
-                        width={20}
-                        height={20}
-                        className="rounded"
-                        style={{ display: "inline-block" }}
-                      />
-                    ))}
-                  </div>
-                </td>
-              </tr>
-            ))}
-          </React.Fragment>
-        ))}
-      </tbody>
-    </table>
-  </div>
-  );
-};
-
-
-export const ExpenseFilterSkeleton = () => {
-  return (
-    <div className="p-3 text-start">
-      {/* Created Date Label and Skeleton */}
-      <div className="mb-3 w-100">
-        <SkeletonLine height={14} width="120px" className="mb-1" />
-        <SkeletonLine height={36} />
-      </div>
-
-      <div className="row g-2">
-        {/* Project Select */}
-        <div className="col-12 col-md-4 mb-3">
-          <SkeletonLine height={14} width="80px" className="mb-1" />
-          <SkeletonLine height={36} />
-        </div>
-
-        {/* Submitted By Select */}
-        <div className="col-12 col-md-4 mb-3">
-          <SkeletonLine height={14} width="100px" className="mb-1" />
-          <SkeletonLine height={36} />
-        </div>
-
-        {/* Paid By Select */}
-        <div className="col-12 col-md-4 mb-3">
-          <SkeletonLine height={14} width="70px" className="mb-1" />
-          <SkeletonLine height={36} />
-        </div>
-
-        {/* Status Checkboxes */}
-        <div className="col-12 mb-3">
-          <SkeletonLine height={14} width="80px" className="mb-2" />
-          <div className="d-flex flex-wrap">
-            {[...Array(3)].map((_, i) => (
-              <div className="d-flex align-items-center me-3 mb-2" key={i}>
-                <div
-                  className="form-check-input bg-secondary me-2"
-                  style={{
-                    height: "16px",
-                    width: "16px",
-                    borderRadius: "3px",
-                  }}
-                />
-                <SkeletonLine height={14} width="60px" />
-              </div>
-            ))}
-          </div>
-        </div>
-      </div>
-
-      {/* Buttons */}
-      <div className="d-flex justify-content-end py-3 gap-2">
-        <SkeletonLine height={30} width="80px" className="rounded" />
-        <SkeletonLine height={30} width="80px" className="rounded" />
-      </div>
-    </div>
-  );
-};
diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx
deleted file mode 100644
index 4284bfbd..00000000
--- a/src/components/Expenses/ManageExpense.jsx
+++ /dev/null
@@ -1,561 +0,0 @@
-import { zodResolver } from "@hookform/resolvers/zod";
-import React, { useEffect, useState } from "react";
-import { useForm } from "react-hook-form";
-import { defaultExpense, ExpenseSchema } from "./ExpenseSchema";
-import { formatFileSize } from "../../utils/appUtils";
-import { useProjectName } from "../../hooks/useProjects";
-import { useDispatch, useSelector } from "react-redux";
-import { changeMaster } from "../../slices/localVariablesSlice";
-import useMaster, {
-  useExpenseStatus,
-  useExpenseType,
-  usePaymentMode,
-} from "../../hooks/masterHook/useMaster";
-import {
-  useEmployeesAllOrByProjectId,
-  useEmployeesByProject,
-} from "../../hooks/useEmployees";
-import Avatar from "../common/Avatar";
-import {
-  useCreateExpnse,
-  useExpense,
-  useUpdateExpense,
-} from "../../hooks/useExpense";
-import ExpenseSkeleton from "./ExpenseSkeleton";
-import moment from "moment";
-import DatePicker from "../common/DatePicker";
-
-const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
-  const {
-    data,
-    isLoading,
-    error: ExpenseErrorLoad,
-  } = useExpense(expenseToEdit);
-  const [ExpenseType, setExpenseType] = useState();
-  const dispatch = useDispatch();
-  const {
-    ExpenseTypes,
-    loading: ExpenseLoading,
-    error: ExpenseError,
-  } = useExpenseType();
-  const schema = ExpenseSchema(ExpenseTypes);
-  const {
-    register,
-    handleSubmit,
-    watch,
-    setValue,
-    reset,
-    control,
-    formState: { errors },
-  } = useForm({
-    resolver: zodResolver(schema),
-    defaultValues: defaultExpense,
-  });
-
-  const selectedproject = watch("projectId");
-  const selectedProject = useSelector(
-    (store) => store.localVariables.projectId
-  );
-  const { projectNames, loading: projectLoading, error } = useProjectName();
-debugger
-  const {
-    PaymentModes,
-    loading: PaymentModeLoading,
-    error: PaymentModeError,
-  } = usePaymentMode();
-  const {
-    ExpenseStatus,
-    loading: StatusLoadding,
-    error: stausError,
-  } = useExpenseStatus();
-  const {
-    employees,
-    loading: EmpLoading,
-    error: EmpError,
-  } = useEmployeesByProject(selectedproject);
-
-  const files = watch("billAttachments");
-  const onFileChange = async (e) => {
-    const newFiles = Array.from(e.target.files);
-    if (newFiles.length === 0) return;
-
-    const existingFiles = watch("billAttachments") || [];
-
-    const parsedFiles = await Promise.all(
-      newFiles.map(async (file) => {
-        const base64Data = await toBase64(file);
-        return {
-          fileName: file.name,
-          base64Data,
-          contentType: file.type,
-          fileSize: file.size,
-          description: "",
-          isActive:true
-        };
-      })
-    );
-
-    const combinedFiles = [
-      ...existingFiles,
-      ...parsedFiles.filter(
-        (newFile) =>
-          !existingFiles.some(
-            (f) =>
-              f.fileName === newFile.fileName && f.fileSize === newFile.fileSize
-          )
-      ),
-    ];
-
-    setValue("billAttachments", combinedFiles, {
-      shouldDirty: true,
-      shouldValidate: true,
-    });
-  };
-
-  const toBase64 = (file) =>
-    new Promise((resolve, reject) => {
-      const reader = new FileReader();
-      reader.readAsDataURL(file);
-      reader.onload = () => resolve(reader.result.split(",")[1]);
-      reader.onerror = (error) => reject(error);
-    });
-  const removeFile = (index) => {
-    if (expenseToEdit) {
-      const newFiles = files.map((file, i) => {
-        if (file.documentId !== index) return file;
-        return {
-          ...file,
-          isActive: false,
-        };
-      });
-      setValue("billAttachments", newFiles, { shouldValidate: true });
-    } else {
-      const newFiles = files.filter((_, i) => i !== index);
-      setValue("billAttachments", newFiles, { shouldValidate: true });
-    }
-  };
-
-  useEffect(() => {
-    if (expenseToEdit && data && employees) {
-      reset({
-        projectId: data.project.id || "",
-        expensesTypeId: data.expensesType.id || "",
-        paymentModeId: data.paymentMode.id || "",
-        paidById: data.paidBy.id || "",
-        transactionDate: data.transactionDate?.slice(0, 10) || "",
-        transactionId: data.transactionId || "",
-        description: data.description || "",
-        location: data.location || "",
-        supplerName: data.supplerName || "",
-        amount: data.amount || "",
-        noOfPersons: data.noOfPersons || "",
-        billAttachments: data.documents
-          ? data.documents.map((doc) => ({
-              fileName: doc.fileName,
-              base64Data: null,
-              contentType: doc.contentType,
-              documentId: doc.documentId,
-              fileSize: 0,
-              description: "",
-              preSignedUrl: doc.preSignedUrl,
-              isActive: doc.isActive ?? true,
-            }))
-          : [],
-      });
-    }
-  }, [data, reset, employees]);
-  const { mutate: ExpenseUpdate, isPending } = useUpdateExpense(() =>
-    handleClose()
-  );
-  const { mutate: CreateExpense, isPending: createPending } = useCreateExpnse(
-    () => {
-      handleClose();
-    }
-  );
-  const onSubmit = (fromdata) => {
-    let payload  = {...fromdata,transactionDate:  moment.utc(fromdata.transactionDate, 'DD-MM-YYYY').toISOString()}
-    if (expenseToEdit) {
-      const editPayload = { ...payload, id: data.id };
-      ExpenseUpdate({ id: data.id, payload: editPayload });
-    } else {
-      CreateExpense(payload);
-    }
-  };
-  const ExpenseTypeId = watch("expensesTypeId");
-
-  useEffect(() => {
-    setExpenseType(ExpenseTypes?.find((type) => type.id === ExpenseTypeId));
-  }, [ExpenseTypeId]);
-
-  const handleClose = () => {
-    reset();
-    closeModal();
-  };
-  if (
-    StatusLoadding ||
-    projectLoading ||
-    ExpenseLoading ||
-    isLoading
-  )
-    return <ExpenseSkeleton />;
-  return (
-    <div className="container p-3">
-      <h5 className="m-0">
-        {expenseToEdit ? "Update Expense " : "Create New Expense"}
-      </h5>
-      <form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
-        <div className="row my-2">
-          <div className="col-md-6">
-            <label  className="form-label">
-              Select Project
-            </label>
-            <select
-              className="form-select form-select-sm"
-              {...register("projectId")}
-            >
-              <option value="">Select Project</option>
-              {projectLoading ? (
-                <option>Loading...</option>
-              ) : (
-                projectNames?.map((project) => (
-                  <option key={project.id} value={project.id}>
-                    {project.name}
-                  </option>
-                ))
-              )}
-            </select>
-            {errors.projectId && (
-              <small className="danger-text">{errors.projectId.message}</small>
-            )}
-          </div>
-
-          <div className="col-md-6">
-            <label htmlFor="expensesTypeId" className="form-label ">
-              Expense Type
-            </label>
-            <select
-              className="form-select form-select-sm"
-              id="expensesTypeId"
-              {...register("expensesTypeId")}
-            >
-              <option value="" disabled>
-                Select Type
-              </option>
-              {ExpenseLoading ? (
-                <option disabled>Loading...</option>
-              ) : (
-                ExpenseTypes?.map((expense) => (
-                  <option key={expense.id} value={expense.id}>
-                    {expense.name}
-                  </option>
-                ))
-              )}
-            </select>
-            {errors.expensesTypeId && (
-              <small className="danger-text">
-                {errors.expensesTypeId.message}
-              </small>
-            )}
-          </div>
-        </div>
-
-        <div className="row my-2">
-          <div className="col-md-6">
-            <label htmlFor="paymentModeId" className="form-label ">
-              Payment Mode
-            </label>
-            <select
-              className="form-select form-select-sm"
-              id="paymentModeId"
-              {...register("paymentModeId")}
-            >
-              <option value="" disabled>
-                Select Mode
-              </option>
-              {PaymentModeLoading ? (
-                <option disabled>Loading...</option>
-              ) : (
-                PaymentModes?.map((payment) => (
-                  <option key={payment.id} value={payment.id}>
-                    {payment.name}
-                  </option>
-                ))
-              )}
-            </select>
-            {errors.paymentModeId && (
-              <small className="danger-text">
-                {errors.paymentModeId.message}
-              </small>
-            )}
-          </div>
-
-          <div className="col-md-6">
-            <label htmlFor="paidById" className="form-label ">
-              Paid By
-            </label>
-            <select
-              className="form-select form-select-sm"
-              id="paymentModeId"
-              {...register("paidById")}
-              disabled={!selectedproject}
-            >
-              <option value="" disabled>
-                Select Person
-              </option>
-              {EmpLoading ? (
-                <option disabled>Loading...</option>
-              ) : (
-                employees?.map((emp) => (
-                  <option key={emp.id} value={emp.id}>
-                    {`${emp.firstName} ${emp.lastName} `}
-                  </option>
-                ))
-              )}
-            </select>
-            {errors.paidById && (
-              <small className="danger-text">{errors.paidById.message}</small>
-            )}
-          </div>
-        </div>
-
-        <div className="row my-2">
-          <div className="col-md-6">
-            <label htmlFor="transactionDate" className="form-label ">
-              Transaction Date
-            </label>
-            {/* <input
-              type="date"
-              className="form-control form-control-sm"
-              placeholder="YYYY-MM-DD"
-              id="flatpickr-date"
-              {...register("transactionDate")}
-            /> */}
-                 <DatePicker
-        name="transactionDate"
-        control={control}
-      />
-
-            {errors.transactionDate && (
-              <small className="danger-text">
-                {errors.transactionDate.message}
-              </small>
-            )}
-          </div>
-
-          <div className="col-md-6">
-            <label htmlFor="amount" className="form-label ">
-              Amount
-            </label>
-            <input
-              type="number"
-              id="amount"
-              className="form-control form-control-sm"
-              min="1"
-              step="0.01"
-              inputMode="decimal"
-              {...register("amount", { valueAsNumber: true })}
-            />
-            {errors.amount && (
-              <small className="danger-text">{errors.amount.message}</small>
-            )}
-          </div>
-        </div>
-
-        <div className="row my-2">
-          <div className="col-md-6">
-            <label htmlFor="supplerName" className="form-label ">
-              Supplier Name/Transporter Name/Other
-            </label>
-            <input
-              type="text"
-              id="supplerName"
-              className="form-control form-control-sm"
-              {...register("supplerName")}
-            />
-            {errors.supplerName && (
-              <small className="danger-text">
-                {errors.supplerName.message}
-              </small>
-            )}
-          </div>
-
-          <div className="col-md-6">
-            <label htmlFor="location" className="form-label ">
-              Location
-            </label>
-            <input
-              type="text"
-              id="location"
-              className="form-control form-control-sm"
-              {...register("location")}
-            />
-            {errors.location && (
-              <small className="danger-text">{errors.location.message}</small>
-            )}
-          </div>
-        </div>
-        <div className="row my-2">
-          <div className="col-md-6">
-            <label htmlFor="statusId" className="form-label ">
-              TransactionId
-            </label>
-            <input
-              type="text"
-              id="transactionId"
-              className="form-control form-control-sm"
-              min="1"
-              {...register("transactionId")}
-            />
-            {errors.transactionId && (
-              <small className="danger-text">
-                {errors.transactionId.message}
-              </small>
-            )}
-          </div>
-
-          {ExpenseType?.noOfPersonsRequired && (
-            <div className="col-md-6">
-              <label >
-                No. of Persons
-              </label>
-              <input
-                type="number"
-                id="noOfPersons"
-                className="form-control form-control-sm"
-                {...register("noOfPersons")}
-                inputMode="numeric"
-              />
-              {errors.noOfPersons && (
-                <small className="danger-text">
-                  {errors.noOfPersons.message}
-                </small>
-              )}
-            </div>
-          )}
-        </div>
-
-        <div className="row my-2">
-          <div className="col-md-12" >
-            <label htmlFor="description">Description</label>
-            <textarea
-              id="description"
-              className="form-control form-control-sm"
-              {...register("description")}
-              rows="2"
-            ></textarea>
-            {errors.description && (
-              <small className="danger-text">
-                {errors.description.message}
-              </small>
-            )}
-          </div>
-        </div>
-
-        <div className="row my-2">
-          <div className="col-md-12">
-            <label className="form-label ">Upload Bill </label>
-
-            <div
-              className="border border-secondary border-dashed rounded p-4 text-center bg-textMuted position-relative"
-              style={{ cursor: "pointer" }}
-              onClick={() => document.getElementById("billAttachments").click()}
-            >
-              <i className="bx bx-cloud-upload d-block bx-lg"></i>
-              <span className="text-muted d-block">
-                Click to select or click here to browse
-              </span>
-              <small className="text-muted">(PDF, JPG, PNG, max 5MB)</small>
-
-              <input
-                type="file"
-                id="billAttachments"
-                accept=".pdf,.jpg,.jpeg,.png"
-                multiple
-                style={{ display: "none" }}
-                {...register("billAttachments")}
-                onChange={(e) => {
-                  onFileChange(e);
-                  e.target.value = "";
-                }}
-              />
-            </div>
-            {errors.billAttachments && (
-              <small className="danger-text">
-                {errors.billAttachments.message}
-              </small>
-            )}
-            {files.length > 0 && (
-              <div className="d-block">
-                {files
-                  .filter((file) => {
-                    if (expenseToEdit) {
-                      return file.isActive; 
-                    }
-                    return true;
-                  })
-                  .map((file, idx) => (
-                    <a
-                      key={idx}
-                      className="d-flex justify-content-between text-start p-1"
-                      href={file.preSignedUrl || "#"}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                    >
-                      <div>
-                        <span className="mb-0 text-secondary small d-block">
-                          {file.fileName}
-                        </span>
-                        <span className="text-body-secondary small d-block">
-                          {file.fileSize ? formatFileSize(file.fileSize) : ""}
-                        </span>
-                      </div>
-                      <i
-                        className="bx bx-trash bx-sm cursor-pointer text-danger"
-                        onClick={(e) => {
-                          e.preventDefault();
-                          removeFile(expenseToEdit ? file.documentId : idx);
-                        }}
-                      ></i>
-                    </a>
-                  ))}
-              </div>
-            )}
-
-            {Array.isArray(errors.billAttachments) &&
-              errors.billAttachments.map((fileError, index) => (
-                <div key={index} className="danger-text small mt-1">
-                  {
-                    (fileError?.fileSize?.message ||
-                      fileError?.contentType?.message ||
-                      fileError?.base64Data?.message,
-                    fileError?.documentId?.message)
-                  }
-                </div>
-              ))}
-          </div>
-        </div>
-
-        <div className="d-flex justify-content-center gap-2">
-          {" "}
-          <button
-            type="submit"
-            className="btn btn-primary btn-sm mt-3"
-            disabled={isPending || createPending}
-          >
-            {isPending || createPending ? "Please Wait..." : expenseToEdit ? "Update" : "Submit"}
-          </button>
-          <button
-            type="reset"
-            disabled={isPending || createPending}
-            onClick={handleClose}
-            className="btn btn-secondary btn-sm mt-3"
-          >
-            Cancel
-          </button>
-        </div>
-      </form>
-    </div>
-  );
-};
-
-export default ManageExpense;
diff --git a/src/components/Expenses/PreviewDocument.jsx b/src/components/Expenses/PreviewDocument.jsx
deleted file mode 100644
index 9c0f5c49..00000000
--- a/src/components/Expenses/PreviewDocument.jsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useState } from 'react';
-
-const PreviewDocument = ({ imageUrl }) => {
-  const [loading, setLoading] = useState(true);
-
-  return (
-    <div className="d-flex justify-content-center align-items-center" style={{ minHeight: "50vh" }}>
-      {loading && (
-        <div className="text-secondary text-center mb-2">
-          Loading...
-        </div>
-      )}
-      <img
-        src={imageUrl}
-        alt="Full View"
-        className="img-fluid"
-        style={{
-          maxHeight: "100vh",
-          objectFit: "contain",
-          display: loading ? "none" : "block",
-        }}
-        onLoad={() => setLoading(false)}
-      />
-    </div>
-  );
-};
-
-export default PreviewDocument;
diff --git a/src/components/Expenses/ViewExpense.jsx b/src/components/Expenses/ViewExpense.jsx
deleted file mode 100644
index 663c6ff5..00000000
--- a/src/components/Expenses/ViewExpense.jsx
+++ /dev/null
@@ -1,547 +0,0 @@
-import React, { useState, useMemo } from "react";
-import {
-  useActionOnExpense,
-  useExpense,
-  useHasAnyPermission,
-} from "../../hooks/useExpense";
-import { formatUTCToLocalTime } from "../../utils/dateUtils";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { defaultActionValues, ExpenseActionScheam } from "./ExpenseSchema";
-import { useExpenseContext } from "../../pages/Expense/ExpensePage";
-import { getColorNameFromHex } from "../../utils/appUtils";
-import { ExpenseDetailsSkeleton } from "./ExpenseSkeleton";
-import { useHasUserPermission } from "../../hooks/useHasUserPermission";
-import {
-  EXPENSE_REJECTEDBY,
-  PROCESS_EXPENSE,
-  REVIEW_EXPENSE,
-} from "../../utils/constants";
-import { useProfile } from "../../hooks/useProfile";
-import { useSelector } from "react-redux";
-import { useNavigate } from "react-router-dom";
-import Avatar from "../common/Avatar";
-import Error from "../common/Error";
-import DatePicker from "../common/DatePicker";
-import { useEmployeeRoles, useEmployeesName } from "../../hooks/useEmployees";
-import EmployeeSearchInput from "../common/EmployeeSearchInput";
-import { z } from "zod";
-import moment from "moment";
-
-const ViewExpense = ({ ExpenseId }) => {
-  const { data, isLoading, isError, error } = useExpense(ExpenseId);
-  const [IsPaymentProcess, setIsPaymentProcess] = useState(false);
-  const [clickedStatusId, setClickedStatusId] = useState(null);
-
-  const IsReview = useHasUserPermission(REVIEW_EXPENSE);
-  const [imageLoaded, setImageLoaded] = useState({});
-  const { setDocumentView } = useExpenseContext();
-  const ActionSchema = ExpenseActionScheam(IsPaymentProcess) ?? z.object({});
-  const navigate = useNavigate();
-  const {
-    register,
-    handleSubmit,
-    setValue,
-    reset,
-    control,
-    formState: { errors },
-  } = useForm({
-    resolver: zodResolver(ActionSchema),
-    defaultValues: defaultActionValues,
-  });
-
-  const userPermissions = useSelector(
-    (state) => state?.globalVariables?.loginUser?.featurePermissions || []
-  );
-  const CurrentUser = useSelector(
-    (state) => state?.globalVariables?.loginUser?.employeeInfo
-  );
-
-  const nextStatusWithPermission = useMemo(() => {
-    if (!Array.isArray(data?.nextStatus)) return [];
-
-    return data.nextStatus.filter((status) => {
-      const permissionIds = Array.isArray(status?.permissionIds)
-        ? status.permissionIds
-        : [];
-
-      if (permissionIds.length === 0) return true;
-      if (permissionIds.includes(PROCESS_EXPENSE)) {
-        setIsPaymentProcess(true);
-      }
-      return permissionIds.some((id) => userPermissions.includes(id));
-    });
-  }, [data, userPermissions]);
-
-  const IsRejectedExpense = useMemo(() => {
-    return EXPENSE_REJECTEDBY.includes(data?.status?.id);
-  }, [data]);
-
-  const isCreatedBy = useMemo(() => {
-    return data?.createdBy.id === CurrentUser?.id;
-  }, [data, CurrentUser]);
-
-  const { mutate: MakeAction, isPending } = useActionOnExpense(() => {
-    setClickedStatusId(null);
-    reset();
-  });
-
-  const onSubmit = (formData) => {
-    const Payload = {
-      ...formData,
-      reimburseDate: moment
-        .utc(formData.reimburseDate, "DD-MM-YYYY")
-        .toISOString(),
-      expenseId: ExpenseId,
-      comment: formData.comment,
-    };
-    MakeAction(Payload);
-  };
-
-  if (isLoading) return <ExpenseDetailsSkeleton />;
-  if (isError) return <Error error={error} />;
-  const handleImageLoad = (id) => {
-    setImageLoaded((prev) => ({ ...prev, [id]: true }));
-  };
-
-  return (
-    <form className="container px-3" onSubmit={handleSubmit(onSubmit)}>
-      <div className="row mb-3">
-        <div className="col-12 mb-3">
-          <h5 className="fw-semibold">Expense Details</h5>
-          <hr />
-        </div>
-
-        {/* Row 1 */}
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Transaction Date :
-            </label>
-            <div className="text-muted">
-              {formatUTCToLocalTime(data?.transactionDate)}
-            </div>
-          </div>
-        </div>
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Expense Type :
-            </label>
-            <div className="text-muted">{data?.expensesType?.name}</div>
-          </div>
-        </div>
-
-        {/* Row 2 */}
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Supplier :
-            </label>
-            <div className="text-muted">{data?.supplerName}</div>
-          </div>
-        </div>
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Amount :
-            </label>
-            <div className="text-muted">₹ {data.amount}</div>
-          </div>
-        </div>
-
-        {/* Row 3 */}
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Payment Mode :
-            </label>
-            <div className="text-muted">{data?.paymentMode?.name}</div>
-          </div>
-        </div>
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Paid By :
-            </label>
-            <div className="text-muted">
-              {data?.paidBy?.firstName} {data?.paidBy?.lastName}
-            </div>
-          </div>
-        </div>
-
-        {/* Row 4 */}
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Status :
-            </label>
-            <span
-              className={`badge bg-label-${
-                getColorNameFromHex(data?.status?.color) || "secondary"
-              }`}
-            >
-              {data?.status?.name}
-            </span>
-          </div>
-        </div>
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Pre-Approved :
-            </label>
-            <div className="text-muted">{data.preApproved ? "Yes" : "No"}</div>
-          </div>
-        </div>
-
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Project :
-            </label>
-            <div className="text-muted">{data?.project?.name}</div>
-          </div>
-        </div>
-        <div className="col-md-6 mb-3">
-          <div className="d-flex">
-            <label
-              className="form-label me-2 mb-0 fw-semibold text-start"
-              style={{ minWidth: "130px" }}
-            >
-              Created At :
-            </label>
-            <div className="text-muted">
-              {formatUTCToLocalTime(data?.createdAt, true)}
-            </div>
-          </div>
-        </div>
-
-        {/* Row 6 */}
-        {data.createdBy && (
-          <div className="col-md-6 mb-3 text-start">
-            <div className="d-flex align-items-center">
-              <label
-                className="form-label me-2 mb-0 fw-semibold"
-                style={{ minWidth: "130px" }}
-              >
-                Created By :
-              </label>
-              <div className="d-flex align-items-center gap-1">
-                <Avatar
-                  size="xs"
-                  classAvatar="m-0"
-                  firstName={data.createdBy?.firstName}
-                  lastName={data.createdBy?.lastName}
-                />
-                <span className="text-muted">
-                  {`${data.createdBy?.firstName ?? ""} ${
-                    data.createdBy?.lastName ?? ""
-                  }`.trim() || "N/A"}
-                </span>
-              </div>
-            </div>
-          </div>
-        )}
-
-        {data.reviewedBy && (
-          <div className="col-md-6 mb-3 text-start">
-            <div className="d-flex align-items-center">
-              <label
-                className="form-label me-2 mb-0 fw-semibold"
-                style={{ minWidth: "130px" }}
-              >
-                Reviewed By :
-              </label>
-              <div className="d-flex align-items-center">
-                <Avatar
-                  size="xs"
-                  classAvatar="m-0"
-                  firstName={data.reviewedBy?.firstName}
-                  lastName={data.reviewedBy?.lastName}
-                />
-                <span className="text-muted">
-                  {`${data.reviewedBy?.firstName ?? ""} ${
-                    data.reviewedBy?.lastName ?? ""
-                  }`.trim() || "N/A"}
-                </span>
-              </div>
-            </div>
-          </div>
-        )}
-
-        {data.approvedBy && (
-          <div className="col-md-6 mb-3 text-start">
-            <div className="d-flex align-items-center">
-              <label
-                className="form-label me-2 mb-0 fw-semibold"
-                style={{ minWidth: "130px" }}
-              >
-                Approved By :{" "}
-              </label>
-              <div className="d-flex align-items-center">
-                <Avatar
-                  size="xs"
-                  classAvatar="m-0"
-                  firstName={data.approvedBy?.firstName}
-                  lastName={data.approvedBy?.lastName}
-                />
-                <span className="text-muted">
-                  {`${data.approvedBy?.firstName ?? ""} ${
-                    data.approvedBy?.lastName ?? ""
-                  }`.trim() || "N/A"}
-                </span>
-              </div>
-            </div>
-          </div>
-        )}
-        {data.processedBy && (
-          <div className="col-md-6 mb-3 text-start">
-            <div className="d-flex align-items-center">
-              <label
-                className="form-label me-2 mb-0 fw-semibold"
-                style={{ minWidth: "130px" }}
-              >
-                Processed By :{" "}
-              </label>
-              <div className="d-flex align-items-center">
-                <Avatar
-                  size="xs"
-                  classAvatar="m-0"
-                  firstName={data.processedBy?.firstName}
-                  lastName={data.processedBy?.lastName}
-                />
-                <span className="text-muted">
-                  {`${data.processedBy?.firstName ?? ""} ${
-                    data.processedBy?.lastName ?? ""
-                  }`.trim() || "N/A"}
-                </span>
-              </div>
-            </div>
-          </div>
-        )}
-      </div>
-      {data.expensesReimburse && (
-        <div className="row text-start">
-          <div className="col-md-6 mb-3">
-            <label className="form-label me-2 mb-0 fw-semibold">
-              Transaction ID :
-            </label>
-            {data.expensesReimburse.reimburseTransactionId || "N/A"}
-          </div>
-          <div className="col-md-6 mb-3">
-            <label className="form-label me-2 mb-0 fw-semibold">
-              Reimburse Date :
-            </label>
-            {formatUTCToLocalTime(data.expensesReimburse.reimburseDate)}
-          </div>
-
-          {data.expensesReimburse && (
-            <>
-              <div className="col-md-6 mb-3 d-flex align-items-center">
-                <label className="form-label me-2 mb-0 fw-semibold">
-                  Reimburse By :
-                </label>
-                <Avatar
-                  size="xs"
-                  classAvatar="m-0 me-1"
-                  firstName={data?.expensesReimburse?.reimburseBy?.firstName}
-                  lastName={data?.expensesReimburse?.reimburseBy?.lastName}
-                />
-                <span className="text-muted">
-                  {`${data?.expensesReimburse?.reimburseBy?.firstName} ${data?.expensesReimburse?.reimburseBy?.lastName}`.trim()}
-                </span>
-              </div>
-            </>
-          )}
-
-          <div className="col-md-6 mb-3">
-            <label className="form-label me-2 mb-0 fw-semibold"> Note :</label>{" "}
-            {data.expensesReimburse.reimburseNote}
-          </div>
-        </div>
-      )}
-
-      <div className="text-start">
-        <label className="form-label me-2 mb-0 fw-semibold">
-          Description :
-        </label>
-        <div className="text-muted">{data?.description}</div>
-      </div>
-      <div className="col-12 my-2 text-start">
-        <label className="form-label me-2 mb-0 fw-semibold">Attachment :</label>
-
-        {data?.documents?.map((doc) => {
-          const getIconByType = (type) => {
-            if (!type) return "bx bx-file";
-
-            if (type.includes("pdf")) return "bxs-file-pdf";
-            if (type.includes("word")) return "bxs-file-doc";
-            if (type.includes("excel") || type.includes("spreadsheet"))
-              return "bxs-file-xls";
-            if (type.includes("image")) return "bxs-file-image";
-            if (type.includes("zip") || type.includes("rar"))
-              return "bxs-file-archive";
-
-            return "bx bx-file";
-          };
-
-          const isImage = doc.contentType?.includes("image");
-
-          return (
-            <div
-              className="list-group-item list-group-item-action d-flex align-items-center"
-              key={doc.documentId}
-            >
-              <div
-                className="rounded me-1 d-flex align-items-center justify-content-center cursor-pointer"
-                style={{ height: "50px", width: "60px", position: "relative" }}
-                onClick={() => {
-                  if (isImage) {
-                    setDocumentView({
-                      IsOpen: true,
-                      Image: doc.preSignedUrl,
-                    });
-                  }
-                }}
-              >
-                <i
-                  className={`bx ${getIconByType(
-                    doc.contentType
-                  )} text-primary`}
-                  style={{ fontSize: "35px" }}
-                ></i>
-              </div>
-
-              <div className="w-100">
-                <small className="mb-0 small">{doc.fileName}</small>
-                <div className="d">
-                  <a
-                    href={doc.preSignedUrl}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="bx bx-cloud-download cursor-pointer"
-                  />
-                </div>
-              </div>
-            </div>
-          );
-        })}
-      </div>
-
-      <hr className="divider my-1" />
-
-      {Array.isArray(data?.nextStatus) && data.nextStatus.length > 0 && (
-        <>
-          {IsPaymentProcess && nextStatusWithPermission?.length > 0 && (
-            <div className="row">
-              <div className="col-12 col-md-6 text-start">
-                <label className="form-label">Transaction Id </label>
-                <input
-                  type="text"
-                  className="form-control form-control-sm"
-                  {...register("reimburseTransactionId")}
-                />
-                {errors.reimburseTransactionId && (
-                  <small className="danger-text">
-                    {errors.reimburseTransactionId.message}
-                  </small>
-                )}
-              </div>
-              <div className="col-12 col-md-6 text-start">
-                <label className="form-label">Transaction Date </label>
-                <DatePicker
-                  name="reimburseDate"
-                  control={control}
-                  minDate={data?.transactionDate}
-                />
-                {errors.reimburseDate && (
-                  <small className="danger-text">
-                    {errors.reimburseDate.message}
-                  </small>
-                )}
-              </div>
-              <div className="col-12 col-md-6 text-start">
-                <label className="form-label">Employeee </label>
-                <EmployeeSearchInput
-                  control={control}
-                  name="reimburseById"
-                  projectId={null}
-                />
-              </div>
-            </div>
-          )}
-          <div className="col-12 mb-3 text-start">
-            {((nextStatusWithPermission.length > 0 && !IsRejectedExpense) ||
-              (IsRejectedExpense && isCreatedBy)) && (
-              <>
-                <label className="form-label me-2 mb-0">Comment:</label>
-                <textarea
-                  className="form-control form-control-sm"
-                  {...register("comment")}
-                  rows="2"
-                />
-                {errors.comment && (
-                  <small className="danger-text">
-                    {errors.comment.message}
-                  </small>
-                )}
-              </>
-            )}
-
-            {nextStatusWithPermission?.length > 0 &&
-              (!IsRejectedExpense || isCreatedBy) && (
-                <div className="text-center flex-wrap gap-2 my-2">
-                  {nextStatusWithPermission.map((status, index) => (
-                    <button
-                      key={status.id || index}
-                      type="button"
-                      onClick={() => {
-                        setClickedStatusId(status.id);
-                        setValue("statusId", status.id);
-                        handleSubmit(onSubmit)();
-                      }}
-                      disabled={isPending}
-                      className="btn btn-primary btn-sm cursor-pointer mx-2 border-0"
-                    >
-                      {isPending && clickedStatusId === status.id
-                        ? "Please Wait..."
-                        : status.displayName || status.name}
-                    </button>
-                  ))}
-                </div>
-              )}
-          </div>
-        </>
-      )}
-    </form>
-  );
-};
-
-export default ViewExpense;
diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx
index 47ca8bf4..38966865 100644
--- a/src/components/Layout/Header.jsx
+++ b/src/components/Layout/Header.jsx
@@ -1,9 +1,9 @@
+
 import getGreetingMessage from "../../utils/greetingHandler";
 import {
   cacheData,
   clearAllCache,
   getCachedData,
-  useSelectedproject,
 } from "../../slices/apiDataManager";
 import AuthRepository from "../../repositories/AuthRepository";
 import { useDispatch, useSelector } from "react-redux";
@@ -28,17 +28,9 @@ const Header = () => {
   const navigate = useNavigate();
   const HasManageProjectPermission = useHasUserPermission(MANAGE_PROJECT);
 
-  const isDirectoryPath = /^\/directory$/.test(location.pathname);
-  const isProjectPath = /^\/projects$/.test(location.pathname);
-  const isDashboard =
-    /^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname);
-
-  const allowedProjectStatusIds = [
-    "603e994b-a27f-4e5d-a251-f3d69b0498ba",
-    "cdad86aa-8a56-4ff4-b633-9c629057dfef",
-    "b74da4c2-d07e-46f2-9919-e75e49b12731",
-  ];
-
+    const isDirectoryPath = /^\/directory$/.test(location.pathname);
+    const isProjectPath = /^\/projects$/.test(location.pathname);
+    const isDashboard = /^\/dashboard$/.test(location.pathname) || /^\/$/.test(location.pathname) ;
   const getRole = (roles, joRoleId) => {
     if (!Array.isArray(roles)) return "User";
     let role = roles.find((role) => role.id === joRoleId);
@@ -46,7 +38,7 @@ const Header = () => {
   };
 
   const handleLogout = (e) => {
-    e.preventDefault();
+    e.preventDefault(); 
     logout();
   };
 
@@ -57,7 +49,7 @@ const Header = () => {
       };
 
       AuthRepository.logout(data)
-        .then(() => {
+        .then((response) => {
           localStorage.removeItem("jwtToken");
           localStorage.removeItem("refreshToken");
           localStorage.removeItem("user");
@@ -65,11 +57,11 @@ const Header = () => {
           clearAllCache();
           window.location.href = "/auth/login";
         })
-        .catch(() => {
+        .catch((error) => {
+          // Even if logout API fails, clear local storage and redirect
           localStorage.removeItem("jwtToken");
           localStorage.removeItem("refreshToken");
           localStorage.removeItem("user");
-          localStorage.clear();
           clearAllCache();
           window.location.href = "/auth/login";
         });
@@ -87,30 +79,22 @@ const Header = () => {
 
   const { projectNames, loading: projectLoading, fetchData } = useProjectName();
 
-  const selectedProject = useSelectedproject();
+  const selectedProject = useSelector(
+    (store) => store.localVariables.projectId
+  );
 
-  const projectsForDropdown = isDashboard
-    ? projectNames
-    : projectNames?.filter(project =>
-        allowedProjectStatusIds.includes(project.projectStatusId)
-      );
-
-  let currentProjectDisplayName;
-  if (projectLoading) {
-    currentProjectDisplayName = "Loading...";
-  } else if (!projectNames || projectNames.length === 0) {
-    currentProjectDisplayName = "No Projects Assigned";
-  } else if (projectNames.length === 1) {
-    currentProjectDisplayName = projectNames[0].name;
-  } else {
-    if (selectedProject === null) {
-      currentProjectDisplayName = "All Projects";
-    } else {
-      const selectedProjectObj = projectNames.find(
-        (p) => p?.id === selectedProject
-      );
-      currentProjectDisplayName = selectedProjectObj ? selectedProjectObj.name : "All Projects";
-    }
+  // Determine the display text for the project dropdown
+  let displayText = "All Projects";
+  if (selectedProject === null) {
+    displayText = "All Projects";
+  } else if (selectedProject) {
+    const selectedProjectObj = projectNames?.find(
+      (p) => p?.id === selectedProject
+    );
+    // Fallback to selectedProject ID if name not found during loading or mismatch
+    displayText = selectedProjectObj ? selectedProjectObj.name : selectedProject;
+  } else if (projectLoading) {
+    displayText = "Loading...";
   }
 
   const { openChangePassword } = useChangePassword();
@@ -122,18 +106,17 @@ const Header = () => {
       selectedProject === undefined &&
       !getCachedData("hasReceived")
     ) {
-      if (projectNames.length === 1) {
-        dispatch(setProjectId(projectNames[0]?.id || null));
-      } else {
-        if (isDashboard) {
-          dispatch(setProjectId(null));
-        } else {
-          const firstAllowedProject = projectNames.find(project => allowedProjectStatusIds.includes(project.projectStatusId));
-          dispatch(setProjectId(firstAllowedProject?.id || null));
-        }
+      if(isDashboard){
+        dispatch(setProjectId(null));
+      }else{
+         dispatch(setProjectId(projectNames[0]?.id));
       }
     }
-  }, [projectNames, selectedProject, dispatch, isDashboard]);
+  }, [projectNames, selectedProject, dispatch]);
+
+
+  /** Check if current page is project details page or directory page */
+  // const isProjectPath = /^\/projects\/[a-f0-9-]{36}$/.test(location.pathname);
 
 
   const handler = useCallback(
@@ -177,15 +160,14 @@ const Header = () => {
     };
   }, [handler, newProjectHandler]);
 
-  const handleProjectChange = (project) => {
-    dispatch(setProjectId(project));
-
-    if (isProjectPath && project !== null) {
-      navigate("/projects/details");
+  const handleProjectChange =(project)=>{
+    if(isProjectPath){
+     dispatch(setProjectId(project))
+     navigate("/projects/details")
+    } else{
+      dispatch(setProjectId(project))
     }
-  };
-
-  const shouldShowDropdown = projectNames && projectNames.length > 1;
+  }
 
   return (
     <nav
@@ -208,43 +190,39 @@ const Header = () => {
           <div className="align-items-center">
             <i className="rounded-circle bx bx-building-house bx-sm-lg bx-md me-2"></i>
             <div className="btn-group">
-              {shouldShowDropdown ? (
-                <button
-                  className={`btn btn-sm-sm btn-xl dropdown-toggle px-1`}
-                  type="button"
-                  data-bs-toggle="dropdown"
-                  aria-expanded="false"
-                >
-                  {currentProjectDisplayName}
-                </button>
-              ) : (
-                <span className="btn btn-sm-sm btn-xl px-1">
-                  {currentProjectDisplayName}
-                </span>
-              )}
+              <button
+                className={`btn btn-sm-sm btn-xl ${projectNames.length > 0 ? "dropdown-toggle" : ""
+                  } px-1`}
+                type="button"
+                data-bs-toggle="dropdown"
+                aria-expanded="false"
+              >
+                {displayText}
+              </button>
 
-              {shouldShowDropdown && projectsForDropdown && projectsForDropdown.length > 0 && (
+              {projectNames.length > 0 && (
                 <ul
                   className="dropdown-menu"
                   style={{ overflow: "auto", maxHeight: "300px" }}
                 >
+            
                   {isDashboard && (
                     <li>
                       <button
                         className="dropdown-item"
-                        onClick={() => handleProjectChange(null)}
+                        onClick={() => dispatch(setProjectId(null))}
                       >
                         All Projects
                       </button>
                     </li>
                   )}
-                  {[...projectsForDropdown]
+                  {[...projectNames]
                     .sort((a, b) => a?.name?.localeCompare(b.name))
                     .map((project) => (
                       <li key={project?.id}>
                         <button
                           className="dropdown-item"
-                          onClick={() => handleProjectChange(project?.id)}
+                          onClick={()=>handleProjectChange(project?.id)}
                         >
                           {project?.name}
                           {project?.shortName && (
@@ -261,6 +239,7 @@ const Header = () => {
           </div>
         )}
 
+
         <ul className="navbar-nav flex-row align-items-center ms-md-auto">
           <li className="nav-item dropdown-shortcuts navbar-dropdown dropdown me-2 me-xl-0">
             <a
diff --git a/src/components/Project/AboutProject.jsx b/src/components/Project/AboutProject.jsx
index 204fe759..e5196eac 100644
--- a/src/components/Project/AboutProject.jsx
+++ b/src/components/Project/AboutProject.jsx
@@ -1,18 +1,17 @@
 import React, { useEffect, useState } from "react";
 import moment from "moment";
 import { getProjectStatusName } from "../../utils/projectStatus";
-import { useProjectDetails, useUpdateProject } from "../../hooks/useProjects";
+import {useProjectDetails, useUpdateProject} from "../../hooks/useProjects";
 import { useSelector } from "react-redux"; // Import useSelector
-import { useHasUserPermission } from "../../hooks/useHasUserPermission";
-import { MANAGE_PROJECT } from "../../utils/constants";
+import {useHasUserPermission} from "../../hooks/useHasUserPermission";
+import {MANAGE_PROJECT} from "../../utils/constants";
 import GlobalModel from "../common/GlobalModel";
 import ManageProjectInfo from "./ManageProjectInfo";
-import { useQueryClient } from "@tanstack/react-query";
-import { useSelectedproject } from "../../slices/apiDataManager";
+import {useQueryClient} from "@tanstack/react-query";
 
 const AboutProject = () => {
   const [IsOpenModal, setIsOpenModal] = useState(false);
-  const { mutate: UpdateProjectDetails, isPending } = useUpdateProject({
+  const {mutate: UpdateProjectDetails, isPending} = useUpdateProject({
     onSuccessCallback: () => {
       setIsOpenModal(false);
     }
@@ -20,134 +19,118 @@ const AboutProject = () => {
   const ClientQuery = useQueryClient();
 
   // *** MODIFIED LINE: Get projectId from Redux store using useSelector ***
-  // const projectId = useSelector((store) => store.localVariables.projectId);
-  const projectId = useSelectedproject();
+  const projectId = useSelector((store) => store.localVariables.projectId);
 
   const manageProject = useHasUserPermission(MANAGE_PROJECT);
-  const { projects_Details, isLoading, error, refetch } = useProjectDetails(projectId); // Pass projectId from useSelector
-
-  const handleFormSubmit = (updatedProject) => {
-    if (projects_Details?.id) {
-      UpdateProjectDetails({ projectId: projects_Details?.id, updatedData: updatedProject });
+  const {projects_Details, isLoading, error,refetch} = useProjectDetails( projectId ); // Pass projectId from useSelector
+  
+  const handleFormSubmit = ( updatedProject ) => {
+    if ( projects_Details?.id ) {
+      UpdateProjectDetails({ projectId: projects_Details?.id,updatedData: updatedProject });
       // The refetch here might be redundant or could be handled by react-query's invalidateQueries
       // if UpdateProjectDetails properly invalidates the 'projectDetails' query key.
       // If refetch is still needed, consider adding a delay or using onSuccess of UpdateProjectDetails.
       // For now, keeping it as is based on your original code.
-      refetch();
+      refetch(); 
     }
   };
 
   return (
     <>
       {IsOpenModal && (
-        <GlobalModel isOpen={IsOpenModal} closeModal={() => setIsOpenModal(false)}>
+        <GlobalModel isOpen={IsOpenModal} closeModal={()=>setIsOpenModal(false)}>
           <ManageProjectInfo
             project={projects_Details}
             handleSubmitForm={handleFormSubmit}
-            onClose={() => setIsOpenModal(false)}
+            onClose={() => setIsOpenModal( false )}
             isPending={isPending}
           />
         </GlobalModel>
       )}
       {projects_Details && (
         <>
-          <div className="card mb-6">
-            <div className="card-header text-start">
-              <h6 className="card-action-title mb-0 ps-1">
-                {" "}
-                <i className="fa fa-building rounded-circle text-primary"></i>
-                <span className="ms-2">Project Profile</span>
-              </h6>
-            </div>
-            <div className="card-body">
-              <ul className="list-unstyled my-3 ps-0">
-                <li className="d-flex mb-3">
-                  <div className="d-flex align-items-center" style={{ width: '120px' }}> {/* Adjust width as needed for alignment */}
-                    <i className="bx bx-cog"></i>
-                    <span className="fw-medium mx-2">Name:</span>
-                  </div>
-                  <span>{projects_Details.name}</span>
-                </li>
-                <li className="d-flex mb-3">
-                  <div className="d-flex align-items-center" style={{ width: '120px' }}>
-                    <i className="bx bx-fingerprint"></i>
-                    <span className="fw-medium mx-2">Nick Name:</span>
-                  </div>
-                  <span>{projects_Details.shortName}</span>
-                </li>
-                <li className="d-flex mb-3">
-                  <div className="d-flex align-items-center" style={{ width: '120px' }}>
-                    <i className="bx bx-check"></i>
-                    <span className="fw-medium mx-2">Start Date:</span>
-                  </div>
-                  <span>
-                    {projects_Details.startDate
-                      ? moment(projects_Details.startDate).format("DD-MMM-YYYY")
-                      : "N/A"}
-                  </span>
-                </li>
-                <li className="d-flex mb-3">
-                  <div className="d-flex align-items-center" style={{ width: '120px' }}>
-                    <i className="bx bx-stop-circle"></i>
-                    <span className="fw-medium mx-2">End Date:</span>
-                  </div>
-                  <span>
-                    {projects_Details.endDate
-                      ? moment(projects_Details.endDate).format("DD-MMM-YYYY")
-                      : "N/A"}
-                  </span>
-                </li>
-                <li className="d-flex mb-3">
-                  <div className="d-flex align-items-center" style={{ width: '120px' }}>
-                    <i className="bx bx-trophy"></i>
-                    <span className="fw-medium mx-2">Status:</span>
-                  </div>
-                  <span>{projects_Details?.projectStatus?.status.replace(/\s/g, '')}</span>
-                </li>
-                <li className="d-flex mb-3">
-                  <div className="d-flex align-items-center" style={{ width: '120px' }}>
-                    <i className="bx bx-user"></i>
-                    <span className="fw-medium mx-2">Contact:</span>
-                  </div>
-                  <span>{projects_Details.contactPerson}</span>
-                </li>
-                <li className="d-flex mb-3">
-                  {/* Label section with icon */}
-                  <div className="d-flex align-items-start" style={{ minWidth: "120px" }}>
-                    <i className="bx bx-flag mt-1"></i>
-                    <span className="fw-medium mx-2 text-nowrap">Address:</span>
-                  </div>
-
-                  {/* Content section that wraps nicely */}
-                  <div className="flex-grow-1 text-start text-wrap">
-                    {projects_Details.projectAddress}
-                  </div>
-                </li>
-
-
-
-                <li className="d-flex justify-content-center mt-4"> {/* Added mt-4 for some top margin */}
-                  {manageProject && (
-                    <button
-                      type="button"
-                      className={`btn btn-sm btn-primary ${!manageProject && "d-none"
-                        }`}
-                      data-bs-toggle="modal"
-                      data-bs-target="#edit-project-modal"
-                      onClick={() => setIsOpenModal(true)}
-                    >
-                      Modify Details
-                    </button>
-                  )}
-                </li>
-              </ul>
-
-            </div>
+        <div className="card mb-6">
+          <div className="card-header text-start">
+            <h6 className="card-action-title mb-0">
+              {" "}
+              <i className="fa fa-building rounded-circle text-primary"></i>
+              <span className="ms-2">Project Profile</span>
+            </h6>
           </div>
+          <div className="card-body">
+            <ul className="list-unstyled my-3 ps-2">
+              <li className="d-flex align-items-center mb-3">
+                <i className="bx bx-cog"></i>
+                <span className="fw-medium mx-2">Name:</span>{" "}
+                <span>{projects_Details.name}</span>
+              </li>
+              <li className="d-flex align-items-center mb-3">
+                <i className="bx bx-fingerprint"></i>
+                <span className="fw-medium mx-2">Nick Name:</span>{" "}
+                <span> {projects_Details.shortName} </span>
+              </li>
+              <li className="d-flex align-items-center mb-3">
+                <i className="bx bx-check"></i>
+                <span className="fw-medium mx-2">Start Date:</span>{" "}
+                <span>
+                  {projects_Details.startDate
+                    ? moment(projects_Details.startDate).format("DD-MMM-YYYY")
+                    : "N/A"}
+                </span>
+              </li>
+              <li className="d-flex align-items-center mb-3">
+                <i className="bx bx-stop-circle"></i>{" "}
+                <span className="fw-medium mx-2">End Date:</span>{" "}
+                <span>
+                  {projects_Details.endDate
+                    ? moment(projects_Details.endDate).format("DD-MMM-YYYY")
+                    : "N/A"}
+                </span>
+              </li>
+              <li className="d-flex align-items-center mb-3">
+                <i className="bx bx-trophy"></i>
+                <span className="fw-medium mx-2">Status:</span>{" "}
+                <span>{projects_Details?.projectStatus?.status}</span>
+              </li>
+              <li className="d-flex align-items-center mb-3">
+                <i className="bx bx-user"></i>
+                <span className="fw-medium mx-2">Contact:</span>{" "}
+                <span>{projects_Details.contactPerson}</span>
+              </li>
+              <li className="d-flex flex-column align-items-start mb-3">
+                <div className="d-flex align-items-center">
+                  <i className="bx bx-flag"></i>
+                  <span className="fw-medium mx-2">Address:</span>
+                  {projects_Details.projectAddress?.length <= 20 && (
+                    <span>{projects_Details.projectAddress}</span>
+                  )}
+                </div>
+                {projects_Details.projectAddress?.length > 20 && (
+                  <div className="ms-4 text-start">{projects_Details.projectAddress}</div>
+                )}
+              </li>
 
-        </>
-      )}
-
+              <li className="d-flex justify-content-center mb-3">
+                {manageProject && (
+                  <button
+                    type="button"
+                    className={`btn btn-sm btn-primary ${
+                      !manageProject && "d-none"
+                    }`}
+                    data-bs-toggle="modal"
+                    data-bs-target="#edit-project-modal"
+                    onClick={()=>setIsOpenModal(true)}
+                  >
+                    Modify Details
+                  </button>
+                )}
+              </li>
+            </ul>
+          </div>
+          </div>
+          </>
+        )}
+    
       {isLoading && <span>loading...</span>}
     </>
   );
diff --git a/src/components/Project/AssignTask.jsx b/src/components/Project/AssignTask.jsx
index 0836cbd2..2ab01e6e 100644
--- a/src/components/Project/AssignTask.jsx
+++ b/src/components/Project/AssignTask.jsx
@@ -48,9 +48,6 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
   const infoRef = useRef(null);
   const infoRef1 = useRef(null);
 
-  // State for search term
-  const [searchTerm, setSearchTerm] = useState("");
-
   useEffect(() => {
     if (typeof bootstrap !== "undefined") {
       if (infoRef.current) {
@@ -86,10 +83,7 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
   const { loading } = useMaster();
   const { data: jobRoleData } = useMaster();
 
-  // Changed to an array to hold multiple selected roles
-  const [selectedRoles, setSelectedRoles] = useState(["all"]);
-  // Changed to an array to hold multiple selected roles
-  // const [selectedRoles, setSelectedRoles] = useState(["all"]);
+  const [selectedRole, setSelectedRole] = useState("all");
   const [displayedSelection, setDisplayedSelection] = useState("");
   const {
     handleSubmit,
@@ -127,79 +121,20 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
 
   useEffect(() => {
     dispatch(changeMaster("Job Role"));
-    // Initial state should reflect "All Roles" selected
-    setSelectedRoles(["all"]);
+
+    return () => setSelectedRole("all");
   }, [dispatch]);
 
-  // Modified handleRoleChange to handle multiple selections
-  const handleRoleChange = (event, roleId) => {
-    // If 'all' is selected, clear other selections
-    if (roleId === "all") {
-      setSelectedRoles(["all"]);
-    } else {
-      setSelectedRoles((prevSelectedRoles) => {
-        // If "all" was previously selected, remove it
-        const newRoles = prevSelectedRoles.filter((role) => role !== "all");
-        if (newRoles.includes(roleId)) {
-          // If role is already selected, unselect it
-          return newRoles.filter((id) => id !== roleId);
-        } else {
-          // If role is not selected, add it
-          return [...newRoles, roleId];
-        }
-      });
-    }
+  const handleRoleChange = (event) => {
+    setSelectedRole(event.target.value);
   };
 
-  useEffect(() => {
-    // Update displayedSelection based on selectedRoles
-    if (selectedRoles.includes("all")) {
-      setDisplayedSelection("All Roles");
-    } else if (selectedRoles.length > 0) {
-      const selectedRoleNames = selectedRoles.map(roleId => {
-        const role = jobRoleData?.find(r => String(r.id) === roleId);
-        return role ? role.name : '';
-      }).filter(Boolean); // Filter out empty strings for roles not found
-      setDisplayedSelection(selectedRoleNames.join(', '));
-    } else {
-      setDisplayedSelection("Select Roles");
-    }
-  }, [selectedRoles, jobRoleData]);
-
-
-  const handleSearchChange = (event) => {
-    setSearchTerm(event.target.value);
-  };
-
-  // Filter employees first by role, then by search term AND job role name
-  const filteredEmployees = employees?.filter((emp) => {
-    const matchesRole =
-      selectedRoles.includes("all") || selectedRoles.includes(String(emp.jobRoleId));
-    // Convert both first and last names and job role name to lowercase for case-insensitive matching
-    const fullName = `${emp.firstName} ${emp.lastName}`.toLowerCase();
-
-    const jobRoleName = jobRoleData?.find((role) => role.id === emp.jobRoleId)?.name?.toLowerCase() || "";
-
-    const searchLower = searchTerm.toLowerCase();
-    // Check if the full name OR job role name includes the search term
-    const matchesSearch = fullName.includes(searchLower) || jobRoleName.includes(searchLower);
-    return matchesRole && matchesSearch;
-  });
-
-  // Determine unique job role IDs from the filtered employees (for dropdown options)
-  const uniqueJobRoleIdsInFilteredEmployees = new Set(
-    employees?.map(emp => emp.jobRoleId).filter(Boolean)
-  );
-
-  // Filter jobRoleData to only include roles present in the uniqueJobRoleIdsInFilteredEmployees
-  const jobRolesForDropdown = jobRoleData?.filter(role =>
-    uniqueJobRoleIdsInFilteredEmployees.has(role.id)
-  );
-
-  // Calculate the count of selected roles for display
-  const selectedRolesCount = selectedRoles.includes("all")
-    ? 0 // "All Roles" doesn't contribute to a specific count
-    : selectedRoles.length;
+  const filteredEmployees =
+    selectedRole === "all"
+      ? employees
+      : employees?.filter(
+          (emp) => String(emp.jobRoleId || "") === selectedRole
+        );
 
   const onSubmit = (data) => {
     const selectedEmployeeIds = data.selectedEmployees;
@@ -224,339 +159,226 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
     reset();
     onClose();
   };
-
   return (
-   <div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">
-  <p className="align-items-center flex-wrap m-0 ">Assign Task</p>
-  <div className="container my-3">
-    <div className="mb-1">
-      <p className="mb-0">
-        <span className="text-dark text-start d-flex align-items-center flex-wrap form-text">
-          <span className="me-2 m-0 fw-bold">Work Location :</span> {/* Changed font-bold to fw-bold */}
-          {[
-            assignData?.building?.buildingName,
-            assignData?.floor?.floorName,
-            assignData?.workArea?.areaName,
-            assignData?.workItem?.activityMaster?.activityName,
-          ]
-            .filter(Boolean) // Filter out any undefined/null values
-            .map((item, index, array) => (
-              <span key={index} className="d-flex align-items-center">
-                {item}
-                {index < array.length - 1 && (
-                  <i className="bx bx-chevron-right mx-2"></i>
-                )}
-              </span>
-            ))}
-        </span>
-      </p>
-
-      <form onSubmit={handleSubmit(onSubmit)}>
-        <div className="form-label text-start">
-          <div className="row mb-1">
-            <div className="col-12">
-              <div className="form-text text-start">
-                <div className="d-flex align-items-center form-text fs-7">
-                  <span className="text-dark">Select Team</span>
-                  <div className="dropdown position-relative d-inline-block">
-                    <a
-                      className={`dropdown-toggle hide-arrow cursor-pointer ${
-                        selectedRoles.includes("all") || selectedRoles.length === 0
-                          ? "text-secondary"
-                          : "text-primary"
-                      }`}
-                      data-bs-toggle="dropdown"
-                      role="button"
-                      aria-expanded="false"
-                    >
-                      <i className="bx bx-slider-alt ms-2"></i>
-                    </a>
-
-                    {/* Badge */}
-                    {selectedRolesCount > 0 && (
-                      <span
-                        className="position-absolute top-0 start-100 translate-middle badge rounded-circle bg-warning text-white"
-                        style={{
-                          fontSize: "0.65rem",
-                          minWidth: "18px",
-                          height: "18px",
-                          padding: "0",
-                          lineHeight: "18px",
-                          textAlign: "center",
-                          zIndex: 10,
-                        }}
-                      >
-                        {selectedRolesCount}
-                      </span>
+    <div className="fs-5 text-dark text-center d-flex align-items-center justify-content-center flex-wrap">
+      <p className="align-items-center flex-wrap m-0 ">Assign Task</p>
+      <div className="container my-3">
+        <div className="mb-1">
+          <p className="mb-0">
+            <span className="text-dark text-start d-flex align-items-center flex-wrap form-text">
+              <span className="me-2 m-0 font-bold">Work Location :</span>
+              {[
+                assignData?.building?.buildingName,
+                assignData?.floor?.floorName,
+                assignData?.workArea?.areaName,
+                assignData?.workItem?.activityMaster?.activityName,
+              ]
+                .filter(Boolean) // Filter out any undefined/null values
+                .map((item, index, array) => (
+                  <span key={index} className="d-flex align-items-center">
+                    {item}
+                    {index < array.length - 1 && (
+                      <i className="bx bx-chevron-right mx-2"></i>
                     )}
+                  </span>
+                ))}
+            </span>
+          </p>
 
-                    {/* Dropdown Menu - Corrected: Removed duplicate ul block */}
-                    <ul className="dropdown-menu p-2 text-capitalize" style={{ maxHeight: "300px", overflowY: "auto" }}>
-                      <li> {/* Changed key="all" to a unique key if possible, or keep it if "all" is a unique identifier */}
-                        <div className="form-check dropdown-item py-0">
-                          <input
-                            className="form-check-input"
-                            type="checkbox"
-                            id="checkboxAllRoles" // Unique ID
-                            value="all"
-                            checked={selectedRoles.includes("all")}
-                            onChange={(e) => handleRoleChange(e, e.target.value)}
-                          />
-                          <label className="form-check-label ms-2" htmlFor="checkboxAllRoles">
-                            All Roles
-                          </label>
-                        </div>
-                      </li>
-
-                      {jobRolesForDropdown?.map((role) => (
-                        <li key={role.id}>
-                          <div className="form-check dropdown-item py-0">
-                            <input
-                              className="form-check-input"
-                              type="checkbox"
-                              id={`checkboxRole-${role.id}`} // Unique ID
-                              value={role.id}
-                              checked={selectedRoles.includes(String(role.id))}
-                              onChange={(e) => handleRoleChange(e, e.target.value)}
-                            />
-                            <label className="form-check-label ms-2" htmlFor={`checkboxRole-${role.id}`}>
-                              {role.name}
-                            </label>
-                          </div>
-                        </li>
-                      ))}
-                    </ul>
-                  </div>
-                  <input
-                    type="text"
-                    className="form-control form-control-sm ms-auto mb-2 mt-2"
-                    placeholder="Search employees or roles..."
-                    value={searchTerm}
-                    onChange={handleSearchChange}
-                    style={{ maxWidth: "200px" }}
-                  />
-                </div>
-              </div>
-            </div>
-          </div>
-          <div
-            className="col-12 mt-2"
-            style={{ maxHeight: "280px", overflowY: "auto", overflowX: "hidden" }}
-          >
-            {selectedRoles?.length > 0 && (
-              <div className="row">
-                {employeeLoading ? (
-                  <div className="col-12">
-                    <p className="text-center">Loading employees...</p>
-                  </div>
-                ) : filteredEmployees?.length > 0 ? (
-                  filteredEmployees.map((emp) => {
-                    const jobRole = jobRoleData?.find(
-                      (role) => role?.id === emp?.jobRoleId
-                    );
-
-                    return (
-                      <div
-                        key={emp.id}
-                        className="col-6 col-md-4 col-lg-3 mb-3"
+          <form onSubmit={handleSubmit(onSubmit)}>
+            <div className="form-label text-start">
+              <div className="row mb-1">
+                <div className="col-12">
+                  <div className="form-text text-start">
+                    <div className="d-flex align-items-center form-text fs-7">
+                      <span className="text-dark">Select Team</span>
+                      <div className="me-2">{displayedSelection}</div>
+                      <a
+                        className="dropdown-toggle hide-arrow cursor-pointer"
+                        data-bs-toggle="dropdown"
+                        aria-expanded="false"
                       >
-                        <div className="form-check d-flex align-items-start">
-                          <Controller
-                            name="selectedEmployees"
-                            control={control}
-                            render={({ field }) => (
-                              <input
-                                {...field}
-                                className="form-check-input me-1 mt-1"
-                                type="checkbox"
-                                id={`employee-${emp?.id}`} // Unique ID
-                                value={emp.id}
-                                checked={field.value?.includes(emp.id)}
-                                onChange={(e) => {
-                                  handleCheckboxChange(e, emp);
-                                }}
-                              />
-                            )}
-                          />
-                          <div className="flex-grow-1">
-                            <p
-                              className="mb-0"
-                              style={{ fontSize: "13px" }}
-                            >
-                              {emp.firstName} {emp.lastName}
-                            </p>
-                            <small
-                              className="text-muted"
-                              style={{ fontSize: "11px" }}
-                            >
-                              {loading ? (
-                                <span className="placeholder-glow">
-                                  <span className="placeholder col-6"></span>
-                                </span>
-                              ) : (
-                                jobRole?.name || "Unknown Role"
-                              )}
-                            </small>
-                          </div>
-                        </div>
-                      </div>
-                    );
-                  })
-                ) : (
-                  <div className="col-12">
-                    <p className="text-center">
-                      No employees found for the selected role(s).
-                    </p>
-                  </div>
-                )}
-              </div>
-            )}
-          </div>
+                        <i className="bx bx-filter bx-lg text-primary"></i>
+                      </a>
 
-          <div
-            className="col-12 h-25 overflow-auto"
-            style={{ maxHeight: "200px" }}
-          >
-            {watch("selectedEmployees")?.length > 0 && (
-              <div className="mt-1">
-                <div className="text-start px-2">
-                  {watch("selectedEmployees")?.map((empId) => {
-                    const emp = employees.find((emp) => emp.id === empId);
-                    return (
-                      emp && (
-                        <span
-                          key={empId}
-                          className="badge rounded-pill bg-label-primary d-inline-flex align-items-center me-1 mb-1"
-                        >
-                          {emp.firstName} {emp.lastName}
-                          {/* Changed p tag to button for semantic correctness and accessibility */}
+                      <ul className="dropdown-menu p-2 text-capitalize">
+                        <li key="all">
                           <button
                             type="button"
-                            className="btn-close btn-close-white ms-1" // Added ms-1 for spacing, removed p-0 m-0
-                            aria-label="Remove employee" // More descriptive aria-label
-                            onClick={() => {
-                              const updatedSelected = watch(
-                                "selectedEmployees"
-                              ).filter((id) => id !== empId);
-                              setValue(
-                                "selectedEmployees",
-                                updatedSelected
-                              );
-                              trigger("selectedEmployees");
-                            }}
+                            className="dropdown-item py-1"
+                            onClick={() =>
+                              handleRoleChange({
+                                target: { value: "all" },
+                              })
+                            }
                           >
-                            <i className="icon-base bx bx-x icon-md"></i>
+                            All Roles
                           </button>
-                        </span>
-                      )
-                    );
-                  })}
-                </div>
-              </div>
-            )}
-          </div>
-
-          {!loading && errors.selectedEmployees && (
-            <div className="danger-text mt-1">
-              <p>{errors.selectedEmployees.message}</p>{" "}
-            </div>
-          )}
-
-          <div className="col-md text-start mx-0 px-0">
-            <div className="form-check form-check-inline mt-3 px-1">
-              <label
-                className="form-text text-dark align-items-center d-flex"
-                htmlFor="inlineCheckbox1" // This htmlFor isn't linked to a checkbox in this context
-              >
-                Pending Task of Activity :
-                <label
-                  className="form-check-label fs-7 ms-4"
-                  htmlFor="inlineCheckbox1" // This htmlFor isn't linked to a checkbox in this context
-                >
-                  <strong>
-                    {assignData?.workItem?.plannedWork -
-                      assignData?.workItem?.completedWork}
-                  </strong>{" "}
-                  <u>
-                    {
-                      assignData?.workItem?.activityMaster
-                        ?.unitOfMeasurement
-                    }
-                  </u>
-                </label>
-                <div style={{ display: "flex", alignItems: "center" }}>
-                  <div
-                    ref={infoRef}
-                    tabIndex="0"
-                    className="d-flex align-items-center avatar-group justify-content-center ms-2"
-                    data-bs-toggle="popover"
-                    data-bs-trigger="focus"
-                    data-bs-placement="right"
-                    data-bs-html="true"
-                    style={{ cursor: "pointer" }}
-                  >
-                    &nbsp;
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      width="13"
-                      height="13"
-                      fill="currentColor"
-                      className="bi bi-info-circle"
-                      viewBox="0 0 16 16"
-                    >
-                      <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                      <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
-                    </svg>
+                        </li>
+                        {jobRoleData?.map((user) => (
+                          <li key={user.id}>
+                            <button
+                              type="button"
+                              className="dropdown-item py-1"
+                              value={user.id}
+                              onClick={handleRoleChange}
+                            >
+                              {user.name}
+                            </button>
+                          </li>
+                        ))}
+                      </ul>
+                    </div>
                   </div>
                 </div>
-              </label>
-            </div>
-          </div>
+              </div>
 
-          {/* Target for Today input and validation */}
-          <div className="col-md text-start mx-0 px-0">
-            <div className="form-check form-check-inline mt-2 px-1 mb-2 text-start">
-              <label
-                className="text-dark text-start d-flex align-items-center flex-wrap form-text"
-                htmlFor="targetForTodayInput" // Added a unique htmlFor for clarity
+              <div className="row">
+                <div className="col-12 h-sm-25 overflow-auto mt-2">
+                  {selectedRole !== "" && (
+                    <div className="row">
+                      {employeeLoading ? (
+                        <div className="col-12">
+                          <p className="text-center">Loading employees...</p>
+                        </div>
+                      ) : filteredEmployees?.length > 0 ? (
+                        filteredEmployees.map((emp) => {
+                          const jobRole = jobRoleData?.find(
+                            (role) => role?.id === emp?.jobRoleId
+                          );
+
+                          return (
+                            <div
+                              key={emp.id}
+                              className="col-6 col-md-4 col-lg-3 mb-3"
+                            >
+                              <div className="form-check d-flex align-items-start">
+                                <Controller
+                                  name="selectedEmployees"
+                                  control={control}
+                                  render={({ field }) => (
+                                    <input
+                                      {...field}
+                                      className="form-check-input me-1 mt-1"
+                                      type="checkbox"
+                                      id={`employee-${emp?.id}`}
+                                      value={emp.id}
+                                      checked={field.value?.includes(emp.id)}
+                                      onChange={(e) => {
+                                        handleCheckboxChange(e, emp);
+                                      }}
+                                    />
+                                  )}
+                                />
+                                <div className="flex-grow-1">
+                                  <p
+                                    className="mb-0"
+                                    style={{ fontSize: "13px" }}
+                                  >
+                                    {emp.firstName} {emp.lastName}
+                                  </p>
+                                  <small
+                                    className="text-muted"
+                                    style={{ fontSize: "11px" }}
+                                  >
+                                    {loading ? (
+                                      <span className="placeholder-glow">
+                                        <span className="placeholder col-6"></span>
+                                      </span>
+                                    ) : (
+                                      jobRole?.name || "Unknown Role"
+                                    )}
+                                  </small>
+                                </div>
+                              </div>
+                            </div>
+                          );
+                        })
+                      ) : (
+                        <div className="col-12">
+                          <p className="text-center">
+                            No employees found for the selected role.
+                          </p>
+                        </div>
+                      )}
+                    </div>
+                  )}
+                </div>
+              </div>
+
+              <div
+                className="col-12 h-25 overflow-auto"
+                style={{ maxHeight: "200px" }}
               >
-                <span>Target for Today</span>&nbsp;
-                <span style={{ marginLeft: "46px" }}>:</span>
-              </label>
-            </div>
-            <div
-              className="form-check form-check-inline col-sm-3 mt-2"
-              style={{ marginLeft: "-28px" }}
-            >
-              <Controller
-                name="plannedTask"
-                control={control}
-                render={({ field }) => (
-                  <div className="d-flex align-items-center gap-1 ">
-                    <input
-                      type="text"
-                      className="form-control form-control-sm"
-                      {...field}
-                      id="defaultFormControlInput" // Consider a more descriptive ID if used elsewhere
-                      aria-describedby="defaultFormControlHelp"
-                    />
-                    <span style={{ paddingLeft: "6px", whiteSpace: "nowrap" }}>
+                {watch("selectedEmployees")?.length > 0 && (
+                  <div className="mt-1">
+                    <div className="text-start px-2">
+                      {watch("selectedEmployees")?.map((empId) => {
+                        const emp = employees.find((emp) => emp.id === empId);
+                        return (
+                          emp && (
+                            <span
+                              key={empId}
+                              className="badge rounded-pill bg-label-primary d-inline-flex align-items-center me-1 mb-1"
+                            >
+                              {emp.firstName} {emp.lastName}
+                              <p
+                                type="button"
+                                className=" btn-close-white p-0 m-0"
+                                aria-label="Close"
+                                onClick={() => {
+                                  const updatedSelected = watch(
+                                    "selectedEmployees"
+                                  ).filter((id) => id !== empId);
+                                  setValue(
+                                    "selectedEmployees",
+                                    updatedSelected
+                                  );
+                                  trigger("selectedEmployees");
+                                }}
+                              >
+                                <i className="icon-base bx bx-x icon-md "></i>
+                              </p>
+                            </span>
+                          )
+                        );
+                      })}
+                    </div>
+                  </div>
+                )}
+              </div>
+
+              {!loading && errors.selectedEmployees && (
+                <div className="danger-text mt-1">
+                  <p>{errors.selectedEmployees.message}</p>{" "}
+                </div>
+              )}
+
+              <div className="col-md text-start mx-0 px-0">
+                <div className="form-check form-check-inline mt-3 px-1">
+                  <label
+                    className="form-text text-dark align-items-center d-flex"
+                    htmlFor="inlineCheckbox1"
+                  >
+                    Pending Task of Activity :
+                    <label
+                      className="form-check-label fs-7 ms-4"
+                      htmlFor="inlineCheckbox1"
+                    >
+                      <strong>
+                        {assignData?.workItem?.plannedWork -
+                          assignData?.workItem?.completedWork}
+                      </strong>{" "}
                       <u>
-                        {" "}
                         {
                           assignData?.workItem?.activityMaster
                             ?.unitOfMeasurement
                         }
                       </u>
-                    </span>
-                    <div
-                      style={{
-                        display: "flex",
-                        alignItems: "center",
-                      }}
-                    >
+                    </label>
+                    <div style={{ display: "flex", alignItems: "center" }}>
                       <div
-                        ref={infoRef1}
+                        ref={infoRef}
                         tabIndex="0"
                         className="d-flex align-items-center avatar-group justify-content-center ms-2"
                         data-bs-toggle="popover"
@@ -579,75 +401,145 @@ const AssignTask = ({ assignData, onClose, setAssigned }) => {
                         </svg>
                       </div>
                     </div>
+                  </label>
+                </div>
+              </div>
+
+              {/* Target for Today input and validation */}
+              <div className="col-md text-start mx-0 px-0">
+                <div className="form-check form-check-inline mt-2 px-1 mb-2 text-start">
+                  <label
+                    className="text-dark text-start d-flex align-items-center flex-wrap form-text"
+                    htmlFor="inlineCheckbox1"
+                  >
+                    <span>Target for Today</span>&nbsp;
+                    <span style={{ marginLeft: "46px" }}>:</span>
+                  </label>
+                </div>
+                <div
+                  className="form-check form-check-inline col-sm-3 mt-2"
+                  style={{ marginLeft: "-28px" }}
+                >
+                  <Controller
+                    name="plannedTask"
+                    control={control}
+                    render={({ field }) => (
+                      <div className="d-flex align-items-center gap-1 ">
+                        <input
+                          type="text"
+                          className="form-control form-control-sm"
+                          {...field}
+                          id="defaultFormControlInput"
+                          aria-describedby="defaultFormControlHelp"
+                        />
+                        <span style={{ paddingLeft: "6px" }}>
+                          {
+                            assignData?.workItem?.workItem?.activityMaster
+                              ?.unitOfMeasurement
+                          }
+                        </span>
+                        <div
+                          style={{
+                            display: "flex",
+                            alignItems: "center",
+                          }}
+                        >
+                          <div
+                            ref={infoRef1}
+                            tabIndex="0"
+                            className="d-flex align-items-center avatar-group justify-content-center ms-2"
+                            data-bs-toggle="popover"
+                            data-bs-trigger="focus"
+                            data-bs-placement="right"
+                            data-bs-html="true"
+                            style={{ cursor: "pointer" }}
+                          >
+                            &nbsp;
+                            <svg
+                              xmlns="http://www.w3.org/2000/svg"
+                              width="13"
+                              height="13"
+                              fill="currentColor"
+                              className="bi bi-info-circle"
+                              viewBox="0 0 16 16"
+                            >
+                              <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+                              <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
+                            </svg>
+                          </div>
+                        </div>
+                      </div>
+                    )}
+                  />
+                </div>
+
+                {errors.plannedTask && (
+                  <div className="danger-text mt-1">
+                    {errors.plannedTask.message}
                   </div>
                 )}
+
+                {isHelpVisible && (
+                  <div
+                    className="position-absolute bg-white border p-2 rounded shadow"
+                    style={{ zIndex: 10, marginLeft: "10px" }}
+                  >
+                    {/* Add your help content here */}
+                    <p className="mb-0">
+                      Enter the target value for today's task.
+                    </p>
+                  </div>
+                )}
+              </div>
+
+              <label
+                className="form-text fs-7 m-1 text-lg text-dark"
+                htmlFor="descriptionTextarea" // Changed htmlFor for better accessibility
+              >
+                Description
+              </label>
+              <Controller
+                name="description"
+                control={control}
+                render={({ field }) => (
+                  <textarea
+                    {...field}
+                    className="form-control"
+                    id="descriptionTextarea" // Changed id for better accessibility
+                    rows="2"
+                  />
+                )}
               />
+              {errors.description && (
+                <div className="danger-text">{errors.description.message}</div>
+              )}
             </div>
 
-            {errors.plannedTask && (
-              <div className="danger-text mt-1">
-                {errors.plannedTask.message}
-              </div>
-            )}
-
-            {isHelpVisible && (
-              <div
-                className="position-absolute bg-white border p-2 rounded shadow"
-                style={{ zIndex: 10, marginLeft: "10px" }}
+            {/* Submit and Cancel buttons */}
+            <div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1">
+              <button
+                type="submit"
+                className="btn btn-sm btn-primary "
+                disabled={isSubmitting || loading}
               >
-                <p className="mb-0">
-                  Enter the target value for today's task.
-                </p>
-              </div>
-            )}
-          </div>
-
-          <label
-            className="form-text fs-7 m-1 text-dark" // Removed duplicate htmlFor and text-lg
-            htmlFor="descriptionTextarea"
-          >
-            Description
-          </label>
-          <Controller
-            name="description"
-            control={control}
-            render={({ field }) => (
-              <textarea
-                {...field}
-                className="form-control"
-                id="descriptionTextarea" // Unique ID
-                rows="2"
-              />
-            )}
-          />
-          {errors.description && (
-            <div className="danger-text">{errors.description.message}</div>
-          )}
+                {isSubmitting ? "Please Wait" : "Submit"}
+              </button>
+              <button
+                type="reset"
+                className="btn btn-sm btn-label-secondary"
+                data-bs-dismiss="modal"
+                aria-label="Close"
+                onClick={closedModel}
+                disabled={isSubmitting || loading}
+              >
+                Cancel
+              </button>
+            </div>
+          </form>
         </div>
-
-        <div className="col-12 d-flex justify-content-center align-items-center gap-sm-6 gap-8 text-center mt-1">
-          <button
-            type="submit"
-            className="btn btn-sm btn-primary "
-            disabled={isSubmitting || loading}
-          >
-            {isSubmitting ? "Please Wait" : "Submit"}
-          </button>
-          <button
-            type="reset"
-            className="btn btn-sm btn-label-secondary"
-            data-bs-dismiss="modal"
-            aria-label="Close"
-            onClick={closedModel}
-            disabled={isSubmitting || loading}
-          >
-            Cancel
-          </button>
-        </div>
-      </form>
+      </div>
     </div>
-  </div>
-</div>  );
+  );
 };
 
-export default AssignTask;
\ No newline at end of file
+export default AssignTask;
diff --git a/src/components/Project/ProjectInfra.jsx b/src/components/Project/ProjectInfra.jsx
index 047e41c5..5e76a73e 100644
--- a/src/components/Project/ProjectInfra.jsx
+++ b/src/components/Project/ProjectInfra.jsx
@@ -15,7 +15,6 @@ import {
   cacheData,
   clearCacheKey,
   getCachedData,
-  useSelectedproject,
 } from "../../slices/apiDataManager";
 import { useProjectDetails, useProjectInfra } from "../../hooks/useProjects";
 import { useDispatch, useSelector } from "react-redux";
@@ -26,8 +25,7 @@ import GlobalModel from "../common/GlobalModel";
 
 const ProjectInfra = ( {data, onDataChange, eachSiteEngineer} ) =>
 {
-  // const projectId = useSelector((store)=>store.localVariables.projectId)
-  const projectId = useSelectedproject();
+  const projectId = useSelector((store)=>store.localVariables.projectId)
   const reloadedData = useSelector((store) => store.localVariables.reload);
   const [ expandedBuildings, setExpandedBuildings ] = useState( [] );
    const {projectInfra,isLoading,error} = useProjectInfra(projectId)
diff --git a/src/components/Project/ProjectNav.jsx b/src/components/Project/ProjectNav.jsx
index 0a7f960e..821c22ee 100644
--- a/src/components/Project/ProjectNav.jsx
+++ b/src/components/Project/ProjectNav.jsx
@@ -49,21 +49,6 @@ const ProjectNav = ({ onPillClick, activePill }) => {
           </a>
         </li>
       
-        
-        {(DirAdmin || DireManager || DirUser) && (
-            <li className="nav-item">
-          <a
-            className={`nav-link ${activePill === "directory" ? "active" : ""} fs-6`}
-            href="#"
-            onClick={(e) => {
-              e.preventDefault(); // Prevent page reload
-              onPillClick("directory");
-            }}
-          >
-           <i className='bx bxs-contact bx-sm me-1_5'></i> <span className="d-none d-md-inline">Directory</span>
-          </a>
-        </li>
-        )}
         <li className="nav-item">
           <a
             className={`nav-link ${
@@ -78,6 +63,20 @@ const ProjectNav = ({ onPillClick, activePill }) => {
            <i className='bx bxs-cog bx-sm me-1_5'></i> <span className="d-none d-md-inline">project Setup</span>
           </a>
         </li>
+        {(DirAdmin || DireManager || DirUser) && (
+            <li className="nav-item">
+          <a
+            className={`nav-link ${activePill === "directory" ? "active" : ""} fs-6`}
+            href="#"
+            onClick={(e) => {
+              e.preventDefault(); // Prevent page reload
+              onPillClick("directory");
+            }}
+          >
+           <i className='bx bxs-contact bx-sm me-1_5'></i> <span className="d-none d-md-inline">Directory</span>
+          </a>
+        </li>
+        )}
       
       </ul>
     </div>
diff --git a/src/components/Project/Teams.jsx b/src/components/Project/Teams.jsx
index 10618458..25e3eda8 100644
--- a/src/components/Project/Teams.jsx
+++ b/src/components/Project/Teams.jsx
@@ -15,13 +15,11 @@ import { ASSIGN_TO_PROJECT } from "../../utils/constants";
 import ConfirmModal from "../common/ConfirmModal";
 import eventBus from "../../services/eventBus";
 import {useEmployeesByProjectAllocated, useManageProjectAllocation} from "../../hooks/useProjects";
-import { useSelectedproject } from "../../slices/apiDataManager";
 
 const Teams = () =>
 {
   // const {projectId} = useParams()
-  // const projectId = useSelector((store)=>store.localVariables.projectId)
-  const projectId = useSelectedproject();
+  const projectId = useSelector((store)=>store.localVariables.projectId)
   const dispatch = useDispatch();
 
   const { data, loading } = useMaster();
@@ -295,7 +293,7 @@ const {
                             <div className="d-flex flex-column">
                               <a
                                 onClick={() =>
-                                  navigate(`/employee/${item.employeeId}?for=attendance`)
+                                  navigate(`/employee/${item.employeeId}?for=account`)
                                 }
                                 className="text-heading text-truncate cursor-pointer"
                               >
diff --git a/src/components/common/DatePicker.jsx b/src/components/common/DatePicker.jsx
index 9645fddb..728b14fb 100644
--- a/src/components/common/DatePicker.jsx
+++ b/src/components/common/DatePicker.jsx
@@ -1,71 +1,39 @@
-import { useEffect, useRef } from "react";
-import { useController } from "react-hook-form";
+import React, { useEffect, useRef } from "react";
 
-
-const DatePicker = ({
-  name,
-  control,
-  placeholder = "DD-MM-YYYY",
-  className = "",
-  allowText = false,
-  maxDate=new Date(),
-  minDate,
-  ...rest
-}) => {
+const DatePicker = ({ onDateChange }) => {
   const inputRef = useRef(null);
 
-  const {
-    field: { onChange, value, ref }
-  } = useController({
-    name,
-    control
-  });
-
   useEffect(() => {
-    if (inputRef.current) {
-      flatpickr(inputRef.current, {
-        dateFormat: "d-m-Y",
-        allowInput: allowText, 
-        defaultDate: value
-          ? flatpickr.parseDate(value, "Y-m-d")
-          : null,
-        maxDate:maxDate,
-        minDate:new Date(minDate?.split("T")[0]) ?? undefined,
-        onChange: function (selectedDates, dateStr) {
-          onChange(dateStr); 
-        },
-        ...rest
-      });
-    }
-  }, [inputRef]);
+    const fp = flatpickr(inputRef.current, {
+      dateFormat: "Y-m-d",
+      defaultDate: new Date(),
+      onChange: (selectedDates, dateStr) => {
+        if (onDateChange) {
+          onDateChange(dateStr); // Pass selected date to parent
+        }
+      }
+    });
+
+    return () => {
+      // Cleanup flatpickr instance
+      fp.destroy();
+    };
+  }, [onDateChange]);
 
   return (
-    <div className={` position-relative ${className}`}>
-      <input
-        type="text"
-        className="form-control form-control-sm " 
-        placeholder={placeholder}
-          defaultValue={
-          value ? flatpickr.formatDate(flatpickr.parseDate(value, "Y-m-d"), "d-m-Y") : ""
-        }
-        ref={(el) => {
-          inputRef.current = el;
-          ref(el);
-        }}
-        readOnly={!allowText}
-        autoComplete="off"
-      />
-
-      <span
-        className="position-absolute top-50 end-0 pe-1 translate-middle-y cursor-pointer"
-        onClick={() => {
-          if (inputRef.current && inputRef.current._flatpickr) {
-            inputRef.current._flatpickr.open();
-          }
-        }}
-      >
-        <i className="bx bx-calendar bx-sm fs-5 text-muted"></i>
-      </span>
+    <div className="container mt-3">
+      <div className="mb-3">
+        {/* <label htmlFor="flatpickr-single" className="form-label">
+          Select Date
+        </label> */}
+        <input
+          type="text"
+          id="flatpickr-single"
+          className="form-control"
+          placeholder="YYYY-MM-DD"
+          ref={inputRef}
+        />
+      </div>
     </div>
   );
 };
diff --git a/src/components/common/DateRangePicker.jsx b/src/components/common/DateRangePicker.jsx
index 1e95ef09..e7239c53 100644
--- a/src/components/common/DateRangePicker.jsx
+++ b/src/components/common/DateRangePicker.jsx
@@ -1,10 +1,8 @@
 import React, { useEffect, useRef } from "react";
-import { useController, useFormContext, useWatch } from "react-hook-form";
+
 const DateRangePicker = ({
-  md,
-  sm,
   onRangeChange,
-  DateDifference = 7,
+  DateDifference = 7, 
   endDateMode = "yesterday",
 }) => {
   const inputRef = useRef(null);
@@ -12,34 +10,33 @@ const DateRangePicker = ({
   useEffect(() => {
     const endDate = new Date();
     if (endDateMode === "yesterday") {
-      endDate.setDate(endDate.getDate() - 1);
+      endDate.setDate(endDate.getDate() - 1); 
     }
 
     endDate.setHours(0, 0, 0, 0);
 
-    const startDate = new Date(endDate);
+    const startDate = new Date(endDate); 
     startDate.setDate(endDate.getDate() - (DateDifference - 1));
     startDate.setHours(0, 0, 0, 0);
 
     const fp = flatpickr(inputRef.current, {
       mode: "range",
-      dateFormat: "Y-m-d",
-      altInput: true,
-      altFormat: "d-m-Y",
-      defaultDate: [startDate, endDate],
-      static: false,
-      // appendTo: document.body,
+      dateFormat: "Y-m-d", 
+      altInput: true,     
+      altFormat: "d-m-Y", 
+      defaultDate: [startDate, endDate], 
+      static: true,       
       clickOpens: true,
-      maxDate: endDate,
+      maxDate: endDate, // ✅ Disable future dates
       onChange: (selectedDates, dateStr) => {
-        const [startDateString, endDateString] = dateStr.split(" To ");
+        const [startDateString, endDateString] = dateStr.split(" to ");
         onRangeChange?.({ startDate: startDateString, endDate: endDateString });
       },
     });
 
     onRangeChange?.({
-      startDate: startDate.toLocaleDateString("en-CA"),
-      endDate: endDate.toLocaleDateString("en-CA"),
+      startDate: startDate.toLocaleDateString("en-CA"), 
+      endDate: endDate.toLocaleDateString("en-CA"),     
     });
 
     return () => {
@@ -48,129 +45,14 @@ const DateRangePicker = ({
   }, [onRangeChange, DateDifference, endDateMode]);
 
   return (
-    <div className={`col-${sm} col-sm-${md} px-1 position-relative`}>
-      <input
-        type="text"
-        className="form-control form-control-sm ps-2 pe-5  me-4"
-        placeholder="From to End"
-        id="flatpickr-range"
-        ref={inputRef}
-      />
-
-      <i
-        className="bx bx-calendar calendar-icon cursor-pointer position-absolute top-50  translate-middle-y "
-        style={{ right: "12px" }}
-      ></i>
-    </div>
+    <input
+      type="text"
+      className="form-control form-control-sm ms-1"
+      placeholder="From to End"
+      id="flatpickr-range"
+      ref={inputRef}
+    />
   );
 };
 
 export default DateRangePicker;
-
-
-
-
-
-export const DateRangePicker1 = ({
-  startField = "startDate",
-  endField = "endDate",
-  placeholder = "Select date range",
-  className = "",
-  allowText = false,
-  resetSignal, // <- NEW prop
-  ...rest
-}) => {
-  const inputRef = useRef(null);
-  const { control, setValue, getValues } = useFormContext();
-
-  const {
-    field: { ref },
-  } = useController({ name: startField, control });
-
-  const applyDefaultDates = () => {
-    const today = new Date();
-    const past = new Date();
-    past.setDate(today.getDate() - 6);
-
-    const format = (d) => flatpickr.formatDate(d, "d-m-Y");
-    const formattedStart = format(past);
-    const formattedEnd = format(today);
-
-    setValue(startField, formattedStart, { shouldValidate: true });
-    setValue(endField, formattedEnd, { shouldValidate: true });
-
-    if (inputRef.current?._flatpickr) {
-      inputRef.current._flatpickr.setDate([past, today]);
-    }
-  };
-
-  useEffect(() => {
-    if (!inputRef.current || inputRef.current._flatpickr) return;
-
-    const instance = flatpickr(inputRef.current, {
-      mode: "range",
-      dateFormat: "d-m-Y",
-      allowInput: allowText,
-      onChange: (selectedDates) => {
-        if (selectedDates.length === 2) {
-          const [start, end] = selectedDates;
-          const format = (d) => flatpickr.formatDate(d, "d-m-Y");
-          setValue(startField, format(start), { shouldValidate: true });
-          setValue(endField, format(end), { shouldValidate: true });
-        } else {
-          setValue(startField, "", { shouldValidate: true });
-          setValue(endField, "", { shouldValidate: true });
-        }
-      },
-      ...rest,
-    });
-
-    // Apply default if empty
-    const currentStart = getValues(startField);
-    const currentEnd = getValues(endField);
-    if (!currentStart && !currentEnd) {
-      applyDefaultDates();
-    } else if (currentStart && currentEnd) {
-      instance.setDate([
-        flatpickr.parseDate(currentStart, "d-m-Y"),
-        flatpickr.parseDate(currentEnd, "d-m-Y"),
-      ]);
-    }
-
-    return () => instance.destroy();
-  }, []);
-
-  // Reapply default range on resetSignal change
-  useEffect(() => {
-    if (resetSignal !== undefined) {
-      applyDefaultDates();
-    }
-  }, [resetSignal]);
-
-  const start = getValues(startField);
-  const end = getValues(endField);
-  const formattedValue = start && end ? `${start} To ${end}` : "";
-
-  return (
-    <div className={`position-relative ${className}`}>
-      <input
-        type="text"
-        className="form-control form-control-sm"
-        placeholder={placeholder}
-        defaultValue={formattedValue}
-        ref={(el) => {
-          inputRef.current = el;
-          ref(el);
-        }}
-        readOnly={!allowText}
-        autoComplete="off"
-      />
-      <span
-        className="position-absolute top-50 end-0 pe-1 translate-middle-y cursor-pointer"
-        onClick={() => inputRef.current?._flatpickr?.open()}
-      >
-        <i className="bx bx-calendar bx-sm fs-5 text-muted"></i>
-      </span>
-    </div>
-  );
-};
diff --git a/src/components/common/EmployeeSearchInput.jsx b/src/components/common/EmployeeSearchInput.jsx
deleted file mode 100644
index c3b9295a..00000000
--- a/src/components/common/EmployeeSearchInput.jsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { useState, useEffect } from "react";
-import { useEmployeesName } from "../../hooks/useEmployees";
-import { useDebounce } from "../../utils/appUtils";
-import { useController } from "react-hook-form";
-
-
-
-
-const EmployeeSearchInput = ({ control, name, projectId }) => {
-  const {
-    field: { onChange, value, ref },
-    fieldState: { error },
-  } = useController({ name, control });
-
-  const [search, setSearch] = useState("");
-  const [showDropdown, setShowDropdown] = useState(false);
-  const debouncedSearch = useDebounce(search, 500);
-
-  const {
-    data: employees,
-    isLoading,
-  } = useEmployeesName(projectId, debouncedSearch);
-
-  useEffect(() => {
-    if (value && !search) {
-      const found = employees?.data?.find((emp) => emp.id === value);
-      if (found) setSearch(found.firstName + " " + found.lastName);
-    }
-  }, [value, employees]);
-
-  const handleSelect = (employee) => {
-    onChange(employee.id);
-    setSearch(employee.firstName + " " + employee.lastName);
-    setShowDropdown(false);
-  };
-
-  return (
-    <div className="position-relative">
-      <input
-        type="text"
-        ref={ref}
-        className={`form-control form-control-sm`}
-        placeholder="Search employee..."
-        value={search}
-        onChange={(e) => {
-          setSearch(e.target.value);
-          setShowDropdown(true);
-          onChange(""); 
-        }}
-        onFocus={() => {
-          if (search) setShowDropdown(true);
-        }}
-      />
-
-      {showDropdown && (employees?.data?.length > 0 || isLoading) && (
-        <ul
-          className="list-group position-absolute bg-white w-100 shadow z-3 rounded-none"
-          style={{ maxHeight: 200, overflowY: "auto" }}
-        >
-          {isLoading ? (
-            <li className="list-group-item">
-              <a>Searching...</a>
-              
-            </li>
-          ) : (
-            employees?.data?.map((emp) => (
-              <li
-                key={emp.id}
-                className="list-group-item list-group-item-action"
-                style={{ cursor: "pointer" }}
-                onClick={() => handleSelect(emp)}
-              >
-                {emp.firstName} {emp.lastName}
-              </li>
-            ))
-          )}
-        </ul>
-      )}
-
-      {error && <small className="danger-text">{error.message}</small>}
-    </div>
-  );
-};
-
-export default EmployeeSearchInput;
diff --git a/src/components/common/Error.jsx b/src/components/common/Error.jsx
deleted file mode 100644
index 1e44947f..00000000
--- a/src/components/common/Error.jsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react'
-
-const Error = ({error,close}) => {
-  console.log(error)
-  return (
-      <div className="container text-center py-5">
-      <h1 className="display-4 fw-bold text-danger">{error.statusCode || error?.response?.status
-}</h1>
-      <h2 className="mb-3">Internal Server Error</h2>
-      <p className="lead">
-        {error.message}
-      </p>
-      <a href="/" className="btn btn-primary btn-sm mt-3" onClick={()=>close()}>
-        Go to Home
-      </a>
-    </div>
-  )
-}
-
-export default Error
\ No newline at end of file
diff --git a/src/components/common/GlobalModel.jsx b/src/components/common/GlobalModel.jsx
index 16a58ce1..e30244dd 100644
--- a/src/components/common/GlobalModel.jsx
+++ b/src/components/common/GlobalModel.jsx
@@ -68,21 +68,6 @@ useEffect(() => {
       backgroundColor: 'rgba(0,0,0,0.3)',
     };
 
-const getPositionClass = (type) => {
-  switch (type) {
-    case 'top':
-      return 'mt-3';
-    case 'bottom':
-      return 'mt-auto mb-0 d-flex flex-column';
-    case 'left':
-      return 'position-absolute top-50 start-0 translate-middle-y me-auto';
-    case 'right':
-      return 'position-absolute top-50 end-0 translate-middle-y ms-auto';
-    case 'center':
-    default:
-      return 'modal-dialog-centered';
-  }
-};
 
   return (
     <div
@@ -95,7 +80,7 @@ const getPositionClass = (type) => {
       {...dataAttributesProps}
       style={backdropStyle}
     >
-      <div   className={`modal-dialog ${modalSizeClass} ${getPositionClass(modalType)} ${dialogClass} mx-sm-auto mx-1`} role={role}>
+      <div className={`modal-dialog ${dialogClass} ${modalSizeClass } mx-sm-auto mx-1`} role={role} >
         <div className="modal-content">
           <div className="modal-header p-0">
             {/* Close button inside the modal header */}
diff --git a/src/components/common/GlobalOffcanvas .jsx b/src/components/common/GlobalOffcanvas .jsx
deleted file mode 100644
index bcca92bb..00000000
--- a/src/components/common/GlobalOffcanvas .jsx	
+++ /dev/null
@@ -1,52 +0,0 @@
-import React, { useEffect, useRef } from "react";
-import { useFab } from "../../Context/FabContext";
-
-const GlobalOffcanvas = () => {
-  const { offcanvas, setIsOffcanvasOpen } = useFab();
-  const offcanvasRef = useRef();
-
-  useEffect(() => {
-    const el = offcanvasRef.current;
-    const bsOffcanvas = new bootstrap.Offcanvas(el);
-
-    const handleShow = () => setIsOffcanvasOpen(true);
-    const handleHide = () => setIsOffcanvasOpen(false);
-
-    el.addEventListener("show.bs.offcanvas", handleShow);
-    el.addEventListener("hidden.bs.offcanvas", handleHide);
-
-    return () => {
-      el.removeEventListener("show.bs.offcanvas", handleShow);
-      el.removeEventListener("hidden.bs.offcanvas", handleHide);
-    };
-  }, []);
-
-  return (
-    <div
-      className="offcanvas offcanvas-end"
-      tabIndex="-1"
-      id="globalOffcanvas"
-      ref={offcanvasRef}
-      aria-labelledby="offcanvasLabel"
-         data-bs-backdrop="false"
-      data-bs-scroll="true"
-    >
-      <div className="offcanvas-header">
-        <h5 className="offcanvas-title" id="offcanvasLabel">
-          {offcanvas.title}
-        </h5>
-        <button
-          type="button"
-          className="btn-close text-reset"
-          data-bs-dismiss="offcanvas"
-          aria-label="Close"
-        ></button>
-      </div>
-      <div className="offcanvas-body  mx-0 py-1 flex-grow-0">
-        {offcanvas.content || <p>No content</p>}
-      </div>
-    </div>
-  );
-};
-
-export default GlobalOffcanvas;
diff --git a/src/components/common/OffcanvasTrigger.jsx b/src/components/common/OffcanvasTrigger.jsx
deleted file mode 100644
index 3c74fb14..00000000
--- a/src/components/common/OffcanvasTrigger.jsx
+++ /dev/null
@@ -1,26 +0,0 @@
-import { createPortal } from "react-dom";
-import { useFab } from "../../Context/FabContext";
-
-const OffcanvasTrigger = () => {
-  const { openOffcanvas, offcanvas, showTrigger } = useFab();
-
-  if (!showTrigger || !offcanvas.content) return null;
-
-  const btn = (
-    <i
-      className="bx bx-slider-alt position-fixed p-2 bg-primary text-white rounded-start"
-      onClick={() => openOffcanvas(offcanvas.title, offcanvas.content)} 
-      role="button"
-      style={{
-        top: "25%",
-        right: "0%",
-        cursor: "pointer",
-        zIndex: 1056,
-      }}
-    />
-  );
-
-  return createPortal(btn, document.body);
-};
-
-export default OffcanvasTrigger;
diff --git a/src/components/common/Pagination.jsx b/src/components/common/Pagination.jsx
deleted file mode 100644
index 5274eddc..00000000
--- a/src/components/common/Pagination.jsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import React from "react";
-
-const getPaginationRange = (currentPage, totalPages, delta = 1) => {
-  const range = [];
-  const rangeWithDots = [];
-  let l;
-
-  for (let i = 1; i <= totalPages; i++) {
-    if (
-      i === 1 ||
-      i === totalPages ||
-      (i >= currentPage - delta && i <= currentPage + delta)
-    ) {
-      range.push(i);
-    }
-  }
-
-  for (let i of range) {
-    if (l) {
-      if (i - l === 2) {
-        rangeWithDots.push(l + 1);
-      } else if (i - l !== 1) {
-        rangeWithDots.push("...");
-      }
-    }
-    rangeWithDots.push(i);
-    l = i;
-  }
-
-  return rangeWithDots;
-};
-
-const Pagination = ({ currentPage, totalPages, onPageChange }) => {
-  if (totalPages <= 1) return null;
-
-  const paginationRange = getPaginationRange(currentPage, totalPages);
-
-  return (
-    <nav aria-label="Page navigation">
-      <ul className="pagination pagination-sm justify-content-end py-1 mx-1">
-        <li className={`page-item ${currentPage === 1 ? "disabled" : ""}`}>
-          <button
-            className="page-link btn-xs"
-            onClick={() => onPageChange(currentPage - 1)}
-          >
-            &laquo;
-          </button>
-        </li>
-
-        {paginationRange.map((page, index) => (
-          <li
-            key={index}
-            className={`page-item ${
-              page === currentPage ? "active" : ""
-            } ${page === "..." ? "disabled" : ""}`}
-          >
-            {page === "..." ? (
-              <span className="page-link">…</span>
-            ) : (
-              <button className="page-link" onClick={() => onPageChange(page)}>
-                {page}
-              </button>
-            )}
-          </li>
-        ))}
-
-        <li
-          className={`page-item ${
-            currentPage === totalPages ? "disabled" : ""
-          }`}
-        >
-          <button
-            className="page-link"
-            onClick={() => onPageChange(currentPage + 1)}
-          >
-            &raquo;
-          </button>
-        </li>
-      </ul>
-    </nav>
-  );
-};
-
-export default Pagination;
diff --git a/src/components/common/SelectMultiple.jsx b/src/components/common/SelectMultiple.jsx
index 0873637e..272f8944 100644
--- a/src/components/common/SelectMultiple.jsx
+++ b/src/components/common/SelectMultiple.jsx
@@ -1,13 +1,12 @@
 import React, { useState, useEffect, useRef } from "react";
 import { useFormContext } from "react-hook-form";
-import { createPortal } from "react-dom";
 import "./MultiSelectDropdown.css";
 
 const SelectMultiple = ({
   name,
   options = [],
   label = "Select options",
-  labelKey = "name", // Can now be a function or a string
+  labelKey = "name",
   valueKey = "id",
   placeholder = "Please select...",
   IsLoading = false,
@@ -17,18 +16,11 @@ const SelectMultiple = ({
 
   const [isOpen, setIsOpen] = useState(false);
   const [searchText, setSearchText] = useState("");
-  const containerRef = useRef(null);
   const dropdownRef = useRef(null);
 
-  const [dropdownStyles, setDropdownStyles] = useState({ top: 0, left: 0, width: 0 });
-
   useEffect(() => {
     const handleClickOutside = (e) => {
-      if (
-        containerRef.current &&
-        !containerRef.current.contains(e.target) &&
-        (!dropdownRef.current || !dropdownRef.current.contains(e.target))
-      ) {
+      if (dropdownRef.current && !dropdownRef.current.contains(e.target)) {
         setIsOpen(false);
       }
     };
@@ -36,21 +28,6 @@ const SelectMultiple = ({
     return () => document.removeEventListener("mousedown", handleClickOutside);
   }, []);
 
-  useEffect(() => {
-    if (isOpen && containerRef.current) {
-      const rect = containerRef.current.getBoundingClientRect();
-      setDropdownStyles({
-        top: rect.bottom + window.scrollY,
-        left: rect.left + window.scrollX,
-        width: rect.width,
-      });
-    }
-  }, [isOpen]);
-
-  const getLabel = (item) => {
-    return typeof labelKey === "function" ? labelKey(item) : item[labelKey];
-  };
-
   const handleCheckboxChange = (value) => {
     const updated = selectedValues.includes(value)
       ? selectedValues.filter((v) => v !== value)
@@ -59,113 +36,96 @@ const SelectMultiple = ({
     setValue(name, updated, { shouldValidate: true });
   };
 
-  const filteredOptions = options.filter((item) => {
-    const label = getLabel(item);
-    return label?.toLowerCase().includes(searchText.toLowerCase());
-  });
+  const filteredOptions = options.filter((item) =>
+    item[labelKey]?.toLowerCase().includes(searchText.toLowerCase())
+  );
 
-  const dropdownElement = (
-    <div
-      ref={dropdownRef}
-      className="multi-select-dropdown-options"
-      style={{
-        position: "absolute",
-        top: dropdownStyles.top,
-        left: dropdownStyles.left,
-        width: dropdownStyles.width,
-        zIndex: 9999,
-        backgroundColor: "white",
-        boxShadow: "0 2px 8px rgba(0,0,0,0.15)",
-        borderRadius: 4,
-        maxHeight: 300,
-        overflowY: "auto",
-      }}
-    >
-      <div className="multi-select-dropdown-search" style={{ padding: 8 }}>
-        <input
-          type="text"
-          placeholder="Search..."
-          value={searchText}
-          onChange={(e) => setSearchText(e.target.value)}
-          className="multi-select-dropdown-search-input"
-          style={{ width: "100%", padding: 4 }}
-        />
+  return (
+    <div ref={dropdownRef} className="multi-select-dropdown-container">
+      <label className="form-label mb-1">{label}</label>
+
+      <div
+        className="multi-select-dropdown-header"
+        onClick={() => setIsOpen((prev) => !prev)}
+      >
+        <span
+          className={
+            selectedValues.length > 0
+              ? "placeholder-style-selected"
+              : "placeholder-style"
+          }
+        >
+          <div className="selected-badges-container">
+            {selectedValues.length > 0 ? (
+              selectedValues.map((val) => {
+                const found = options.find((opt) => opt[valueKey] === val);
+                return (
+                  <span
+                    key={val}
+                    className="badge badge-selected-item mx-1 mb-1"
+                  >
+                    {found ? found[labelKey] : ""}
+                  </span>
+                );
+              })
+            ) : (
+              <span className="placeholder-text">{placeholder}</span>
+            )}
+          </div>
+        </span>
+        <i className="bx bx-chevron-down"></i>
       </div>
 
-      {filteredOptions.map((item) => {
-        const labelVal = getLabel(item);
-        const valueVal = item[valueKey];
-        const isChecked = selectedValues.includes(valueVal);
-
-        return (
-          <div
-            key={valueVal}
-            className={`multi-select-dropdown-option ${isChecked ? "selected" : ""}`}
-            style={{ display: "flex", alignItems: "center", padding: "4px 8px" }}
-          >
+      {isOpen && (
+        <div className="multi-select-dropdown-options">
+          <div className="multi-select-dropdown-search">
             <input
-              type="checkbox"
-              className="custom-checkbox form-check-input"
-              checked={isChecked}
-              onChange={() => handleCheckboxChange(valueVal)}
-              style={{ marginRight: 8 }}
+              type="text"
+              placeholder="Search..."
+              value={searchText}
+              onChange={(e) => setSearchText(e.target.value)}
+              className="multi-select-dropdown-search-input"
             />
-            <label className="text-secondary">{labelVal}</label>
           </div>
-        );
-      })}
 
-      {!IsLoading && filteredOptions.length === 0 && (
-        <div className="multi-select-dropdown-Not-found" style={{ padding: 8 }}>
-          <label className="text-muted">Not Found {`'${searchText}'`}</label>
-        </div>
-      )}
-      {IsLoading && filteredOptions.length === 0 && (
-        <div className="multi-select-dropdown-Not-found" style={{ padding: 8 }}>
-          <label className="text-muted">Loading...</label>
+          {filteredOptions.map((item) => {
+            const labelVal = item[labelKey];
+            const valueVal = item[valueKey];
+            const isChecked = selectedValues.includes(valueVal);
+
+            return (
+              <div
+                key={valueVal}
+                className={`multi-select-dropdown-option ${
+                  isChecked ? "selected" : ""
+                }`}
+              >
+                <input
+                  type="checkbox"
+                  className="custom-checkbox form-check-input"
+                  checked={isChecked}
+                  onChange={() => handleCheckboxChange(valueVal)}
+                />
+                <label className="text-secondary">{labelVal}</label>
+              </div>
+            );
+          })}
+          {!IsLoading && filteredOptions.length === 0 && (
+            <div className="multi-select-dropdown-Not-found">
+              <label className="text-muted">
+                Not Found {`'${searchText}'`}
+              </label>
+            </div>
+          )}
+          {IsLoading && filteredOptions.length === 0 && (
+            <div className="multi-select-dropdown-Not-found">
+              <label className="text-muted">Loading...</label>
+            </div>
+          )}
         </div>
       )}
     </div>
   );
-
-  return (
-    <>
-      <div ref={containerRef} className="multi-select-dropdown-container" style={{ position: "relative" }}>
-        <label className="form-label mb-1">{label}</label>
-
-        <div
-          className="multi-select-dropdown-header"
-          onClick={() => setIsOpen((prev) => !prev)}
-          style={{ cursor: "pointer" }}
-        >
-          <span
-            className={
-              selectedValues.length > 0 ? "placeholder-style-selected" : "placeholder-style"
-            }
-          >
-            <div className="selected-badges-container">
-              {selectedValues.length > 0 ? (
-                selectedValues.map((val) => {
-                  const found = options.find((opt) => opt[valueKey] === val);
-                  const label = found ? getLabel(found) : "";
-                  return (
-                    <span key={val} className="badge badge-selected-item mx-1 mb-1">
-                      {label}
-                    </span>
-                  );
-                })
-              ) : (
-                <span className="placeholder-text">{placeholder}</span>
-              )}
-            </div>
-          </span>
-          <i className="bx bx-chevron-down"></i>
-        </div>
-      </div>
-
-      {isOpen && createPortal(dropdownElement, document.body)}
-    </>
-  );
 };
 
 export default SelectMultiple;
diff --git a/src/components/master/CreateRole.jsx b/src/components/master/CreateRole.jsx
index 14ca6c15..9f314612 100644
--- a/src/components/master/CreateRole.jsx
+++ b/src/components/master/CreateRole.jsx
@@ -141,92 +141,83 @@ const CreateRole = ({ modalType, onClose }) => {
         )}
       </div>
 
-      <div
-        className="border rounded px-3"
-        style={{
-          maxHeight: "350px",
-          overflowY: "auto",
-          overflowX: "hidden", // Prevent bottom scrollbar
-        }}
-      >
+      <div className="col-12 col-md-12  border">
         {masterFeatures.map((feature, featureIndex) => (
           <React.Fragment key={feature.id}>
-            <div className="row my-1">
-              {/* Feature Title */}
-              <div className="col-12 text-start fw-semibold mb-2">
-                {feature.name}
+            <div
+              className="row my-1"
+              key={feature.id}
+              style={{ marginLeft: "0px" }}
+            >
+              <div
+                className="col-12 col-md-3 d-flex text-start align-items-start"
+                style={{ wordWrap: "break-word" }}
+              >
+                <span className="fs">{feature.name}</span>
               </div>
 
-              {/* Permissions Grid */}
-              <div className="col-12">
-                <div className="row">
-                  {feature.featurePermissions.map((perm, permIndex) => {
-                    const refIndex = featureIndex * 100 + permIndex;
-                    return (
-                      <div
-                        className="col-12 col-sm-6 col-md-4 mb-3"
-                        key={perm.id}
-                      >
-                        <div className="d-flex align-items-start">
-                          <label
-                            className="form-check-label d-flex align-items-center"
-                            htmlFor={perm.id}
-                          >
-                            <input
-                              type="checkbox"
-                              className="form-check-input me-2"
-                              id={perm.id}
-                              value={perm.id}
-                              {...register("selectedPermissions")}
-                            />
-                            {perm.name}
-                          </label>
+              <div className="col-12 col-md-1"></div>
 
-                          {/* Info icon */}
-                          <div className="ms-1 d-flex align-items-center">
-                            <div
-                              ref={(el) => (popoverRefs.current[refIndex] = el)}
-                              tabIndex="0"
-                              className="d-flex align-items-center justify-content-center"
-                              data-bs-toggle="popover"
-                              data-bs-trigger="focus"
-                              data-bs-placement="right"
-                              data-bs-html="true"
-                              data-bs-content={`<div class="border border-secondary rounded custom-popover p-2 px-3">${perm.description}</div>`}
-                            >
-                              &nbsp;
-                              <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                width="13"
-                                height="13"
-                                fill="currentColor"
-                                className="bi bi-info-circle"
-                                viewBox="0 0 16 16"
-                              >
-                                <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                                <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
-                              </svg>
-                            </div>
-                          </div>
+              <div className="col-12 col-md-8 d-flex justify-content-start align-items-center flex-wrap">
+                {feature.featurePermissions.map((perm, permIndex) => {
+                  const refIndex = featureIndex * 10 + permIndex;
+                  return (
+                    <div className="d-flex me-3 mb-2" key={perm.id}>
+                      <label className="form-check-label" htmlFor={perm.id}>
+                        <input
+                          type="checkbox"
+                          className="form-check-input mx-2"
+                          id={perm.id}
+                          value={perm.id}
+                          {...register("selectedPermissions")}
+                        />
+                        {perm.name}
+                      </label>
+                      <div style={{ display: "flex", alignItems: "center" }}>
+                        <div
+                          key={refIndex}
+                          ref={(el) => (popoverRefs.current[refIndex] = el)}
+                          tabIndex="0"
+                          className="d-flex align-items-center avatar-group justify-content-center"
+                          data-bs-toggle="popover"
+                          refIndex
+                          data-bs-trigger="focus"
+                          data-bs-placement="right"
+                          data-bs-html="true"
+                          data-bs-content={`
+                                      <div class="border border-secondary rounded custom-popover p-2 px-3">
+                                        ${perm.description}
+                                      </div>
+                                    `}
+                        >
+                          &nbsp;
+                          <svg
+                            xmlns="http://www.w3.org/2000/svg"
+                            width="13"
+                            height="13"
+                            fill="currentColor"
+                            className="bi bi-info-circle"
+                            viewBox="0 0 16 16"
+                          >
+                            <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+                            <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
+                          </svg>
                         </div>
                       </div>
-                    );
-                  })}
-                </div>
+                    </div>
+                  );
+                })}
               </div>
             </div>
-
-            <hr className="my-2" />
+            <hr className="hr my-1 py-1" />
           </React.Fragment>
         ))}
-
         {errors.selectedPermissions && (
           <p className="text-danger">{errors.selectedPermissions.message}</p>
         )}
         {!masterFeatures && <p>Loading...</p>}
       </div>
 
-
       {masterFeatures && (
         <div className="col-12 text-center">
           <button type="submit" className="btn btn-sm btn-primary me-3">
diff --git a/src/components/master/EditRole.jsx b/src/components/master/EditRole.jsx
index 9e377048..91891b90 100644
--- a/src/components/master/EditRole.jsx
+++ b/src/components/master/EditRole.jsx
@@ -7,7 +7,14 @@ import { useFeatures } from "../../hooks/useMasterRole";
 import { MasterRespository } from "../../repositories/MastersRepository";
 import { cacheData, getCachedData } from "../../slices/apiDataManager";
 import showToast from "../../services/toastService";
-import { useUpdateApplicationRole } from "../../hooks/masterHook/useMaster";
+import {useUpdateApplicationRole} from "../../hooks/masterHook/useMaster";
+
+
+
+
+
+
+
 
 const updateSchema = z.object({
   role: z.string().min(1, { message: "Role is required" }),
@@ -18,145 +25,147 @@ const updateSchema = z.object({
   }),
 });
 
+
+
 const EditMaster = ({ master, onClose }) => {
-  const maxDescriptionLength = 255;
-  const popoverRefs = useRef([]);
-  const { masterFeatures } = useFeatures();
-  const { mutate: updateApplicationRole, isPending: isLoading } = useUpdateApplicationRole(() => onClose?.());
+const maxDescriptionLength = 255;
+const popoverRefs = useRef([]);
+const { masterFeatures } = useFeatures();
+const { mutate: updateApplicationRole, isPending: isLoading } = useUpdateApplicationRole(() => onClose?.());
 
-  const buildDefaultPermissions = () => {
-    const defaults = {};
-    masterFeatures.forEach((feature) => {
-      feature.featurePermissions.forEach((perm) => {
-        const existing = master?.item?.featurePermission?.find(p => p.id === perm.id);
-        defaults[perm.id] = existing?.isEnabled || false;
-      });
+const buildDefaultPermissions = () => {
+  const defaults = {};
+  masterFeatures.forEach((feature) => {
+    feature.featurePermissions.forEach((perm) => {
+      const existing = master?.item?.featurePermission?.find(p => p.id === perm.id);
+      defaults[perm.id] = existing?.isEnabled || false;
     });
-    return defaults;
-  };
-
-  const initialPermissions = buildDefaultPermissions();
-
-  const {
-    register,
-    handleSubmit,
-    formState: { errors, dirtyFields },
-    setError,
-    reset,
-  } = useForm({
-    resolver: zodResolver(updateSchema),
-    defaultValues: {
-      role: master?.item?.role || "",
-      description: master?.item?.description || "",
-      permissions: initialPermissions,
-    },
   });
+  return defaults;
+};
 
-  const [descriptionLength, setDescriptionLength] = useState(master?.item?.description?.length || 0);
+const initialPermissions = buildDefaultPermissions();
 
-  const onSubmit = (data) => {
-    const existingIds = new Set(master?.item?.featurePermission?.map(p => p.id));
+const {
+  register,
+  handleSubmit,
+  formState: { errors, dirtyFields },
+  setError,
+  reset,
+} = useForm({
+  resolver: zodResolver(updateSchema),
+  defaultValues: {
+    role: master?.item?.role || "",
+    description: master?.item?.description || "",
+    permissions: initialPermissions,
+  },
+});
 
-    const updatedPermissions = Object.entries(data.permissions)
-      .filter(([id, value]) => {
-        return existingIds.has(id) || value === true || (dirtyFields.permissions?.[id]);
-      })
-      .map(([id, value]) => ({ id, isEnabled: value }));
+const [descriptionLength, setDescriptionLength] = useState(master?.item?.description?.length || 0);
 
-    if (updatedPermissions.length === 0) {
-      setError("permissions", {
-        type: "manual",
-        message: "At least one permission must be selected.",
-      });
-      return;
-    }
+const onSubmit = (data) => {
+  const existingIds = new Set(master?.item?.featurePermission?.map(p => p.id));
 
-    const payload = {
-      id: master?.item?.id,
-      role: data.role,
-      description: data.description,
-      featuresPermission: updatedPermissions,
-    };
+  const updatedPermissions = Object.entries(data.permissions)
+    .filter(([id, value]) => {
+      return existingIds.has(id) || value === true || (dirtyFields.permissions?.[id]);
+    })
+    .map(([id, value]) => ({ id, isEnabled: value }));
 
-    updateApplicationRole({ id: payload.id, payload });
+  if (updatedPermissions.length === 0) {
+    setError("permissions", {
+      type: "manual",
+      message: "At least one permission must be selected.",
+    });
+    return;
+  }
+
+  const payload = {
+    id: master?.item?.id,
+    role: data.role,
+    description: data.description,
+    featuresPermission: updatedPermissions,
   };
-  // const onSubmit = (data) => {
-  //     setIsLoading(true)
-  //     const existingIds = new Set(
-  //       master?.item?.featurePermission?.map((p) => p.id)
-  //     );
+
+   updateApplicationRole({ id: payload.id, payload });
+};
+// const onSubmit = (data) => {
+//     setIsLoading(true)
+//     const existingIds = new Set(
+//       master?.item?.featurePermission?.map((p) => p.id)
+//     );
 
 
-  //     const updatedPermissions = Object.entries(data.permissions)
-  //       .filter(([id, value]) => {
-  //         if (existingIds.has(id)) return true;
+//     const updatedPermissions = Object.entries(data.permissions)
+//       .filter(([id, value]) => {
+//         if (existingIds.has(id)) return true;
 
-  //         return (
-  //           value === true ||
-  //           (dirtyFields.permissions && dirtyFields.permissions[id])
-  //         );
-  //       })
-  //       .map(([id, value]) => ({ id, isEnabled: value }));
+//         return (
+//           value === true ||
+//           (dirtyFields.permissions && dirtyFields.permissions[id])
+//         );
+//       })
+//       .map(([id, value]) => ({ id, isEnabled: value }));
 
 
-  //     if (updatedPermissions.length === 0) {
-  //       setError("permissions", {
-  //         type: "manual",
-  //         message: "At least one permission must be selected.",
-  //       });
-  //       return;
-  //     }
+//     if (updatedPermissions.length === 0) {
+//       setError("permissions", {
+//         type: "manual",
+//         message: "At least one permission must be selected.",
+//       });
+//       return;
+//     }
 
-  //     const updatedRole = {
-  //       id: master?.item?.id,
-  //       role: data.role,
-  //       description: data.description,
-  //       featuresPermission: updatedPermissions,
-  //     };
-  //     MasterRespository.updateRoles(master?.item?.id, updatedRole).then((resp) => {
-  //       setIsLoading(false)
+//     const updatedRole = {
+//       id: master?.item?.id,
+//       role: data.role,
+//       description: data.description,
+//       featuresPermission: updatedPermissions,
+//     };
+//     MasterRespository.updateRoles(master?.item?.id, updatedRole).then((resp) => {
+//       setIsLoading(false)
 
 
-  //       const cachedData = getCachedData("Application Role");
+//       const cachedData = getCachedData("Application Role");
 
-  //       if (cachedData) {
+//       if (cachedData) {
 
-  //         const updatedData = cachedData.map((role) =>
-  //           role.id === resp.data?.id ? { ...role, ...resp.data } : role
-  //         );
+//         const updatedData = cachedData.map((role) =>
+//           role.id === resp.data?.id ? { ...role, ...resp.data } : role
+//         );
 
-  //         cacheData("Application Role", updatedData);
-  //       }
-  //       showToast("Application Role Updated successfully.", "success");
-  //       setIsLoading(false)
-  //       onClose()
-  //     }).catch((Err) => {
-  //       showToast(Err.message, "error");
-  //       setIsLoading(false)
-  //     })
+//         cacheData("Application Role", updatedData);
+//       }
+//       showToast("Application Role Updated successfully.", "success");
+//       setIsLoading(false)
+//       onClose()
+//     }).catch((Err) => {
+//       showToast(Err.message, "error");
+//       setIsLoading(false)
+//     })
 
-  //   };
-  useEffect(() => {
-    reset({
-      role: master?.item?.role || "",
-      description: master?.item?.description || "",
-      permissions: buildDefaultPermissions(),
-    });
-    setDescriptionLength(master?.item?.description?.length || 0);
-  }, [master, reset]);
+//   };
+useEffect(() => {
+  reset({
+    role: master?.item?.role || "",
+    description: master?.item?.description || "",
+    permissions: buildDefaultPermissions(),
+  });
+  setDescriptionLength(master?.item?.description?.length || 0);
+}, [master, reset]);
 
-  useEffect(() => {
-    popoverRefs.current.forEach((el) => {
-      if (el) {
-        new bootstrap.Popover(el, {
-          trigger: "focus",
-          placement: "right",
-          html: true,
-          content: el.getAttribute("data-bs-content"),
-        });
-      }
-    });
-  }, [masterFeatures]);
+useEffect(() => {
+  popoverRefs.current.forEach((el) => {
+    if (el) {
+      new bootstrap.Popover(el, {
+        trigger: "focus",
+        placement: "right",
+        html: true,
+        content: el.getAttribute("data-bs-content"),
+      });
+    }
+  });
+}, [masterFeatures]);
 
 
   return (
@@ -190,90 +199,76 @@ const EditMaster = ({ master, onClose }) => {
         )}
       </div>
 
-     <div className="col-12 text-start">
-  {/* Scrollable Container with Border */}
-  <div
-    className="border rounded p-3"
-    style={{
-      maxHeight: "350px",
-      overflowY: "auto",
-      overflowX: "hidden", // Prevent horizontal scrollbar
-      paddingRight: "10px",
-    }}
-  >
-    {masterFeatures.map((feature, featureIndex) => (
-      <div key={feature.id} className="mb-3">
-        {/* Feature Group Title */}
-        <div className="fw-semibold mb-2">{feature.name}</div>
+      <div className="col-12 col-md-12 mx-2s" >
 
-        {/* Permissions Grid */}
-        <div className="row">
-          {feature.featurePermissions.map((perm, permIndex) => {
-            const refIndex = featureIndex * 10 + permIndex;
-            return (
-              <div
-                key={perm.id}
-                className="col-12 col-sm-6 col-md-4 mb-3 d-flex align-items-start"
-              >
-                <label
-                  className="form-check-label d-flex align-items-center"
-                  htmlFor={perm.id}
-                >
-                  <input
-                    type="checkbox"
-                    className="form-check-input me-2"
-                    id={perm.id}
-                    {...register(`permissions.${perm.id}`, {
-                      value: initialPermissions[perm.id] || false,
-                    })}
-                  />
-                  {perm.name}
-                </label>
+        {masterFeatures.map((feature, featureIndex) => (
+          <div className="row my-1" key={feature.id} style={{ marginLeft: "0px" }}>
 
-                {/* Info Icon */}
-                <div style={{ display: "flex", alignItems: "center" }}>
-                  <div
-                    ref={(el) => (popoverRefs.current[refIndex] = el)}
-                    tabIndex="0"
-                    className="d-flex align-items-center justify-content-center"
-                    data-bs-toggle="popover"
-                    data-bs-trigger="focus"
-                    data-bs-placement="right"
-                    data-bs-html="true"
-                    data-bs-content={`<div class="border border-secondary rounded custom-popover p-2 px-3">${perm.description}</div>`}
-                  >
-                    &nbsp;
-                    <svg
-                      xmlns="http://www.w3.org/2000/svg"
-                      width="13"
-                      height="13"
-                      fill="currentColor"
-                      className="bi bi-info-circle"
-                      viewBox="0 0 16 16"
-                    >
-                      <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
-                      <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
-                    </svg>
+            <div className="col-12 col-md-3 d-flex text-start align-items-center" style={{ wordWrap: 'break-word' }}>
+              <span className="fs">{feature.name}</span>
+            </div>
+            <div className="col-12 col-md-1">
+
+            </div>
+            <div className="col-12 col-md-8 d-flex justify-content-start align-items-center flex-wrap ">
+              {feature.featurePermissions.map((perm, permIndex) => {
+                const refIndex = (featureIndex * 10) + permIndex;
+                return (
+
+                  <div className="d-flex me-3 mb-2" key={perm.id}>
+
+                    <label className="form-check-label" htmlFor={perm.id}>
+                      <input
+                        type="checkbox"
+                        className="form-check-input mx-2"
+                        id={perm.id}
+                        {...register(`permissions.${perm.id}`, {
+                          value: initialPermissions[perm.id] || false
+                        })}
+                      />
+
+                      {perm.name}
+                    </label>
+
+
+                    <div style={{ display: 'flex', alignItems: 'center' }}>
+                      <div
+                        key={refIndex}
+                        ref={(el) =>
+                          (popoverRefs.current[refIndex] = el)
+                        }
+                        tabIndex="0"
+                        className="d-flex align-items-center avatar-group justify-content-center"
+                        data-bs-toggle="popover" refIndex
+                        data-bs-trigger="focus"
+                        data-bs-placement="right"
+                        data-bs-html="true"
+                        data-bs-content={`
+                                      <div class="border border-secondary rounded custom-popover p-2 px-3">
+                                        ${perm.description}
+                                      </div>
+                                    `}
+                      >
+                        &nbsp;
+                        <svg xmlns="http://www.w3.org/2000/svg" width="13" height="13" fill="currentColor" className="bi bi-info-circle" viewBox="0 0 16 16">
+                          <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
+                          <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
+                        </svg>
+                      </div>
+                    </div>
                   </div>
-                </div>
-              </div>
-            );
-          })}
-        </div>
+                )
+              })}
 
-        <hr className="my-2" />
+
+            </div>
+            <hr className="hr my-1 py-1" />
+          </div>
+        ))}
+        {errors.permissions && (
+          <p className="text-danger">{errors.permissions.message}</p>
+        )}
       </div>
-    ))}
-  </div>
-
-  {/* Error Display */}
-  {errors.permissions && (
-    <p className="text-danger">{errors.permissions.message}</p>
-  )}
-</div>
-
-
-
 
       <div className="col-12 text-center">
         <button type="submit" className="btn btn-sm btn-primary me-3"> {isLoading ? "Please Wait..." : "Submit"}</button>
diff --git a/src/components/master/ManageExpenseStatus.jsx b/src/components/master/ManageExpenseStatus.jsx
deleted file mode 100644
index eccc3bf8..00000000
--- a/src/components/master/ManageExpenseStatus.jsx
+++ /dev/null
@@ -1,165 +0,0 @@
-import React, { useEffect } from "react";
-import {
-  useForm,
-  FormProvider,
-} from "react-hook-form";
-import { z } from "zod";
-import { zodResolver } from "@hookform/resolvers/zod";
-import SelectMultiple from "../common/SelectMultiple";
-import { useFeatures } from "../../hooks/useMasterRole";
-import { EXPENSE_MANAGEMENT } from "../../utils/constants";
-import { useCreateExpenseStatus, useUpdateExpenseStatus } from "../../hooks/masterHook/useMaster";
-import { displayName } from "react-quill";
-import { AppColorconfig } from "../../utils/appUtils";
-
-const ExpenseStatusSchema = z.object({
-  name: z.string().min(1, { message: "Name is required" }),
-  displayName: z.string().min(1, { message: "Display Name is required" }),
-  description: z.string().min(1, { message: "Description is required" }),
-  permissionIds: z.array(z.string()).min(1, {
-    message: "At least one permission is required",
-  }),
-  color: z
-    .string()
-    .regex(/^#([0-9A-F]{3}){1,2}$/i, { message: "Invalid hex color" }),
-});
-
-const ManageExpenseStatus = ({data, onClose }) => {
-  const methods = useForm({
-    resolver: zodResolver(ExpenseStatusSchema),
-    defaultValues: {
-      name: "",
-      displayName: "",
-      description: "",
-      permissionIds: [],
-      color: AppColorconfig.colors.primary,
-    },
-  });
-
-  const {
-    register,
-    handleSubmit,
-    reset,
-    formState: { errors },
-  } = methods;
-
-  const { masterFeatures, loading } = useFeatures();
-
-  const ExpenseFeature = masterFeatures?.find(
-    (appfeature) => appfeature.id === EXPENSE_MANAGEMENT
-  );
-  const {mutate:CreateExpenseStatus,isPending:isPending} = useCreateExpenseStatus(()=>onClose?.())
-  const {mutate:UpdateExpenseStatus,isPending:Updating} = useUpdateExpenseStatus(()=>onClose?.());
-
-
-
-  const onSubmit = (payload) => {
-  if(data){
-        UpdateExpenseStatus({id:data.id,payload:{...payload,id:data.id}})
-  }else{
-     CreateExpenseStatus(payload)
-  }
-  };
-
-
-  useEffect(()=>{
-    if(data){
-     reset({
-        name:data.name ?? "",
-        displayName:data.displayName ?? "",
-        description:data.description ?? "",
-        permissionIds:data.permissionIds ?? [],
-        color:data.color ?? AppColorconfig.colors.primary
-      })
-    }
-  },[data])
-  return (
-    <FormProvider {...methods}>
-      {loading ? (
-        <div>Loading...</div>
-      ) : (
-        <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
-          <div className="col-12">
-            <label className="form-label">Expense Status Name</label>
-            <input
-              type="text"
-              {...register("name")}
-              className={`form-control ${errors.name ? "is-invalid" : ""}`}
-            />
-            {errors.name && <p className="text-danger">{errors.name.message}</p>}
-          </div>
-
-          <div className="col-12">
-            <label className="form-label">Status Display Name</label>
-            <input
-              type="text"
-              {...register("displayName")}
-              className={`form-control ${errors.displayName ? "is-invalid" : ""}`}
-            />
-            {errors.displayName && (
-              <p className="text-danger">{errors.displayName.message}</p>
-            )}
-          </div>
-
-          <div className="col-12">
-            <SelectMultiple
-              name="permissionIds"
-              label="Select Permissions"
-              options={ExpenseFeature?.featurePermissions || []}
-              labelKey="name"
-              valueKey="id"
-              IsLoading={loading}
-            />
-            {errors.permissionIds && (
-              <p className="text-danger">{errors.permissionIds.message}</p>
-            )}
-          </div>
-
-          <div className="col-12">
-            <label className="form-label">Select Color</label>
-            <input
-              type="color"
-              className={`form-control form-control ${errors.color ? "is-invalid" : ""}`}
-              {...register("color")}
-            />
-            {errors.color && (
-              <p className="text-danger">{errors.color.message}</p>
-            )}
-          </div>
-
-          <div className="col-12">
-            <label className="form-label">Description</label>
-            <textarea
-              rows="3"
-              {...register("description")}
-              className={`form-control ${errors.description ? "is-invalid" : ""}`}
-            />
-            {errors.description && (
-              <p className="text-danger">{errors.description.message}</p>
-            )}
-          </div>
-
-          <div className="col-12 text-center">
-            <button
-              type="submit"
-              className="btn btn-sm btn-primary me-3"
-              disabled={isPending || Updating}
-            >
-              {isPending || Updating ? "Please Wait..." : Updating ? "Update" : "Submit"}
-            </button>
-            <button
-              type="button"
-              className="btn btn-sm btn-secondary"
-              onClick={onClose}
-              disabled={isPending || Updating}
-            >
-              Cancel
-            </button>
-          </div>
-        </form>
-      )}
-    </FormProvider>
-  );
-};
-
-export default ManageExpenseStatus;
diff --git a/src/components/master/ManageExpenseType.jsx b/src/components/master/ManageExpenseType.jsx
deleted file mode 100644
index 8f280af5..00000000
--- a/src/components/master/ManageExpenseType.jsx
+++ /dev/null
@@ -1,113 +0,0 @@
-import React, { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
-import { zodResolver } from "@hookform/resolvers/zod";
-import {
-  useCreateExpenseType,
-  useUpdateExpenseType,
-} from "../../hooks/masterHook/useMaster";
-
-const ExpnseSchema = z.object({
-  name: z.string().min(1, { message: "Name is required" }),
-  noOfPersonsRequired: z.boolean().default(false),
-  description: z.string().min(1, { message: "Description is required" }),
-});
-
-const ManageExpenseType = ({ data = null, onClose }) => {
-  const {
-    register,
-    handleSubmit,
-    reset,
-    formState: { errors },
-  } = useForm({
-    resolver: zodResolver(ExpnseSchema),
-    defaultValues: { name: "", noOfPersonsRequired: false, description: "" },
-  });
-  const { mutate: UpdateExpenseType, isPending:isPendingUpdate } = useUpdateExpenseType(
-    () => onClose?.()
-  );
-  const { mutate: CreateExpenseType, isPending } = useCreateExpenseType(() =>
-    onClose?.()
-  );
-
-  const onSubmit = (payload) => {
-    if (data) {
-      UpdateExpenseType({
-        id: data.id,
-        payload: { ...payload, id: data.id },
-      });
-    } else {
-      CreateExpenseType(payload);
-    }
-  };
-
-  useEffect(() => {
-    if (data) {
-      reset({
-        name: data.name ?? "",
-        noOfPersonsRequired: data.noOfPersonsRequired ?? false,
-        description: data.description ?? "",
-      });
-    }
-  }, [data]);
-  return (
-    <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
-      <div className="col-12 col-md-12">
-        <label className="form-label">Expesne Type Name</label>
-        <input
-          type="text"
-          {...register("name")}
-          className={`form-control ${errors.name ? "is-invalids" : ""}`}
-        />
-        {errors.name && <p className="danger-text">{errors.name.message}</p>}
-      </div>
-      <div className="col-12 col-md-12">
-        <label className="form-label" htmlFor="description">
-          Description
-        </label>
-        <textarea
-          rows="3"
-          {...register("description")}
-          className={`form-control ${errors.description ? "is-invalids" : ""}`}
-        ></textarea>
-
-        {errors.description && (
-          <p className="danger-text">{errors.description.message}</p>
-        )}
-      </div>
-      <div className="col-12 col-md-12 d-flex align-items-center">
-        <label className="from-label">No. of Persons Required </label>{" "}
-        <input
-          type="checkbox"
-          className="form-check-input  ms-2"
-          {...register("noOfPersonsRequired")}
-        />
-      </div>
-      <div className="col-12 text-center">
-        <button
-          type="submit"
-          className="btn btn-sm btn-primary me-3"
-          disabled={isPending || isPendingUpdate}
-        >
-          {isPending || isPendingUpdate
-            ? "Please Wait..."
-            : data
-            ? "Update"
-            : "Submit"}
-        </button>
-        <button
-          type="reset"
-          className="btn btn-sm btn-label-secondary "
-          data-bs-dismiss="modal"
-          aria-label="Close"
-          disabled={isPending || isPendingUpdate}
-          onClick={()=>onClose()}
-        >
-          Cancel
-        </button>
-      </div>
-    </form>
-  );
-};
-
-export default ManageExpenseType;
diff --git a/src/components/master/ManagePaymentMode.jsx b/src/components/master/ManagePaymentMode.jsx
deleted file mode 100644
index b05856db..00000000
--- a/src/components/master/ManagePaymentMode.jsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import React, { useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { z } from "zod";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useCreatePaymentMode, useUpdatePaymentMode } from "../../hooks/masterHook/useMaster";
-
-const ExpnseSchema = z.object({
-  name: z.string().min(1, { message: "Name is required" }),
-  description: z.string().min(1, { message: "Description is required" }),
-});
-
-const ManagePaymentMode = ({ data = null, onClose }) => {
-  const {
-    register,
-    handleSubmit,
-    reset,
-    formState: { errors },
-  } = useForm({
-    resolver: zodResolver(ExpnseSchema),
-    defaultValues: { name: "",  description: "" },
-  });
-
-  const { mutate: CreatePaymentMode, isPending } = useCreatePaymentMode(() =>
-    onClose?.()
-  );
-  const {mutate:UpdatePaymentMode,isPending:Updating} = useUpdatePaymentMode(()=>onClose?.())
-
-  const onSubmit = (payload) => {
-    if(data){
-        UpdatePaymentMode({id:data.id,payload:{...payload,id:data.id}})
-    }else(
-        CreatePaymentMode(payload)
-    )
-    
-  };
-
-  useEffect(()=>{
-    if(data){ 
-      reset({
-        name:data.name ?? "",
-        description:data.description ?? ""
-      })
-    }
-  },[data])
-
-
-  return (
-    <form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
-      <div className="col-12 col-md-12">
-        <label className="form-label">Payment Mode Name</label>
-        <input
-          type="text"
-          {...register("name")}
-          className={`form-control ${errors.name ? "is-invalids" : ""}`}
-        />
-        {errors.name && <p className="danger-text">{errors.name.message}</p>}
-      </div>
-      <div className="col-12 col-md-12">
-        <label className="form-label" htmlFor="description">
-          Description
-        </label>
-        <textarea
-          rows="3"
-          {...register("description")}
-          className={`form-control ${errors.description ? "is-invalids" : ""}`}
-        ></textarea>
-
-        {errors.description && (
-          <p className="danger-text">{errors.description.message}</p>
-        )}
-      </div>
-
-      <div className="col-12 text-center">
-        <button
-          type="submit"
-          className="btn btn-sm btn-primary me-3"
-          disabled={isPending || Updating}
-        >
-          {isPending || Updating? "Please Wait..." : Updating ? "Update" : "Submit"}
-        </button>
-        <button
-          type="reset"
-          className="btn btn-sm btn-label-secondary "
-          data-bs-dismiss="modal"
-          aria-label="Close"
-          disabled={isPending || Updating}
-        >
-          Cancel
-        </button>
-      </div>
-    </form>
-  );
-};
-
-export default ManagePaymentMode;
diff --git a/src/components/master/MasterModal.jsx b/src/components/master/MasterModal.jsx
index 0a472727..52e22114 100644
--- a/src/components/master/MasterModal.jsx
+++ b/src/components/master/MasterModal.jsx
@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from "react";
+
 import CreateRole from "./CreateRole";
 import DeleteMaster from "./DeleteMaster";
 import EditRole from "./EditRole";
@@ -17,45 +18,67 @@ import CreateContactTag from "./CreateContactTag";
 import EditContactCategory from "./EditContactCategory";
 import EditContactTag from "./EditContactTag";
 import { useDeleteMasterItem } from "../../hooks/masterHook/useMaster";
-import ManageExpenseType from "./ManageExpenseType";
-import ManagePaymentMode from "./ManagePaymentMode";
-import ManageExpenseStatus from "./ManageExpenseStatus";
-
 
 const MasterModal = ({ modaldata, closeModal }) => {
   const [isDeleteModalOpen, setIsDeleteModalOpen] = useState(false);
   const { mutate: deleteMasterItem, isPending } = useDeleteMasterItem();
 
+  // const handleSelectedMasterDeleted = async () =>
+  // {
+  //   debugger
+  //   const deleteFn = MasterRespository[modaldata.masterType];
+  //   if (!deleteFn) {
+  //     showToast(`No delete strategy defined for master type`,"error");
+  //     return false;
+  //   }
+  //    try
+  //    {
+  //      const response = await deleteFn( modaldata?.item?.id );
+  //      const selected_cachedData = getCachedData( modaldata?.masterType );
+  //      const updated_master =  selected_cachedData?.filter(item => item.id !== modaldata?.item.id);
+  //      cacheData( modaldata?.masterType, updated_master )
+
+  //      showToast(`${modaldata?.masterType} is deleted successfully`, "success");
+  //      handleCloseDeleteModal()
+
+  //    } catch ( error )
+  //    {
+  //      const message = error.response.data.message || error.message || "Error occured api during call"
+  //      showToast(message, "success");
+  //   }
+  // }
+
   const handleSelectedMasterDeleted = () => {
-    const { masterType, item, validateFn } = modaldata || {};
-    if (!masterType || !item?.id) {
+    if (!modaldata?.masterType || !modaldata?.item?.id) {
       showToast("Missing master type or item", "error");
       return;
     }
-
     deleteMasterItem(
-      { masterType, item, validateFn },
-      { onSuccess: handleCloseDeleteModal }
+      {
+        masterType: modaldata.masterType,
+        item: modaldata.item,
+        validateFn: modaldata.validateFn, // optional
+      },
+      {
+        onSuccess: () => {
+          handleCloseDeleteModal();
+        },
+      }
     );
   };
 
-  const handleCloseDeleteModal = () => {
-    setIsDeleteModalOpen(false);
-    closeModal();
-  };
-
   useEffect(() => {
     if (modaldata?.modalType === "delete") {
       setIsDeleteModalOpen(true);
     }
   }, [modaldata]);
 
-  if (!modaldata?.modalType) {
+  const handleCloseDeleteModal = () => {
+    setIsDeleteModalOpen(false);
     closeModal();
-    return null;
-  }
+  };
 
-  if (modaldata.modalType === "delete" && isDeleteModalOpen) {
+  if (modaldata?.modalType === "delete" && isDeleteModalOpen) {
     return (
       <div
         className="modal fade show"
@@ -67,69 +90,86 @@ const MasterModal = ({ modaldata, closeModal }) => {
         <ConfirmModal
           type="delete"
           header={`Delete ${modaldata.masterType}`}
-          message="Are you sure you want delete?"
+          message={"Are you sure you want delete?"}
           onSubmit={handleSelectedMasterDeleted}
           onClose={handleCloseDeleteModal}
         />
       </div>
     );
   }
-
-  const renderModalContent = () => {
-    const { modalType, item, masterType } = modaldata;
-
-    const modalComponents = {
-      "Application Role": <CreateRole masmodalType={masterType} onClose={closeModal} />,
-      "Edit-Application Role": <EditRole master={modaldata} onClose={closeModal} />,
-      "Job Role": <CreateJobRole onClose={closeModal} />,
-      "Edit-Job Role": <EditJobRole data={item} onClose={closeModal} />,
-      "Activity": <CreateActivity onClose={closeModal} />,
-      "Edit-Activity": <EditActivity activityData={item} onClose={closeModal} />,
-      "Work Category": <CreateWorkCategory onClose={closeModal} />,
-      "Edit-Work Category": <EditWorkCategory data={item} onClose={closeModal} />,
-      "Contact Category": <CreateCategory data={item} onClose={closeModal} />,
-      "Edit-Contact Category": <EditContactCategory data={item} onClose={closeModal} />,
-      "Contact Tag": <CreateContactTag data={item} onClose={closeModal} />,
-      "Edit-Contact Tag": <EditContactTag data={item} onClose={closeModal} />,
-      "Expense Type":<ManageExpenseType  onClose={closeModal} />,
-      "Edit-Expense Type":<ManageExpenseType data={item} onClose={closeModal} />,
-      "Payment Mode":<ManagePaymentMode onClose={closeModal}/>,
-      "Edit-Payment Mode":<ManagePaymentMode data={item} onClose={closeModal}/>,
-      "Expense Status":<ManageExpenseStatus onClose={closeModal}/>,
-      "Edit-Expense Status":<ManageExpenseStatus data={item} onClose={closeModal}/>
-    };
-
-    return modalComponents[modalType] || null;
-  };
-
-  const isLargeModal = ["Application Role", "Edit-Application Role"].includes(
-    modaldata.modalType
-  );
-
   return (
     <div
-      className="modal fade show"
+      className="modal fade"
       id="master-modal"
       tabIndex="-1"
-      role="dialog"
       aria-hidden="true"
+      role="dialog"
       aria-labelledby="modalToggleLabel"
-      style={{ display: "block" }}
     >
-      <div className={`modal-dialog mx-sm-auto mx-1 ${isLargeModal ? "modal-lg" : "modal-md"} modal-simple`}>
+      <div
+        className={`modal-dialog mx-sm-auto mx-1 ${
+          ["Application Role", "Edit-Application Role"].includes(
+            modaldata?.modalType
+          )
+            ? "modal-lg"
+            : "modal-md"
+        } modal-simple`}
+      >
         <div className="modal-content">
           <div className="modal-body p-sm-4 p-0">
             <div className="d-flex justify-content-between">
-              <h6>{modaldata?.modalType}</h6>
+              <h6>{`${modaldata?.modalType} `}</h6>
               <button
                 type="button"
                 className="btn-close"
                 data-bs-dismiss="modal"
                 aria-label="Close"
                 onClick={closeModal}
-              />
+              ></button>
             </div>
-            {renderModalContent()}
+
+            {modaldata.modalType === "Application Role" && (
+              <CreateRole
+                masmodalType={modaldata.masterType}
+                onClose={closeModal}
+              />
+            )}
+            {modaldata.modalType === "Edit-Application Role" && (
+              <EditRole master={modaldata} onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Job Role" && (
+              <CreateJobRole onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Edit-Job Role" && (
+              <EditJobRole data={modaldata.item} onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Activity" && (
+              <CreateActivity onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Edit-Activity" && (
+              <EditActivity
+                activityData={modaldata.item}
+                onClose={closeModal}
+              />
+            )}
+            {modaldata.modalType === "Work Category" && (
+              <CreateWorkCategory onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Edit-Work Category" && (
+              <EditWorkCategory data={modaldata.item} onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Contact Category" && (
+              <CreateCategory data={modaldata.item} onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Edit-Contact Category" && (
+              <EditContactCategory data={modaldata.item} onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Contact Tag" && (
+              <CreateContactTag data={modaldata.item} onClose={closeModal} />
+            )}
+            {modaldata.modalType === "Edit-Contact Tag" && (
+              <EditContactTag data={modaldata.item} onClose={closeModal} />
+            )}
           </div>
         </div>
       </div>
diff --git a/src/data/masters.js b/src/data/masters.js
index 54942c87..e94de7a3 100644
--- a/src/data/masters.js
+++ b/src/data/masters.js
@@ -1,157 +1,153 @@
 // it important ------
-export const mastersList = [
-  { id: 1, name: "Application Role" },
-  { id: 2, name: "Job Role" },
-  { id: 3, name: "Activity" },
-  { id: 4, name: "Work Category" },
-  { id: 5, name: "Contact Category" },
-  { id: 6, name: "Contact Tag" },
-  { id: 7, name: "Expense Type" },
-  { id: 8, name: "Payment Mode" },
-  { id: 9, name: "Expense Status" },
-];
+export const mastersList = [ {id: 1, name: "Application Role"}, {id: 2, name: "Job Role"}, {id: 3, name: "Activity"},{id: 4, name:"Work Category"},{id:5,name:"Contact Category"},{id:6,name:"Contact Tag"}]
 // -------------------
 
-// export const dailyTask = [
-//     {
-//         id:1,
-//         project:{
-//             projectName:"Project Name1",
-//             building:"buildName1",
-//             floor:"floorName1",
-//             workArea:"workarea1"
-//         },
-//         target:80,
-//         employees:[
-//             {
-//                 id:1,
-//                 name:"Vishal Patil",
-//                 role:"helper"
-//             },
-//             {
-//                 id:202,
-//                 name:"Vishal Patil",
-//                 role:"helper"
-//             },
-//             {
-//                 id:101,
-//                 name:"Kushal Patil",
-//                 role:"Engineer"
-//             }
-//         ]
+export const dailyTask = [
+    {
+        id:1,
+        project:{
+            projectName:"Project Name1",
+            building:"buildName1",
+            floor:"floorName1",
+            workArea:"workarea1"
+        },
+        target:80,
+        employees:[
+            {
+                id:1,
+                name:"Vishal Patil",
+                role:"helper"
+            },
+            {
+                id:202,
+                name:"Vishal Patil",
+                role:"helper"
+            },
+            {
+                id:101,
+                name:"Kushal Patil",
+                role:"Engineer"
+            }
+        ]
+        
+    },
+    {
+        id:2,
+        project:{
+            projectName:"Project Name1",
+            building:"buildName1",
+            floor:"floorName1",
+            workArea:"workarea1"
+        },
+        target:90,
+        employees:[
+            {
+                id:1,
+                name:"Vishal Patil",
+                role:"welder"
+            },
+            {
+                id:202,
+                name:"Vishal Patil",
+                role:"welder"
+            },
+            {
+                id:101,
+                name:"Kushal Patil",
+                role:"Site Engineer"
+            }
+        ]
+        
+    }
+]
+
+
+
+export const jobRoles =[
+    {
+        id:1,
+        name:"Project Manager"
+    },
+    {
+        id:2,
+        name:"Software Developer"
+    },
+    {
+        id:3,
+        name:"Estimation Engineer"
+    },
+    {
+        id:4,
+        name:"Designer"
+    },
+    {
+        id:5,
+        name:"Site Engineer"
+    }
+]
+
+export const employee =[
+    {
+        id:1,
+        FirtsName:"Pramod",
+        LastName:"Mahajan",
+        JobRoleId:2,
+    },
+    {
+        id:2,
+        FirtsName:"Akahsy",
+        LastName:"Patil",
+        JobRoleId:1,
+    },
+    {
+        id:3,
+        FirtsName:"janvi",
+        LastName:"Potdar",
+        JobRoleId:3,
+    },
+    {
+        id:4,
+        FirtsName:"Aboli",
+        LastName:"Patil",
+        JobRoleId:2,
+    },
+    {
+        id:5,
+        FirtsName:"Shubham",
+        LastName:"Tamboli",
+        JobRoleId:1,
+    },
+    {
+        id:6,
+        FirtsName:"Alwin",
+        LastName:"Joy",
+        JobRoleId:4,
+    },
+    {
+        id:7,
+        FirtsName:"John",
+        LastName:"kwel",
+        JobRoleId:4,
+    },
+    {
+        id:8,
+        FirtsName:"Gita",
+        LastName:"shaha",
+        JobRoleId:1,
+    },{
+        id:9,
+        FirtsName:"Pratik",
+        LastName:"Joshi",
+        JobRoleId:5,
+    },
+    {
+        id:10,
+        FirtsName:"Nikil",
+        LastName:"Patil",
+        JobRoleId:5,
+    }
+]
 
-//     },
-//     {
-//         id:2,
-//         project:{
-//             projectName:"Project Name1",
-//             building:"buildName1",
-//             floor:"floorName1",
-//             workArea:"workarea1"
-//         },
-//         target:90,
-//         employees:[
-//             {
-//                 id:1,
-//                 name:"Vishal Patil",
-//                 role:"welder"
-//             },
-//             {
-//                 id:202,
-//                 name:"Vishal Patil",
-//                 role:"welder"
-//             },
-//             {
-//                 id:101,
-//                 name:"Kushal Patil",
-//                 role:"Site Engineer"
-//             }
-//         ]
 
-//     }
-// ]
 
-// export const jobRoles =[
-//     {
-//         id:1,
-//         name:"Project Manager"
-//     },
-//     {
-//         id:2,
-//         name:"Software Developer"
-//     },
-//     {
-//         id:3,
-//         name:"Estimation Engineer"
-//     },
-//     {
-//         id:4,
-//         name:"Designer"
-//     },
-//     {
-//         id:5,
-//         name:"Site Engineer"
-//     }
-// ]
 
-// export const employee =[
-//     {
-//         id:1,
-//         FirtsName:"Pramod",
-//         LastName:"Mahajan",
-//         JobRoleId:2,
-//     },
-//     {
-//         id:2,
-//         FirtsName:"Akahsy",
-//         LastName:"Patil",
-//         JobRoleId:1,
-//     },
-//     {
-//         id:3,
-//         FirtsName:"janvi",
-//         LastName:"Potdar",
-//         JobRoleId:3,
-//     },
-//     {
-//         id:4,
-//         FirtsName:"Aboli",
-//         LastName:"Patil",
-//         JobRoleId:2,
-//     },
-//     {
-//         id:5,
-//         FirtsName:"Shubham",
-//         LastName:"Tamboli",
-//         JobRoleId:1,
-//     },
-//     {
-//         id:6,
-//         FirtsName:"Alwin",
-//         LastName:"Joy",
-//         JobRoleId:4,
-//     },
-//     {
-//         id:7,
-//         FirtsName:"John",
-//         LastName:"kwel",
-//         JobRoleId:4,
-//     },
-//     {
-//         id:8,
-//         FirtsName:"Gita",
-//         LastName:"shaha",
-//         JobRoleId:1,
-//     },{
-//         id:9,
-//         FirtsName:"Pratik",
-//         LastName:"Joshi",
-//         JobRoleId:5,
-//     },
-//     {
-//         id:10,
-//         FirtsName:"Nikil",
-//         LastName:"Patil",
-//         JobRoleId:5,
-//     }
-// ]
diff --git a/src/data/menuData.json b/src/data/menuData.json
index d4b2104d..bbd37e2c 100644
--- a/src/data/menuData.json
+++ b/src/data/menuData.json
@@ -66,12 +66,6 @@
                 "available": true,
                 "link": "/gallary"
             },
-            {
-                "text": "Expense",
-                "icon": "bx bx-receipt",
-                "available": true,
-                "link": "/expenses"
-            },
             {
                 "text": "Administration",
                 "icon": "bx bx-box",
diff --git a/src/hooks/masterHook/useMaster.js b/src/hooks/masterHook/useMaster.js
index 15dc3305..20caff62 100644
--- a/src/hooks/masterHook/useMaster.js
+++ b/src/hooks/masterHook/useMaster.js
@@ -12,6 +12,213 @@ import showToast from "../../services/toastService";
 
 
 
+// const useMaster = () => {
+
+//   const selectedMaster = useSelector((store)=>store.localVariables.selectedMaster);
+//   const [data, setData] = useState([]);
+//   const [loading, setLoading] = useState(true);
+//   const [error, setError] = useState("");
+//   useEffect(() => {
+//     const fetchData = async () => {
+//       if (!selectedMaster) return;
+//       setLoading(true);
+//       try {
+//         const cachedData = getCachedData(selectedMaster);
+//         if (cachedData) {
+          
+//           setData(cachedData);
+          
+//         } else {
+//           let response;
+//           switch (selectedMaster) {
+//             case "Application Role":
+//               response = await MasterRespository.getRoles();
+//               response = response.data;
+//               break;
+//             case "Job Role":
+//               response = await MasterRespository.getJobRole();
+//               response = response.data
+//                 break;
+//             case "Activity":
+//               response = await MasterRespository.getActivites();
+//               response = response.data
+//               break;
+//             case "Work Category":
+//               response = await MasterRespository.getWorkCategory();
+//               response = response.data
+//               break;
+//             case "Contact Category":
+//               response = await MasterRespository.getContactCategory();
+//               response = response.data
+//               break;
+//             case "Contact Tag":
+//               response = await MasterRespository.getContactTag();
+//               response = response.data
+//               break;
+//             case "Status":
+//               response = [{description: null,featurePermission: null,id: "02dd4761-363c-49ed-8851-3d2489a3e98d",status:"status 1"},{description: null,featurePermission: null,id: "03dy9761-363c-49ed-8851-3d2489a3e98d",status:"status 2"},{description: null,featurePermission: null,id: "03dy7761-263c-49ed-8851-3d2489a3e98d",status:"Status 3"}];
+//               break;
+//             default:
+//               response = [];
+//           }
+
+//           if (response) {
+//             setData(response);
+//             cacheData(selectedMaster, response);
+//           }
+//         }
+//       } catch (err) {
+//         setError("Failed to fetch data.");
+//       } finally {
+//         setLoading(false);
+//       }
+//     };
+
+//     if ( selectedMaster )
+//     {
+     
+//       fetchData();
+//     }
+    
+//   }, [selectedMaster]);
+
+  
+
+//   return { data, loading, error }
+// };
+
+
+
+
+// export const useActivitiesMaster = () =>
+//   {
+//     const [ activities, setActivites ] = useState( [] )
+//     const [ loading, setloading ] = useState( false );
+//     const [ error, setError ] = useState()
+//       const fetchActivities =async () =>  {
+//           setloading(true);
+//           try {
+//             const response = await MasterRespository.getActivites();
+//             setActivites(response.data);
+//             cacheData( "ActivityMaster", response.data );
+//             setloading(false);
+//           } catch (err) {
+//             setError(err);
+//             setloading(false);
+//           } 
+//        }
+//     useEffect( () =>
+//     {
+//       const cacheddata = getCachedData( "ActivityMaster" );
+//       if ( !cacheddata )
+//       {
+//              fetchActivities()
+//       } else
+//       {
+//            setActivites(cacheddata);
+//       }
+//     }, [] )
+    
+//     return {activities,loading,error}
+//   }
+
+//   export const useWorkCategoriesMaster = () =>
+//     {
+//       const [ categories, setCategories ] = useState( [] )
+//       const [ categoryLoading, setloading ] = useState( false );
+//       const [ categoryError, setError ] = useState( "" )
+    
+//         const fetchCategories =async () =>  {
+//           const cacheddata = getCachedData("Work Category");
+    
+//           if (!cacheddata) {
+//             setloading(true);
+//             try {
+//               const response = await MasterRespository.getWorkCategory();
+//               setCategories(response.data);
+//               cacheData("Work Category", response.data);
+//             } catch (err) {
+//               setError(err);
+//               console.log(err);
+//             } finally {
+//               setloading(false);
+//             }
+//           } else {
+//             setCategories(cacheddata);
+//           }
+//          }
+//       useEffect( () =>
+//       {
+//         fetchCategories()
+//       }, [] )
+      
+//       return {categories,categoryLoading,categoryError}
+// }
+    
+// export const useContactCategory = () =>
+// {
+//   const [ contactCategory, setContactCategory ] = useState( [] )
+//   const [ loading, setLoading ] = useState( false )
+//   const [ Error, setError ] = useState()
+  
+//   const fetchConatctCategory = async() =>
+//   {
+//     const cache_Category = getCachedData( "Contact Category" );
+//     if ( !cache_Category )
+//     {
+//       try
+//       {
+//         let resp = await MasterRespository.getContactCategory();
+//         setContactCategory( resp.data );
+//         cacheData("Contact Category",resp.data)
+//       } catch ( error )
+//       {
+//         setError(error)
+//       }
+//     } else
+//     {
+//       setContactCategory(cache_Category)
+//     }
+//   }
+
+//   useEffect( () =>
+//   {
+//     fetchConatctCategory()
+//   }, [] )
+//   return { contactCategory,loading,Error}
+// }
+// export const useContactTags = () => {
+//   const [contactTags, setContactTags] = useState([]);
+//   const [loading, setLoading] = useState(false);
+//   const [error, setError] = useState(null);
+
+//   useEffect(() => {
+//     const fetchContactTag = async () => {
+//       const cache_Tags = getCachedData("Contact Tag");
+
+//       if (!cache_Tags) {
+//         setLoading(true);
+//         try {
+//           const resp = await MasterRespository.getContactTag();
+//           setContactTags(resp.data);
+//           cacheData("Contact Tag", resp.data);
+//         } catch (err) {
+//           setError(err);
+//         } finally {
+//           setLoading(false);
+//         }
+//       } else {
+//         setContactTags(cache_Tags);
+//       }
+//     };
+
+//     fetchContactTag();
+//   }, []);
+
+//   return { contactTags, loading, error };
+// };
+
+// Separate matser-------------
 
 export const useActivitiesMaster = () =>
 {
@@ -93,76 +300,6 @@ export const useContactTags = () => {
   return { contactTags, loading, error };
 };
 
-
-export const useExpenseType =()=>{
-const {
-    data: ExpenseTypes = [],
-    isLoading: loading,
-    error,
-  } = useQuery({
-    queryKey: ["Expense Type"],
-    queryFn: async () => {
-      const res = await MasterRespository.getExpenseType()
-      return res.data;
-    },
-    onError: (error) => {
-      showToast(
-        error?.response?.data?.message ||
-          error.message ||
-          "Failed to fetch Expense Type",
-        "error"
-      );
-    },
-  });
-
-  return { ExpenseTypes, loading, error };
-}
-export const usePaymentMode =()=>{
-const {
-    data: PaymentModes = [],
-    isLoading: loading,
-    error,
-  } = useQuery({
-    queryKey: ["Payment Mode"],
-    queryFn: async () => {
-      const res = await MasterRespository.getPaymentMode()
-      return res.data;
-    },
-    onError: (error) => {
-      showToast(
-        error?.response?.data?.message ||
-          error.message ||
-          "Failed to fetch Payment Mode",
-        "error"
-      );
-    },
-  });
-
-  return { PaymentModes, loading, error };
-}
-export const useExpenseStatus =()=>{
-const {
-    data: ExpenseStatus = [],
-    isLoading: loading,
-    error,
-  } = useQuery({
-    queryKey: ["Expense Status"],
-    queryFn: async () => {
-      const res = await MasterRespository.getExpenseStatus()
-      return res.data;
-    },
-    onError: (error) => {
-      showToast(
-        error?.response?.data?.message ||
-          error.message ||
-          "Failed to fetch Expense Status",
-        "error"
-      );
-    },
-  });
-
-  return { ExpenseStatus, loading, error };
-}
 // ===Application Masters Query=================================================
 
 const fetchMasterData = async (masterType) => {
@@ -179,12 +316,6 @@ const fetchMasterData = async (masterType) => {
       return (await MasterRespository.getContactCategory()).data;
     case "Contact Tag":
       return (await MasterRespository.getContactTag()).data;
-    case "Expense Type":
-      return (await MasterRespository.getExpenseType()).data;
-    case "Payment Mode":
-      return (await MasterRespository.getPaymentMode()).data;
-    case "Expense Status":
-      return (await MasterRespository.getExpenseStatus()).data;
     case "Status":
       return [
         {
@@ -535,140 +666,6 @@ export const useUpdateContactTag = (onSuccessCallback) =>
   });
 }
 
-// ----------------------Expense Type------------------
-export const useCreateExpenseType = (onSuccessCallback)=>{
-    const queryClient = useQueryClient();
-
-  return useMutation( {
-    mutationFn: async ( payload ) =>
-    {
-      const resp = await MasterRespository.createExpenseType(payload);
-      return resp.data;
-    },
-    onSuccess: ( data ) =>
-    {
-      queryClient.invalidateQueries( {queryKey:[ "masterData", "Expense Type" ]} )
-      showToast( "Expense Type added successfully", "success" );
-      if(onSuccessCallback) onSuccessCallback(data)
-    },
-    onError: ( error ) =>
-    {
-     showToast(error.message || "Something went wrong", "error");
-    }
-  })
-}
-export const useUpdateExpenseType = (onSuccessCallback) =>
-{
-   const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: async ( {id, payload} ) =>
-    {
-      const response = await MasterRespository.updateExpenseType(id,payload);
-      return response.data;
-    },
-    onSuccess: (data, variables) => {
-
-      queryClient.invalidateQueries({
-        queryKey: ["masterData", "Expense Type"],
-      });
-      showToast("Expense Type updated successfully.", "success");
-       
-      if (onSuccessCallback) onSuccessCallback(data);
-    },
-    onError: (error) => {
-      showToast(error.message || "Something went wrong", "error");
-    },
-  });
-}
-
-// -----------------Payment Mode -------------
-
-export const useCreatePaymentMode = (onSuccessCallback)=>{
-    const queryClient = useQueryClient();
-
-  return useMutation( {
-    mutationFn: async ( payload ) =>
-    {
-      const resp = await MasterRespository.createPaymentMode(payload);
-      return resp.data;
-    },
-    onSuccess: ( data ) =>
-    {
-      queryClient.invalidateQueries( {queryKey:[ "masterData", "Payment Mode" ]} )
-      showToast( "Payment Mode added successfully", "success" );
-      if(onSuccessCallback) onSuccessCallback(data)
-    },
-    onError: ( error ) =>
-    {
-     showToast(error.message || "Something went wrong", "error");
-    }
-  })
-}
-export const useUpdatePaymentMode = (onSuccessCallback)=>{
-    const queryClient = useQueryClient();
-
-  return useMutation( {
-    mutationFn: async ( {id,payload} ) =>
-    {
-      const resp = await MasterRespository.updatePaymentMode(id,payload);
-      return resp.data;
-    },
-    onSuccess: ( data ) =>
-    {
-      queryClient.invalidateQueries( {queryKey:[ "masterData", "Payment Mode" ]} )
-      showToast( "Payment Mode Updated successfully", "success" );
-      if(onSuccessCallback) onSuccessCallback(data)
-    },
-    onError: ( error ) =>
-    {
-     showToast(error.message || "Something went wrong", "error");
-    }
-  })
-}
-// -------------------Expense Status----------------------------------
-export const useCreateExpenseStatus =(onSuccessCallback)=>{
-      const queryClient = useQueryClient();
-
-  return useMutation( {
-    mutationFn: async ( payload ) =>
-    {
-      const resp = await MasterRespository.createExpenseStatus(payload);
-      return resp.data;
-    },
-    onSuccess: ( data ) =>
-    {
-      queryClient.invalidateQueries( {queryKey:[ "masterData", "Expense Status" ]} )
-      showToast( "Expense Status added successfully", "success" );
-      if(onSuccessCallback) onSuccessCallback(data)
-    },
-    onError: ( error ) =>
-    {
-     showToast(error.message || "Something went wrong", "error");
-    }
-  })
-}
-export const useUpdateExpenseStatus = (onSuccessCallback)=>{
-    const queryClient = useQueryClient();
-
-  return useMutation( {
-    mutationFn: async ( {id,payload} ) =>
-    {
-      const resp = await MasterRespository.updateExepnseStatus(id,payload);
-      return resp.data;
-    },
-    onSuccess: ( data ) =>
-    {
-      queryClient.invalidateQueries( {queryKey:[ "masterData", "Expense Status" ]} )
-      showToast( "Expense Status Updated successfully", "success" );
-      if(onSuccessCallback) onSuccessCallback(data)
-    },
-    onError: ( error ) =>
-    {
-     showToast(error.message || "Something went wrong", "error");
-    }
-  })
-}
 // -Delete Master --------
 export const useDeleteMasterItem = () => {
   const queryClient = useQueryClient();
diff --git a/src/hooks/useDashboard_Data.jsx b/src/hooks/useDashboard_Data.jsx
index 0322566a..831d9092 100644
--- a/src/hooks/useDashboard_Data.jsx
+++ b/src/hooks/useDashboard_Data.jsx
@@ -104,15 +104,17 @@ export const useDashboardTeamsCardData = (projectId) => {
 
   useEffect(() => {
     const fetchTeamsData = async () => {
+      if (!projectId) return; // ✅ Skip if projectId is not provided
+
       setLoading(true);
       setError("");
 
       try {
         const response = await GlobalRepository.getDashboardTeamsCardData(projectId);
-        setTeamsData(response.data || {});
+        setTeamsData(response.data); // ✅ Handle undefined/null
       } catch (err) {
         setError("Failed to fetch teams card data.");
-        console.error("Error fetching teams card data:", err);
+        console.error(err);
         setTeamsData({});
       } finally {
         setLoading(false);
diff --git a/src/hooks/useDirectory.js b/src/hooks/useDirectory.js
index f5ecb35c..7c2fb13f 100644
--- a/src/hooks/useDirectory.js
+++ b/src/hooks/useDirectory.js
@@ -177,36 +177,3 @@ export const useOrganization = () => {
 
   return { organizationList, loading, error };
 };
-
-export const useDesignation = () => {
-  const [designationList, setDesignationList] = useState([]);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState("");
-
-  const fetchOrg = async () => {
-    const cacheOrg = getCachedData("designation");
-    if (cacheOrg?.length != 0) {
-      setLoading(true);
-      try {
-        const resp = await DirectoryRepository.GetDesignations();
-        cacheData("designation", resp.data);
-        setDesignationList(resp.data);
-        setLoading(false);
-      } catch (error) {
-        const msg =
-          error?.response?.data?.message ||
-          error?.message ||
-          "Something went wrong";
-        setError(msg);
-      }
-    } else {
-      setDesignationList(cacheOrg);
-    }
-  };
-
-  useEffect(() => {
-    fetchOrg();
-  }, []);
-
-  return { designationList, loading, error };
-};
diff --git a/src/hooks/useEmployees.js b/src/hooks/useEmployees.js
index 9e597e3b..30e41256 100644
--- a/src/hooks/useEmployees.js
+++ b/src/hooks/useEmployees.js
@@ -3,22 +3,27 @@ import { cacheData, getCachedData } from "../slices/apiDataManager";
 import { RolesRepository } from "../repositories/MastersRepository";
 import EmployeeRepository from "../repositories/EmployeeRepository";
 import ProjectRepository from "../repositories/ProjectRepository";
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
+import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import showToast from "../services/toastService";
-import { useSelector } from "react-redux";
-import { store } from "../store/store";
-import { queryClient } from "../layouts/AuthLayout";
+import {useSelector} from "react-redux";
+import {store} from "../store/store";
+import {queryClient} from "../layouts/AuthLayout";
+
+
+
 
 // Query ---------------------------------------------------------------------------
 
-export const useAllEmployees = (showInactive) => {
+
+export const useAllEmployees = ( showInactive ) =>
+{
   const {
     data = [],
     isLoading,
     error,
     refetch, // optional if you want recall functionality
   } = useQuery({
-    queryKey: ["allEmployee", showInactive],
+    queryKey: ['allEmployee', showInactive],
     queryFn: async () => {
       const res = await EmployeeRepository.getAllEmployeeList(showInactive);
       return res.data;
@@ -29,12 +34,14 @@ export const useAllEmployees = (showInactive) => {
     employeesList: data,
     loading: isLoading,
     error,
-    recallEmployeeData: refetch,
+    recallEmployeeData: refetch, 
   };
 };
 
 //  ManageBucket.jsx
-export const useEmployees = (selectedProject) => {
+export const useEmployees = ( selectedProject ) =>
+{
+
   const {
     data = [],
     isLoading,
@@ -43,9 +50,7 @@ export const useEmployees = (selectedProject) => {
   } = useQuery({
     queryKey: ["employeeListByProject", selectedProject],
     queryFn: async () => {
-      const res = await EmployeeRepository.getEmployeeListByproject(
-        selectedProject
-      );
+      const res = await EmployeeRepository.getEmployeeListByproject(selectedProject);
       return res.data || res;
     },
     enabled: !!selectedProject,
@@ -67,12 +72,12 @@ export const useEmployeeRoles = (employeeId) => {
     isLoading: loading,
     error,
   } = useQuery({
-    queryKey: ["employeeRoles", employeeId],
+    queryKey: ['employeeRoles', employeeId],
     queryFn: async () => {
       const res = await RolesRepository.getEmployeeRoles(employeeId);
       return res.data;
     },
-    enabled: !!employeeId,
+     enabled: !!employeeId,
   });
 
   return {
@@ -90,12 +95,12 @@ export const useEmployeesByProject = (projectId) => {
     error,
     refetch: recallProjectEmplloyee,
   } = useQuery({
-    queryKey: ["projectEmployees", projectId],
+    queryKey: ['projectEmployees', projectId],
     queryFn: async () => {
       const res = await ProjectRepository.getEmployeesByProject(projectId);
       return res.data;
     },
-    enabled: !!projectId,
+    enabled: !!projectId, 
   });
 
   return {
@@ -107,17 +112,16 @@ export const useEmployeesByProject = (projectId) => {
 };
 
 // EmployeeList.jsx
-export const useEmployeesAllOrByProjectId = (
-  showAllEmployees,
-  projectId,
-  showInactive
-) => {
-  const queryKey = showAllEmployees
-    ? ["allEmployees", showInactive]
-    : ["projectEmployees", projectId, showInactive];
+export const useEmployeesAllOrByProjectId = (showAllEmployees ,projectId,
+      showInactive) => {
+
+
+  	const queryKey = showAllEmployees
+  ? ['allEmployees', showInactive]
+  : ['projectEmployees', projectId, showInactive];
 
   const queryFn = async () => {
-    if (showAllEmployees) {
+  if (showAllEmployees) {
       const res = await EmployeeRepository.getAllEmployeeList(showInactive);
       return res.data;
     } else {
@@ -135,8 +139,7 @@ export const useEmployeesAllOrByProjectId = (
   } = useQuery({
     queryKey,
     queryFn,
-    enabled:
-      typeof showInactive === "boolean" && (showAllEmployees || !!projectId),
+    enabled:typeof showInactive === "boolean" && (showAllEmployees || !!projectId),  
   });
 
   return {
@@ -148,85 +151,69 @@ export const useEmployeesAllOrByProjectId = (
 };
 
 //  ManageEmployee.jsx
-export const useEmployeeProfile = (employeeId) => {
+export const useEmployeeProfile = ( employeeId ) =>
+{
   const isEnabled = !!employeeId;
   const {
     data = null,
     isLoading: loading,
     error,
-    refetch,
+    refetch
   } = useQuery({
-    queryKey: ["employeeProfile", employeeId],
+    queryKey: ['employeeProfile', employeeId],
     queryFn: async () => {
       if (!employeeId) return null;
       const res = await EmployeeRepository.getEmployeeProfile(employeeId);
       return res.data;
     },
-    enabled: isEnabled,
+    enabled: isEnabled,   
   });
 
   return {
     employee: data,
     loading,
     error,
-    refetch,
+    refetch
   };
 };
 
-export const useEmployeesName = (projectId, search) => {
-  return useQuery({
-    queryKey: ["employees", projectId, search],
-    queryFn: async() => await EmployeeRepository.getEmployeeName(projectId, search),
-   
-    staleTime: 5 * 60 * 1000, // Optional: cache for 5 minutes
-  });
-};
 
 // Mutation------------------------------------------------------------------
 
-export const useUpdateEmployee = () => {
-  const selectedProject = useSelector(
-    (store) => store.localVariables.projectId
-  );
-  const queryClient = useQueryClient();
+
+
+export const useUpdateEmployee = () =>
+{
+    const selectedProject = useSelector((store)=>store.localVariables.projectId)
+    const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (employeeData) =>
-      EmployeeRepository.manageEmployee(employeeData),
+    mutationFn: (employeeData) => EmployeeRepository.manageEmployee(employeeData),
     onSuccess: (_, variables) => {
       const id = variables.id || variables.employeeId;
       const isAllEmployee = variables.IsAllEmployee;
-
+    
       // Cache invalidation
-      queryClient.invalidateQueries({ queryKey: ["allEmployees"] });
+        queryClient.invalidateQueries( {queryKey:[ 'allEmployees'] }); 
       // queryClient.invalidateQueries(['employeeProfile', id]);
-      queryClient.invalidateQueries({ queryKey: ["projectEmployees"] });
-      queryClient.removeQueries({ queryKey: ["empListByProjectAllocated"] });
-
+      queryClient.invalidateQueries( {queryKey: [ 'projectEmployees' ]} );
+      queryClient.removeQueries( {queryKey: [ "empListByProjectAllocated" ]} );
+      
       // queryClient.invalidateQueries( {queryKey:[ 'employeeListByProject']} );
-      showToast(
-        `Employee ${id ? "updated" : "created"} successfully`,
-        "success"
-      );
+      showToast( `Employee ${ id ? 'updated' : 'created' } successfully`, 'success' );
     },
     onError: (error) => {
-      const msg =
-        error?.response?.data?.message ||
-        error.message ||
-        "Something went wrong";
-      showToast(msg, "error");
+      const msg = error?.response?.data?.message || error.message || 'Something went wrong';
+      showToast(msg, 'error');
     },
   });
 };
 
-export const useSuspendEmployee = ({
-  setIsDeleteModalOpen,
-  setemployeeLodaing,
-}) => {
+
+
+export const useSuspendEmployee = ({ setIsDeleteModalOpen, setemployeeLodaing }) => {
   const queryClient = useQueryClient();
-  const selectedProject = useSelector(
-    (store) => store.localVariables.projectId
-  );
+ const selectedProject = useSelector((store)=>store.localVariables.projectId)
   return useMutation({
     mutationFn: (id) => {
       setemployeeLodaing(true);
@@ -234,12 +221,12 @@ export const useSuspendEmployee = ({
     },
 
     onSuccess: () => {
+  
+
       // queryClient.invalidateQueries( ['allEmployee',false]);
-      queryClient.invalidateQueries({ queryKey: ["projectEmployees"] });
-      queryClient.invalidateQueries({
-        queryKey: ["employeeListByProject", selectedProject],
-      });
-      showToast("Employee deleted successfully.", "success");
+      queryClient.invalidateQueries( {queryKey: [ 'projectEmployees' ]} );
+      queryClient.invalidateQueries( {queryKey:[ 'employeeListByProject' ,selectedProject]} );
+          showToast("Employee deleted successfully.", "success");
       setIsDeleteModalOpen(false);
     },
 
@@ -260,11 +247,8 @@ export const useSuspendEmployee = ({
 
 // Manage Role
 
-export const useUpdateEmployeeRoles = ({
-  onClose,
-  resetForm,
-  onSuccessCallback,
-} = {}) => {
+
+export const useUpdateEmployeeRoles = ({ onClose, resetForm, onSuccessCallback } = {}) => {
   const queryClient = useQueryClient();
   const mutation = useMutation({
     mutationFn: (updates) => RolesRepository.createEmployeeRoles(updates),
@@ -275,14 +259,12 @@ export const useUpdateEmployeeRoles = ({
       onClose?.();
       onSuccessCallback?.();
 
-      queryClient.invalidateQueries({ queryKey: ["employeeRoles"] });
-      queryClient.invalidateQueries({ queryKey: ["profile"] });
+      queryClient.invalidateQueries( {queryKey: [ "employeeRoles" ]} );
+      queryClient.invalidateQueries( {queryKey: [ "profile" ]} );
     },
     onError: (err) => {
       const message =
-        err?.response?.data?.message ||
-        err?.message ||
-        "Error occurred while updating roles";
+        err?.response?.data?.message || err?.message || "Error occurred while updating roles";
       showToast(message, "error");
     },
   });
diff --git a/src/hooks/useExpense.js b/src/hooks/useExpense.js
deleted file mode 100644
index 7fcf2c44..00000000
--- a/src/hooks/useExpense.js
+++ /dev/null
@@ -1,254 +0,0 @@
-import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import ExpenseRepository from "../repositories/ExpsenseRepository";
-import showToast from "../services/toastService";
-import { queryClient } from "../layouts/AuthLayout";
-import { useSelector } from "react-redux";
-
-// -------------------Query------------------------------------------------------
-const cleanFilter = (filter) => {
-  const cleaned = { ...filter };
-
-  ["projectIds", "statusIds", "createdByIds", "paidById"].forEach((key) => {
-    if (Array.isArray(cleaned[key]) && cleaned[key].length === 0) {
-      delete cleaned[key];
-    }
-  });
-
-  if (!cleaned.startDate) delete cleaned.startDate;
-  if (!cleaned.endDate) delete cleaned.endDate;
-
-  return cleaned;
-};
-
-export const useExpenseList = (
-  pageSize,
-  pageNumber,
-  filter,
-  searchString = ""
-) => {
-  return useQuery({
-    queryKey: ["Expenses", pageNumber, pageSize, filter, searchString],
-    queryFn: async () => {
-      const cleanedFilter = cleanFilter(filter);
-      const response = await ExpenseRepository.GetExpenseList(
-        pageSize,
-        pageNumber,
-        cleanedFilter,
-        searchString
-      );
-      return response.data;
-    },
-    keepPreviousData: true,
-  });
-};
-
-export const useExpense = (ExpenseId) => {
-  return useQuery({
-    queryKey: ["Expense", ExpenseId],
-    queryFn: async () =>
-      await ExpenseRepository.GetExpenseDetails(ExpenseId).then(
-        (res) => res.data
-      ),
-    enabled: !!ExpenseId,
-  });
-};
-
-export const useExpenseFilter = () => {
-  return useQuery({
-    queryKey: ["ExpenseFilter"],
-    queryFn: async () =>
-      await ExpenseRepository.GetExpenseFilter().then((res) => res.data),
-  });
-};
-
-// ---------------------------Mutation---------------------------------------------
-
-export const useCreateExpnse = (onSuccessCallBack) => {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: async (payload) => {
-      await ExpenseRepository.CreateExpense(payload);
-    },
-    onSuccess: (_, variables) => {
-      queryClient.invalidateQueries({ queryKey: ["Expenses"] });
-      showToast("Expense Created Successfully", "success");
-      if (onSuccessCallBack) onSuccessCallBack();
-    },
-    onError: (error) => {
-      showToast(
-        error.message || "Something went wrong please try again !",
-        "error"
-      );
-    },
-  });
-};
-
-export const useUpdateExpense = (onSuccessCallBack) => {
-  const queryClient = useQueryClient();
-  return useMutation({
-    mutationFn: async ({ id, payload }) => {
-      const response = await ExpenseRepository.UpdateExpense(id, payload);
-      return response.data;
-    },
-    onSuccess: (updatedExpense, variables) => {
-      // queryClient.setQueriesData(
-      //   {queryKey:['expenses'],exact:true},
-      //   (oldData) => {
-      //     if (!oldData || !oldData.data) return oldData;
-
-      //     const updatedList = oldData.data.map((expense) => {
-      //       if (expense.id !== variables.id) return expense;
-
-      //       return {
-      //         ...expense,
-      //         project:
-      //           expense.project.id !== updatedExpense.project.id
-      //             ? updatedExpense.project
-      //             : expense.project,
-      //         expensesType:
-      //           expense.expensesType.id !== updatedExpense.expensesType.id
-      //             ? updatedExpense.expensesType
-      //             : expense.expensesType,
-      //         paymentMode:
-      //           expense.paymentMode.id !== updatedExpense.paymentMode.id
-      //             ? updatedExpense.paymentMode
-      //             : expense.paymentMode,
-      //         paidBy:
-      //           expense.paidBy.id !== updatedExpense.paidBy.id
-      //             ? updatedExpense.paidBy
-      //             : expense.paidBy,
-      //         createdBy:
-      //           expense.createdBy.id !== updatedExpense.createdBy.id
-      //             ? updatedExpense.createdBy
-      //             : expense.createdBy,
-      //         createdAt: updatedExpense.createdAt,
-      //         status: updatedExpense.status,
-      //         nextStatus: updatedExpense.nextStatus,
-      //         preApproved: updatedExpense.preApproved,
-      //         transactionDate: updatedExpense.transactionDate,
-      //         amount: updatedExpense.amount,
-      //       };
-      //     });
-
-      //     return {
-      //       ...oldData,
-      //       data: updatedList,
-      //     };
-      //   }
-      // );
-      queryClient.removeQueries({ queryKey: ["Expense", variables.id] });
-      queryClient.invalidateQueries({ queryKey: ["Expenses"] });
-      showToast("Expense updated Successfully", "success");
-
-      if (onSuccessCallBack) onSuccessCallBack();
-    },
-    onError: (error) => {
-      showToast("Something went wrong.Please try again later.", "error");
-    },
-  });
-};
-
-export const useActionOnExpense = (onSuccessCallBack) => {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: async (payload) => {
-      const response = await ExpenseRepository.ActionOnExpense(payload);
-      return response.data;
-    },
-    onSuccess: (updatedExpense, variables) => {
-      showToast("Request processed successfully.", "success");
-
-      queryClient.setQueriesData(
-        {
-          queryKey: ["Expenses"],
-          exact: false,
-        },
-        (oldData) => {
-          if (!oldData) return oldData;
-          return {
-            ...oldData,
-            data: oldData.data.map((item) =>
-              item.id === updatedExpense.id
-                ? {
-                    ...item,
-                    nextStatus: updatedExpense.nextStatus,
-                    status: updatedExpense.status,
-                  }
-                : item
-            ),
-          };
-        }
-      );
-      // queryClient.setQueriesData(
-      //   { queryKey: ["Expense", updatedExpense.id] },
-      //   (oldData) => {
-      //     return {
-      //       ...oldData,
-      //       nextStatus: updatedExpense.nextStatus,
-      //       status: updatedExpense.status,
-      //     };
-      //   }
-      // );
-      queryClient.invalidateQueries({queryKey:["Expense",updatedExpense.id]})
-
-      if (onSuccessCallBack) onSuccessCallBack();
-    },
-    onError: (error) => {
-      showToast(
-        error.response.data.message ||
-          "Something went wrong.Please try again later.",
-        "error"
-      );
-    },
-  });
-};
-
-export const useDeleteExpense = () => {
-  const queryClient = useQueryClient();
-
-  return useMutation({
-    mutationFn: async ({ id }) => {
-      const response = await ExpenseRepository.DeleteExpense(id);
-      return response.data;
-    },
-    onSuccess: (data, variables) => {
-      queryClient.setQueryData(["Expenses"], (oldData) => {
-        if (!oldData || !oldData.data)
-          return queryClient.invalidateQueries({ queryKey: ["Expenses"] });
-
-        const updatedList = oldData.data.filter(
-          (expense) => expense.id !== variables.id
-        );
-
-        return {
-          ...oldData,
-          data: updatedList,
-        };
-      });
-
-      showToast(data.message || "Expense deleted successfully", "success");
-    },
-    onError: (error) => {
-      showToast(
-        error.message ||
-          error.response.message ||
-          "Something went wrong.Please try again later.",
-        "error"
-      );
-    },
-  });
-};
-
-export const useHasAnyPermission = (permissionIdsInput) => {
-  const permissions = useSelector((state) => state?.profile?.permissions || []);
-
-  const permissionIds = Array.isArray(permissionIdsInput)
-    ? permissionIdsInput
-    : [];
-
-  // No permission needed
-  if (permissionIds.length === 0) return true;
-
-  return permissionIds.some((id) => permissions.includes(id));
-};
diff --git a/src/layouts/HomeLayout.jsx b/src/layouts/HomeLayout.jsx
index 0de9e4b9..34639ee0 100644
--- a/src/layouts/HomeLayout.jsx
+++ b/src/layouts/HomeLayout.jsx
@@ -7,8 +7,6 @@ import Footer from "../components/Layout/Footer";
 import FloatingMenu from "../components/common/FloatingMenu";
 import { FabProvider } from "../Context/FabContext";
 import { useSelector } from "react-redux";
-import OffcanvasTrigger from "../components/common/OffcanvasTrigger";
-import GlobalOffcanvas from "../components/common/GlobalOffcanvas ";
 
 const HomeLayout = () => {
   const loggedUser = useSelector((store) => store.globalVariables.loginUser);
@@ -36,11 +34,9 @@ const HomeLayout = () => {
               <Footer />
             </div>
           </div>
-            <OffcanvasTrigger />
           <FloatingMenu />
           <div className="layout-overlay layout-menu-toggle"></div>
         </div>
-                <GlobalOffcanvas />
       </div>
     </FabProvider>
   );
diff --git a/src/pages/Activities/AttendancePage.jsx b/src/pages/Activities/AttendancePage.jsx
index b3224bde..0aaa4b43 100644
--- a/src/pages/Activities/AttendancePage.jsx
+++ b/src/pages/Activities/AttendancePage.jsx
@@ -8,35 +8,42 @@ import {
 import Breadcrumb from "../../components/common/Breadcrumb";
 import AttendanceLog from "../../components/Activities/AttendcesLogs";
 import Attendance from "../../components/Activities/Attendance";
-import AttendanceModel from "../../components/Activities/AttendanceModel";
+// import AttendanceModel from "../../components/Activities/AttendanceModel";
 import showToast from "../../services/toastService";
+// import { useProjects } from "../../hooks/useProjects";
 import Regularization from "../../components/Activities/Regularization";
 import { useAttendance } from "../../hooks/useAttendance";
 import { useDispatch, useSelector } from "react-redux";
 import { setProjectId } from "../../slices/localVariablesSlice";
-import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice";
+// import { markCurrentAttendance } from "../../slices/apiSlice/attendanceAllSlice";
+import { hasUserPermission } from "../../utils/authUtils";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import { REGULARIZE_ATTENDANCE } from "../../utils/constants";
 import eventBus from "../../services/eventBus";
-import AttendanceRepository from "../../repositories/AttendanceRepository";
+// import AttendanceRepository from "../../repositories/AttendanceRepository";
 import { useProjectName } from "../../hooks/useProjects";
+import GlobalModel from "../../components/common/GlobalModel";
+import CheckCheckOutmodel from "../../components/Activities/CheckCheckOutForm";
+import AttendLogs from "../../components/Activities/AttendLogs";
+// import Confirmation from "../../components/Activities/Confirmation";
+import { useQueryClient } from "@tanstack/react-query";
 
 const AttendancePage = () => {
   const [activeTab, setActiveTab] = useState("all");
-  const [showPending, setShowPending] = useState(false);
-  const [searchQuery, setSearchQuery] = useState("");
+  const [ShowPending, setShowPending] = useState(false);
+  const queryClient = useQueryClient();
   const loginUser = getCachedProfileData();
-  const selectedProject = useSelector((store) => store.localVariables.projectId);
+  var selectedProject = useSelector((store) => store.localVariables.projectId);
   const dispatch = useDispatch();
-  const {
-    attendance,
-    loading: attLoading,
-    recall: attrecall,
-  } = useAttendance(selectedProject);
+  // const {
+  //   attendance,
+  //   loading: attLoading,
+  //   recall: attrecall,
+  // } = useAttendance(selectedProject);
   const [attendances, setAttendances] = useState();
   const [empRoles, setEmpRoles] = useState(null);
   const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
-  const [modelConfig, setModelConfig] = useState(null); // Initialize as null
+  const [modelConfig, setModelConfig] = useState();
   const DoRegularized = useHasUserPermission(REGULARIZE_ATTENDANCE);
   const { projectNames, loading: projectLoading, fetchData } = useProjectName();
 
@@ -46,163 +53,86 @@ const AttendancePage = () => {
     date: new Date().toLocaleDateString(),
   });
 
-  const handler = useCallback(
-    (msg) => {
-      if (selectedProject === msg.projectId) {
-        const updatedAttendance = attendances
-          ? attendances.map((item) =>
-              item.employeeId === msg.response.employeeId
-                ? { ...item, ...msg.response }
-                : item
-            )
-          : [msg.response];
+  // const handler = useCallback(
+  //   (msg) => {
+  //     if (selectedProject == msg.projectId) {
+  //       const updatedAttendance = attendances.map((item) =>
+  //         item.employeeId === msg.response.employeeId
+  //           ? { ...item, ...msg.response }
+  //           : item
+  //       );
+  //       queryClient.setQueryData(["attendance", selectedProject], (oldData) => {
+  //         if (!oldData) return oldData;
+  //         return oldData.map((emp) =>
+  //           emp.employeeId === data.employeeId ? { ...emp, ...data } : emp
+  //         );
+  //       });
+  //     }
+  //   },
+  //   [selectedProject, attrecall]
+  // );
 
-        cacheData("Attendance", {
-          data: updatedAttendance,
-          projectId: selectedProject,
-        });
-        setAttendances(updatedAttendance);
-      }
-    },
-    [selectedProject, attendances]
-  );
-
-  const employeeHandler = useCallback(
-    (msg) => {
-      // This logic seems fine for refetching if an employee ID exists in current attendances
-      if (attendances?.some((item) => item.employeeId === msg.employeeId)) {
-        AttendanceRepository.getAttendance(selectedProject)
-          .then((response) => {
-            cacheData("Attendance", { data: response.data, selectedProject });
-            setAttendances(response.data);
-          })
-          .catch((error) => {
-            console.error(error);
-          });
-      }
-    },
-    [selectedProject, attendances]
-  );
+  // const employeeHandler = useCallback(
+  //   (msg) => {
+  //     if (attendances.some((item) => item.employeeId == msg.employeeId)) {
+  //       attrecall();
+  //     }
+  //   },
+  //   [selectedProject, attendances]
+  // );
+  useEffect(() => {
+    if (selectedProject == null) {
+      dispatch(setProjectId(projectNames[0]?.id));
+    }
+  }, []);
 
   const getRole = (roleId) => {
     if (!empRoles) return "Unassigned";
     if (!roleId) return "Unassigned";
-    const role = empRoles.find((b) => b.id === roleId);
+    const role = empRoles.find((b) => b.id == roleId);
     return role ? role.role : "Unassigned";
   };
 
-  // Simplified and moved modal opening logic
-  const handleModalData = useCallback((employee) => {
-    setModelConfig(employee);
-    setIsCreateModalOpen(true); // Open the modal directly when data is set
-  }, []);
-
-  const closeModal = useCallback(() => {
-    setModelConfig(null);
-    setIsCreateModalOpen(false);
-    // Directly manipulating the DOM is generally not recommended in React.
-    // React handles modal visibility via state. If you must, ensure it's
-    // for external libraries or for very specific, controlled reasons.
-    // For a typical Bootstrap modal, just setting `isCreateModalOpen` to false
-    // should be enough if the modal component itself handles the Bootstrap classes.
-    const modalElement = document.getElementById("check-Out-modal");
-    if (modalElement) {
-      modalElement.classList.remove("show");
-      modalElement.style.display = "none";
-      document.body.classList.remove("modal-open");
-      const modalBackdrop = document.querySelector(".modal-backdrop");
-      if (modalBackdrop) {
-        modalBackdrop.remove();
-      }
-    }
-  }, []);
-
-  const handleSubmit = useCallback((formData) => {
-    dispatch(markCurrentAttendance(formData))
-      .then((action) => {
-        if (action.payload && action.payload.employeeId) {
-          const updatedAttendance = attendances
-            ? attendances.map((item) =>
-                item.employeeId === action.payload.employeeId
-                  ? { ...item, ...action.payload }
-                  : item
-              )
-            : [action.payload];
-
-          cacheData("Attendance", {
-            data: updatedAttendance,
-            projectId: selectedProject,
-          });
-          setAttendances(updatedAttendance);
-          showToast("Attendance Marked Successfully", "success");
-        } else {
-          showToast("Failed to mark attendance: Invalid response", "error");
-        }
-      })
-      .catch((error) => {
-        showToast(error.message, "error");
-      });
-  }, [dispatch, attendances, selectedProject]);
-
-
-  const handleToggle = (event) => {
-    setShowPending(event.target.checked);
+  const openModel = () => {
+    setIsCreateModalOpen(true);
   };
 
+  const handleModalData = (employee) => {
+    setModelConfig(employee);
+  };
+
+  const closeModal = () => {
+    setModelConfig(null);
+    setIsCreateModalOpen(false);
+  };
+
+  const handleToggle = (event) => {
+    setShowOnlyCheckout(event.target.checked);
+  };
+
+
   useEffect(() => {
-    if (selectedProject === null && projectNames.length > 0) {
-      dispatch(setProjectId(projectNames[0]?.id));
+    if (modelConfig !== null) {
+      openModel();
     }
-  }, [selectedProject, projectNames, dispatch]);
+  }, [modelConfig, isCreateModalOpen]);
 
-  useEffect(() => {
-    setAttendances(attendance);
-  }, [attendance]);
-
-  const filteredAndSearchedTodayAttendance = useCallback(() => {
-    let currentData = attendances;
-
-    if (showPending) {
-      currentData = currentData?.filter(
-        (att) => att?.checkInTime !== null && att?.checkOutTime === null
-      );
-    }
-
-    if (searchQuery) {
-      const lowerCaseSearchQuery = searchQuery.toLowerCase();
-      currentData = currentData?.filter((att) => {
-        const fullName = [att.firstName, att.middleName, att.lastName]
-          .filter(Boolean)
-          .join(" ")
-          .toLowerCase();
-
-        return (
-          att.employeeName?.toLowerCase().includes(lowerCaseSearchQuery) ||
-          att.employeeId?.toLowerCase().includes(lowerCaseSearchQuery) ||
-          fullName.includes(lowerCaseSearchQuery)
-        );
-      });
-    }
-    return currentData;
-  }, [attendances, showPending, searchQuery]);
-
-  useEffect(() => {
-    eventBus.on("attendance", handler);
-    return () => eventBus.off("attendance", handler);
-  }, [handler]);
-
-  useEffect(() => {
-    eventBus.on("employee", employeeHandler);
-    return () => eventBus.off("employee", employeeHandler);
-  }, [employeeHandler]);
+  // useEffect(() => {
+  //   eventBus.on("attendance", handler);
+  //   return () => eventBus.off("attendance", handler);
+  // }, [handler]);
 
+  // useEffect(() => {
+  //   eventBus.on("employee", employeeHandler);
+  //   return () => eventBus.off("employee", employeeHandler);
+  // }, [employeeHandler]);
   return (
     <>
-      {isCreateModalOpen && modelConfig && (
+      {/* {isCreateModalOpen && modelConfig && (
         <div
           className="modal fade show"
           style={{ display: "block" }}
-          id="check-Out-modal"
+          id="check-Out-modalg"
           tabIndex="-1"
           aria-hidden="true"
         >
@@ -212,6 +142,29 @@ const AttendancePage = () => {
             handleSubmitForm={handleSubmit}
           />
         </div>
+      )} */}
+      {isCreateModalOpen && modelConfig && (
+        <GlobalModel
+          isOpen={isCreateModalOpen}
+          size={modelConfig?.action === 6 && "lg"}
+          closeModal={closeModal}
+        >
+          {(modelConfig?.action === 0 ||
+            modelConfig?.action === 1 ||
+            modelConfig?.action === 2) && (
+            <CheckCheckOutmodel
+              modeldata={modelConfig}
+              closeModal={closeModal}
+            />
+          )}
+          {/* For view logs */}
+          {modelConfig?.action === 6 && (
+            <AttendLogs Id={modelConfig?.id} closeModal={closeModal} />
+          )}
+          {modelConfig?.action === 7 && (
+            <Confirmation closeModal={closeModal} />
+          )}
+        </GlobalModel>
       )}
 
       <div className="container-fluid">
@@ -221,106 +174,69 @@ const AttendancePage = () => {
             { label: "Attendance", link: null },
           ]}
         ></Breadcrumb>
-        <div className="nav-align-top nav-tabs-shadow">
-          <ul
-            className="nav nav-tabs d-flex justify-content-between align-items-center"
-            role="tablist"
-          >
-            <div className="d-flex">
-              <li className="nav-item">
-                <button
-                  type="button"
-                  className={`nav-link ${activeTab === "all" ? "active" : ""} fs-6`}
-                  onClick={() => setActiveTab("all")}
-                  data-bs-toggle="tab"
-                  data-bs-target="#navs-top-home"
-                >
-                  Today's
-                </button>
-              </li>
-              <li className="nav-item">
-                <button
-                  type="button"
-                  className={`nav-link ${activeTab === "logs" ? "active" : ""} fs-6`}
-                  onClick={() => setActiveTab("logs")}
-                  data-bs-toggle="tab"
-                  data-bs-target="#navs-top-profile"
-                >
-                  Logs
-                </button>
-              </li>
-              <li className={`nav-item ${!DoRegularized && "d-none"}`}>
-                <button
-                  type="button"
-                  className={`nav-link ${
-                    activeTab === "regularization" ? "active" : ""
-                  } fs-6`}
-                  onClick={() => setActiveTab("regularization")}
-                  data-bs-toggle="tab"
-                  data-bs-target="#navs-top-messages"
-                >
-                  Regularization
-                </button>
-              </li>
-            </div>
-            <div className="p-2">
-              <input
-                type="text"
-                className="form-control form-control-sm"
-                placeholder="Search employee..."
-                value={searchQuery}
-                onChange={(e) => setSearchQuery(e.target.value)}
-              />
-            </div>
+        <div className="nav-align-top nav-tabs-shadow" >
+          <ul className="nav nav-tabs" role="tablist">
+            <li className="nav-item">
+              <button
+                type="button"
+                className={`nav-link ${
+                  activeTab === "all" ? "active" : ""
+                } fs-6`}
+                onClick={() => setActiveTab("all")}
+                data-bs-toggle="tab"
+                data-bs-target="#navs-top-home"
+              >
+                Today's
+              </button>
+            </li>
+            <li className="nav-item">
+              <button
+                type="button"
+                className={`nav-link ${
+                  activeTab === "logs" ? "active" : ""
+                } fs-6`}
+                onClick={() => setActiveTab("logs")}
+                data-bs-toggle="tab"
+                data-bs-target="#navs-top-profile"
+              >
+                Logs
+              </button>
+            </li>
+            <li className={`nav-item ${!DoRegularized && "d-none"}`}>
+              <button
+                type="button"
+                className={`nav-link ${
+                  activeTab === "regularization" ? "active" : ""
+                } fs-6`}
+                onClick={() => setActiveTab("regularization")}
+                data-bs-toggle="tab"
+                data-bs-target="#navs-top-messages"
+              >
+                Regularization
+              </button>
+            </li>
           </ul>
-          <div className="tab-content attedanceTabs py-0 px-1 px-sm-3">
+          <div className="tab-content attedanceTabs py-0 px-1 px-sm-3" >
             {activeTab === "all" && (
-              <>
-                {!attLoading && (
                   <div className="tab-pane fade show active py-0">
                     <Attendance
-                      attendance={filteredAndSearchedTodayAttendance()}
                       handleModalData={handleModalData}
                       getRole={getRole}
-                      setshowOnlyCheckout={setShowPending}
-                      showOnlyCheckout={showPending}
-                      searchQuery={searchQuery}
                     />
                   </div>
-                )}
-                {!attLoading && filteredAndSearchedTodayAttendance()?.length === 0 && (
-                  <p>
-                    {" "}
-                    {showPending
-                      ? "No Pending Available"
-                      : "No Employee assigned yet."}{" "}
-                  </p>
-                )}
-              </>
             )}
-
             {activeTab === "logs" && (
               <div className="tab-pane fade show active py-0">
                 <AttendanceLog
                   handleModalData={handleModalData}
-                  projectId={selectedProject}
-                  setshowOnlyCheckout={setShowPending}
-                  showOnlyCheckout={showPending}
-                  searchQuery={searchQuery}
                 />
               </div>
             )}
-
             {activeTab === "regularization" && DoRegularized && (
               <div className="tab-pane fade show active py-0">
-                <Regularization
-                  handleRequest={handleSubmit}
-                  searchQuery={searchQuery}
-                />
+                <Regularization />
               </div>
             )}
-
-            {!attLoading && !attendances && <span>Not Found</span>}
           </div>
         </div>
       </div>
@@ -328,4 +244,4 @@ const AttendancePage = () => {
   );
 };
 
-export default AttendancePage;
\ No newline at end of file
+export default AttendancePage;
diff --git a/src/pages/Directory/DirectoryPageHeader.jsx b/src/pages/Directory/DirectoryPageHeader.jsx
index 81074dde..657c22de 100644
--- a/src/pages/Directory/DirectoryPageHeader.jsx
+++ b/src/pages/Directory/DirectoryPageHeader.jsx
@@ -257,7 +257,7 @@ const DirectoryPageHeader = ({
                     <ul className="nav nav-tabs mb-0" role="tablist">
                         <li className="nav-item" role="presentation">
                             <button
-                                className={`nav-link ${viewType === "notes" ? "active" : ""} fs-6`}
+                                className={`nav-link ${viewType === "notes" ? "active" : ""}`}
                                 onClick={() => setViewType("notes")}
                                 type="button"
                             >
@@ -266,9 +266,8 @@ const DirectoryPageHeader = ({
                         </li>
                         <li className="nav-item" role="presentation">
                             <button
-                                // Corrected: Apply 'active' if viewType is either 'card' or 'list'
-                                className={`nav-link ${viewType === "card" || viewType === "list" ? "active" : ""} fs-6`}
-                                onClick={() => setViewType("card")} // You might want to default to 'card' when switching to contacts
+                                className={`nav-link ${viewType === "card" ? "active" : ""}`}
+                                onClick={() => setViewType("card")}
                                 type="button"
                             >
                                 <i className="bx bx-user me-1"></i> Contacts
@@ -280,7 +279,7 @@ const DirectoryPageHeader = ({
             <hr className="my-0 mb-2" style={{ borderTop: "1px solid #dee2e6" }} />
 
             <div className="row mx-0 px-0 align-items-center mt-2">
-                <div className="col-12 col-md-6 mb-2 px-1 d-flex align-items-center gap-2">
+                <div className="col-12 col-md-6 mb-2 px-5 d-flex align-items-center gap-4">
 
                     <input
                         type="search"
@@ -299,7 +298,7 @@ const DirectoryPageHeader = ({
                                 data-bs-toggle="dropdown"
                                 aria-expanded="false"
                             >
-                                <i className={`bx bx-slider-alt ${notesFilterCount > 0 ? "text-primary" : "text-muted"}`}></i>
+                                <i className={`fa-solid fa-filter ms-1 fs-5 ${notesFilterCount > 0 ? "text-primary" : "text-muted"}`}></i>
                                 {notesFilterCount > 0 && (
                                     <span className="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning" style={{ fontSize: "0.4rem" }}>
                                         {notesFilterCount}
@@ -342,7 +341,7 @@ const DirectoryPageHeader = ({
                                         </div>
 
                                         {/* Organization */}
-                                        <div style={{ maxHeight: "260px", overflowY: "auto", overflowX: "hidden", }}>
+                                        <div style={{  maxHeight: "260px", overflowY: "auto",overflowX: "hidden", }}>
                                             <div style={{ position: "sticky", top: 0, background: "#fff", zIndex: 1 }}>
                                                 <p className="text-muted mb-2 pt-2">Organization</p>
                                             </div>
@@ -405,17 +404,17 @@ const DirectoryPageHeader = ({
 
                             <button
                                 type="button"
-                                className={`btn  btn-sm p-1 ${viewType === "card" ? "btn-primary" : "btn-outline-primary"}`}
+                                className={`btn btn-xs ${viewType === "card" ? "btn-primary" : "btn-outline-primary"}`}
                                 onClick={() => setViewType("card")}
                             >
                                 <i className="bx bx-grid-alt"></i>
                             </button>
                             <button
                                 type="button"
-                                className={`btn  btn-sm p-1 ${viewType === "list" ? "btn-primary" : "btn-outline-primary"}`}
+                                className={`btn btn-xs ${viewType === "list" ? "btn-primary" : "btn-outline-primary"}`}
                                 onClick={() => setViewType("list")}
                             >
-                                <i className="bx bx-list-ul"></i>
+                                <i className="bx bx-list-ul me-1"></i>
 
                             </button>
                         </div>
@@ -423,13 +422,13 @@ const DirectoryPageHeader = ({
 
                     {/* Filter by funnel icon for Contacts view (retains numerical badge) */}
                     {viewType !== "notes" && (
-                        <div className="dropdown" style={{ width: "fit-content" }}>
+                        <div className="dropdown-center" style={{ width: "fit-content" }}>
                             <a
                                 className="dropdown-toggle hide-arrow cursor-pointer d-flex align-items-center position-relative"
                                 data-bs-toggle="dropdown"
                                 aria-expanded="false"
                             >
-                                <i className={`bx bx-slider-alt ${filtered > 0 ? "text-primary" : "text-muted"}`}></i>
+                                <i className={`fa-solid fa-filter ms-1 fs-5 ${filtered > 0 ? "text-primary" : "text-muted"}`}></i>
                                 {filtered > 0 && (
                                     <span className="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-warning" style={{ fontSize: "0.4rem" }}>
                                         {filtered}
diff --git a/src/pages/Expense/ExpensePage.jsx b/src/pages/Expense/ExpensePage.jsx
deleted file mode 100644
index a7b3028a..00000000
--- a/src/pages/Expense/ExpensePage.jsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import React, { createContext, useContext, useState, useEffect } from "react";
-import { useForm } from "react-hook-form";
-import { zodResolver } from "@hookform/resolvers/zod";
-import { useSelector } from "react-redux";
-
-// Components
-import ExpenseList from "../../components/Expenses/ExpenseList";
-import ViewExpense from "../../components/Expenses/ViewExpense";
-import Breadcrumb from "../../components/common/Breadcrumb";
-import GlobalModel from "../../components/common/GlobalModel";
-import PreviewDocument from "../../components/Expenses/PreviewDocument";
-import ManageExpense from "../../components/Expenses/ManageExpense";
-import ExpenseFilterPanel from "../../components/Expenses/ExpenseFilterPanel";
-
-// Context & Hooks
-import { useFab } from "../../Context/FabContext";
-import { useHasUserPermission } from "../../hooks/useHasUserPermission";
-import {
-  CREATE_EXEPENSE,
-  VIEW_ALL_EXPNESE,
-  VIEW_SELF_EXPENSE,
-} from "../../utils/constants";
-
-// Schema & Defaults
-import {
-  defaultFilter,
-  SearchSchema,
-} from "../../components/Expenses/ExpenseSchema";
-
-// Context
-export const ExpenseContext = createContext();
-export const useExpenseContext = () => {
-  const context = useContext(ExpenseContext);
-  if (!context) {
-    throw new Error("useExpenseContext must be used within an ExpenseProvider");
-  }
-  return context;
-};
-
-const ExpensePage = () => {
-  const selectedProjectId = useSelector(
-    (store) => store.localVariables.projectId
-  );
-
-  const [filters, setFilter] = useState();
-  const [groupBy, setGroupBy] = useState("transactionDate");
-  const [searchText, setSearchText] = useState("");
-
-  const [ManageExpenseModal, setManageExpenseModal] = useState({
-    IsOpen: null,
-    expenseId: null,
-  });
-
-  const [viewExpense, setViewExpense] = useState({
-    expenseId: null,
-    view: false,
-  });
-
-  const [ViewDocument, setDocumentView] = useState({
-    IsOpen: false,
-    Image: null,
-  });
-
-  const IsCreatedAble = useHasUserPermission(CREATE_EXEPENSE);
-  const IsViewAll = useHasUserPermission(VIEW_ALL_EXPNESE);
-  const IsViewSelf = useHasUserPermission(VIEW_SELF_EXPENSE);
-
-  const { setOffcanvasContent, setShowTrigger } = useFab();
-
-  const methods = useForm({
-    resolver: zodResolver(SearchSchema),
-    defaultValues: defaultFilter,
-  });
-
-  const { reset } = methods;
-
-  const clearFilter = () => {
-    setFilter(defaultFilter);
-    reset();
-  };
-
-  useEffect(() => {
-    setShowTrigger(true);
-    setOffcanvasContent(
-      "Expense Filters",
-      <ExpenseFilterPanel
-        onApply={setFilter}
-        handleGroupBy={setGroupBy}
-        clearFilter={clearFilter}
-      />
-    );
-
-    return () => {
-      setShowTrigger(false);
-      setOffcanvasContent("", null);
-    };
-  }, []);
-
-  const contextValue = {
-    setViewExpense,
-    setManageExpenseModal,
-    setDocumentView,
-  };
-
-  return (
-    <ExpenseContext.Provider value={contextValue}>
-      <div className="container-fluid">
-        <Breadcrumb data={[{ label: "Home", link: "/" }, { label: "Expense" }]} />
-
-        {(IsViewAll || IsViewSelf) ? (
-          <>
-            <div className="card my-1">
-              <div className="card-body py-2 px-3">
-                <div className="row align-items-center">
-                  <div className="col-sm-6 col-md-4">
-                    <div className="d-flex align-items-center">
-
-                      <input
-                        type="search"
-                        className="form-control form-control-sm w-auto"
-                        placeholder="Search Expense"
-                        aria-describedby="search-label"
-                        value={searchText}
-                        onChange={(e) => setSearchText(e.target.value)}
-                      />
-                    </div>
-                  </div>
-
-                  <div className="col-sm-6 col-md-8 text-end mt-2 mt-sm-0">
-                    {IsCreatedAble && (
-                      <button
-                        type="button"
-                        className="p-1 me-2 bg-primary rounded-circle"
-                        title="Add New Expense"
-                        onClick={() => setManageExpenseModal({ IsOpen: true, expenseId: null })}
-                      >
-                        <i className="bx bx-plus fs-4 text-white"></i>
-                      </button>
-                    )}
-                  </div>
-                </div>
-              </div>
-            </div>
-
-            <ExpenseList filters={filters} groupBy={groupBy} searchText={searchText} />
-          </>
-        ) : (
-          <div className="card text-center py-1">
-            <i className="fa-solid fa-triangle-exclamation fs-5" />
-            <p>Access Denied: You don't have permission to perform this action!</p>
-          </div>
-        )}
-
-        {/* Modals */}
-        {ManageExpenseModal.IsOpen && (
-          <GlobalModel
-            isOpen
-            size="lg"
-            closeModal={() => setManageExpenseModal({ IsOpen: null, expenseId: null })}
-          >
-            <ManageExpense
-              key={ManageExpenseModal.expenseId ?? "new"}
-              expenseToEdit={ManageExpenseModal.expenseId}
-              closeModal={() => setManageExpenseModal({ IsOpen: null, expenseId: null })}
-            />
-          </GlobalModel>
-        )}
-
-        {viewExpense.view && (
-          <GlobalModel
-            isOpen
-            size="lg"
-            modalType="top"
-            closeModal={() => setViewExpense({ expenseId: null, view: false })}
-          >
-            <ViewExpense ExpenseId={viewExpense.expenseId} />
-          </GlobalModel>
-        )}
-
-        {ViewDocument.IsOpen && (
-          <GlobalModel
-            isOpen
-            size="lg"
-            key={ViewDocument.Image ?? "doc"}
-            closeModal={() => setDocumentView({ IsOpen: false, Image: null })}
-          >
-            <PreviewDocument imageUrl={ViewDocument.Image} />
-          </GlobalModel>
-        )}
-      </div>
-    </ExpenseContext.Provider>
-  );
-};
-
-export default ExpensePage;
diff --git a/src/pages/Gallary/ImageGallary.jsx b/src/pages/Gallary/ImageGallary.jsx
index d92ce8ca..16335df2 100644
--- a/src/pages/Gallary/ImageGallary.jsx
+++ b/src/pages/Gallary/ImageGallary.jsx
@@ -320,7 +320,7 @@ useEffect(() => {
           {isFilterPanelOpen ? (
             <i className="fa-solid fa-times fs-5" />
           ) : (
-            <i className="bx bx-slider-alt ms-1" />
+            <i className="fa-solid fa-filter ms-1 fs-5" />
           )}
         </button>
         <div className="activity-section">
@@ -394,7 +394,7 @@ useEffect(() => {
                     >
                       {batch.documents.map((d, i) => {
                         const hoverDate = moment(d.uploadedAt).format(
-                          "DD MMMM, YYYY"
+                          "DD-MM-YYYY"
                         );
                         const hoverTime = moment(d.uploadedAt).format(
                           "hh:mm A"
diff --git a/src/pages/employee/EmployeeList.jsx b/src/pages/employee/EmployeeList.jsx
index 73ef5901..6d3b66b4 100644
--- a/src/pages/employee/EmployeeList.jsx
+++ b/src/pages/employee/EmployeeList.jsx
@@ -480,7 +480,7 @@ const EmployeeList = () => {
                           aria-label="User: activate to sort column ascending"
                           aria-sort="descending"
                         >
-                          <div className="text-start ms-5">Official Designation</div>
+                          <div className="text-start ms-5">Role</div>
                         </th>
 
                         <th
diff --git a/src/pages/employee/EmployeeProfile.jsx b/src/pages/employee/EmployeeProfile.jsx
index fd94c668..3801fe9f 100644
--- a/src/pages/employee/EmployeeProfile.jsx
+++ b/src/pages/employee/EmployeeProfile.jsx
@@ -102,8 +102,8 @@ const EmployeeProfile = () => {
   return (
     <>
       {showModal && (
-        <GlobalModel size="lg" isOpen={showModal} closeModal={() => setShowModal(false)}>
-          <ManageEmployee employeeId={employeeId} onClosed={() => setShowModal(false)} />
+        <GlobalModel size="lg" isOpen={showModal} closeModal={()=>setShowModal(false)}>
+              <ManageEmployee  employeeId={employeeId} onClosed={()=>setShowModal(false)} />
         </GlobalModel>
       )}
       <div className="container-fluid">
@@ -146,29 +146,34 @@ const EmployeeProfile = () => {
                                 </td>
                               </tr>
                               <tr>
-                                <td className="fw-medium text-start text-nowrap">
+                                <td className="fw-medium text-start">
                                   Phone Number:
                                 </td>
                                 <td className="text-start">
                                   {currentEmployee?.phoneNumber || <em>NA</em>}
                                 </td>
-                              </tr> 
+                              </tr>
                               <tr>
-                                <td className="fw-medium text-start" style={{ width: '120px' }}>
+                                <td className="fw-medium text-start">
                                   Emergency Contact Person:
                                 </td>
-                                <td className="text-start align-bottom">
-                                  {currentEmployee?.emergencyContactPerson || <em>NA</em>}
+                                <td className="text-start">
+                                  {currentEmployee?.emergencyContactPerson || (
+                                    <em>NA</em>
+                                  )}
                                 </td>
                               </tr>
                               <tr>
                                 <td className="fw-medium text-start">
                                   Emergency Contact Number:
                                 </td>
-                                <td className="text-start align-bottom">
-                                  {currentEmployee?.emergencyPhoneNumber || <em>NA</em>}
+                                <td className="text-start">
+                                  {currentEmployee?.emergencyPhoneNumber || (
+                                    <em>NA</em>
+                                  )}
                                 </td>
                               </tr>
+
                               <tr>
                                 <td className="fw-medium text-start">
                                   Gender:
@@ -215,20 +220,21 @@ const EmployeeProfile = () => {
                                 </td>
                               </tr>
                               <tr>
-                                <td className="fw-medium text-start align-top" >
+                                <td className="fw-medium text-start">
                                   Address:
                                 </td>
                                 <td className="text-start">
-                                  {currentEmployee?.currentAddress || <em>NA</em>}
+                                  {currentEmployee?.currentAddress || (
+                                    <em>NA</em>
+                                  )}
                                 </td>
                               </tr>
-
                             </tbody>
                           </table>
                         </div>
                         <button
                           className="btn btn-primary btn-block"
-                          onClick={() => setShowModal(true)}
+                          onClick={()=>setShowModal(true)}
                         >
                           Edit Profile
                         </button>
diff --git a/src/pages/master/MasterTable.jsx b/src/pages/master/MasterTable.jsx
index c064bd11..0126b339 100644
--- a/src/pages/master/MasterTable.jsx
+++ b/src/pages/master/MasterTable.jsx
@@ -16,11 +16,6 @@ const MasterTable = ({ data, columns, loading, handleModalData }) => {
     "tenantId",
     "checkLists",
     "isSystem",
-    "isActive",
-    "noOfPersonsRequired",
-    "color",
-    "displayName",
-    "permissionIds"
   ];
 
   const safeData = Array.isArray(data) ? data : [];
diff --git a/src/pages/project/ProjectDetails.jsx b/src/pages/project/ProjectDetails.jsx
index 1c1492b6..7df9107e 100644
--- a/src/pages/project/ProjectDetails.jsx
+++ b/src/pages/project/ProjectDetails.jsx
@@ -13,7 +13,6 @@ import {
   cacheData,
   clearCacheKey,
   getCachedData,
-  useSelectedproject,
 } from "../../slices/apiDataManager";
 import "./ProjectDetails.css";
 import {
@@ -29,7 +28,8 @@ import { setProjectId } from "../../slices/localVariablesSlice";
 
 const ProjectDetails = () => {
 
-  const projectId = useSelectedproject()
+
+  const projectId = useSelector((store) => store.localVariables.projectId);
 
   const { projectNames, fetchData } = useProjectName();
   const dispatch = useDispatch()
@@ -47,10 +47,9 @@ const ProjectDetails = () => {
     refetch,
   } = useProjectDetails(projectId);
 
-  // const [activePill, setActivePill] = useState("profile");
-  const [activePill, setActivePill] = useState(() => {
-  return localStorage.getItem("lastActiveProjectTab") || "profile";
-});
+  const [activePill, setActivePill] = useState("profile");
+
+
 
   const handler = useCallback(
     (msg) => {
@@ -66,11 +65,9 @@ const ProjectDetails = () => {
     return () => eventBus.off("project", handler);
   }, [handler]);
 
- const handlePillClick = (pillKey) => {
-  setActivePill(pillKey);
-  localStorage.setItem("lastActiveProjectTab", pillKey); // ✅ Save to localStorage
-};
-
+  const handlePillClick = (pillKey) => {
+    setActivePill(pillKey);
+  };
 
   const renderContent = () => {
     if (projectLoading || !projects_Details) return <Loader />;
diff --git a/src/pages/project/ProjectList.jsx b/src/pages/project/ProjectList.jsx
index 2bd8d936..abf76a49 100644
--- a/src/pages/project/ProjectList.jsx
+++ b/src/pages/project/ProjectList.jsx
@@ -192,7 +192,7 @@ const ProjectList = () => {
                   </button>
                 </div>
 
-                 <div className="dropdown mt-1">
+                <div className="dropdown ms-3 mt-1">
                   <a
                     className="dropdown-toggle hide-arrow cursor-pointer p-1 mt-3 "
                     data-bs-toggle="dropdown"
@@ -200,7 +200,7 @@ const ProjectList = () => {
                     data-bs-custom-class="tooltip"
                     title="Filter"
                   >
-                    <i className="bx bx-slider-alt ms-1"></i>
+                    <i className="fa-solid fa-filter fs-4"></i>
                   </a>
                   <ul className="dropdown-menu p-2 text-capitalize">
                     {[
@@ -269,10 +269,10 @@ const ProjectList = () => {
           <div className="card cursor-pointer">
             <div className="card-body p-2">
               <div
-                className="table-responsive text-nowrap py-2 mx-2"
-                style={{ minHeight: "200px" }}
+                className="table-responsive text-nowrap py-2 "
+                style={{ minHeight: "400px" }}
               >
-                <table className="table m-0">
+                <table className="table m-3">
                   <thead>
                     <tr>
                       <th className="text-start" colSpan={5}>
diff --git a/src/repositories/DirectoryRepository.jsx b/src/repositories/DirectoryRepository.jsx
index e19571cc..c99601ed 100644
--- a/src/repositories/DirectoryRepository.jsx
+++ b/src/repositories/DirectoryRepository.jsx
@@ -2,7 +2,6 @@ import { api } from "../utils/axiosClient";
 
 export const DirectoryRepository = {
   GetOrganizations: () => api.get("/api/directory/organization"),
-  GetDesignations: () => api.get("/api/directory/designations"),
   GetContacts: (isActive, projectId) => {
     const params = new URLSearchParams();
     params.append("active", isActive);
diff --git a/src/repositories/EmployeeRepository.jsx b/src/repositories/EmployeeRepository.jsx
index b31f67c8..a466d5f7 100644
--- a/src/repositories/EmployeeRepository.jsx
+++ b/src/repositories/EmployeeRepository.jsx
@@ -1,22 +1,17 @@
 import { api } from "../utils/axiosClient";
 
 const EmployeeRepository = {
-  getAllEmployeeList: (showInactive) =>
-    api.get(`api/employee/list?showInactive=${showInactive}`),
+  getAllEmployeeList:(showInactive)=>api.get(`api/employee/list?showInactive=${showInactive}`),
   getEmployeeListByproject: (projectid) =>
     api.get(`/api/employee/list/${projectid}`),
-  searchEmployees: (query) => api.get(`/api/employee/search/${query}`),
-  manageEmployee: (data) => api.post("/api/employee/manage", data),
+  searchEmployees: (query) =>
+    api.get(`/api/employee/search/${query}`),
+  manageEmployee: (data) =>
+    api.post("/api/employee/manage", data),
   updateEmployee: (id, data) => api.put(`/users/${id}`, data),
   // deleteEmployee: ( id ) => api.delete( `/users/${ id }` ),
-  getEmployeeProfile: (id) => api.get(`/api/employee/profile/get/${id}`),
-  deleteEmployee: (id) => api.delete(`/api/employee/${id}`),
-  getEmployeeName: (projectId, search) =>
-    api.get(
-      `/api/Employee/basic${projectId ? `?projectId=${projectId}` : ""}${
-        search ? `${projectId ? "&" : "?"}searchString=${search}` : ""
-      }`
-    ),
+  getEmployeeProfile:(id)=>api.get(`/api/employee/profile/get/${id}`),
+  deleteEmployee:(id)=>api.delete(`/api/employee/${id}`)
 };
 
 export default EmployeeRepository;
diff --git a/src/repositories/ExpsenseRepository.jsx b/src/repositories/ExpsenseRepository.jsx
deleted file mode 100644
index ef15940a..00000000
--- a/src/repositories/ExpsenseRepository.jsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { api } from "../utils/axiosClient";
-
-
-const ExpenseRepository = {
-  GetExpenseList: ( pageSize, pageNumber, filter,searchString ) => {
-    const payloadJsonString = JSON.stringify(filter);
-
-   
-
-    return api.get(`/api/expense/list?pageSize=${pageSize}&pageNumber=${pageNumber}&filter=${payloadJsonString}&searchString=${searchString}`);
-  },
-  
-  GetExpenseDetails:(id)=>api.get(`/api/Expense/details/${id}`),
-  CreateExpense:(data)=>api.post("/api/Expense/create",data),
-  UpdateExpense:(id,data)=>api.put(`/api/Expense/edit/${id}`,data),
-  DeleteExpense:(id)=>api.delete(`/api/Expense/delete/${id}`),
-
-  ActionOnExpense:(data)=>api.post('/api/expense/action',data),
-  
-  GetExpenseFilter:()=>api.get('/api/Expense/filter')
-
-}
-
-export default ExpenseRepository;
diff --git a/src/repositories/MastersRepository.jsx b/src/repositories/MastersRepository.jsx
index 6f3fb89b..aebfc157 100644
--- a/src/repositories/MastersRepository.jsx
+++ b/src/repositories/MastersRepository.jsx
@@ -12,71 +12,50 @@ export const RolesRepository = {
   createRoles: (data) => api.post("/users", data),
   updateRoles: (id, data) => api.put(`/users/${id}`, data),
   deleteRoles: (id) => api.delete(`/users/${id}`),
+  
 
-  getEmployeeRoles: (id) => api.get(`/api/employee/roles/${id}`),
-  createEmployeeRoles: (data) => api.post("/api/roles/assign-roles", data),
+  getEmployeeRoles:(id)=>api.get(`/api/employee/roles/${id}`),
+  createEmployeeRoles:(data)=>api.post("/api/roles/assign-roles",data)
 };
 
+
 export const MasterRespository = {
   getRoles: () => api.get("/api/roles"),
   createRole: (data) => api.post("/api/roles", data),
-  updateRoles: (id, data) => api.put(`/api/roles/${id}`, data),
-  getFeatures: () => api.get(`/api/feature`),
+  updateRoles:(id,data) => api.put(`/api/roles/${id}`,data),
+  getFeatures: () => api.get( `/api/feature` ),
 
-  createJobRole: (data) => api.post("api/roles/jobrole", data),
-  getJobRole: () => api.get("/api/roles/jobrole"),
-  updateJobRole: (id, data) => api.put(`/api/roles/jobrole/${id}`, data),
 
-  getActivites: () => api.get("api/master/activities"),
-  createActivity: (data) => api.post("api/master/activity", data),
-  updateActivity: (id, data) =>
-    api.post(`api/master/activity/edit/${id}`, data),
-  getIndustries: () => api.get("api/master/industries"),
+  createJobRole:(data)=>api.post('api/roles/jobrole',data),
+  getJobRole :()=>api.get("/api/roles/jobrole"),
+  updateJobRole: ( id, data ) => api.put( `/api/roles/jobrole/${ id }`, data ),
 
+  
+  getActivites: () => api.get( 'api/master/activities' ),
+  createActivity: (data) => api.post( 'api/master/activity',data ),
+  updateActivity:(id,data) =>api.post(`api/master/activity/edit/${id}`,data),
+  getIndustries: () => api.get( 'api/master/industries' ),
+  
   // delete
-  "Job Role": (id) => api.delete(`/api/roles/jobrole/${id}`),
-  Activity: (id) => api.delete(`/api/master/activity/delete/${id}`),
-  "Application Role": (id) => api.delete(`/api/roles/${id}`),
-  "Work Category": (id) => api.delete(`api/master/work-category/${id}`),
-  "Contact Category": (id) => api.delete(`/api/master/contact-category/${id}`),
-  "Contact Tag": (id) => api.delete(`/api/master/contact-tag/${id}`),
-  "Expense Type": (id, isActive) =>
-    api.delete(`/api/Master/expenses-type/delete/${id}`, (isActive = false)),
-  "Payment Mode": (id, isActive) =>
-    api.delete(`/api/Master/payment-mode/delete/${id}`, (isActive = false)),
-  "Expense Status": (id, isActive) =>
-    api.delete(`/api/Master/expenses-status/delete/${id}`, (isActive = false)),
+  "Job Role": ( id ) => api.delete( `/api/roles/jobrole/${ id }` ),
+  "Activity": ( id ) => api.delete( `/api/master/activity/delete/${ id }` ),
+  "Application Role":(id)=>api.delete(`/api/roles/${id}`),
+  "Work Category": ( id ) => api.delete( `api/master/work-category/${ id }` ),
+  "Contact Category": ( id ) => api.delete( `/api/master/contact-category/${id}` ),
+  "Contact Tag" :(id)=>api.delete(`/api/master/contact-tag/${id}`),
 
-  getWorkCategory: () => api.get(`/api/master/work-categories`),
-  createWorkCategory: (data) => api.post(`/api/master/work-category`, data),
-  updateWorkCategory: (id, data) =>
-    api.post(`/api/master/work-category/edit/${id}`, data),
+  getWorkCategory:() => api.get(`/api/master/work-categories`),
+  createWorkCategory: (data) => api.post(`/api/master/work-category`,data),
+  updateWorkCategory: ( id, data ) => api.post( `/api/master/work-category/edit/${ id }`, data ),
+  
+  getContactCategory: () => api.get( `/api/master/contact-categories` ),
+  createContactCategory: (data ) => api.post( `/api/master/contact-category`, data ),
+  updateContactCategory: ( id, data ) => api.post( `/api/master/contact-category/edit/${ id }`, data ),
+  
+  getContactTag: () => api.get( `/api/master/contact-tags` ),
+  createContactTag: (data ) => api.post( `/api/master/contact-tag`, data ),
+  updateContactTag: ( id, data ) => api.post( `/api/master/contact-tag/edit/${ id }`, data ),
 
-  getContactCategory: () => api.get(`/api/master/contact-categories`),
-  createContactCategory: (data) =>
-    api.post(`/api/master/contact-category`, data),
-  updateContactCategory: (id, data) =>
-    api.post(`/api/master/contact-category/edit/${id}`, data),
-
-  getContactTag: () => api.get(`/api/master/contact-tags`),
-  createContactTag: (data) => api.post(`/api/master/contact-tag`, data),
-  updateContactTag: (id, data) =>
-    api.post(`/api/master/contact-tag/edit/${id}`, data),
-
-  getAuditStatus: () => api.get("/api/Master/work-status"),
-
-  getExpenseType: () => api.get("/api/Master/expenses-types"),
-  createExpenseType: (data) => api.post("/api/Master/expenses-type", data),
-  updateExpenseType: (id, data) =>
-    api.put(`/api/Master/expenses-type/edit/${id}`, data),
-
-  getPaymentMode: () => api.get("/api/Master/payment-modes"),
-  createPaymentMode: (data) => api.post(`/api/Master/payment-mode`, data),
-  updatePaymentMode: (id, data) =>
-    api.put(`/api/Master/payment-mode/edit/${id}`, data),
-
-  getExpenseStatus: () => api.get("/api/Master/expenses-status"),
-  createExpenseStatus: (data) => api.post("/api/Master/expenses-status", data),
-  updateExepnseStatus: (id, data) =>
-    api.put(`/api/Master/expenses-status/edit/${id}`, data),
-};
+  getAuditStatus:()=>api.get('/api/Master/work-status')
+  
+}
\ No newline at end of file
diff --git a/src/router/AppRoutes.jsx b/src/router/AppRoutes.jsx
index d89191d8..5ce5b6d4 100644
--- a/src/router/AppRoutes.jsx
+++ b/src/router/AppRoutes.jsx
@@ -38,7 +38,6 @@ import LegalInfoCard from "../pages/TermsAndConditions/LegalInfoCard";
 import ProtectedRoute from "./ProtectedRoute";
 import Directory from "../pages/Directory/Directory";
 import LoginWithOtp from "../pages/authentication/LoginWithOtp";
-import ExpensePage from "../pages/Expense/ExpensePage";
 
 const router = createBrowserRouter(
   [
@@ -77,7 +76,6 @@ const router = createBrowserRouter(
             { path: "/activities/task", element: <TaskPlannng /> },
             { path: "/activities/reports", element: <Reports /> },
             { path: "/gallary", element: <ImageGallary /> },
-            { path: "/expenses", element: <ExpensePage /> },
             { path: "/masters", element: <MasterPage /> },
             { path: "/help/support", element: <Support /> },
             { path: "/help/docs", element: <Documentation /> },
diff --git a/src/slices/apiDataManager.jsx b/src/slices/apiDataManager.jsx
index d0f8bc67..84cc1d8d 100644
--- a/src/slices/apiDataManager.jsx
+++ b/src/slices/apiDataManager.jsx
@@ -5,7 +5,6 @@ import {
   flushApiCache,
 } from "../slices/apiCacheSlice";
 import {setLoginUserPermmisions} from "./globalVariablesSlice";
-import { useSelector } from "react-redux";
 
 
 // Cache data
@@ -37,17 +36,4 @@ export const cacheProfileData = ( data) => {
 // Get cached data
 export const getCachedProfileData = () => {
   return store.getState().globalVariables.loginUser;
-};
-
-export const useSelectedproject = () => {
-  const selectedProject = useSelector((store)=> store.localVariables.projectId);
-  var project = localStorage.getItem("project");
-  if(project){
-    return project
-  } else{
-    return selectedProject
-  }
-  // return project ? selectedProject
-  
-  
-}; 
\ No newline at end of file
+};
\ No newline at end of file
diff --git a/src/slices/localVariablesSlice.jsx b/src/slices/localVariablesSlice.jsx
index 7c996608..7e7ada9d 100644
--- a/src/slices/localVariablesSlice.jsx
+++ b/src/slices/localVariablesSlice.jsx
@@ -21,9 +21,7 @@ const localVariablesSlice = createSlice({
       state.regularizationCount = action.payload;
     },
     setProjectId: (state, action) => { 
-      localStorage.setItem("project",null)
       state.projectId = action.payload;
-      localStorage.setItem("project",state.projectId)
     },
     refreshData: ( state, action ) =>
     {
diff --git a/src/utils/appUtils.js b/src/utils/appUtils.js
deleted file mode 100644
index 94d5b09a..00000000
--- a/src/utils/appUtils.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { useEffect, useState } from "react";
-
-export const formatFileSize=(bytes)=> {
-  if (bytes < 1024) return bytes + " B";
-  else if (bytes < 1024 * 1024) return (bytes / 1024).toFixed(2) + " KB";
-  else return (bytes / (1024 * 1024)).toFixed(2) + " MB";
-}
-export const AppColorconfig = {
-  colors: {
-    primary: '#696cff',
-    secondary: '#8592a3',
-    success: '#71dd37',
-    info: '#03c3ec',
-    warning: '#ffab00',
-    danger: '#ff3e1d',
-    dark: '#233446',
-    black: '#000',
-    white: '#fff',
-    cardColor: '#fff',
-    bodyBg: '#f5f5f9',
-    bodyColor: '#697a8d',
-    headingColor: '#566a7f',
-    textMuted: '#a1acb8',
-    borderColor: '#eceef1'
-  }
-};
-export const getColorNameFromHex = (hex) => {
-  const normalizedHex = hex?.replace(/'/g, '').toLowerCase(); 
-  const colors = AppColorconfig.colors;
-
-  for (const [name, value] of Object.entries(colors)) {
-    if (value.toLowerCase() === normalizedHex) {
-      return name;
-    }
-  }
-
-  return null; //
-};
-
-export const useDebounce = (value, delay = 500) => {
-  const [debouncedValue, setDebouncedValue] = useState(value);
-
-  useEffect(() => {
-    const timer = setTimeout(() => setDebouncedValue(value), delay);
-    return () => clearTimeout(timer);
-  }, [value, delay]);
-
-  return debouncedValue;
-};
\ No newline at end of file
diff --git a/src/utils/axiosClient.jsx b/src/utils/axiosClient.jsx
index 9c4bd3ae..4b7f34e2 100644
--- a/src/utils/axiosClient.jsx
+++ b/src/utils/axiosClient.jsx
@@ -44,7 +44,7 @@ axiosClient.interceptors.response.use(
     const originalRequest = error.config;
 
     // Skip retry for public requests or already retried ones
-    if (!originalRequest && originalRequest._retry || originalRequest.authRequired === false) {
+    if (!originalRequest || originalRequest._retry || originalRequest.authRequired === false) {
       return Promise.reject(error);
     }
 
diff --git a/src/utils/constants.jsx b/src/utils/constants.jsx
index d6727a04..a8dc1c2d 100644
--- a/src/utils/constants.jsx
+++ b/src/utils/constants.jsx
@@ -41,28 +41,5 @@ export const DIRECTORY_MANAGER = "62668630-13ce-4f52-a0f0-db38af2230c5"
 
 export const DIRECTORY_USER = "0f919170-92d4-4337-abd3-49b66fc871bb"
 
-export const VIEW_SELF_EXPENSE = "385be49f-8fde-440e-bdbc-3dffeb8dd116"
-
-export const VIEW_ALL_EXPNESE = "01e06444-9ca7-4df4-b900-8c3fa051b92f";
-
-export const CREATE_EXEPENSE = "0f57885d-bcb2-4711-ac95-d841ace6d5a7";
-
-export const REVIEW_EXPENSE = "1f4bda08-1873-449a-bb66-3e8222bd871b";
-
-export const APPROVE_EXPENSE = "eaafdd76-8aac-45f9-a530-315589c6deca";
-
-
-export const PROCESS_EXPENSE = "ea5a1529-4ee8-4828-80ea-0e23c9d4dd11"
-
-export const EXPENSE_MANAGE = "ea5a1529-4ee8-4828-80ea-0e23c9d4dd11"
-
-export const EXPENSE_REJECTEDBY = ["d1ee5eec-24b6-4364-8673-a8f859c60729","965eda62-7907-4963-b4a1-657fb0b2724b"]
-
-export const EXPENSE_DRAFT = "297e0d8f-f668-41b5-bfea-e03b354251c8"
-// -------------------Application Role------------------------------
-
-// 1 - Expense Manage 
-export const EXPENSE_MANAGEMENT = "a4e25142-449b-4334-a6e5-22f70e4732d7"
-
 export const BASE_URL = process.env.VITE_BASE_URL;
 // export const BASE_URL = "https://api.marcoaiot.com";
\ No newline at end of file
diff --git a/src/utils/dateUtils.jsx b/src/utils/dateUtils.jsx
index b3b61b6d..4d6643b6 100644
--- a/src/utils/dateUtils.jsx
+++ b/src/utils/dateUtils.jsx
@@ -67,13 +67,9 @@ export  const formatNumber = (num) => {
   if (num == null || isNaN(num)) return "NA";
   return Number.isInteger(num) ? num : num.toFixed(2);
 };
-
-
-export const formatUTCToLocalTime = (datetime, timeRequired = false) => {
-  return timeRequired
-    ? moment.utc(datetime).local().format("DD MMMM YYYY hh:mm A")
-    : moment.utc(datetime).local().format("DD MMMM YYYY");
-};
+export const formatUTCToLocalTime = (datetime) =>{
+  return moment.utc(datetime).local().format("MMMM DD, YYYY [at] hh:mm A");
+}
 
 export  const getCompletionPercentage = (completedWork, plannedWork)=> {
   if (!plannedWork || plannedWork === 0) return 0;