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