Code-4-Community · Yurika-Kan · Sep 11, 2026 · Sep 11, 2026 · Sep 11, 2026 · Sep 11, 2026
diff --git a/apps/frontend/src/components/dashboardCard.tsx b/apps/frontend/src/components/dashboardCard.tsx
@@ -30,7 +30,7 @@ export const CARD_TYPE_ICON: Record<DashboardCardType, React.ReactNode> = {
 const CARD_TYPE_DATE_LABEL: Record<DashboardCardType, string> = {
   [DashboardCardType.ACTION]: 'Applied',
   [DashboardCardType.ORDER]: 'Requested',
-  [DashboardCardType.UPCOMING_DONATION]: 'Scheduled',
+  [DashboardCardType.UPCOMING_DONATION]: 'Scheduled to send',
   [DashboardCardType.RECENT_DONATION]: 'Donated',
   [DashboardCardType.FOOD_REQUEST]: 'Requested',
 };

diff --git a/apps/frontend/src/components/forms/addNewVolunteerModal.tsx b/apps/frontend/src/components/forms/addNewVolunteerModal.tsx
@@ -109,6 +109,8 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       onOpenChange={(e: { open: boolean }) =>
         e.open ? setIsOpen(true) : closeAndReset()

diff --git a/apps/frontend/src/components/forms/assignVolunteersModal.tsx b/apps/frontend/src/components/forms/assignVolunteersModal.tsx
@@ -131,6 +131,8 @@ const AssignVolunteersModal: React.FC<AssignVolunteersModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       size="md"
       open={isOpen}
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/changePasswordModal.tsx b/apps/frontend/src/components/forms/changePasswordModal.tsx
@@ -103,6 +103,8 @@ const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={open}
       onOpenChange={(e: { open: boolean }) => {
         if (!e.open) {

diff --git a/apps/frontend/src/components/forms/completeRequiredActionsModal.tsx b/apps/frontend/src/components/forms/completeRequiredActionsModal.tsx
@@ -64,6 +64,8 @@ const CompleteRequiredActionsModal: React.FC<
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/confirmActionModal.tsx b/apps/frontend/src/components/forms/confirmActionModal.tsx
@@ -20,6 +20,8 @@ const ConfirmActionModal: React.FC<ConfirmActionModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       onOpenChange={(e: { open: boolean }) => !e.open && onClose()}
     >

diff --git a/apps/frontend/src/components/forms/confirmFoodManufacturerDecisionModal.tsx b/apps/frontend/src/components/forms/confirmFoodManufacturerDecisionModal.tsx
@@ -24,6 +24,8 @@ const ConfirmFoodManufacturerDecisionModal: React.FC<
   useModalBodyCleanup();
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       onOpenChange={(e: { open: boolean }) => !e.open && onClose()}
     >

diff --git a/apps/frontend/src/components/forms/confirmPantryDecisionModal.tsx b/apps/frontend/src/components/forms/confirmPantryDecisionModal.tsx
@@ -22,6 +22,8 @@ const ConfirmPantryDecisionModal: React.FC<ConfirmPantryDecisionModalProps> = ({
   useModalBodyCleanup();
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       onOpenChange={(e: { open: boolean }) => !e.open && onClose()}
     >

diff --git a/apps/frontend/src/components/forms/createNewOrderModal.tsx b/apps/frontend/src/components/forms/createNewOrderModal.tsx
@@ -166,6 +166,8 @@ const CreateNewOrderModal: React.FC<CreateNewOrderModalModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/donationDetailsModal.tsx b/apps/frontend/src/components/forms/donationDetailsModal.tsx
@@ -115,6 +115,8 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       onOpenChange={(e: { open: boolean }) => {
         if (!e.open) {

diff --git a/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx b/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx
@@ -37,7 +37,7 @@ interface FmCompleteRequiredActionsModalProps {
   donation: DonationDetails;
   isOpen: boolean;
   onClose: () => void;
-  onSuccess: () => void;
+  onSuccess: (allOrdersComplete: boolean) => void;
 }
 
 interface OrderFormData {
@@ -160,14 +160,14 @@ const FmCompleteRequiredActionsModal: React.FC<
   const [isSubmitting, setIsSubmitting] = useState(false);
   const [alertState, setAlertMessage] = useAlert();
 
-  // True once every relevant item has both ozPerItem and estimatedValue filled in
+  // True once every relevant item has both ozPerItem and estimatedValue set to at least 0.01
   const isSubmitEnabled = useMemo(
     () =>
       donation.relevantDonationItems.length > 0 &&
       donation.relevantDonationItems.every(
         (item) =>
-          itemFormData[item.itemId].ozPerItem !== '' &&
-          itemFormData[item.itemId].estimatedValue !== '',
+          parseFloat(itemFormData[item.itemId].ozPerItem) >= 0.01 &&
+          parseFloat(itemFormData[item.itemId].estimatedValue) >= 0.01,
       ),
     [itemFormData],
   );
@@ -284,7 +284,13 @@ const FmCompleteRequiredActionsModal: React.FC<
         });
       }
 
-      onSuccess();
+      // Whether every pending order now has both a shipping cost and a tracking
+      // link set, i.e. will flip to SHIPPED once this save lands on the backend
+      const allOrdersComplete = orders.every((order) => {
+        const { trackingLink, shippingCost } = orderFormData[order.orderId];
+        return trackingLink.trim() !== '' && shippingCost !== '';
+      });
+      onSuccess(allOrdersComplete);
     } catch (error) {
       const rawMsg = axios.isAxiosError(error) && error.response?.data?.message;
       const msg = Array.isArray(rawMsg) ? rawMsg[0] : rawMsg;
@@ -312,6 +318,8 @@ const FmCompleteRequiredActionsModal: React.FC<
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="lg"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/fmDeleteDonationModal.tsx b/apps/frontend/src/components/forms/fmDeleteDonationModal.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import React, { useRef, useState } from 'react';
 import {
   Box,
   Button,
@@ -29,24 +29,30 @@ const FMDeleteDonationActionModal: React.FC<
 > = ({ donation, isOpen, onClose, onSuccess }) => {
   useModalBodyCleanup();
   const [alertState, setAlertMessage] = useAlert();
+  const [isDeleting, setIsDeleting] = useState(false);
 
   const donationRef = useRef<Donation | null>(donation);
   if (donation) donationRef.current = donation;
   const displayDonation = donation ?? donationRef.current;
 
   const onDeleteDonation = async () => {
-    if (!donation) return;
+    if (!donation || isDeleting) return;
+    setIsDeleting(true);
     try {
       await apiClient.deleteDonation(donation.donationId);
       onClose();
       onSuccess();
     } catch {
       setAlertMessage('Donation could not be deleted.', AlertStatus.ERROR);
+    } finally {
+      setIsDeleting(false);
     }
   };
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {
@@ -107,6 +113,7 @@ const FMDeleteDonationActionModal: React.FC<
                     textAlign="center"
                     lineHeight="28px"
                     onClick={onClose}
+                    disabled={isDeleting}
                   >
                     Cancel
                   </Button>
@@ -121,6 +128,8 @@ const FMDeleteDonationActionModal: React.FC<
                     flexShrink={0}
                     textAlign="center"
                     onClick={onDeleteDonation}
+                    loading={isDeleting}
+                    disabled={isDeleting}
                   >
                     Delete
                   </Button>

diff --git a/apps/frontend/src/components/forms/newDonationFormModal.tsx b/apps/frontend/src/components/forms/newDonationFormModal.tsx
@@ -99,6 +99,8 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/orderDetailsModal.tsx b/apps/frontend/src/components/forms/orderDetailsModal.tsx
@@ -191,6 +191,8 @@ const OrderDetailsModal: React.FC<OrderDetailsModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="xl"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/orderReceivedActionModal.tsx b/apps/frontend/src/components/forms/orderReceivedActionModal.tsx
@@ -90,6 +90,8 @@ const OrderReceivedActionModal: React.FC<OrderReceivedActionModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="xl"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/pantryApplicationModal.tsx b/apps/frontend/src/components/forms/pantryApplicationModal.tsx
@@ -19,6 +19,8 @@ const PantryApplicationModal: React.FC<PantryApplicationModalProps> = ({
   const pantryUser = pantry.pantryUser;
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       onOpenChange={(e: { open: boolean }) => {
         if (!e.open) onClose();

diff --git a/apps/frontend/src/components/forms/pantryDeleteRequestModal.tsx b/apps/frontend/src/components/forms/pantryDeleteRequestModal.tsx
@@ -40,6 +40,8 @@ const PantryDeleteRequestActionModal: React.FC<
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/promoteVolunteerModal.tsx b/apps/frontend/src/components/forms/promoteVolunteerModal.tsx
@@ -18,6 +18,8 @@ const PromoteVolunteerModal: React.FC<PromoteVolunteerModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       onOpenChange={(e: { open: boolean }) => !e.open && onClose()}
     >

diff --git a/apps/frontend/src/components/forms/requestDetailsModal.tsx b/apps/frontend/src/components/forms/requestDetailsModal.tsx
@@ -188,6 +188,8 @@ const RequestDetailsModal: React.FC<RequestDetailsModalProps> = ({
         />
       )}
       <Dialog.Root
+        lazyMount
+        unmountOnExit
         open={isOpen}
         size="xl"
         onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/requestFormModal.tsx b/apps/frontend/src/components/forms/requestFormModal.tsx
@@ -114,6 +114,8 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="xl"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/resubmitDonationModal.tsx b/apps/frontend/src/components/forms/resubmitDonationModal.tsx
@@ -139,6 +139,8 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/volunteerCloseOrderModal.tsx b/apps/frontend/src/components/forms/volunteerCloseOrderModal.tsx
@@ -43,6 +43,8 @@ const VolunteerCloseOrderModal: React.FC<VolunteerCloseOrderModalProps> = ({
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/volunteerCloseRequestModal.tsx b/apps/frontend/src/components/forms/volunteerCloseRequestModal.tsx
@@ -43,6 +43,8 @@ const VolunteerCloseRequestActionModal: React.FC<
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/forms/volunteerRequestActionRequiredModal.tsx b/apps/frontend/src/components/forms/volunteerRequestActionRequiredModal.tsx
@@ -31,6 +31,8 @@ const VolunteerRequestActionRequiredModal: React.FC<
 
   return (
     <Dialog.Root
+      lazyMount
+      unmountOnExit
       open={isOpen}
       size="md"
       onOpenChange={(e: { open: boolean }) => {

diff --git a/apps/frontend/src/components/sectionEmptyState.tsx b/apps/frontend/src/components/sectionEmptyState.tsx
@@ -17,9 +17,6 @@ const SectionEmptyState: React.FC<EmptyStateProps> = ({ entity, subtitle }) => {
       py={10}
       gap={2}
     >
-      <Text fontWeight="600" textStyle="p" color="neutral.800">
-        Nothing to see here!
-      </Text>
       <Text textStyle="p2" color="neutral.700" fontWeight="400">
         {message}
       </Text>