diff --git a/src/components/Expenses/ExpenseList.jsx b/src/components/Expenses/ExpenseList.jsx index 58a6cf22..cb9567df 100644 --- a/src/components/Expenses/ExpenseList.jsx +++ b/src/components/Expenses/ExpenseList.jsx @@ -202,7 +202,7 @@ const canDetetExpense = (expense)=>{ )} -
+
{ const cleaned = { ...filter }; @@ -14,12 +16,19 @@ const cleanFilter = (filter) => { } }); - if (!cleaned.startDate) delete cleaned.startDate; - if (!cleaned.endDate) delete cleaned.endDate; + // moment.utc() to get consistent UTC ISO strings + if (!cleaned.startDate) { + cleaned.startDate = moment.utc().subtract(7, "days").startOf("day").toISOString(); + } + + if (!cleaned.endDate) { + cleaned.endDate = moment.utc().startOf("day").toISOString(); + } return cleaned; }; + export const useExpenseList = ( pageSize, pageNumber, diff --git a/src/utils/dateUtils.jsx b/src/utils/dateUtils.jsx index b3b61b6d..a9c5f31d 100644 --- a/src/utils/dateUtils.jsx +++ b/src/utils/dateUtils.jsx @@ -71,8 +71,8 @@ export const formatNumber = (num) => { 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"); + ? moment.utc(datetime).local().format("DD MMM YYYY hh:mm A") + : moment.utc(datetime).local().format("DD MMM YYYY"); }; export const getCompletionPercentage = (completedWork, plannedWork)=> {