From b318d469f64014eb1d3d1192e43e088528df74dd Mon Sep 17 00:00:00 2001
From: Kartik Sharma <kartik.sharma@marcoaiot.com>
Date: Wed, 15 Oct 2025 16:52:27 +0530
Subject: [PATCH] Changes in OnField Work.

---
 src/components/Expenses/ExpenseFilterPanel.jsx | 12 +++++-------
 src/components/Layout/Header.jsx               |  7 ++++---
 src/router/AppRoutes.jsx                       |  1 +
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/Expenses/ExpenseFilterPanel.jsx b/src/components/Expenses/ExpenseFilterPanel.jsx
index 0ec19ce6..7a3b04e6 100644
--- a/src/components/Expenses/ExpenseFilterPanel.jsx
+++ b/src/components/Expenses/ExpenseFilterPanel.jsx
@@ -51,7 +51,7 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
       startDate: defaultFilter.startDate,
       endDate: defaultFilter.endDate,
     };
-  }, [status,selectedProjectId]);
+  }, [status, selectedProjectId]);
 
   const methods = useForm({
     resolver: zodResolver(SearchSchema),
@@ -119,12 +119,12 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
   const [appliedStatusId, setAppliedStatusId] = useState(null);
 
   useEffect(() => {
-    if (!status) return;
+    if (!status || !data) return;
 
-    if (status !== appliedStatusId && data) {
+    if (status !== appliedStatusId) {
       const filterWithStatus = {
         ...dynamicDefaultFilter,
-        projectIds: selectedProjectId ? [selectedProjectId] : [], // ✅ include project ID
+        projectIds: selectedProjectId ? [selectedProjectId] : dynamicDefaultFilter.projectIds || [],
         startDate: dynamicDefaultFilter.startDate
           ? moment.utc(dynamicDefaultFilter.startDate, "DD-MM-YYYY").toISOString()
           : undefined,
@@ -135,7 +135,6 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
 
       onApply(filterWithStatus);
       handleGroupBy(selectedGroup.id);
-
       setAppliedStatusId(status);
     }
   }, [
@@ -146,10 +145,9 @@ const ExpenseFilterPanel = forwardRef(({ onApply, handleGroupBy, setFilterdata }
     handleGroupBy,
     selectedGroup.id,
     appliedStatusId,
-    selectedProjectId, // ✅ added dependency
+    selectedProjectId, // ✅ Added dependency
   ]);
 
-
   if (isLoading || isFetching) return <ExpenseFilterSkeleton />;
   if (isError && isFetched)
     return <div>Something went wrong Here- {error.message} </div>;
diff --git a/src/components/Layout/Header.jsx b/src/components/Layout/Header.jsx
index 26b070d3..590ba758 100644
--- a/src/components/Layout/Header.jsx
+++ b/src/components/Layout/Header.jsx
@@ -36,16 +36,17 @@ const Header = () => {
   const pathname = location.pathname;
 
   // ======= MEMO CHECKS =======
+
   const isDashboardPath = pathname === "/" || pathname === "/dashboard";
   const isProjectPath = pathname === "/projects";
   const isDirectory = pathname === "/directory";
   const isEmployeeList = pathname === "/employees";
-  const isMasters = pathname === "/masters";
-  // const isExpense = pathname === "/expenses";
   const isEmployeeProfile = UUID_REGEX.test(pathname);
+  const isMasters = pathname === "/masters";
+  const isExpensePath = pathname.startsWith("/expenses");
 
   const hideDropPaths =
-    isDirectory || isEmployeeList || isMasters || isEmployeeProfile;
+    isDirectory || isEmployeeList || isMasters || isEmployeeProfile || isExpensePath;
 
   const showProjectDropdown = !hideDropPaths;
 
diff --git a/src/router/AppRoutes.jsx b/src/router/AppRoutes.jsx
index 24e98921..17aba35c 100644
--- a/src/router/AppRoutes.jsx
+++ b/src/router/AppRoutes.jsx
@@ -95,6 +95,7 @@ const router = createBrowserRouter(
             { path: "/activities/reports", element: <Reports /> },
             { path: "/gallary", element: <ComingSoonPage /> },
             { path: "/expenses/:status?/:project?", element: <ExpensePage /> },
+            { path: "/expenses", element: <ExpensePage /> },
             { path: "/masters", element: <MasterPage /> },
             { path: "/tenants", element: <TenantPage /> },
             { path: "/tenants/new-tenant", element: <CreateTenant /> },