diff --git a/src/components/Directory/ManageContact.jsx b/src/components/Directory/ManageContact.jsx
index 04205961..56d45e32 100644
--- a/src/components/Directory/ManageContact.jsx
+++ b/src/components/Directory/ManageContact.jsx
@@ -23,7 +23,7 @@ import Label from "../common/Label";
 const ManageContact = ({ contactId, closeModal }) => {
   // fetch master data
   const { buckets, loading: bucketsLoaging } = useBuckets();
-  const { projects, loading: projectLoading } = useProjects();
+  const { data:projects, loading: projectLoading } = useProjects();
   const { contactCategory, loading: contactCategoryLoading } =
     useContactCategory();
   const { organizationList } = useOrganization();
diff --git a/src/components/Expenses/ManageExpense.jsx b/src/components/Expenses/ManageExpense.jsx
index 309cfd8b..9b14bfcf 100644
--- a/src/components/Expenses/ManageExpense.jsx
+++ b/src/components/Expenses/ManageExpense.jsx
@@ -28,6 +28,7 @@ import moment from "moment";
 import DatePicker from "../common/DatePicker";
 import ErrorPage from "../../pages/ErrorPage";
 import Label from "../common/Label";
+import EmployeeSearchInput from "../common/EmployeeSearchInput";
 
 const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   const {
@@ -57,7 +58,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   });
 
   const selectedproject = watch("projectId");
