diff --git a/src/components/BudgetExpiryAlertAndModal/data/hooks/useExpiry.jsx b/src/components/BudgetExpiryAlertAndModal/data/hooks/useExpiry.jsx index e8f5a6d3bd..a150d97649 100644 --- a/src/components/BudgetExpiryAlertAndModal/data/hooks/useExpiry.jsx +++ b/src/components/BudgetExpiryAlertAndModal/data/hooks/useExpiry.jsx @@ -10,7 +10,7 @@ const useExpiry = (enterpriseId, budgets, modalOpen, modalClose, alertOpen, aler const [notification, setNotification] = useState(null); const [expirationThreshold, setExpirationThreshold] = useState(null); const [modal, setModal] = useState(null); - const [isNonExpiredBudget, setisNonExpiredBudget] = useState(false); + const [isNonExpiredBudget, setIsNonExpiredBudget] = useState(false); useEffect(() => { if (!budgets || budgets.length === 0) { @@ -31,7 +31,7 @@ const useExpiry = (enterpriseId, budgets, modalOpen, modalClose, alertOpen, aler // If an unexpired budget exists, set budgetsToConsiderForExpirationMessaging to nonExpiredBudgets if (hasNonExpiredBudgets) { budgetsToConsiderForExpirationMessaging = nonExpiredBudgets; - setisNonExpiredBudget(true); + setIsNonExpiredBudget(true); } else { budgetsToConsiderForExpirationMessaging = expiredBudgets; } diff --git a/src/components/BudgetExpiryAlertAndModal/data/utils.js b/src/components/BudgetExpiryAlertAndModal/data/utils.js index 9812d78e0a..60805a7f2a 100644 --- a/src/components/BudgetExpiryAlertAndModal/data/utils.js +++ b/src/components/BudgetExpiryAlertAndModal/data/utils.js @@ -7,9 +7,18 @@ dayjs.extend(duration); export const getExpiredAndNonExpiredBudgets = (budgets) => { const today = dayjs(); + const nonExpiredBudgets = []; + const expiredBudgets = []; + budgets.forEach((budget) => { + if (today <= dayjs(budget.end)) { + nonExpiredBudgets.push(budget); + } else { + expiredBudgets.push(budget); + } + }); return { - nonExpiredBudgets: budgets.filter((budget) => today <= dayjs(budget.end)), - expiredBudgets: budgets.filter((budget) => today > dayjs(budget.end)), + nonExpiredBudgets, + expiredBudgets, }; };