diff --git a/apps/frontend/src/components/foodRequestManagement.tsx b/apps/frontend/src/components/foodRequestManagement.tsx index 608d593ab..62ddb0805 100644 --- a/apps/frontend/src/components/foodRequestManagement.tsx +++ b/apps/frontend/src/components/foodRequestManagement.tsx @@ -78,7 +78,7 @@ const RequestManagement: React.FC = ({ }, [selectedFilteredPantries]); useEffect(() => { - if (!initialRequestId || requests.length === 0) return; + if (initialRequestId === undefined || requests.length === 0) return; const match = requests.find((r) => r.requestId === initialRequestId); if (match) { @@ -95,9 +95,10 @@ const RequestManagement: React.FC = ({ setCurrentPage(Math.floor(idx / itemsPerPage) + 1); } } else { + setAlertMessage('Request not found.', AlertStatus.ERROR); navigate(location.pathname, { replace: true }); } - }, [initialRequestId, requests, navigate, location]); + }, [initialRequestId, requests, navigate, location, setAlertMessage]); const pantryOptions = [ ...new Set( diff --git a/apps/frontend/src/containers/volunteerOrderManagement.tsx b/apps/frontend/src/containers/volunteerOrderManagement.tsx index f396a2a2b..ff61683b0 100644 --- a/apps/frontend/src/containers/volunteerOrderManagement.tsx +++ b/apps/frontend/src/containers/volunteerOrderManagement.tsx @@ -198,9 +198,10 @@ const VolunteerOrderManagement: React.FC = () => { } } } else { + setAlertMessage('Order not found.', AlertStatus.ERROR); navigate(ROUTES.VOLUNTEER_ORDER_MANAGEMENT, { replace: true }); } - }, [searchParams, statusOrders, navigate]); + }, [searchParams, statusOrders, navigate, setAlertMessage]); // Pre-fill pantry filter from url param, url is kept for back/forward navigation useEffect(() => {