- 
+
   const {
     projectNames,
     loading: projectLoading,
@@ -142,8 +143,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   };
 
   useEffect(() => {
-    if (expenseToEdit && data ) {
-   
+    if (expenseToEdit && data) {
       reset({
         projectId: data.project.id || "",
         expensesTypeId: data.expensesType.id || "",
@@ -156,7 +156,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
         supplerName: data.supplerName || "",
         amount: data.amount || "",
         noOfPersons: data.noOfPersons || "",
-        gstNumber:data.gstNumber || "",
+        gstNumber: data.gstNumber || "",
         billAttachments: data.documents
           ? data.documents.map((doc) => ({
               fileName: doc.fileName,
@@ -183,8 +183,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   const onSubmit = (fromdata) => {
     let payload = {
       ...fromdata,
-      transactionDate: localToUtc(fromdata.transactionDate)
-
+      transactionDate: localToUtc(fromdata.transactionDate),
     };
     if (expenseToEdit) {
       const editPayload = { ...payload, id: data.id };
@@ -206,7 +205,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
   if (StatusLoadding || projectLoading || ExpenseLoading || isLoading)
     return <ExpenseSkeleton />;
 
-
   return (
     <div className="container p-3">
       <h5 className="m-0">
@@ -215,7 +213,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
       <form id="expenseForm" onSubmit={handleSubmit(onSubmit)}>
         <div className="row my-2 text-start">
           <div className="col-md-6">
-            <Label className="form-label" required>Select Project</Label>
+            <Label className="form-label" required>
+              Select Project
+            </Label>
             <select
               className="form-select form-select-sm"
               {...register("projectId")}
@@ -296,11 +296,11 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             )}
           </div>
 
-          <div className="col-md-6">
+          <div className="col-12 col-md-6 text-start">
             <Label htmlFor="paidById" className="form-label" required>
               Paid By
             </Label>
-            <select
+            {/* <select
               className="form-select form-select-sm"
               id="paymentModeId"
               {...register("paidById")}
@@ -321,7 +321,14 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             </select>
             {errors.paidById && (
               <small className="danger-text">{errors.paidById.message}</small>
-            )}
+            )} */}
+
+            <EmployeeSearchInput
+              control={control}
+              name="paidById"
+              projectId={null}
+              forAll={expenseToEdit ? true : false}
+            />
           </div>
         </div>
 
@@ -330,7 +337,11 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
             <Label htmlFor="transactionDate" className="form-label" required>
               Transaction Date
             </Label>
-            <DatePicker name="transactionDate" control={control} maxDate={new Date()}/>
+            <DatePicker
+              name="transactionDate"
+              control={control}
+              maxDate={new Date()}
+            />
 
             {errors.transactionDate && (
               <small className="danger-text">
@@ -409,9 +420,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               </small>
             )}
           </div>
-              <div className="col-md-6">
+          <div className="col-md-6">
             <label htmlFor="statusId" className="form-label ">
-             GST Number
+              GST Number
             </label>
             <input
               type="text"
@@ -421,9 +432,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               {...register("gstNumber")}
             />
             {errors.gstNumber && (
-              <small className="danger-text">
-                {errors.gstNumber.message}
-              </small>
+              <small className="danger-text">{errors.gstNumber.message}</small>
             )}
           </div>
 
@@ -448,7 +457,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
         <div className="row my-2 text-start">
           <div className="col-md-12">
-            <Label htmlFor="description" className="form-label" required>Description</Label>
+            <Label htmlFor="description" className="form-label" required>
+              Description
+            </Label>
             <textarea
               id="description"
               className="form-control form-control-sm"
@@ -465,7 +476,9 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
         <div className="row my-2 text-start">
           <div className="col-md-12">
-            <Label className="form-label" required>Upload Bill </Label>
+            <Label className="form-label" required>
+              Upload Bill{" "}
+            </Label>
 
             <div
               className="border border-secondary border-dashed rounded p-4 text-center bg-textMuted position-relative"
@@ -549,7 +562,7 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
 
         <div className="d-flex justify-content-end gap-3">
           {" "}
-           <button
+          <button
             type="reset"
             disabled={isPending || createPending}
             onClick={handleClose}
@@ -568,7 +581,6 @@ const ManageExpense = ({ closeModal, expenseToEdit = null }) => {
               ? "Update"
               : "Submit"}
           </button>
-         
         </div>
       </form>
     </div>
diff --git a/src/components/Expenses/ViewExpense.jsx b/src/components/Expenses/ViewExpense.jsx
index 8fca0998..e6ca4426 100644
--- a/src/components/Expenses/ViewExpense.jsx
+++ b/src/components/Expenses/ViewExpense.jsx
@@ -9,7 +9,7 @@ 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, getIconByFileType } from "../../utils/appUtils";
+import { getColorNameFromHex, getIconByFileType, localToUtc } from "../../utils/appUtils";
 import { ExpenseDetailsSkeleton } from "./ExpenseSkeleton";
 import { useHasUserPermission } from "../../hooks/useHasUserPermission";
 import {
@@ -91,9 +91,7 @@ const ViewExpense = ({ ExpenseId }) => {
   const onSubmit = (formData) => {
     const Payload = {
       ...formData,
-      reimburseDate: moment
-        .utc(formData.reimburseDate, "DD-MM-YYYY")
-        .toISOString(),
+      reimburseDate: localToUtc(formData.reimburseDate),
       expenseId: ExpenseId,
       comment: formData.comment,
     };
@@ -397,7 +395,8 @@ const ViewExpense = ({ ExpenseId }) => {
                 <DatePicker
                   name="reimburseDate"
                   control={control}
-                  minDate={data?.transactionDate}
+                  minDate={data?.createdAt}
+                  maxDate={new Date()}
                 />
                 {errors.reimburseDate && (
                   <small className="danger-text">
diff --git a/src/components/Organization/OrganizationsList.jsx b/src/components/Organization/OrganizationsList.jsx
index 6e170a2f..af981025 100644
--- a/src/components/Organization/OrganizationsList.jsx
+++ b/src/components/Organization/OrganizationsList.jsx
@@ -23,7 +23,7 @@ const OrganizationsList = ({searchText}) => {
       label: "Organization Name",
       getValue: (org) => (
         <div className="d-flex gap-2 py-1 ">
-          <i class="bx bx-buildings"></i>
+          <i className="bx bx-buildings"></i>
           <span
             className="text-truncate d-inline-block "
             style={{ maxWidth: "150px" }}
diff --git a/src/components/common/EmployeeSearchInput.jsx b/src/components/common/EmployeeSearchInput.jsx
index f1121e6b..34fdecaa 100644
--- a/src/components/common/EmployeeSearchInput.jsx
+++ b/src/components/common/EmployeeSearchInput.jsx
@@ -4,10 +4,13 @@ import { useDebounce } from "../../utils/appUtils";
 import { useController } from "react-hook-form";
 import Avatar from "./Avatar";
 
-
-
-
-const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
+const EmployeeSearchInput = ({
+  control,
+  name,
+  projectId,
+  placeholder,
+  forAll,
+}) => {
   const {
     field: { onChange, value, ref },
     fieldState: { error },
@@ -17,17 +20,20 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
   const [showDropdown, setShowDropdown] = useState(false);
   const debouncedSearch = useDebounce(search, 500);
 
-  const {
-    data: employees,
-    isLoading,
-  } = useEmployeesName(projectId, debouncedSearch);
+  const { data: employees, isLoading } = useEmployeesName(
+    projectId,
+    debouncedSearch,
+    forAll
+  );
 
   useEffect(() => {
-    if (value && !search) {
-      const found = employees?.data?.find((emp) => emp.id === value);
-      if (found) setSearch(found.firstName + " " + found.lastName);
+    if (value && employees?.data) {
+      const found = employees.data.find((emp) => emp.id === value);
+      if (found && forAll) {
+        setSearch(found.firstName + " " + found.lastName);
+      }
     }
-  }, [value, employees]);
+  }, [value, employees?.data]);
 
   const handleSelect = (employee) => {
     onChange(employee.id);
@@ -46,7 +52,7 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
         onChange={(e) => {
           setSearch(e.target.value);
           setShowDropdown(true);
-          onChange(""); 
+          onChange("");
         }}
         onFocus={() => {
           if (search) setShowDropdown(true);
@@ -61,28 +67,27 @@ const EmployeeSearchInput = ({ control, name, projectId,placeholder }) => {
           {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 py-1 px-1"
-        style={{ cursor: "pointer" }}
-        onClick={() => handleSelect(emp)}
-      >
-        <div className="d-flex align-items-center px-0">
-          <Avatar
-            size="xs"
-            classAvatar="m-0 me-2"
-            firstName={emp.firstName}
-            lastName={emp.lastName}
-          />
-          <span className="text-muted">
-            {`${emp?.firstName} ${emp?.lastName}`.trim()}
-          </span>
-        </div>
-      </li>
+              <li
+                key={emp.id}
+                className="list-group-item list-group-item-action py-1 px-1"
+                style={{ cursor: "pointer" }}
+                onClick={() => handleSelect(emp)}
+              >
+                <div className="d-flex align-items-center px-0">
+                  <Avatar
+                    size="xs"
+                    classAvatar="m-0 me-2"
+                    firstName={emp.firstName}
+                    lastName={emp.lastName}
+                  />
+                  <span className="text-muted">
+                    {`${emp?.firstName} ${emp?.lastName}`.trim()}
+                  </span>
+                </div>
+              </li>
             ))
           )}
         </ul>
diff --git a/src/hooks/useDirectory.js b/src/hooks/useDirectory.js
index a1fd716b..76e13815 100644
--- a/src/hooks/useDirectory.js
+++ b/src/hooks/useDirectory.js
@@ -548,6 +548,7 @@ export const useUpdateNote = (onSuccessCallBack) => {
     mutationFn: async ({ noteId, notePayload }) =>
       await DirectoryRepository.UpdateNote(noteId, notePayload),
     onSuccess: (_, variables) => {
+      queryClient.invalidateQueries({ queryKey: ["Contact"] });
       queryClient.invalidateQueries({ queryKey: ["Notes"] });
       queryClient.invalidateQueries({ queryKey: ["ContactNotes"] });
       showToast("Note updated Successfully", "success");
diff --git a/src/hooks/useEmployees.js b/src/hooks/useEmployees.js
index 477b18f7..2b37e0de 100644
--- a/src/hooks/useEmployees.js
+++ b/src/hooks/useEmployees.js
@@ -184,11 +184,11 @@ export const useEmployeeProfile = (employeeId) => {
   };
 };
 
-export const useEmployeesName = (projectId, search) => {
+export const useEmployeesName = (projectId, search,allEmployee) => {
   return useQuery({
-    queryKey: ["employees", projectId, search],
+    queryKey: ["employees", projectId, search,allEmployee],
     queryFn: async () =>
-      await EmployeeRepository.getEmployeeName(projectId, search),
+      await EmployeeRepository.getEmployeeName(projectId, search,allEmployee),
 
     staleTime: 5 * 60 * 1000, // Optional: cache for 5 minutes
   });
diff --git a/src/hooks/useProjectAccess.js b/src/hooks/useProjectAccess.js
index 8449df82..b8c269c8 100644
--- a/src/hooks/useProjectAccess.js
+++ b/src/hooks/useProjectAccess.js
@@ -14,7 +14,6 @@ export const useProjectAccess = (projectId) => {
   const canView = useHasUserPermission(VIEW_PROJECTS); 
 
   const loading = isLoading || !isFetched;
-   debugger
   useEffect(() => {
     if (projectId && !loading && !canView) {
       showToast("You don't have permission to view project details", "warning");
diff --git a/src/pages/authentication/LoginPage.jsx b/src/pages/authentication/LoginPage.jsx
index 6be7cb2b..0015a605 100644
--- a/src/pages/authentication/LoginPage.jsx
+++ b/src/pages/authentication/LoginPage.jsx
@@ -6,6 +6,7 @@ import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { z } from "zod";
 import { AuthWrapper } from "./AuthWrapper";
+import { removeSession } from "../../utils/authUtils";
 
 const LoginPage = () => {
   const navigate = useNavigate();
@@ -44,9 +45,11 @@ const LoginPage = () => {
         if (data.rememberMe) {
           localStorage.setItem("jwtToken", response.data.token);
           localStorage.setItem("refreshToken", response.data.refreshToken);
+          removeSession("session")
         } else {
           sessionStorage.setItem("jwtToken", response.data.token);
           sessionStorage.setItem("refreshToken", response.data.refreshToken);
+           removeSession("local")
         }
         setLoading(false);
         navigate("/auth/switch/org");
diff --git a/src/pages/authentication/SwitchTenant.jsx b/src/pages/authentication/SwitchTenant.jsx
index b5a8652a..028414cb 100644
--- a/src/pages/authentication/SwitchTenant.jsx
+++ b/src/pages/authentication/SwitchTenant.jsx
@@ -86,7 +86,7 @@ const SwitchTenant = () => {
                 <button
                   className={` ${currentTenant === tenant.id ? "badge bg-label-primary w-50" :"btn btn-primary btn-sm mt-2 align-self-start" }`}
                   onClick={() => handleTenantselection(tenant?.id)}
-                  disabled={isPending && pendingTenant === tenant.id || currentTenant === tenant.id }
+                  disabled={isPending && pendingTenant === tenant.id || currentTenant === tenant.id || isPending}
                 >
                   {currentTenant === tenant.id  ?  "Active Tenant" :isPending && pendingTenant === tenant.id
                     ? "Please Wait.."
diff --git a/src/repositories/EmployeeRepository.jsx b/src/repositories/EmployeeRepository.jsx
index 931c7c51..d257825b 100644
--- a/src/repositories/EmployeeRepository.jsx
+++ b/src/repositories/EmployeeRepository.jsx
@@ -11,11 +11,12 @@ const EmployeeRepository = {
   // deleteEmployee: ( id ) => api.delete( `/users/${ id }` ),
   getEmployeeProfile: (id) => api.get(`/api/employee/profile/get/${id}`),
   deleteEmployee: (id,active) => api.delete(`/api/employee/${id}?active=${active}`),
- getEmployeeName: (projectId, search) => {
+ getEmployeeName: (projectId, search,allEmployee) => {
   const params = new URLSearchParams();
 
   if (projectId) params.append("projectId", projectId);
   if (search) params.append("searchString", search);
+  if(allEmployee) params.append("allEmployee",allEmployee)
 
   const query = params.toString();
   return api.get(`/api/Employee/basic${query ? `?${query}` : ""}`);
diff --git a/src/repositories/ProjectRepository.jsx b/src/repositories/ProjectRepository.jsx
index 43a1ee66..2daf73fd 100644
--- a/src/repositories/ProjectRepository.jsx
+++ b/src/repositories/ProjectRepository.jsx
@@ -6,19 +6,19 @@ const ProjectRepository = {
     api.get(`/api/project/details/${projetid}`),
 
   getProjectAllocation: (projectId, serviceId, organizationId, employeeStatus) => {
-  let url = `/api/project/allocation/${projectId}`;
+    let url = `/api/project/allocation/${projectId}`;
 
-  const params = [];
-  if (organizationId) params.push(`organizationId=${organizationId}`);
-  if (serviceId) params.push(`serviceId=${serviceId}`);
-  if (employeeStatus !== undefined) params.push(`includeInactive=${employeeStatus}`);
+    const params = [];
+    if (organizationId) params.push(`organizationId=${organizationId}`);
+    if (serviceId) params.push(`serviceId=${serviceId}`);
+    if (employeeStatus !== undefined) params.push(`includeInactive=${employeeStatus}`);
 
-  if (params.length > 0) {
-    url += `?${params.join("&")}`;
-  }
+    if (params.length > 0) {
+      url += `?${params.join("&")}`;
+    }
 
-  return api.get(url);
-},
+    return api.get(url);
+  },
 
 
   getEmployeesByProject: (projectId) =>
@@ -43,12 +43,13 @@ const ProjectRepository = {
   projectNameList: () => api.get("/api/project/list/basic"),
 
   getProjectDetails: (id) => api.get(`/api/project/details/${id}`),
+ 
   getProjectInfraByproject: (projectId, serviceId) => {
     let url = `/api/project/infra-details/${projectId}`;
-
     if (serviceId) {
-      url + `?serviceId=${serviceId}`;
+      url = `${url}?serviceId=${serviceId}`;
     }
+
     return api.get(url);
   },
   getProjectTasksByWorkArea: (workAreaId, serviceId) => {
diff --git a/src/router/ProtectedRoute.jsx b/src/router/ProtectedRoute.jsx
index d174652c..9179d43d 100644
--- a/src/router/ProtectedRoute.jsx
+++ b/src/router/ProtectedRoute.jsx
@@ -59,7 +59,7 @@ const attemptTokenRefresh = async (storedRefreshToken) => {
 
     return true;
   } catch (error) {
-    console.error("Token refresh failed:", error);
+      removeSession()
     return false;
   }
 };
diff --git a/src/services/signalRService.js b/src/services/signalRService.js
index 3d9d40b1..05ff808a 100644
--- a/src/services/signalRService.js
+++ b/src/services/signalRService.js
@@ -8,7 +8,7 @@ import showToast from "./toastService";
 import eventBus from "./eventBus";
 import { useSelector } from "react-redux";
 import { clearApiCacheKey } from "../slices/apiCacheSlice";
-import {BASE_URL} from "../utils/constants";
+import { BASE_URL } from "../utils/constants";
 import { queryClient } from "../layouts/AuthLayout";
 const base_Url = BASE_URL;
 let connection = null;
@@ -32,103 +32,108 @@ export function startSignalR(loggedUser) {
     .toISOString()
     .split("T")[0];
   connection.on("NotificationEventHandler", (data) => {
-    if (data.loggedInUserId != loggedUser?.employeeInfo.id) {
-      // console.log("Notification received:", data);
-      // if action taken on attendance module
-      if (data.keyword == "Attendance") {
-        const checkIn = data.response.checkInTime.substring(0, 10);
-        if (today === checkIn) {
-          eventBus.emit("attendance", data);
-        }
-        var onlyDate = Number(checkIn.substring(8, 10));
+    const { loggedInUserId, keyword, response, employeeList, numberOfImages } =
+      data;
+    const loggedInId = loggedUser?.employeeInfo?.id;
 
-        var afterTwoDay =
-          checkIn.substring(0, 8) + (onlyDate + 2).toString().padStart(2, "0");
-        if (
-          afterTwoDay <= today &&
-          (data.response.activity == 4 || data.response.activity == 5)
-        ) {
-          eventBus.emit("regularization", data);
-        }
-        eventBus.emit("attendance_log", data);
-      }
-         if(data.keyword == "Expanse"){
-        queryClient.invalidateQueries({queryKey:["Expenses"]})
-      }
-      // if create or update project
+    if (loggedInUserId === loggedInId) return;
+
+    // ---- Handlers for invalidate or remove ----
+    const queryInvalidators = {
+      Expanse: () => {
+        queryClient.invalidateQueries({ queryKey: ["Expenses"] }),
+          queryClient.invalidateQueries({ queryKey: ["Expense"] });
+      },
+      Create_Project: () => queryClient.invalidateQueries(["projectslist"]),
+      Update_Project: () => queryClient.invalidateQueries(["projectslist"]),
+      Infra: () => queryClient.removeQueries({ queryKey: ["ProjectInfra"] }),
+      Task_Report: () => queryClient.invalidateQueries({ queryKey: ["Infra"] }),
+      WorkItem: () =>
+        queryClient.invalidateQueries({ queryKey: ["WorkItems"] }),
+      Directory_Notes: () => {
+        queryClient.invalidateQueries({ queryKey: ["directoryNotes"] });
+        queryClient.invalidateQueries({ queryKey: ["Notes"] });
+      },
+      Directory_Buckets: () => {
+        queryClient.invalidateQueries({ queryKey: ["bucketList"] });
+      },
+      Directory: () => {
+        queryClient.invalidateQueries({ queryKey: ["contacts"] });
+        queryClient.invalidateQueries({ queryKey: ["Contact"] });
+        queryClient.invalidateQueries({ queryKey: ["ContactProfile"] });
+      },
+    };
+
+    // ---- Keyword based event emitters ----
+    const emitters = {
+      employee: () => eventBus.emit("employee", data),
+      project: () => eventBus.emit("project", data),
+      infra: () => eventBus.emit("infra", data),
+      assign_project_all: () => eventBus.emit("assign_project_all", data),
+      image_gallery: () => eventBus.emit("image_gallery", data),
+    };
+
+    // ---- Handle Attendance ----
+    if (keyword === "Attendance") {
+      const checkIn = response.checkInTime.substring(0, 10);
+      if (today === checkIn) eventBus.emit("attendance", data);
+
+      const onlyDate = Number(checkIn.substring(8, 10));
+      const afterTwoDay = checkIn.substring(0,8) + (onlyDate + 2).toString().padStart(2, "0");
       if (
-        data.keyword == "Create_Project" ||
-        data.keyword == "Update_Project"
+        afterTwoDay <= today &&
+        (response.activity === 4 || response.activity === 5)
       ) {
-        // clearCacheKey("projectslist");
-        queryClient.invalidateQueries(['projectslist']);  
-        eventBus.emit("project", data);
+        eventBus.emit("regularization", data);
       }
+      eventBus.emit("attendance_log", data);
+    }
 
-      // if assign or deassign employee to any project
-      if (data.keyword == "Assign_Project") {
-        if (
-          data.employeeList.some((item) => item === loggedUser?.employeeInfo.id)
-        ) {
-          try {
-            cacheData("hasReceived", false);
-            eventBus.emit("assign_project_one", data);
-          } catch (e) {
-            // console.error("Error in cacheData:", e);
-          }
-        }
-        eventBus.emit("assign_project_all", data);
-      }
-      // if created or updated infra
-      if (data.keyword == "Infra") {
-        queryClient.removeQueries({queryKey:["ProjectInfra"]})
-        // eventBus.emit("infra", data);
-      }
-      if (data.keyword == "Task_Report") {
-        queryClient.removeQueries({queryKey:["Infra"]})
-        // eventBus.emit("infra", data);
-      }
+    // ---- Invalidate/Remove cache by keywords ----
+    if (queryInvalidators[keyword]) {
+      queryInvalidators[keyword]();
+    }
 
-      if ( data.keyword == "WorkItem" )
-      {
-        queryClient.removeQueries({queryKey:["WorkItems"]})
-      }
+    // ---- Project creation/update ----
+    if (keyword === "Create_Project" || keyword === "Update_Project") {
+      emitters.project();
+    }
 
-      // if created or updated Employee
-      if (data.keyword == "Employee") {
-        // clearCacheKey("employeeListByProject");
-        // clearCacheKey("allEmployeeList");
-        // clearCacheKey("allInactiveEmployeeList");
-        // clearCacheKey("employeeProfile");
-        clearCacheKey("Attendance");
-        clearCacheKey("regularizedList")
-        clearCacheKey("AttendanceLogs")
+    // ---- Assign/deassign project ----
+    if (keyword === "Assign_Project") {
+      if (employeeList?.includes(loggedInId)) {
+        try {
+          cacheData("hasReceived", false);
+          eventBus.emit("assign_project_one", data);
+        } catch {}
+      }
+      emitters.assign_project_all();
+    }
 
-        // ---we can do also----
-        // queryClient.removeQueries(['allEmployee', true]);
-        //  but best practies is refetch
-          queryClient.invalidateQueries(['allEmployee', true]);  
-          queryClient.invalidateQueries(['allEmployee', false]); 
-          queryClient.invalidateQueries(['employeeProfile', data.response?.employeeId]);
-          queryClient.invalidateQueries(['employeeListByProject']); // optional if scope
-          eventBus.emit("employee", data);
-      }
+    // ---- Employee update ----
+    if (keyword === "Employee") {
+      clearCacheKey("Attendance");
+      clearCacheKey("regularizedList");
+      clearCacheKey("AttendanceLogs");
 
-      if (data.keyword == "Task_Report") {
-        if(data.numberOfImages > 0){
-        eventBus.emit("image_gallery", data);
-        }
-      }
-      if (data.keyword == "Task_Comment") {
-        if(data.numberOfImages > 0){
-        eventBus.emit("image_gallery", data);
-        }
-      }
+      queryClient.invalidateQueries(["allEmployee", true]);
+      queryClient.invalidateQueries(["allEmployee", false]);
+      queryClient.invalidateQueries(["employeeProfile", response?.employeeId]);
+      queryClient.invalidateQueries(["employeeListByProject"]);
+
+      emitters.employee();
+    }
+
+    // ---- Image related events ----
+    if (
+      ["Task_Report", "Task_Comment"].includes(keyword) &&
+      numberOfImages > 0
+    ) {
+      emitters.image_gallery();
     }
   });
 
-  connection
-    .start();
+  connection.start();
 }
 
 export function stopSignalR() {
diff --git a/src/utils/appUtils.js b/src/utils/appUtils.js
index ce708ed6..0611d9c8 100644
--- a/src/utils/appUtils.js
+++ b/src/utils/appUtils.js
@@ -69,15 +69,26 @@ export const normalizeAllowedContentTypes = (allowedContentType) => {
     return allowedContentType.split(",");
   return [];
 };
-export function localToUtc(localDateString) {
-  if (!localDateString || typeof localDateString !== "string") return null;
+export function localToUtc(dateString) {
+if (!dateString || typeof dateString !== "string") return null;
 
-  const [year, month, day] = localDateString.trim().split("-");
+const parts = dateString.trim().split("-");
+if (parts.length !== 3) return null;
 
-  if (!year || !month || !day) return null;
+let day, month, year;
 
-
-  const date = new Date(Number(year), Number(month) - 1, Number(day), 0, 0, 0);
-
-  return isNaN(date.getTime()) ? null : date.toISOString();
+if (parts[0].length === 4) {
+// Format: yyyy-mm-dd
+[year, month, day] = parts;
+} else {
+// Format: dd-mm-yyyy
+[day, month, year] = parts;
 }
+
+if (!day || !month || !year) return null;
+
+const date = new Date(
+Date.UTC(Number(year), Number(month) - 1, Number(day), 0, 0, 0)
+);
+return isNaN(date.getTime()) ? null : date.toISOString();
+}
\ No newline at end of file
diff --git a/src/utils/authUtils.js b/src/utils/authUtils.js
index 8e266583..c09a6252 100644
--- a/src/utils/authUtils.js
+++ b/src/utils/authUtils.js
@@ -1,7 +1,14 @@
-export const removeSession = () => {
-  localStorage.removeItem("jwtToken");
-  localStorage.removeItem("refreshToken");
-  sessionStorage.removeItem("jwtToken");
-  sessionStorage.removeItem("refreshToken");
-  localStorage.removeItem("ctnt");
-};
\ No newline at end of file
+export const removeSession = (target = "all") => {
+  const keys = ["jwtToken", "refreshToken", "ctnt"];
+
+  if (target === "local") {
+    keys.forEach((key) => localStorage.removeItem(key));
+  } else if (target === "session") {
+    keys.forEach((key) => sessionStorage.removeItem(key));
+  } else if (target === "all") {
+    keys.forEach((key) => {
+      localStorage.removeItem(key);
+      sessionStorage.removeItem(key);
+    });
+  }
+};