diff --git a/src/components/Expenses/ExpenseFilterPanel.jsx b/src/components/Expenses/ExpenseFilterPanel.jsx index 88dc7ccd..8b6f149d 100644 --- a/src/components/Expenses/ExpenseFilterPanel.jsx +++ b/src/components/Expenses/ExpenseFilterPanel.jsx @@ -94,6 +94,14 @@ const ExpenseFilterPanel = forwardRef( reset({ ...methods.getValues(), [name]: defaultFilter[name] }); } }, + // --- START FIX: Add resetDateRange method --- + resetDateRange: () => { + setValue("startDate", null); + setValue("endDate", null); + // Trigger re-render/reset of the DateRangePicker component + setResetKey((prev) => prev + 1); + }, + // --- END FIX --- getValues: methods.getValues, // optional, to read current filter state })); @@ -137,13 +145,13 @@ const ExpenseFilterPanel = forwardRef( : dynamicDefaultFilter.projectIds || [], startDate: dynamicDefaultFilter.startDate ? moment - .utc(dynamicDefaultFilter.startDate, "DD-MM-YYYY") - .toISOString() + .utc(dynamicDefaultFilter.startDate, "DD-MM-YYYY") + .toISOString() : undefined, endDate: dynamicDefaultFilter.endDate ? moment - .utc(dynamicDefaultFilter.endDate, "DD-MM-YYYY") - .toISOString() + .utc(dynamicDefaultFilter.endDate, "DD-MM-YYYY") + .toISOString() : undefined, }; @@ -176,18 +184,16 @@ const ExpenseFilterPanel = forwardRef(