diff --git a/apps/backend/src/donations/donations.controller.spec.ts b/apps/backend/src/donations/donations.controller.spec.ts
index 554afe7d6..19cdd053d 100644
--- a/apps/backend/src/donations/donations.controller.spec.ts
+++ b/apps/backend/src/donations/donations.controller.spec.ts
@@ -7,6 +7,7 @@ import { CreateDonationDto } from './dtos/create-donation.dto';
 import { CreateDonationItemDto } from '../donationItems/dtos/create-donation-items.dto';
 import { DonationStatus, RecurrenceEnum } from './types';
 import { UpdateDonationItemDetailsDto } from '../donationItems/dtos/update-donation-item-details.dto';
+import { AuthenticatedRequest } from '../auth/authenticated-request';
 
 const mockDonationService = mock<DonationService>();
 
@@ -58,7 +59,6 @@ describe('DonationsController', () => {
   describe('POST /', () => {
     it('should call donationService.create and return the created donation', async () => {
       const createBody: Partial<CreateDonationDto> = {
-        foodManufacturerId: 1,
         recurrence: RecurrenceEnum.MONTHLY,
         recurrenceFreq: 3,
         occurrencesRemaining: 2,
@@ -72,6 +72,8 @@ describe('DonationsController', () => {
         ] as CreateDonationItemDto[],
       };
 
+      const mockReq = { user: { id: 1 } };
+
       const createdDonation: Partial<Donation> = {
         donationId: 1,
         ...createBody,
@@ -84,11 +86,12 @@ describe('DonationsController', () => {
       );
 
       const result = await controller.createDonation(
+        mockReq as AuthenticatedRequest,
         createBody as CreateDonationDto,
       );
 
       expect(result).toEqual(createdDonation);
-      expect(mockDonationService.create).toHaveBeenCalledWith(createBody);
+      expect(mockDonationService.create).toHaveBeenCalledWith(createBody, 1);
     });
   });
 
diff --git a/apps/backend/src/donations/donations.controller.ts b/apps/backend/src/donations/donations.controller.ts
index ab493edd5..e9005271b 100644
--- a/apps/backend/src/donations/donations.controller.ts
+++ b/apps/backend/src/donations/donations.controller.ts
@@ -8,6 +8,7 @@ import {
   ParseArrayPipe,
   Get,
   Delete,
+  Req,
 } from '@nestjs/common';
 import { ApiBody } from '@nestjs/swagger';
 import { Donation } from './donations.entity';
@@ -21,6 +22,7 @@ import { Role } from '../users/types';
 import { CheckOwnership, pipeNullable } from '../auth/ownership.decorator';
 import { FoodManufacturersService } from '../foodManufacturers/manufacturers.service';
 import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
+import { AuthenticatedRequest } from '../auth/authenticated-request';
 
 @Controller('donations')
 export class DonationsController {
@@ -37,7 +39,6 @@ export class DonationsController {
     schema: {
       type: 'object',
       properties: {
-        foodManufacturerId: { type: 'integer', example: 1 },
         recurrence: {
           type: 'string',
           enum: Object.values(RecurrenceEnum),
@@ -79,11 +80,12 @@ export class DonationsController {
       },
     },
   })
+  @Roles(Role.FOODMANUFACTURER)
   async createDonation(
-    @Body()
-    body: CreateDonationDto,
+    @Req() req: AuthenticatedRequest,
+    @Body() body: CreateDonationDto,
   ): Promise<Donation> {
-    return this.donationService.create(body);
+    return this.donationService.create(body, req.user.id);
   }
 
   @Patch('/:donationId/fulfill')
diff --git a/apps/backend/src/donations/donations.service.spec.ts b/apps/backend/src/donations/donations.service.spec.ts
index 6fa0bcda3..245b4e877 100644
--- a/apps/backend/src/donations/donations.service.spec.ts
+++ b/apps/backend/src/donations/donations.service.spec.ts
@@ -13,12 +13,19 @@ import { DonationItemsService } from '../donationItems/donationItems.service';
 import { Allocation } from '../allocations/allocations.entity';
 import { DataSource, In } from 'typeorm';
 import { FoodType } from '../donationItems/types';
-import { mock } from 'jest-mock-extended';
+import { FoodManufacturersService } from '../foodManufacturers/manufacturers.service';
+import { UsersService } from '../users/users.service';
 import { EmailsService } from '../emails/email.service';
+import { mock } from 'jest-mock-extended';
 import { emailTemplates } from '../emails/emailTemplates';
 
 jest.setTimeout(60000);
 
+// findByUserId only touches the FoodManufacturer repo, so UsersService and
+// EmailsService are mocked to satisfy FoodManufacturersService's DI.
+const mockUsersService = mock<UsersService>();
+const mockEmailsService = mock<EmailsService>();
+
 const TODAY = new Date();
 TODAY.setHours(0, 0, 0, 0);
 const MOCK_MONDAY = new Date(2025, 0, 6);
@@ -131,8 +138,6 @@ const TODAYOfWeek = (iso: string): DayOfWeek => {
   return days[new Date(iso).getDay()];
 };
 
-const mockEmailsService = mock<EmailsService>();
-
 describe('DonationService', () => {
   let service: DonationService;
   let donationItemService: DonationItemsService;
@@ -151,6 +156,7 @@ describe('DonationService', () => {
       providers: [
         DonationService,
         DonationItemsService,
+        FoodManufacturersService,
         {
           provide: getRepositoryToken(Allocation),
           useValue: testDataSource.getRepository(Allocation),
@@ -163,6 +169,14 @@ describe('DonationService', () => {
           provide: getRepositoryToken(FoodManufacturer),
           useValue: testDataSource.getRepository(FoodManufacturer),
         },
+        {
+          provide: UsersService,
+          useValue: mockUsersService,
+        },
+        {
+          provide: EmailsService,
+          useValue: mockEmailsService,
+        },
         {
           provide: getRepositoryToken(DonationItem),
           useValue: testDataSource.getRepository(DonationItem),
@@ -1103,11 +1117,13 @@ describe('DonationService', () => {
     ];
 
     it('successfully creates a donation with items', async () => {
-      const donation = await service.create({
-        foodManufacturerId: 1,
-        recurrence: RecurrenceEnum.NONE,
-        items: validItems,
-      });
+      const donation = await service.create(
+        {
+          recurrence: RecurrenceEnum.NONE,
+          items: validItems,
+        },
+        3,
+      );
 
       expect(donation).toBeDefined();
       expect(donation.donationId).toBeDefined();
@@ -1139,13 +1155,15 @@ describe('DonationService', () => {
       const before = new Date();
       before.setHours(0, 0, 0, 0);
 
-      const donation = await service.create({
-        foodManufacturerId: 1,
-        recurrence: RecurrenceEnum.MONTHLY,
-        recurrenceFreq: 1,
-        occurrencesRemaining: 3,
-        items: validItems,
-      });
+      const donation = await service.create(
+        {
+          recurrence: RecurrenceEnum.MONTHLY,
+          recurrenceFreq: 1,
+          occurrencesRemaining: 3,
+          items: validItems,
+        },
+        3,
+      );
 
       const rows = await testDataSource.query(
         `SELECT next_donation_dates, occurrences_remaining, recurrence, recurrence_freq
@@ -1174,15 +1192,17 @@ describe('DonationService', () => {
       expect(actualDate.getDate()).toEqual(expectedDate.getDate());
     });
 
-    it('throws when foodManufacturerId does not exist', async () => {
+    it('throws when user ID is not a food manufacturer', async () => {
       await expect(
-        service.create({
-          foodManufacturerId: 99999,
-          recurrence: RecurrenceEnum.NONE,
-          items: validItems,
-        }),
+        service.create(
+          {
+            recurrence: RecurrenceEnum.NONE,
+            items: validItems,
+          },
+          1,
+        ),
       ).rejects.toThrow(
-        new NotFoundException('Food Manufacturer 99999 not found'),
+        new NotFoundException('Food Manufacturer for User 1 not found'),
       );
     });
 
@@ -1190,20 +1210,22 @@ describe('DonationService', () => {
       let donations = await testDataSource.query(`SELECT * FROM donations`);
       expect(donations).toHaveLength(4);
       await expect(
-        service.create({
-          foodManufacturerId: 1,
-          recurrence: RecurrenceEnum.WEEKLY,
-          repeatOnDays: {
-            Sunday: false,
-            Monday: true,
-            Tuesday: false,
-            Wednesday: false,
-            Thursday: false,
-            Friday: false,
-            Saturday: false,
+        service.create(
+          {
+            recurrence: RecurrenceEnum.WEEKLY,
+            repeatOnDays: {
+              Sunday: false,
+              Monday: true,
+              Tuesday: false,
+              Wednesday: false,
+              Thursday: false,
+              Friday: false,
+              Saturday: false,
+            },
+            items: validItems,
           },
-          items: validItems,
-        }),
+          3,
+        ),
       ).rejects.toThrow(
         new BadRequestException(
           'recurrenceFreq is required for recurring donations',
@@ -1219,19 +1241,21 @@ describe('DonationService', () => {
       expect(donations).toHaveLength(4);
 
       await expect(
-        service.create({
-          foodManufacturerId: 1,
-          recurrence: RecurrenceEnum.NONE,
-          items: [
-            ...validItems,
-            {
-              itemName: 'a'.repeat(1000),
-              quantity: 5,
-              foodType: FoodType.DAIRY_FREE_ALTERNATIVES,
-              foodRescue: false,
-            },
-          ],
-        }),
+        service.create(
+          {
+            recurrence: RecurrenceEnum.NONE,
+            items: [
+              ...validItems,
+              {
+                itemName: 'a'.repeat(1000),
+                quantity: 5,
+                foodType: FoodType.DAIRY_FREE_ALTERNATIVES,
+                foodRescue: false,
+              },
+            ],
+          },
+          3,
+        ),
       ).rejects.toThrow();
 
       donations = await testDataSource.query(`SELECT * FROM donations`);
diff --git a/apps/backend/src/donations/donations.service.ts b/apps/backend/src/donations/donations.service.ts
index 7fe8664b3..bd54f0bd2 100644
--- a/apps/backend/src/donations/donations.service.ts
+++ b/apps/backend/src/donations/donations.service.ts
@@ -1,7 +1,6 @@
 import {
   BadRequestException,
   Injectable,
-  InternalServerErrorException,
   Logger,
   NotFoundException,
 } from '@nestjs/common';
@@ -13,11 +12,11 @@ import { DayOfWeek, DonationStatus, RecurrenceEnum } from './types';
 import { OrderStatus } from '../orders/types';
 import { calculateNextDonationDate } from './recurrence.utils';
 import { CreateDonationDto, RepeatOnDaysDto } from './dtos/create-donation.dto';
-import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
 import { UpdateDonationItemDetailsDto } from '../donationItems/dtos/update-donation-item-details.dto';
 import { DonationItemsService } from '../donationItems/donationItems.service';
 import { DonationItem } from '../donationItems/donationItems.entity';
 import { Allocation } from '../allocations/allocations.entity';
+import { FoodManufacturersService } from '../foodManufacturers/manufacturers.service';
 import { EmailsService } from '../emails/email.service';
 import { emailTemplates } from '../emails/emailTemplates';
 
@@ -30,9 +29,8 @@ export class DonationService {
     private allocationRepo: Repository<Allocation>,
     @InjectRepository(DonationItem)
     private donationItemsRepo: Repository<DonationItem>,
-    @InjectRepository(FoodManufacturer)
-    private manufacturerRepo: Repository<FoodManufacturer>,
     private donationItemsService: DonationItemsService,
+    private foodManufacturersService: FoodManufacturersService,
     @InjectDataSource() private dataSource: DataSource,
     private emailsService: EmailsService,
   ) {}
@@ -59,17 +57,13 @@ export class DonationService {
     });
   }
 
-  async create(donationData: CreateDonationDto): Promise<Donation> {
-    validateId(donationData.foodManufacturerId, 'Food Manufacturer');
-    const manufacturer = await this.manufacturerRepo.findOne({
-      where: { foodManufacturerId: donationData.foodManufacturerId },
-    });
-
-    if (!manufacturer) {
-      throw new NotFoundException(
-        `Food Manufacturer ${donationData.foodManufacturerId} not found`,
-      );
-    }
+  async create(
+    donationData: CreateDonationDto,
+    userId: number,
+  ): Promise<Donation> {
+    const manufacturer = await this.foodManufacturersService.findByUserId(
+      userId,
+    );
 
     let nextDonationDates = null;
 
diff --git a/apps/backend/src/donations/dtos/create-donation.dto.ts b/apps/backend/src/donations/dtos/create-donation.dto.ts
index 523e6c085..04e7b2b25 100644
--- a/apps/backend/src/donations/dtos/create-donation.dto.ts
+++ b/apps/backend/src/donations/dtos/create-donation.dto.ts
@@ -65,10 +65,6 @@ export class RepeatOnDaysDto {
 }
 
 export class CreateDonationDto {
-  @IsInt()
-  @Min(1)
-  foodManufacturerId!: number;
-
   @IsNotEmpty()
   @IsEnum(RecurrenceEnum)
   recurrence!: RecurrenceEnum;
diff --git a/apps/backend/src/foodManufacturers/manufacturers.service.spec.ts b/apps/backend/src/foodManufacturers/manufacturers.service.spec.ts
index 5a2f5e7ad..5d708779d 100644
--- a/apps/backend/src/foodManufacturers/manufacturers.service.spec.ts
+++ b/apps/backend/src/foodManufacturers/manufacturers.service.spec.ts
@@ -616,6 +616,7 @@ describe('FoodManufacturersService', () => {
       futureDate1.setMilliseconds(0);
       futureDate1.setDate(futureDate1.getDate() + 30);
       clampDay(futureDate1);
+
       const futureDate2 = new Date();
       futureDate2.setMilliseconds(0);
       futureDate2.setDate(futureDate2.getDate() + 60);
diff --git a/apps/backend/src/users/users.service.spec.ts b/apps/backend/src/users/users.service.spec.ts
index c81a6664b..f504fe40d 100644
--- a/apps/backend/src/users/users.service.spec.ts
+++ b/apps/backend/src/users/users.service.spec.ts
@@ -349,7 +349,6 @@ describe('UsersService', () => {
       const now = new Date();
 
       const createDonationBody: Partial<CreateDonationDto> = {
-        foodManufacturerId: 1,
         recurrence: RecurrenceEnum.MONTHLY,
         recurrenceFreq: 3,
         occurrencesRemaining: 2,
@@ -363,7 +362,7 @@ describe('UsersService', () => {
         ],
       };
 
-      await donationService.create(createDonationBody as CreateDonationDto);
+      await donationService.create(createDonationBody as CreateDonationDto, 3);
 
       // updating existing request to have a current month requested at date
       const existingRequest = await foodRequestService.findOne(1);
diff --git a/apps/frontend/src/components/floatingAlert.tsx b/apps/frontend/src/components/floatingAlert.tsx
index 8e45294da..52e0c22bb 100644
--- a/apps/frontend/src/components/floatingAlert.tsx
+++ b/apps/frontend/src/components/floatingAlert.tsx
@@ -1,9 +1,10 @@
 import { Alert } from '@chakra-ui/react';
 import { useEffect, useState } from 'react';
+import { AlertStatus } from '../types/types';
 
 type FloatingAlertProps = {
   message?: string | null;
-  status?: 'info' | 'error';
+  status?: AlertStatus;
   timeout?: number;
 };
 
@@ -35,7 +36,7 @@ export function FloatingAlert({
 
   return (
     <Alert.Root
-      color={status === 'info' ? 'neutral.800' : 'red'}
+      color={status === AlertStatus.INFO ? 'neutral.800' : 'red'}
       status="info"
       bg="white"
       alignItems="center"
diff --git a/apps/frontend/src/components/foodRequestManagement.tsx b/apps/frontend/src/components/foodRequestManagement.tsx
index 7d0bce590..4fd31ec35 100644
--- a/apps/frontend/src/components/foodRequestManagement.tsx
+++ b/apps/frontend/src/components/foodRequestManagement.tsx
@@ -21,6 +21,7 @@ import VolunteerRequestActionRequiredModal from '@components/forms/volunteerRequ
 import CreateNewOrderModal from '@components/forms/createNewOrderModal';
 import { useAlert } from '../hooks/alert';
 import { useNavigate, useLocation } from 'react-router-dom';
+import { AlertStatus } from '../types/types';
 
 interface RequestManagementProps {
   fetchRequests: () => Promise<FoodRequestSummaryDto[]>;
@@ -50,8 +51,7 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
   const [selectedCreateOrderRequest, setSelectedCreateOrderRequest] =
     useState<FoodRequestSummaryDto | null>(null);
 
-  const [errorAlertState, setErrorMessage] = useAlert();
-  const [successAlertState, setSuccessMessage] = useAlert();
+  const [alertState, setAlertMessage] = useAlert();
 
   const navigate = useNavigate();
   const location = useLocation();
@@ -61,9 +61,9 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
       const data = await fetchData();
       setRequests(data);
     } catch {
-      setErrorMessage('Error fetching requests');
+      setAlertMessage('Error fetching requests', AlertStatus.ERROR);
     }
-  }, [fetchData, setErrorMessage]);
+  }, [fetchData, setAlertMessage]);
 
   useEffect(() => {
     loadRequests();
@@ -160,19 +160,11 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
       <Heading textStyle="h1" color="gray.600" mb={6}>
         Food Request Management
       </Heading>
-      {errorAlertState && (
+      {alertState && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
-          timeout={6000}
-        />
-      )}
-      {successAlertState && (
-        <FloatingAlert
-          key={successAlertState.id}
-          message={successAlertState.message}
-          status="info"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
@@ -424,7 +416,7 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
               isOpen={true}
               onClose={clearCloseRequest}
               onSuccess={() => {
-                setSuccessMessage('Request Closed');
+                setAlertMessage('Request Closed', AlertStatus.INFO);
                 loadRequests();
               }}
             />
@@ -436,7 +428,7 @@ const RequestManagement: React.FC<RequestManagementProps> = ({
               isOpen={true}
               onClose={clearCreateOrder}
               onSuccess={() => {
-                setSuccessMessage('Order Created');
+                setAlertMessage('Order Created', AlertStatus.INFO);
                 loadRequests();
               }}
             />
diff --git a/apps/frontend/src/components/forms/addNewVolunteerModal.tsx b/apps/frontend/src/components/forms/addNewVolunteerModal.tsx
index 5a85fa3be..e0dcafd34 100644
--- a/apps/frontend/src/components/forms/addNewVolunteerModal.tsx
+++ b/apps/frontend/src/components/forms/addNewVolunteerModal.tsx
@@ -9,11 +9,13 @@ import {
   Box,
 } from '@chakra-ui/react';
 import { useState } from 'react';
-import { Role, UserDto } from '../../types/types';
+import { AlertStatus, Role, UserDto } from '../../types/types';
 import ApiClient from '@api/apiClient';
 import { USPhoneInput } from './usPhoneInput';
 import { PlusIcon } from 'lucide-react';
 import { useModalBodyCleanup } from '../../hooks/modalBodyCleanup';
+import { useAlert } from '../../hooks/alert';
+import { FloatingAlert } from '@components/floatingAlert';
 
 interface NewVolunteerModalProps {
   onSubmitSuccess?: () => void;
@@ -32,16 +34,14 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
 
   const [isOpen, setIsOpen] = useState(false);
 
-  const [error, setError] = useState('');
+  const [alertState, setAlertMessage] = useAlert();
 
   const handleSubmit = async () => {
     if (!firstName || !lastName || !email || !phone || phone === '+1') {
-      setError('Please fill in all fields. *');
+      setAlertMessage('Please fill in all fields. *', AlertStatus.ERROR);
       return;
     }
 
-    setError('');
-
     const newVolunteer: UserDto = {
       firstName,
       lastName,
@@ -80,9 +80,12 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
       }
 
       if (hasEmailError) {
-        setError('Please specify a valid email. *');
+        setAlertMessage('Please specify a valid email. *', AlertStatus.ERROR);
       } else if (hasPhoneError) {
-        setError('Please specify a valid phone number. *');
+        setAlertMessage(
+          'Please specify a valid phone number. *',
+          AlertStatus.ERROR,
+        );
       } else {
         if (onSubmitFail) onSubmitFail();
         handleClear();
@@ -95,7 +98,6 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
     setLastName('');
     setEmail('');
     setPhone('');
-    setError('');
     setIsOpen(false);
   };
 
@@ -200,16 +202,13 @@ const NewVolunteerModal: React.FC<NewVolunteerModalProps> = ({
                 }}
               />
             </Field.Root>
-            {error && (
-              <Text
-                color="red"
-                mb={3}
-                fontWeight={400}
-                fontSize="12px"
-                fontFamily="Inter"
-              >
-                {error}
-              </Text>
+            {alertState && (
+              <FloatingAlert
+                key={alertState.id}
+                message={alertState.message}
+                status={alertState.status}
+                timeout={6000}
+              />
             )}
             <Flex justifyContent="flex-end" mt={10} gap={2.5}>
               <Button
diff --git a/apps/frontend/src/components/forms/assignVolunteersModal.tsx b/apps/frontend/src/components/forms/assignVolunteersModal.tsx
index a4aeb70ba..5b1012fab 100644
--- a/apps/frontend/src/components/forms/assignVolunteersModal.tsx
+++ b/apps/frontend/src/components/forms/assignVolunteersModal.tsx
@@ -13,7 +13,11 @@ import {
 } from '@chakra-ui/react';
 import { useAlert } from '../../hooks/alert';
 import { useEffect, useState } from 'react';
-import { ApprovedPantryResponse, Assignments } from 'types/types';
+import {
+  AlertStatus,
+  ApprovedPantryResponse,
+  Assignments,
+} from '../../types/types';
 import { SearchIcon } from 'lucide-react';
 import { getInitials, USER_ICON_COLORS } from '@utils/utils';
 import { FloatingAlert } from '@components/floatingAlert';
@@ -70,7 +74,7 @@ const AssignVolunteersModal: React.FC<AssignVolunteersModalProps> = ({
         setVolunteers(normalized);
         setSelectedIds(new Set(assignedIds));
       } catch {
-        setAlertMessage('Error fetching volunteers');
+        setAlertMessage('Error fetching volunteers', AlertStatus.ERROR);
       }
     };
 
@@ -112,7 +116,7 @@ const AssignVolunteersModal: React.FC<AssignVolunteersModalProps> = ({
       onSuccess();
       onClose();
     } catch {
-      setAlertMessage('Error saving volunteer assignments');
+      setAlertMessage('Error saving volunteer assignments', AlertStatus.ERROR);
     }
   };
 
@@ -129,7 +133,7 @@ const AssignVolunteersModal: React.FC<AssignVolunteersModalProps> = ({
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/changePasswordModal.tsx b/apps/frontend/src/components/forms/changePasswordModal.tsx
index 7893aa340..c74a34012 100644
--- a/apps/frontend/src/components/forms/changePasswordModal.tsx
+++ b/apps/frontend/src/components/forms/changePasswordModal.tsx
@@ -16,6 +16,7 @@ import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
 import { useModalBodyCleanup } from '../../hooks/modalBodyCleanup';
 import { Eye, EyeOff } from 'lucide-react';
+import { AlertStatus } from '../../types/types';
 
 interface ChangePasswordModalProps {
   open: boolean;
@@ -39,12 +40,15 @@ const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
 
   const handleChangePassword = async () => {
     if (password.length < 8) {
-      setAlertMessage('Password must be at least 8 characters');
+      setAlertMessage(
+        'Password must be at least 8 characters',
+        AlertStatus.ERROR,
+      );
       return;
     }
 
     if (password !== confirmPassword) {
-      setAlertMessage('Passwords must match');
+      setAlertMessage('Passwords must match', AlertStatus.ERROR);
       return;
     }
 
@@ -58,11 +62,20 @@ const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
       onSuccess();
     } catch (err: any) {
       if (err.name === 'LimitExceededException') {
-        setAlertMessage('Limit exceeded, please try again later');
+        setAlertMessage(
+          'Limit exceeded, please try again later',
+          AlertStatus.ERROR,
+        );
       } else if (err.name === 'NotAuthorizedException') {
-        setAlertMessage('Failed to update password, old password is incorrect');
+        setAlertMessage(
+          'Failed to update password, old password is incorrect',
+          AlertStatus.ERROR,
+        );
       } else {
-        setAlertMessage('Failed to update password, please try again');
+        setAlertMessage(
+          'Failed to update password, please try again',
+          AlertStatus.ERROR,
+        );
       }
     }
   };
@@ -93,7 +106,6 @@ const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
       open={open}
       onOpenChange={(e: { open: boolean }) => {
         if (!e.open) {
-          setAlertMessage('');
           onClose();
         }
       }}
@@ -109,7 +121,7 @@ const ChangePasswordModal: React.FC<ChangePasswordModalProps> = ({
                 <FloatingAlert
                   key={alertState.id}
                   message={alertState.message}
-                  status="error"
+                  status={alertState.status}
                   timeout={6000}
                 />
               )}
diff --git a/apps/frontend/src/components/forms/completeRequiredActionsModal.tsx b/apps/frontend/src/components/forms/completeRequiredActionsModal.tsx
index 6c7543d99..ab85d4c95 100644
--- a/apps/frontend/src/components/forms/completeRequiredActionsModal.tsx
+++ b/apps/frontend/src/components/forms/completeRequiredActionsModal.tsx
@@ -14,6 +14,7 @@ import {
   VolunteerOrder,
   VolunteerAction,
   VolunteerActionCompletion,
+  AlertStatus,
 } from '../../types/types';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
@@ -46,7 +47,10 @@ const CompleteRequiredActionsModal: React.FC<
       await ApiClient.completeOrderAction(order.orderId, action);
       onActionCompleted(order.orderId, action);
     } catch {
-      setAlertMessage('Error completing action. Please try again.');
+      setAlertMessage(
+        'Error completing action. Please try again.',
+        AlertStatus.ERROR,
+      );
     } finally {
       setLoadingAction(null);
     }
@@ -71,7 +75,7 @@ const CompleteRequiredActionsModal: React.FC<
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/createNewOrderModal.tsx b/apps/frontend/src/components/forms/createNewOrderModal.tsx
index f08af90e3..458f655fb 100644
--- a/apps/frontend/src/components/forms/createNewOrderModal.tsx
+++ b/apps/frontend/src/components/forms/createNewOrderModal.tsx
@@ -15,13 +15,14 @@ import {
   Input,
 } from '@chakra-ui/react';
 import {
+  AlertStatus,
   DonationItemsGroupedByFoodType,
   FoodManufacturerWithoutRelations,
   FoodRequestSummaryDto,
   FoodType,
   MatchingItemsDto,
   MatchingManufacturersDto,
-} from 'types/types';
+} from '../../types/types';
 import apiClient from '@api/apiClient';
 import { useAlert } from '../../hooks/alert';
 import { FloatingAlert } from '@components/floatingAlert';
@@ -62,7 +63,7 @@ const CreateNewOrderModal: React.FC<CreateNewOrderModalModalProps> = ({
         );
         setManufacturers(data);
       } catch {
-        setAlertMessage('Error fetching manufacturers');
+        setAlertMessage('Error fetching manufacturers', AlertStatus.ERROR);
       }
     };
     fetchManufacturers();
@@ -114,7 +115,7 @@ const CreateNewOrderModal: React.FC<CreateNewOrderModalModalProps> = ({
       );
       setManufacturerItems(data);
     } catch {
-      setAlertMessage('Error fetching manufacturer items');
+      setAlertMessage('Error fetching manufacturer items', AlertStatus.ERROR);
     }
   };
 
@@ -140,7 +141,7 @@ const CreateNewOrderModal: React.FC<CreateNewOrderModalModalProps> = ({
       onClose();
       onSuccess();
     } catch {
-      setAlertMessage('Error creating new order');
+      setAlertMessage('Error creating new order', AlertStatus.ERROR);
     }
   };
 
@@ -171,7 +172,7 @@ const CreateNewOrderModal: React.FC<CreateNewOrderModalModalProps> = ({
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/donationDetailsModal.tsx b/apps/frontend/src/components/forms/donationDetailsModal.tsx
index 3b61ab4b7..198e72fdf 100644
--- a/apps/frontend/src/components/forms/donationDetailsModal.tsx
+++ b/apps/frontend/src/components/forms/donationDetailsModal.tsx
@@ -6,6 +6,7 @@ import { formatDate } from '@utils/utils';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
 import { useModalBodyCleanup } from '../../hooks/modalBodyCleanup';
+import { AlertStatus } from '../../types/types';
 
 interface DonationDetailsModalProps {
   donation: Donation;
@@ -36,7 +37,7 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({
 
         setItems(itemsData);
       } catch {
-        setAlertMessage('Error fetching donation details');
+        setAlertMessage('Error fetching donation details', AlertStatus.ERROR);
       }
     };
 
@@ -63,7 +64,7 @@ const DonationDetailsModal: React.FC<DonationDetailsModalProps> = ({
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/editableFMApplication.tsx b/apps/frontend/src/components/forms/editableFMApplication.tsx
index a82f61a4c..18f1fa9c9 100644
--- a/apps/frontend/src/components/forms/editableFMApplication.tsx
+++ b/apps/frontend/src/components/forms/editableFMApplication.tsx
@@ -12,6 +12,7 @@ import axios from 'axios';
 import { AuthError } from 'aws-amplify/auth';
 import ApiClient from '@api/apiClient';
 import {
+  AlertStatus,
   FoodManufacturer,
   UpdateFoodManufacturerApplicationDto,
 } from '../../types/types';
@@ -34,6 +35,8 @@ import {
   EditSelect,
   EditMultiSelect,
 } from '@components/editableComponents';
+import { useAlert } from '../../hooks/alert';
+import { FloatingAlert } from '@components/floatingAlert';
 
 const allergenOptions = Object.values(Allergen);
 const donateWastedFoodOptions = Object.values(DonateWastedFood);
@@ -110,7 +113,7 @@ const EditableFMApplication: React.FC<EditableFMApplicationProps> = ({
   foodManufacturerId,
 }) => {
   const [application, setApplication] = useState<FoodManufacturer | null>(null);
-  const [error, setError] = useState<string | null>(null);
+  const [alertState, setAlertMessage] = useAlert();
   const [isSaving, setIsSaving] = useState(false);
   const [form, setForm] = useState<FormState | null>(null);
 
@@ -120,7 +123,10 @@ const EditableFMApplication: React.FC<EditableFMApplicationProps> = ({
       setApplication(data);
       setForm(buildFormState(data));
     } catch {
-      setError('Could not load application details. Please try again later.');
+      setAlertMessage(
+        'Could not load application details. Please try again later.',
+        AlertStatus.ERROR,
+      );
     }
   }, [foodManufacturerId]);
 
@@ -144,12 +150,14 @@ const EditableFMApplication: React.FC<EditableFMApplicationProps> = ({
     if (!form || !application) return;
 
     if (!validateRequired(form)) {
-      setError('Please complete all required fields before saving.');
+      setAlertMessage(
+        'Please complete all required fields before saving.',
+        AlertStatus.ERROR,
+      );
       return;
     }
 
     setIsSaving(true);
-    setError(null);
     try {
       const formData: UpdateFoodManufacturerApplicationDto = {
         secondaryContactFirstName: form.secondaryContactFirstName || undefined,
@@ -193,23 +201,37 @@ const EditableFMApplication: React.FC<EditableFMApplicationProps> = ({
         const status = err.response?.status;
         if (status === 400) {
           const messages = err.response?.data?.message;
-          setError(
+          setAlertMessage(
             Array.isArray(messages)
               ? messages.join(' ')
               : 'Invalid input. Please check your entries and try again.',
+            AlertStatus.ERROR,
           );
         } else if (status === 403) {
-          setError('You do not have permission to edit this profile.');
+          setAlertMessage(
+            'You do not have permission to edit this profile.',
+            AlertStatus.ERROR,
+          );
         } else if (status === 404) {
-          setError('This manufacturer profile could not be found.');
+          setAlertMessage(
+            'This manufacturer profile could not be found.',
+            AlertStatus.ERROR,
+          );
         } else if (status === 500) {
-          setError('A server error occurred while saving. Please try again.');
+          setAlertMessage(
+            'A server error occurred while saving. Please try again.',
+            AlertStatus.ERROR,
+          );
         } else {
-          setError('Failed to save changes. Please try again.');
+          setAlertMessage(
+            'Failed to save changes. Please try again.',
+            AlertStatus.ERROR,
+          );
         }
       } else if (err instanceof AuthError) {
-        setError(
+        setAlertMessage(
           'Your session may have expired. Please refresh or log in again.',
+          AlertStatus.ERROR,
         );
       }
     } finally {
@@ -221,7 +243,7 @@ const EditableFMApplication: React.FC<EditableFMApplicationProps> = ({
     return (
       <Center py={16}>
         <Text textStyle="p2" color="neutral.500">
-          {error ?? 'Application not found.'}
+          {alertState?.message ?? 'Application not found.'}
         </Text>
       </Center>
     );
@@ -490,10 +512,13 @@ const EditableFMApplication: React.FC<EditableFMApplicationProps> = ({
           onChange={(v) => setField('newsletterSubscription', v)}
         />
 
-        {error && (
-          <Text color="red" fontSize="14px" mb={2}>
-            {error}
-          </Text>
+        {alertState && (
+          <FloatingAlert
+            key={alertState.id}
+            message={alertState.message}
+            status={alertState.status}
+            timeout={6000}
+          />
         )}
 
         <HStack justify="flex-end" gap={3} mt={6}>
diff --git a/apps/frontend/src/components/forms/editablePantryApplication.tsx b/apps/frontend/src/components/forms/editablePantryApplication.tsx
index 8fb74e023..bd56810d2 100644
--- a/apps/frontend/src/components/forms/editablePantryApplication.tsx
+++ b/apps/frontend/src/components/forms/editablePantryApplication.tsx
@@ -11,7 +11,11 @@ import {
 } from '@chakra-ui/react';
 import axios from 'axios';
 import ApiClient from '@api/apiClient';
-import { PantryWithUser, UpdatePantryApplicationDto } from '../../types/types';
+import {
+  AlertStatus,
+  PantryWithUser,
+  UpdatePantryApplicationDto,
+} from '../../types/types';
 import {
   Activity,
   RefrigeratedDonation,
@@ -37,6 +41,8 @@ import {
   EditAddressSection,
 } from '@components/editableComponents';
 import { AuthError } from 'aws-amplify/auth';
+import { useAlert } from '../../hooks/alert';
+import { FloatingAlert } from '@components/floatingAlert';
 
 const allergenClientOptions = [
   '< 10',
@@ -214,7 +220,7 @@ const EditablePantryApplication: React.FC<EditablePantryApplicationProps> = ({
   onEditingChange,
 }) => {
   const [application, setApplication] = useState<PantryWithUser | null>(null);
-  const [error, setError] = useState<string | null>(null);
+  const [alertState, setAlertMessage] = useAlert();
   const [isSaving, setIsSaving] = useState(false);
   const [form, setForm] = useState<FormState | null>(null);
 
@@ -227,7 +233,10 @@ const EditablePantryApplication: React.FC<EditablePantryApplicationProps> = ({
         setForm(buildFormState(data));
       }
     } catch {
-      setError('Could not load application details. Please try again later.');
+      setAlertMessage(
+        'Could not load application details. Please try again later.',
+        AlertStatus.ERROR,
+      );
     }
   }, []);
 
@@ -251,12 +260,14 @@ const EditablePantryApplication: React.FC<EditablePantryApplicationProps> = ({
     if (!form || !application) return;
 
     if (!validateRequired(form)) {
-      setError('Please complete all required fields before saving.');
+      setAlertMessage(
+        'Please complete all required fields before saving.',
+        AlertStatus.ERROR,
+      );
       return;
     }
 
     setIsSaving(true);
-    setError(null);
     try {
       const formData: UpdatePantryApplicationDto = {
         secondaryContactFirstName: form.secondaryContactFirstName || undefined,
@@ -323,23 +334,37 @@ const EditablePantryApplication: React.FC<EditablePantryApplicationProps> = ({
         const status = err.response?.status;
         if (status === 400) {
           const messages = err.response?.data?.message;
-          setError(
+          setAlertMessage(
             Array.isArray(messages)
               ? messages.join(' ')
               : 'Invalid input. Please check your entries and try again.',
+            AlertStatus.ERROR,
           );
         } else if (status === 403) {
-          setError('You do not have permission to edit this profile.');
+          setAlertMessage(
+            'You do not have permission to edit this profile.',
+            AlertStatus.ERROR,
+          );
         } else if (status === 404) {
-          setError('This pantry profile could not be found.');
+          setAlertMessage(
+            'This pantry profile could not be found.',
+            AlertStatus.ERROR,
+          );
         } else if (status === 500) {
-          setError('A server error occurred while saving. Please try again.');
+          setAlertMessage(
+            'A server error occurred while saving. Please try again.',
+            AlertStatus.ERROR,
+          );
         } else {
-          setError('Failed to save changes. Please try again.');
+          setAlertMessage(
+            'Failed to save changes. Please try again.',
+            AlertStatus.ERROR,
+          );
         }
       } else if (err instanceof AuthError) {
-        setError(
+        setAlertMessage(
           'Your session may have expired. Please refresh or log in again.',
+          AlertStatus.ERROR,
         );
       }
     } finally {
@@ -351,7 +376,7 @@ const EditablePantryApplication: React.FC<EditablePantryApplicationProps> = ({
     return (
       <Center py={16}>
         <Text textStyle="p2" color="neutral.500">
-          {error ?? 'Application not found.'}
+          {alertState?.message ?? 'Application not found.'}
         </Text>
       </Center>
     );
@@ -736,10 +761,13 @@ const EditablePantryApplication: React.FC<EditablePantryApplicationProps> = ({
           onChange={(v) => setField('newsletterSubscription', v)}
         />
 
-        {error && (
-          <Text color="red" fontSize="14px" mb={2}>
-            {error}
-          </Text>
+        {alertState && (
+          <FloatingAlert
+            key={alertState.id}
+            message={alertState.message}
+            status={alertState.status}
+            timeout={6000}
+          />
         )}
 
         <HStack justify="flex-end" gap={3} mt={6}>
diff --git a/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx b/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx
index 20e76d0ff..980c62d01 100644
--- a/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx
+++ b/apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx
@@ -26,6 +26,7 @@ import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
 import { useModalBodyCleanup } from '../../hooks/modalBodyCleanup';
 import { isValidUrl } from '../../utils/utils';
+import { AlertStatus } from '../../types/types';
 
 // Up to two decimal places, e.g. "0.5", "1", "12.34" — but not "1.234" or "-1"
 const POSITIVE_TWO_DECIMAL_REGEX = /^\d+(\.\d{1,2})?$/;
@@ -192,12 +193,14 @@ const FmCompleteRequiredActionsModal: React.FC<
       if (shippingCost !== '' && !isValidShippingCost(shippingCost)) {
         setAlertMessage(
           `Shipping cost for order ${order.orderId} must be a positive number with up to 2 decimal places.`,
+          AlertStatus.ERROR,
         );
         return;
       }
       if (trackingLink.trim() !== '' && !isValidUrl(trackingLink)) {
         setAlertMessage(
           `Tracking link for order ${order.orderId} must be a valid http or https URL.`,
+          AlertStatus.ERROR,
         );
         return;
       }
@@ -296,6 +299,7 @@ const FmCompleteRequiredActionsModal: React.FC<
         msg
           ? msg.replace(/^orders\.\d+\./, '')
           : 'Error completing required actions. Please try again.',
+        AlertStatus.ERROR,
       );
     } finally {
       setIsSubmitting(false);
@@ -326,7 +330,7 @@ const FmCompleteRequiredActionsModal: React.FC<
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx b/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
index e104581cf..a299caaa7 100644
--- a/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/manufacturerApplicationForm.tsx
@@ -25,7 +25,7 @@ import {
 import React, { useEffect, useState } from 'react';
 import { USPhoneInput } from '@components/forms/usPhoneInput';
 import { TagGroup } from '@components/forms/tagGroup';
-import { ManufacturerApplicationDto } from '../../types/types';
+import { AlertStatus, ManufacturerApplicationDto } from '../../types/types';
 import ApiClient from '@api/apiClient';
 import axios from 'axios';
 import { ChevronDownIcon } from 'lucide-react';
@@ -76,7 +76,7 @@ const ManufacturerApplicationForm: React.FC = () => {
 
   useEffect(() => {
     if (actionData?.error) {
-      setAlertMessage(actionData.error);
+      setAlertMessage(actionData.error, AlertStatus.ERROR);
     }
   }, [actionData, setAlertMessage]);
 
@@ -87,7 +87,7 @@ const ManufacturerApplicationForm: React.FC = () => {
           <FloatingAlert
             key={alertState.id}
             message={alertState.message}
-            status="error"
+            status={alertState.status}
             timeout={6000}
           />
         )}
diff --git a/apps/frontend/src/components/forms/newDonationFormModal.tsx b/apps/frontend/src/components/forms/newDonationFormModal.tsx
index d9bf495a8..5a52573ee 100644
--- a/apps/frontend/src/components/forms/newDonationFormModal.tsx
+++ b/apps/frontend/src/components/forms/newDonationFormModal.tsx
@@ -30,9 +30,9 @@ import { generateNextDonationDate } from '@utils/utils';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
 import { useModalBodyCleanup } from '../../hooks/modalBodyCleanup';
+import { AlertStatus } from '../../types/types';
 
 interface NewDonationFormModalProps {
-  foodManufacturerId: number;
   onDonationSuccess: () => void;
   isOpen: boolean;
   onClose: () => void;
@@ -104,7 +104,6 @@ const getFirstValidationError = (
 };
 
 const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
-  foodManufacturerId,
   onDonationSuccess,
   isOpen,
   onClose,
@@ -204,12 +203,14 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
       repeatInterval === RecurrenceEnum.WEEKLY &&
       !Object.values(repeatOn).some(Boolean)
     ) {
-      setAlertMessage('Please select at least one day for weekly recurrence.');
+      setAlertMessage(
+        'Please select at least one day for weekly recurrence.',
+        AlertStatus.ERROR,
+      );
       return;
     }
 
     const donationBody: CreateDonationDto = {
-      foodManufacturerId,
       recurrenceFreq: isRecurring ? parseInt(repeatEvery) : undefined,
       recurrence: isRecurring ? repeatInterval : RecurrenceEnum.NONE,
       repeatOnDays:
@@ -248,7 +249,7 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
       setRepeatInterval(RecurrenceEnum.NONE);
       onClose();
     } catch {
-      setAlertMessage('Error submitting new donation');
+      setAlertMessage('Error submitting new donation', AlertStatus.ERROR);
     }
   };
 
@@ -281,7 +282,7 @@ const NewDonationFormModal: React.FC<NewDonationFormModalProps> = ({
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/orderDetailsModal.tsx b/apps/frontend/src/components/forms/orderDetailsModal.tsx
index ea921becb..c7a25518a 100644
--- a/apps/frontend/src/components/forms/orderDetailsModal.tsx
+++ b/apps/frontend/src/components/forms/orderDetailsModal.tsx
@@ -17,7 +17,7 @@ import {
   OrderItemDetailsGroupedByFoodType,
   OrderDetails,
 } from 'types/types';
-import { FoodRequestStatus } from '../../types/types';
+import { FoodRequestStatus, AlertStatus } from '../../types/types';
 import { TagGroup } from './tagGroup';
 import { useGroupedItemsByFoodType } from '../../hooks/groupedItemsByFoodType';
 import { FloatingAlert } from '@components/floatingAlert';
@@ -52,7 +52,10 @@ const OrderDetailsModal: React.FC<OrderDetailsModalProps> = ({
           );
           setFoodRequest(foodRequestData);
         } catch {
-          setAlertMessage('Error fetching food request details');
+          setAlertMessage(
+            'Error fetching food request details',
+            AlertStatus.ERROR,
+          );
         }
       };
 
@@ -67,7 +70,7 @@ const OrderDetailsModal: React.FC<OrderDetailsModalProps> = ({
           const orderDetailsData = await ApiClient.getOrder(orderId);
           setOrderDetails(orderDetailsData);
         } catch {
-          setAlertMessage('Error fetching order details');
+          setAlertMessage('Error fetching order details', AlertStatus.ERROR);
         }
       };
 
@@ -105,7 +108,7 @@ const OrderDetailsModal: React.FC<OrderDetailsModalProps> = ({
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/orderReceivedActionModal.tsx b/apps/frontend/src/components/forms/orderReceivedActionModal.tsx
index c0eb6122f..940222499 100644
--- a/apps/frontend/src/components/forms/orderReceivedActionModal.tsx
+++ b/apps/frontend/src/components/forms/orderReceivedActionModal.tsx
@@ -17,7 +17,7 @@ import {
   Input,
 } from '@chakra-ui/react';
 import { Upload, Calendar } from 'lucide-react';
-import { ConfirmDeliveryDto } from 'types/types';
+import { AlertStatus, ConfirmDeliveryDto } from '../../types/types';
 import apiClient from '@api/apiClient';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
@@ -49,7 +49,6 @@ const OrderReceivedActionModal: React.FC<OrderReceivedActionModalProps> = ({
   const [dateReceived, setDateReceived] = useState<string>('');
   const [photos, setPhotos] = useState<File[]>([]);
   const [invalidPhotoExists, setInvalidPhotoExists] = useState<boolean>(false);
-  const [errorMessage, setErrorMessage] = useState<string>('');
 
   const isFormValid = dateReceived !== '' && !invalidPhotoExists;
 
@@ -100,7 +99,7 @@ const OrderReceivedActionModal: React.FC<OrderReceivedActionModalProps> = ({
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
@@ -224,7 +223,7 @@ const OrderReceivedActionModal: React.FC<OrderReceivedActionModalProps> = ({
                     if (words.length <= 250) {
                       setFeedback(e.target.value);
                     } else {
-                      setAlertMessage('Exceeded word limit');
+                      setAlertMessage('Exceeded word limit', AlertStatus.ERROR);
                     }
                   }}
                 />
@@ -250,8 +249,9 @@ const OrderReceivedActionModal: React.FC<OrderReceivedActionModalProps> = ({
                       (file) => file.size > MAX_FILE_SIZE,
                     );
                     if (oversized) {
-                      setErrorMessage(
+                      setAlertMessage(
                         `${oversized.name} exceeds the 5MB size limit.`,
+                        AlertStatus.ERROR,
                       );
                       setInvalidPhotoExists(true);
                       return;
@@ -285,7 +285,7 @@ const OrderReceivedActionModal: React.FC<OrderReceivedActionModalProps> = ({
                   </FileUpload.Dropzone>
                   {invalidPhotoExists && (
                     <Text color="red" textStyle="p2" mt={1}>
-                      {errorMessage}
+                      {alertState?.message}
                     </Text>
                   )}
                   <FileUpload.List clearable />
diff --git a/apps/frontend/src/components/forms/pantryApplicationForm.tsx b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
index 526de1d1d..44d58376a 100644
--- a/apps/frontend/src/components/forms/pantryApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
@@ -24,7 +24,7 @@ import {
 } from 'react-router-dom';
 import React, { useEffect, useState } from 'react';
 import { USPhoneInput } from '@components/forms/usPhoneInput';
-import { PantryApplicationDto } from '../../types/types';
+import { AlertStatus, PantryApplicationDto } from '../../types/types';
 import ApiClient from '@api/apiClient';
 import { Activity } from '../../types/pantryEnums';
 import axios from 'axios';
@@ -111,7 +111,7 @@ const PantryApplicationForm: React.FC = () => {
 
   useEffect(() => {
     if (actionData?.error) {
-      setAlertMessage(actionData.error);
+      setAlertMessage(actionData.error, AlertStatus.ERROR);
     }
   }, [actionData, setAlertMessage]);
 
@@ -122,7 +122,7 @@ const PantryApplicationForm: React.FC = () => {
           <FloatingAlert
             key={alertState.id}
             message={alertState.message}
-            status="error"
+            status={alertState.status}
             timeout={6000}
           />
         )}
diff --git a/apps/frontend/src/components/forms/profileLeftPanel.tsx b/apps/frontend/src/components/forms/profileLeftPanel.tsx
index bbaa830a9..23709beeb 100644
--- a/apps/frontend/src/components/forms/profileLeftPanel.tsx
+++ b/apps/frontend/src/components/forms/profileLeftPanel.tsx
@@ -4,6 +4,7 @@ import { LockKeyhole } from 'lucide-react';
 import ChangePasswordModal from './changePasswordModal';
 import { useAlert } from '../../hooks/alert';
 import { FloatingAlert } from '@components/floatingAlert';
+import { AlertStatus } from '../../types/types';
 
 interface ProfileLeftPanelProps {
   name: string;
@@ -27,7 +28,7 @@ const ProfileLeftPanel: React.FC<ProfileLeftPanelProps> = ({
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="info"
+          status={alertState.status}
           timeout={6000}
         />
       )}
@@ -86,7 +87,9 @@ const ProfileLeftPanel: React.FC<ProfileLeftPanelProps> = ({
       <ChangePasswordModal
         open={open}
         onClose={onClose}
-        onSuccess={() => setAlertMessage('Password successfully changed')}
+        onSuccess={() =>
+          setAlertMessage('Password successfully changed', AlertStatus.INFO)
+        }
       ></ChangePasswordModal>
     </VStack>
   );
diff --git a/apps/frontend/src/components/forms/requestFormModal.tsx b/apps/frontend/src/components/forms/requestFormModal.tsx
index 43f3cbfc0..6754abcad 100644
--- a/apps/frontend/src/components/forms/requestFormModal.tsx
+++ b/apps/frontend/src/components/forms/requestFormModal.tsx
@@ -22,6 +22,7 @@ import apiClient from '@api/apiClient';
 import { TagGroup } from './tagGroup';
 import { useAlert } from '../../hooks/alert';
 import { useModalBodyCleanup } from '../../hooks/modalBodyCleanup';
+import { AlertStatus } from '../../types/types';
 
 interface FoodRequestFormModalProps {
   previousRequest?: FoodRequestSummaryDto;
@@ -42,8 +43,7 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
   const [selectedFoodTypes, setSelectedFoodTypes] = useState<FoodType[]>([]);
   const [requestedSize, setRequestedSize] = useState<string>('');
   const [additionalNotes, setAdditionalNotes] = useState<string>('');
-  const [errorAlertState, setErrorMessage] = useAlert();
-  const [successAlertState, setSuccessMessage] = useAlert();
+  const [alertState, setAlertMessage] = useAlert();
 
   const isFormValid = requestedSize !== '' && selectedFoodTypes.length > 0;
 
@@ -58,10 +58,8 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
         setRequestedSize('');
         setAdditionalNotes('');
       }
-      setErrorMessage('');
-      setSuccessMessage('');
     }
-  }, [isOpen, previousRequest, setErrorMessage, setSuccessMessage]);
+  }, [isOpen, previousRequest, setAlertMessage]);
 
   const handleSubmit = async () => {
     const foodRequestData: CreateFoodRequestBody = {
@@ -73,11 +71,11 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
 
     try {
       await apiClient.createFoodRequest(foodRequestData);
-      setSuccessMessage('Request submitted');
+      setAlertMessage('Request submitted', AlertStatus.INFO);
       onClose();
       onSuccess();
     } catch {
-      setErrorMessage('Request could not be submitted.');
+      setAlertMessage('Request could not be submitted.', AlertStatus.ERROR);
     }
   };
 
@@ -90,19 +88,11 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
       }}
       closeOnInteractOutside
     >
-      {errorAlertState && (
+      {alertState && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
-          timeout={6000}
-        />
-      )}
-      {successAlertState && (
-        <FloatingAlert
-          key={successAlertState.id}
-          message={successAlertState.message}
-          status="info"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
@@ -285,7 +275,7 @@ const FoodRequestFormModal: React.FC<FoodRequestFormModalProps> = ({
                     if (words.length <= 250) {
                       setAdditionalNotes(e.target.value);
                     } else {
-                      setErrorMessage('Exceeded word limit');
+                      setAlertMessage('Exceeded word limit', AlertStatus.ERROR);
                     }
                   }}
                 />
diff --git a/apps/frontend/src/components/forms/resetPasswordModal.tsx b/apps/frontend/src/components/forms/resetPasswordModal.tsx
index 557d8fbe5..2aadff9b5 100644
--- a/apps/frontend/src/components/forms/resetPasswordModal.tsx
+++ b/apps/frontend/src/components/forms/resetPasswordModal.tsx
@@ -14,6 +14,7 @@ import { resetPassword, confirmResetPassword } from 'aws-amplify/auth';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../../hooks/alert';
 import { useModalBodyCleanup } from '../../hooks/modalBodyCleanup';
+import { AlertStatus } from '../../types/types';
 
 const ResetPasswordModal: React.FC = () => {
   useModalBodyCleanup();
@@ -43,7 +44,7 @@ const ResetPasswordModal: React.FC = () => {
       await resetPassword({ username: email });
       setStep('new');
     } catch {
-      setAlertMessage('Failed to send verification code');
+      setAlertMessage('Failed to send verification code', AlertStatus.ERROR);
     }
   };
 
@@ -51,18 +52,21 @@ const ResetPasswordModal: React.FC = () => {
     try {
       await resetPassword({ username: email });
     } catch {
-      setAlertMessage('Failed to send verification code');
+      setAlertMessage('Failed to send verification code', AlertStatus.ERROR);
     }
   };
 
   const handleResetPassword = async () => {
     if (password !== confirmPassword) {
-      setAlertMessage('Passwords need to match');
+      setAlertMessage('Passwords need to match', AlertStatus.ERROR);
       return;
     }
 
     if (password.length < 8) {
-      setAlertMessage('Password needs to be at least 8 characters');
+      setAlertMessage(
+        'Password needs to be at least 8 characters',
+        AlertStatus.ERROR,
+      );
       return;
     }
 
@@ -74,7 +78,7 @@ const ResetPasswordModal: React.FC = () => {
       });
       navigate(ROUTES.LOGIN);
     } catch {
-      setAlertMessage('Failed to set new password');
+      setAlertMessage('Failed to set new password', AlertStatus.ERROR);
     }
   };
 
@@ -112,7 +116,7 @@ const ResetPasswordModal: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/resubmitDonationModal.tsx b/apps/frontend/src/components/forms/resubmitDonationModal.tsx
index afa697297..dd75ac18d 100644
--- a/apps/frontend/src/components/forms/resubmitDonationModal.tsx
+++ b/apps/frontend/src/components/forms/resubmitDonationModal.tsx
@@ -12,6 +12,7 @@ import {
 } from '@chakra-ui/react';
 import { ChevronDown } from 'lucide-react';
 import {
+  AlertStatus,
   CreateDonationDto,
   DonationDetails,
   DonationItem,
@@ -50,7 +51,7 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
   onSelect,
 }) => {
   useModalBodyCleanup();
-  const [errorAlertState, setErrorMessage] = useAlert();
+  const [alertState, setAlertMessage] = useAlert();
   const [selectedDonationId, setSelectedDonationId] = useState<number | null>(
     null,
   );
@@ -78,10 +79,10 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
         );
         setItems(fetchedItems);
       } catch {
-        setErrorMessage('Error loading donation details');
+        setAlertMessage('Error loading donation details', AlertStatus.ERROR);
       }
     },
-    [setErrorMessage],
+    [setAlertMessage],
   );
 
   useEffect(() => {
@@ -111,7 +112,6 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
     setIsSubmitting(true);
     try {
       const dto: CreateDonationDto = {
-        foodManufacturerId,
         recurrence: RecurrenceEnum.NONE,
         items: items.map((item) => ({
           itemName: item.itemName,
@@ -130,7 +130,7 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
       onSuccess();
       handleClose();
     } catch {
-      setErrorMessage('Error submitting donation');
+      setAlertMessage('Error submitting donation', AlertStatus.ERROR);
     } finally {
       setIsSubmitting(false);
     }
@@ -145,11 +145,11 @@ const ResubmitDonationModal: React.FC<ResubmitDonationModalProps> = ({
       }}
       closeOnInteractOutside
     >
-      {errorAlertState && (
+      {alertState?.status === AlertStatus.ERROR && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/components/forms/volunteerCloseRequestModal.tsx b/apps/frontend/src/components/forms/volunteerCloseRequestModal.tsx
index 8d36592e4..9057b2853 100644
--- a/apps/frontend/src/components/forms/volunteerCloseRequestModal.tsx
+++ b/apps/frontend/src/components/forms/volunteerCloseRequestModal.tsx
@@ -8,7 +8,7 @@ import {
   Flex,
   Dialog,
 } from '@chakra-ui/react';
-import { FoodRequestSummaryDto } from 'types/types';
+import { AlertStatus, FoodRequestSummaryDto } from '../../types/types';
 import { formatDate } from '@utils/utils';
 import apiClient from '@api/apiClient';
 import { useAlert } from '../../hooks/alert';
@@ -34,7 +34,10 @@ const VolunteerCloseRequestActionModal: React.FC<
       onClose();
       onSuccess();
     } catch {
-      setAlertMessage('Error completing action. Please try again.');
+      setAlertMessage(
+        'Error completing action. Please try again.',
+        AlertStatus.ERROR,
+      );
     }
   };
 
@@ -51,7 +54,7 @@ const VolunteerCloseRequestActionModal: React.FC<
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/adminDashboard.tsx b/apps/frontend/src/containers/adminDashboard.tsx
index 7ce01914e..155431bc8 100644
--- a/apps/frontend/src/containers/adminDashboard.tsx
+++ b/apps/frontend/src/containers/adminDashboard.tsx
@@ -9,6 +9,7 @@ import {
   OrderSummary,
   Donation,
   User,
+  AlertStatus,
 } from '../types/types';
 import { DashboardCardType } from '@components/dashboardCard';
 import ApiClient from '@api/apiClient';
@@ -34,7 +35,7 @@ const AdminDashboard: React.FC = () => {
         await ApiClient.getRecentPendingApplications();
       setPendingApplications(pendingApplications);
     } catch {
-      setAlertMessage('Error fetching pending applications');
+      setAlertMessage('Error fetching pending applications', AlertStatus.ERROR);
     }
   };
 
@@ -48,7 +49,7 @@ const AdminDashboard: React.FC = () => {
       const recentOrders = sortedOrders.slice(0, 2);
       setRecentOrders(recentOrders);
     } catch {
-      setAlertMessage('Error fetching orders');
+      setAlertMessage('Error fetching orders', AlertStatus.ERROR);
     }
   };
 
@@ -62,7 +63,7 @@ const AdminDashboard: React.FC = () => {
       const recentDonations = sortedDonations.slice(0, 2);
       setRecentDonations(recentDonations);
     } catch {
-      setAlertMessage('Error fetching donations');
+      setAlertMessage('Error fetching donations', AlertStatus.ERROR);
     }
   };
 
@@ -72,7 +73,10 @@ const AdminDashboard: React.FC = () => {
       user = await ApiClient.getMe();
       setCurrentUser(user);
     } catch {
-      setAlertMessage('Authentication error. Please log in and try again.');
+      setAlertMessage(
+        'Authentication error. Please log in and try again.',
+        AlertStatus.ERROR,
+      );
       return;
     }
   };
@@ -90,7 +94,7 @@ const AdminDashboard: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status={'error'}
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/adminDonation.tsx b/apps/frontend/src/containers/adminDonation.tsx
index c0fa1afe5..dc9bd3fd7 100644
--- a/apps/frontend/src/containers/adminDonation.tsx
+++ b/apps/frontend/src/containers/adminDonation.tsx
@@ -12,7 +12,7 @@ import {
   ButtonGroup,
   Link,
 } from '@chakra-ui/react';
-import { Donation } from 'types/types';
+import { AlertStatus, Donation } from '../types/types';
 import DonationDetailsModal from '@components/forms/donationDetailsModal';
 import ApiClient from '@api/apiClient';
 import { formatDate } from '@utils/utils';
@@ -44,7 +44,7 @@ const AdminDonation: React.FC = () => {
         const data = await ApiClient.getAllDonations();
         setDonations(data);
       } catch {
-        setAlertMessage('Error fetching donations');
+        setAlertMessage('Error fetching donations', AlertStatus.ERROR);
       }
     };
     fetchDonations();
@@ -139,7 +139,7 @@ const AdminDonation: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/adminDonationStats.tsx b/apps/frontend/src/containers/adminDonationStats.tsx
index 22f1d5c93..58e3bb908 100644
--- a/apps/frontend/src/containers/adminDonationStats.tsx
+++ b/apps/frontend/src/containers/adminDonationStats.tsx
@@ -18,7 +18,7 @@ import {
   ButtonGroup,
   Input,
 } from '@chakra-ui/react';
-import { PantryStats, TotalStats } from 'types/types';
+import { AlertStatus, PantryStats, TotalStats } from '../types/types';
 import ApiClient from '@api/apiClient';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
@@ -46,14 +46,14 @@ const AdminDonationStats: React.FC = () => {
         const names = await ApiClient.getApprovedPantryNames();
         setPantryNameOptions(names);
       } catch {
-        setAlertMessage('Error fetching pantry names');
+        setAlertMessage('Error fetching pantry names', AlertStatus.ERROR);
       }
 
       try {
         const years = await ApiClient.getPantryOrderYears();
         setAvailableYears(years);
       } catch {
-        setAlertMessage('Error fetching available years');
+        setAlertMessage('Error fetching available years', AlertStatus.ERROR);
       }
     };
     fetchInitialData();
@@ -70,7 +70,7 @@ const AdminDonationStats: React.FC = () => {
         );
         setTotalStats(stats);
       } catch {
-        setAlertMessage('Error fetching total stats');
+        setAlertMessage('Error fetching total stats', AlertStatus.ERROR);
       }
     };
     fetchTotalStats();
@@ -86,7 +86,7 @@ const AdminDonationStats: React.FC = () => {
         });
         setPantryStats(stats);
       } catch {
-        setAlertMessage('Error fetching pantry stats');
+        setAlertMessage('Error fetching pantry stats', AlertStatus.ERROR);
       }
     };
     fetchStats();
@@ -141,7 +141,7 @@ const AdminDonationStats: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/adminOrderManagement.tsx b/apps/frontend/src/containers/adminOrderManagement.tsx
index f2939ffa7..79ab23b39 100644
--- a/apps/frontend/src/containers/adminOrderManagement.tsx
+++ b/apps/frontend/src/containers/adminOrderManagement.tsx
@@ -29,7 +29,7 @@ import {
   USER_ICON_COLORS,
 } from '@utils/utils';
 import ApiClient from '@api/apiClient';
-import { OrderStatus, OrderSummary } from '../types/types';
+import { AlertStatus, OrderStatus, OrderSummary } from '../types/types';
 import OrderDetailsModal from '@components/forms/orderDetailsModal';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
@@ -133,7 +133,7 @@ const AdminOrderManagement: React.FC = () => {
         };
         setCurrentPages(initialPages);
       } catch {
-        setAlertMessage('Error fetching orders');
+        setAlertMessage('Error fetching orders', AlertStatus.ERROR);
       }
     };
 
@@ -211,7 +211,7 @@ const AdminOrderManagement: React.FC = () => {
         },
       }));
     } else {
-      setAlertMessage('Selected pantry has no orders');
+      setAlertMessage('Selected pantry has no orders', AlertStatus.ERROR);
       navigate(ROUTES.ADMIN_ORDER_MANAGEMENT, { replace: true });
     }
   }, [searchParams, statusOrders, navigate, setAlertMessage]);
@@ -226,7 +226,7 @@ const AdminOrderManagement: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/adminPantryManagement.tsx b/apps/frontend/src/containers/adminPantryManagement.tsx
index f5ff8b547..07d0eb34d 100644
--- a/apps/frontend/src/containers/adminPantryManagement.tsx
+++ b/apps/frontend/src/containers/adminPantryManagement.tsx
@@ -15,7 +15,7 @@ import {
   Badge,
 } from '@chakra-ui/react';
 import { ChevronRight, ChevronLeft, Funnel, Search } from 'lucide-react';
-import { ApprovedPantryResponse } from '../types/types';
+import { AlertStatus, ApprovedPantryResponse } from '../types/types';
 import ApiClient from '@api/apiClient';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
@@ -39,7 +39,6 @@ const AdminPantryManagement: React.FC = () => {
   const [selectedPantries, setSelectedPantries] = useState<string[]>([]);
 
   const [alertState, setAlertMessage] = useAlert();
-  const [isAlertSuccess, setIsAlertSuccess] = useState<boolean>(false);
   const [isFilterOpen, setIsFilterOpen] = useState(false);
   const [
     selectedPantryToAssignVolunteers,
@@ -53,8 +52,7 @@ const AdminPantryManagement: React.FC = () => {
       const allApprovedPantries = await ApiClient.getApprovedPantries();
       setPantries(allApprovedPantries);
     } catch {
-      setIsAlertSuccess(false);
-      setAlertMessage('Error fetching pantries');
+      setAlertMessage('Error fetching pantries', AlertStatus.ERROR);
     }
   };
 
@@ -77,16 +75,17 @@ const AdminPantryManagement: React.FC = () => {
         );
         if (cancelled) return;
         if (assignedPantries.length === 0) {
-          setIsAlertSuccess(false);
-          setAlertMessage('This volunteer has no assigned pantries.');
+          setAlertMessage(
+            'This volunteer has no assigned pantries.',
+            AlertStatus.ERROR,
+          );
           navigate(ROUTES.PANTRY_MANAGEMENT, { replace: true });
           return;
         }
         setSelectedPantries(assignedPantries.map((p) => p.pantryName));
       } catch {
         if (cancelled) return;
-        setIsAlertSuccess(false);
-        setAlertMessage('Error fetching volunteer pantries');
+        setAlertMessage('Error fetching volunteer pantries', AlertStatus.ERROR);
         navigate(ROUTES.PANTRY_MANAGEMENT, { replace: true });
       }
     })();
@@ -97,8 +96,7 @@ const AdminPantryManagement: React.FC = () => {
   }, [searchParams, navigate, setAlertMessage]);
 
   const handleAssignVolunteersSuccess = () => {
-    setIsAlertSuccess(true);
-    setAlertMessage('Successfully assigned volunteers');
+    setAlertMessage('Successfully assigned volunteers', AlertStatus.INFO);
     fetchPantries();
   };
 
@@ -145,7 +143,7 @@ const AdminPantryManagement: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status={isAlertSuccess ? 'info' : 'error'}
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/approveFoodManufacturers.tsx b/apps/frontend/src/containers/approveFoodManufacturers.tsx
index 14208d897..9b6f1ed31 100644
--- a/apps/frontend/src/containers/approveFoodManufacturers.tsx
+++ b/apps/frontend/src/containers/approveFoodManufacturers.tsx
@@ -13,7 +13,7 @@ import {
   Link,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { FoodManufacturer } from 'types/types';
+import { AlertStatus, FoodManufacturer } from '../types/types';
 import {
   ArrowDownUp,
   ChevronLeft,
@@ -37,8 +37,7 @@ const ApproveFoodManufacturers: React.FC = () => {
   const [currentPage, setCurrentPage] = useState(1);
   const [isFilterOpen, setIsFilterOpen] = useState(false);
   const [searchParams, setSearchParams] = useSearchParams();
-  const [errorAlertState, setErrorMessage] = useAlert();
-  const [successAlertState, setSuccessMessage] = useAlert();
+  const [alertState, setAlertMessage] = useAlert();
 
   useEffect(() => {
     const fetchFoodManufacturers = async () => {
@@ -46,12 +45,12 @@ const ApproveFoodManufacturers: React.FC = () => {
         const data = await ApiClient.getAllPendingFoodManufacturers();
         setFoodManufacturers(data);
       } catch {
-        setErrorMessage('Error fetching food manufacturers');
+        setAlertMessage('Error fetching food manufacturers', AlertStatus.ERROR);
       }
     };
 
     fetchFoodManufacturers();
-  }, [setErrorMessage]);
+  }, [setAlertMessage]);
 
   useEffect(() => {
     setCurrentPage(1);
@@ -117,29 +116,21 @@ const ApproveFoodManufacturers: React.FC = () => {
           ? `${name} - Application Accepted`
           : `${name} - Application Rejected`;
 
-      setSuccessMessage(message);
+      setAlertMessage(message, AlertStatus.INFO);
       navigate(ROUTES.APPROVE_FOOD_MANUFACTURERS, { replace: true });
     }
-  }, [searchParams, setErrorMessage, setSuccessMessage, navigate]);
+  }, [searchParams, setAlertMessage, navigate]);
 
   return (
     <Box p={12}>
       <Heading textStyle="h1" color="gray.600" mb={6}>
         Application Review
       </Heading>
-      {errorAlertState && (
+      {alertState && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
-          timeout={6000}
-        />
-      )}
-      {successAlertState && (
-        <FloatingAlert
-          key={successAlertState.id}
-          message={successAlertState.message}
-          status="info"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/approvePantries.tsx b/apps/frontend/src/containers/approvePantries.tsx
index 90bce7abe..702e82413 100644
--- a/apps/frontend/src/containers/approvePantries.tsx
+++ b/apps/frontend/src/containers/approvePantries.tsx
@@ -13,7 +13,7 @@ import {
   Link,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { Pantry } from 'types/types';
+import { AlertStatus, Pantry } from '../types/types';
 import {
   ArrowDownUp,
   ChevronLeft,
@@ -33,8 +33,7 @@ const ApprovePantries: React.FC = () => {
   const [currentPage, setCurrentPage] = useState(1);
   const [isFilterOpen, setIsFilterOpen] = useState(false);
   const [searchParams, setSearchParams] = useSearchParams();
-  const [errorAlertState, setErrorMessage] = useAlert();
-  const [successAlertState, setSuccessMessage] = useAlert();
+  const [alertState, setAlertMessage] = useAlert();
 
   useEffect(() => {
     const fetchPantries = async () => {
@@ -42,12 +41,12 @@ const ApprovePantries: React.FC = () => {
         const data = await ApiClient.getAllPendingPantries();
         setPantries(data);
       } catch {
-        setErrorMessage('Error fetching pantries');
+        setAlertMessage('Error fetching pantries', AlertStatus.ERROR);
       }
     };
 
     fetchPantries();
-  }, [setErrorMessage]);
+  }, [setAlertMessage]);
 
   useEffect(() => {
     setCurrentPage(1);
@@ -108,29 +107,21 @@ const ApprovePantries: React.FC = () => {
           ? `${name} - Application Accepted`
           : `${name} - Application Rejected`;
 
-      setSuccessMessage(message);
+      setAlertMessage(message, AlertStatus.INFO);
       navigate(ROUTES.APPROVE_PANTRIES, { replace: true });
     }
-  }, [searchParams, navigate, setErrorMessage, setSuccessMessage]);
+  }, [searchParams, navigate, setAlertMessage]);
 
   return (
     <Box p={12}>
       <Heading textStyle="h1" color="gray.600" mb={6}>
         Application Review
       </Heading>
-      {errorAlertState && (
+      {alertState && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
-          timeout={6000}
-        />
-      )}
-      {successAlertState && (
-        <FloatingAlert
-          key={successAlertState.id}
-          message={successAlertState.message}
-          status="info"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/donationManagement.tsx b/apps/frontend/src/containers/donationManagement.tsx
index e7d038f4c..9fc9e5cdf 100644
--- a/apps/frontend/src/containers/donationManagement.tsx
+++ b/apps/frontend/src/containers/donationManagement.tsx
@@ -10,7 +10,7 @@ import {
 import ApiClient from '@api/apiClient';
 import NewDonationFormModal from '@components/forms/newDonationFormModal';
 import { formatDate } from '@utils/utils';
-import { Donation, DonationItem } from 'types/types';
+import { AlertStatus, Donation, DonationItem } from '../types/types';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
 
@@ -43,7 +43,7 @@ const DonationManagement: React.FC = () => {
       });
       setDonations(sortedDonations);
     } catch {
-      setAlertMessage('Error fetching donations');
+      setAlertMessage('Error fetching donations', AlertStatus.ERROR);
     }
   };
 
@@ -62,7 +62,7 @@ const DonationManagement: React.FC = () => {
         }));
       });
     } catch {
-      setAlertMessage('Error fetching donation items');
+      setAlertMessage('Error fetching donation items', AlertStatus.ERROR);
     }
   };
 
@@ -82,7 +82,7 @@ const DonationManagement: React.FC = () => {
       await ApiClient.fulfillDonation(donationId);
       fetchDonations();
     } catch {
-      setAlertMessage('Failed to fulfill donation');
+      setAlertMessage('Failed to fulfill donation', AlertStatus.ERROR);
     }
   };
 
@@ -96,14 +96,13 @@ const DonationManagement: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
       <Button onClick={onOpen}>Submit new donation</Button>
       {manufacturerId !== null && (
         <NewDonationFormModal
-          foodManufacturerId={manufacturerId}
           onDonationSuccess={fetchDonations}
           isOpen={open}
           onClose={onClose}
diff --git a/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx b/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
index f60646c8b..d470d0867 100644
--- a/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
+++ b/apps/frontend/src/containers/foodManufacturerApplicationDetails.tsx
@@ -12,10 +12,14 @@ import {
   Spinner,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { ApplicationStatus, FoodManufacturer } from '../types/types';
+import {
+  AlertStatus,
+  ApplicationStatus,
+  FoodManufacturer,
+} from '../types/types';
 import { formatDate, formatPhone } from '@utils/utils';
 import { TagGroup } from '@components/forms/tagGroup';
-import { FileX, TriangleAlert, WifiOff } from 'lucide-react';
+import { TriangleAlert } from 'lucide-react';
 import { AxiosError } from 'axios';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
@@ -90,13 +94,6 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
   const navigate = useNavigate();
   const [application, setApplication] = useState<FoodManufacturer | null>(null);
   const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<{
-    type: 'network' | 'not_found' | 'invalid' | null;
-    message: string;
-  }>({
-    type: null,
-    message: '',
-  });
   const [alertState, setAlertMessage] = useAlert();
   const [showApproveModal, setShowApproveModal] = useState<boolean>(false);
   const [showDenyModal, setShowDenyModal] = useState<boolean>(false);
@@ -127,31 +124,25 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
     try {
       setLoading(true);
       if (!applicationId) {
-        setError({ type: 'invalid', message: 'Application ID not provided.' });
+        setAlertMessage('Application ID not provided.', AlertStatus.ERROR);
         return;
       } else if (isNaN(parseInt(applicationId, 10))) {
-        setError({
-          type: 'invalid',
-          message: 'Application ID is not a number.',
-        });
+        setAlertMessage('Application ID is not a number.', AlertStatus.ERROR);
       }
       const data = await ApiClient.getFoodManufacturer(
         parseInt(applicationId, 10),
       );
       if (!data) {
-        setError({
-          type: 'not_found',
-          message: 'Application not found.',
-        });
+        setAlertMessage('Application not found.', AlertStatus.ERROR);
       }
       setApplication(data);
     } catch (err: unknown) {
       if (err instanceof AxiosError) {
         if (err.response?.status !== 404 && err.response?.status !== 400) {
-          setError({
-            type: 'network',
-            message: 'Could not load application details.',
-          });
+          setAlertMessage(
+            'Could not load application details.',
+            AlertStatus.ERROR,
+          );
         }
       }
     } finally {
@@ -178,7 +169,7 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
             application.foodManufacturerName,
         );
       } catch {
-        setAlertMessage('Error approving application');
+        setAlertMessage('Error approving application', AlertStatus.ERROR);
       }
     }
   };
@@ -198,7 +189,7 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
             application.foodManufacturerName,
         );
       } catch {
-        setAlertMessage('Error denying application');
+        setAlertMessage('Error denying application', AlertStatus.ERROR);
       }
     }
   };
@@ -213,25 +204,11 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
     );
   }
 
-  if (error.message || !application) {
-    const getIcon = () => {
-      switch (error.type) {
-        case 'network':
-          return <WifiOff />;
-        case 'not_found':
-          return <FileX />;
-        default:
-          return <TriangleAlert />;
-      }
-    };
-
+  if (alertState?.message || !application) {
     return (
       <EmptyState
-        icon={getIcon()}
-        title={error.message}
-        subtitle={
-          error.type === 'network' ? 'Please try again later.' : undefined
-        }
+        icon={<TriangleAlert />}
+        title={alertState?.message ?? 'Application not found.'}
       />
     );
   }
@@ -254,7 +231,7 @@ const FoodManufacturerApplicationDetails: React.FC = () => {
           <FloatingAlert
             key={alertState.id}
             message={alertState.message}
-            status="error"
+            status={alertState.status}
             timeout={6000}
           />
         )}
diff --git a/apps/frontend/src/containers/foodManufacturerDashboard.tsx b/apps/frontend/src/containers/foodManufacturerDashboard.tsx
index 93dd02e0d..4a885dbfc 100644
--- a/apps/frontend/src/containers/foodManufacturerDashboard.tsx
+++ b/apps/frontend/src/containers/foodManufacturerDashboard.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Box, Heading, Text } from '@chakra-ui/react';
 import DashboardCard, { DashboardCardType } from '@components/dashboardCard';
 import {
+  AlertStatus,
   Donation,
   DonationDetails,
   DonationReminderDto,
@@ -16,7 +17,7 @@ import { ROUTES } from '../routes';
 const FoodManufacturerDashboard: React.FC = () => {
   const navigate = useNavigate();
 
-  const [errorAlertState, setErrorMessage] = useAlert();
+  const [alertState, setAlertMessage] = useAlert();
   const [foodManufacturer, setFoodManufacturer] =
     useState<FoodManufacturer | null>(null);
   const [upcomingReminders, setUpcomingReminders] = useState<
@@ -32,7 +33,10 @@ const FoodManufacturerDashboard: React.FC = () => {
         const fm = await ApiClient.getFoodManufacturer(fmId);
         setFoodManufacturer(fm);
       } catch {
-        setErrorMessage('Error fetching your manufacturer profile.');
+        setAlertMessage(
+          'Error fetching your manufacturer profile.',
+          AlertStatus.ERROR,
+        );
         return;
       }
 
@@ -45,7 +49,10 @@ const FoodManufacturerDashboard: React.FC = () => {
       if (reminders.status === 'fulfilled') {
         setUpcomingReminders(reminders.value);
       } else {
-        setErrorMessage('Error fetching upcoming donations.');
+        setAlertMessage(
+          'Error fetching upcoming donations.',
+          AlertStatus.ERROR,
+        );
       }
 
       // If donations is successfully retrieved from API with the Promise.allSettled
@@ -60,19 +67,19 @@ const FoodManufacturerDashboard: React.FC = () => {
           .slice(0, 2);
         setRecentDonations(sorted);
       } else {
-        setErrorMessage('Error fetching recent donations.');
+        setAlertMessage('Error fetching recent donations.', AlertStatus.ERROR);
       }
     };
     fetchFmData();
-  }, [setErrorMessage]);
+  }, [setAlertMessage]);
 
   return (
     <Box p={12}>
-      {errorAlertState && (
+      {alertState?.status === AlertStatus.ERROR && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx b/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
index 8005e28eb..cf1b596f0 100644
--- a/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
+++ b/apps/frontend/src/containers/foodManufacturerDonationManagement.tsx
@@ -13,26 +13,25 @@ import {
 import { ChevronRight, ChevronLeft, Mail, CircleCheck } from 'lucide-react';
 import { capitalize, formatDate, DONATION_STATUS_COLORS } from '@utils/utils';
 import ApiClient from '@api/apiClient';
-import { DonationDetails, DonationStatus } from '../types/types';
+import { AlertStatus, DonationDetails, DonationStatus } from '../types/types';
+import DonationDetailsModal from '@components/forms/donationDetailsModal';
 import NewDonationFormModal from '@components/forms/newDonationFormModal';
 import ResubmitDonationModal from '@components/forms/resubmitDonationModal';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { ROUTES } from '../routes';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
-import DonationDetailsModal from '@components/forms/donationDetailsModal';
 import FmCompleteRequiredActionsModal from '@components/forms/fmCompleteRequiredActionsModal';
 
 const MAX_PER_STATUS = 5;
 
 const FoodManufacturerDonationManagement: React.FC = () => {
+  const [alertState, setAlertMessage] = useAlert();
   const navigate = useNavigate();
   const [searchParams, setSearchParams] = useSearchParams();
   const resubmitDonationId: string | null =
     searchParams.get('resubmitDonationId');
   const [isResubmitOpen, setIsResubmitOpen] = useState(false);
-  const [errorAlertState, setErrorMessage] = useAlert();
-  const [successAlertState, setSuccessMessage] = useAlert();
   const [isLogDonationOpen, setIsLogDonationOpen] = useState(false);
   const [manufacturerId, setManufacturerId] = useState<number | null>(null);
   const [selectedActionDonation, setSelectedActionDonation] =
@@ -107,13 +106,18 @@ const FoodManufacturerDonationManagement: React.FC = () => {
 
       setCurrentPages(initialPages);
 
+      // On page load, get the food manufacturer id and all appropriate donations
       return grouped;
-    } catch (error) {
-      setErrorMessage('Error fetching donations');
-      return;
+    } catch {
+      setAlertMessage('Error fetching donations', AlertStatus.ERROR);
     }
   };
 
+  const handleLogNewDonationSuccess = () => {
+    setAlertMessage('Successfully logged new donation', AlertStatus.INFO);
+    if (manufacturerId !== null) fetchDonations(manufacturerId);
+  };
+
   const openResubmitFromQueryParam = (
     grouped: Record<DonationStatus, DonationDetails[]>,
   ) => {
@@ -138,7 +142,10 @@ const FoodManufacturerDonationManagement: React.FC = () => {
         const grouped = await fetchDonations(fmId);
         if (grouped) openResubmitFromQueryParam(grouped);
       } catch {
-        setErrorMessage('Error initializing donation management');
+        setAlertMessage(
+          'Error initializing donation management',
+          AlertStatus.ERROR,
+        );
       }
     };
     init();
@@ -150,7 +157,7 @@ const FoodManufacturerDonationManagement: React.FC = () => {
 
     const id = Number(donationIdParam);
     setSelectedDonationId(id);
-  }, [searchParams, setErrorMessage]);
+  }, [searchParams, setAlertMessage]);
 
   const handleResubmitClose = () => {
     setIsResubmitOpen(false);
@@ -168,19 +175,11 @@ const FoodManufacturerDonationManagement: React.FC = () => {
 
   return (
     <Box p={12}>
-      {errorAlertState && (
+      {alertState && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
-          timeout={6000}
-        />
-      )}
-      {successAlertState && (
-        <FloatingAlert
-          key={successAlertState.id}
-          message={successAlertState.message}
-          status="info"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
@@ -223,8 +222,7 @@ const FoodManufacturerDonationManagement: React.FC = () => {
 
       {manufacturerId !== null && (
         <NewDonationFormModal
-          foodManufacturerId={manufacturerId}
-          onDonationSuccess={() => fetchDonations(manufacturerId)}
+          onDonationSuccess={handleLogNewDonationSuccess}
           isOpen={isLogDonationOpen}
           onClose={() => setIsLogDonationOpen(false)}
         />
@@ -254,8 +252,9 @@ const FoodManufacturerDonationManagement: React.FC = () => {
           onSuccess={() => {
             setSelectedActionDonation(null);
             if (manufacturerId !== null) fetchDonations(manufacturerId);
-            setSuccessMessage(
+            setAlertMessage(
               'Your details have been saved. Actions are complete once all shipment and item details are confirmed.',
+              AlertStatus.INFO,
             );
           }}
         />
diff --git a/apps/frontend/src/containers/formRequests.tsx b/apps/frontend/src/containers/formRequests.tsx
index 40a7cfb48..e5f05b47b 100644
--- a/apps/frontend/src/containers/formRequests.tsx
+++ b/apps/frontend/src/containers/formRequests.tsx
@@ -23,6 +23,7 @@ import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
 import { useSearchParams, useNavigate } from 'react-router-dom';
 import { ROUTES } from '../routes';
+import { AlertStatus } from '../types/types';
 
 const FormRequests: React.FC = () => {
   const [currentPage, setCurrentPage] = useState<number>(1);
@@ -58,10 +59,13 @@ const FormRequests: React.FC = () => {
           setPreviousRequest(sortedData[0]);
         }
       } catch {
-        setAlertMessage('Error fetching requests');
+        setAlertMessage('Error fetching requests', AlertStatus.ERROR);
       }
     } else {
-      setAlertMessage('No pantry associated with this account.');
+      setAlertMessage(
+        'No pantry associated with this account.',
+        AlertStatus.ERROR,
+      );
     }
   }, [setAlertMessage]);
 
@@ -101,7 +105,7 @@ const FormRequests: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/loginPage.tsx b/apps/frontend/src/containers/loginPage.tsx
index d0933c365..18262c54f 100644
--- a/apps/frontend/src/containers/loginPage.tsx
+++ b/apps/frontend/src/containers/loginPage.tsx
@@ -19,6 +19,7 @@ import { Eye, EyeOff } from 'lucide-react';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useAlert } from '../hooks/alert';
 import AuthHeader from '@components/AuthHeader';
+import { AlertStatus } from '../types/types';
 
 type Step = 'login' | 'new-password';
 
@@ -78,7 +79,10 @@ const LoginPage: React.FC = () => {
           error.name === 'NotAuthorizedException' ||
           error.name === 'UserNotFoundException'
         ) {
-          setAlertMessage('Incorrect email or password. Please try again.');
+          setAlertMessage(
+            'Incorrect email or password. Please try again.',
+            AlertStatus.ERROR,
+          );
           return;
         }
       }
@@ -86,6 +90,7 @@ const LoginPage: React.FC = () => {
         navigator.onLine
           ? 'Login failed. The server may be unavailable. Please try again later.'
           : 'No internet connection. Please check your network and try again.',
+        AlertStatus.ERROR,
       );
     }
   };
@@ -93,11 +98,14 @@ const LoginPage: React.FC = () => {
   // Sets the new password for the first time
   const handleSetNewPassword = async () => {
     if (newPassword !== confirmNewPassword) {
-      setAlertMessage('Passwords need to match');
+      setAlertMessage('Passwords need to match', AlertStatus.ERROR);
       return;
     }
     if (newPassword.length < 8) {
-      setAlertMessage('Password needs to be at least 8 characters');
+      setAlertMessage(
+        'Password needs to be at least 8 characters',
+        AlertStatus.ERROR,
+      );
       return;
     }
 
@@ -107,7 +115,7 @@ const LoginPage: React.FC = () => {
       await fetchAuthSession({ forceRefresh: true });
       navigate(from, { replace: true });
     } catch {
-      setAlertMessage('Failed to set new password');
+      setAlertMessage('Failed to set new password', AlertStatus.ERROR);
     }
   };
 
@@ -141,7 +149,7 @@ const LoginPage: React.FC = () => {
           <FloatingAlert
             key={alertState.id}
             message={alertState.message}
-            status="error"
+            status={alertState.status}
             timeout={6000}
           />
         )}
diff --git a/apps/frontend/src/containers/pantryApplicationDetails.tsx b/apps/frontend/src/containers/pantryApplicationDetails.tsx
index 5838b7336..7cbff9d58 100644
--- a/apps/frontend/src/containers/pantryApplicationDetails.tsx
+++ b/apps/frontend/src/containers/pantryApplicationDetails.tsx
@@ -12,10 +12,10 @@ import {
   Spinner,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { ApplicationStatus, PantryWithUser } from '../types/types';
+import { AlertStatus, ApplicationStatus, PantryWithUser } from '../types/types';
 import { formatDate, formatPhone } from '@utils/utils';
 import { TagGroup } from '@components/forms/tagGroup';
-import { FileX, TriangleAlert, WifiOff } from 'lucide-react';
+import { TriangleAlert } from 'lucide-react';
 import { AxiosError } from 'axios';
 import { FloatingAlert } from '@components/floatingAlert';
 import ConfirmPantryDecisionModal from '@components/forms/confirmPantryDecisionModal';
@@ -96,13 +96,6 @@ const PantryApplicationDetails: React.FC = () => {
   const navigate = useNavigate();
   const [application, setApplication] = useState<PantryWithUser | null>(null);
   const [loading, setLoading] = useState(true);
-  const [error, setError] = useState<{
-    type: 'network' | 'not_found' | 'invalid' | null;
-    message: string;
-  }>({
-    type: null,
-    message: '',
-  });
   const [alertState, setAlertMessage] = useAlert();
   const [showApproveModal, setShowApproveModal] = useState<boolean>(false);
   const [showDenyModal, setShowDenyModal] = useState<boolean>(false);
@@ -133,29 +126,23 @@ const PantryApplicationDetails: React.FC = () => {
     try {
       setLoading(true);
       if (!id) {
-        setError({ type: 'invalid', message: 'Application ID not provided.' });
+        setAlertMessage('Application ID not provided.', AlertStatus.ERROR);
         return;
       } else if (isNaN(parseInt(id, 10))) {
-        setError({
-          type: 'invalid',
-          message: 'Application ID is not a number.',
-        });
+        setAlertMessage('Application ID is not a number.', AlertStatus.ERROR);
       }
       const data = await ApiClient.getPantry(parseInt(id, 10));
       if (!data) {
-        setError({
-          type: 'not_found',
-          message: 'Application not found.',
-        });
+        setAlertMessage('Application not found.', AlertStatus.ERROR);
       }
       setApplication(data);
     } catch (err: unknown) {
       if (err instanceof AxiosError) {
         if (err.response?.status !== 404 && err.response?.status !== 400) {
-          setError({
-            type: 'network',
-            message: 'Could not load application details.',
-          });
+          setAlertMessage(
+            'Could not load application details.',
+            AlertStatus.ERROR,
+          );
         }
       }
     } finally {
@@ -179,7 +166,7 @@ const PantryApplicationDetails: React.FC = () => {
             application.pantryName,
         );
       } catch {
-        setAlertMessage('Error approving application');
+        setAlertMessage('Error approving application', AlertStatus.ERROR);
       }
     }
   };
@@ -196,7 +183,7 @@ const PantryApplicationDetails: React.FC = () => {
             application.pantryName,
         );
       } catch {
-        setAlertMessage('Error denying application');
+        setAlertMessage('Error denying application', AlertStatus.ERROR);
       }
     }
   };
@@ -211,25 +198,11 @@ const PantryApplicationDetails: React.FC = () => {
     );
   }
 
-  if (error.message || !application) {
-    const getIcon = () => {
-      switch (error.type) {
-        case 'network':
-          return <WifiOff />;
-        case 'not_found':
-          return <FileX />;
-        default:
-          return <TriangleAlert />;
-      }
-    };
-
+  if (alertState?.message || !application) {
     return (
       <EmptyState
-        icon={getIcon()}
-        title={error.message}
-        subtitle={
-          error.type === 'network' ? 'Please try again later.' : undefined
-        }
+        icon={<TriangleAlert />}
+        title={alertState?.message ?? 'Application not found.'}
       />
     );
   }
@@ -247,7 +220,7 @@ const PantryApplicationDetails: React.FC = () => {
           <FloatingAlert
             key={alertState.id}
             message={alertState.message}
-            status="error"
+            status={alertState.status}
             timeout={6000}
           />
         )}
diff --git a/apps/frontend/src/containers/pantryDashboard.tsx b/apps/frontend/src/containers/pantryDashboard.tsx
index 182c9a9ef..e366725fa 100644
--- a/apps/frontend/src/containers/pantryDashboard.tsx
+++ b/apps/frontend/src/containers/pantryDashboard.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Box, Heading, Text } from '@chakra-ui/react';
 import DashboardCard, { ORDER_STATUS_BADGE } from '@components/dashboardCard';
 import {
+  AlertStatus,
   FoodRequestSummaryDto,
   OrderSummary,
   PantryWithUser,
@@ -31,7 +32,7 @@ const PantryDashboard: React.FC = () => {
         const pantryData = await ApiClient.getPantry(pantryId);
         setPantry(pantryData);
       } catch {
-        setAlertMessage('Error fetching pantry information');
+        setAlertMessage('Error fetching pantry information', AlertStatus.ERROR);
         return;
       }
 
@@ -44,7 +45,10 @@ const PantryDashboard: React.FC = () => {
         );
         setRecentFoodRequests(sortedFoodRequests.slice(0, 2));
       } catch {
-        setAlertMessage('Error fetching pantry food requests');
+        setAlertMessage(
+          'Error fetching pantry food requests',
+          AlertStatus.ERROR,
+        );
       }
 
       try {
@@ -55,7 +59,7 @@ const PantryDashboard: React.FC = () => {
         );
         setRecentOrders(sortedOrders.slice(0, 4));
       } catch {
-        setAlertMessage('Error fetching orders');
+        setAlertMessage('Error fetching orders', AlertStatus.ERROR);
       }
     };
     fetchDashboardData();
@@ -69,7 +73,7 @@ const PantryDashboard: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status={'error'}
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/pantryOrderManagement.tsx b/apps/frontend/src/containers/pantryOrderManagement.tsx
index 5ee5339c2..1d1cf4e02 100644
--- a/apps/frontend/src/containers/pantryOrderManagement.tsx
+++ b/apps/frontend/src/containers/pantryOrderManagement.tsx
@@ -24,7 +24,7 @@ import {
   USER_ICON_COLORS,
 } from '@utils/utils';
 import ApiClient from '@api/apiClient';
-import { OrderStatus, OrderSummary } from '../types/types';
+import { AlertStatus, OrderStatus, OrderSummary } from '../types/types';
 import OrderReceivedActionModal from '@components/forms/orderReceivedActionModal';
 import OrderDetailsModal from '@components/forms/orderDetailsModal';
 import { FloatingAlert } from '@components/floatingAlert';
@@ -62,8 +62,7 @@ const PantryOrderManagement: React.FC = () => {
 
   const [searchParams] = useSearchParams();
   const navigate = useNavigate();
-  const [errorAlertState, setErrorMessage] = useAlert();
-  const [successAlertState, setSuccessMessage] = useAlert();
+  const [alertState, setAlertMessage] = useAlert();
 
   // State to hold filter state per status
   type FilterState = {
@@ -116,9 +115,9 @@ const PantryOrderManagement: React.FC = () => {
       };
       setCurrentPages(initialPages);
     } catch {
-      setErrorMessage('Failed to fetch orders');
+      setAlertMessage('Failed to fetch orders', AlertStatus.ERROR);
     }
-  }, [setErrorMessage]);
+  }, [setAlertMessage]);
 
   useEffect(() => {
     fetchOrders();
@@ -170,19 +169,11 @@ const PantryOrderManagement: React.FC = () => {
         Order Management
       </Heading>
 
-      {errorAlertState && (
+      {alertState && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
-          timeout={6000}
-        />
-      )}
-      {successAlertState && (
-        <FloatingAlert
-          key={successAlertState.id}
-          message={successAlertState.message}
-          status="info"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
@@ -249,10 +240,13 @@ const PantryOrderManagement: React.FC = () => {
           onClose={() => setSelectedActionOrder(null)}
           onSuccess={() => {
             fetchOrders();
-            setSuccessMessage('Delivery Confirmed');
+            setAlertMessage('Delivery Confirmed', AlertStatus.INFO);
           }}
           onError={() => {
-            setErrorMessage('Delivery could not be confirmed.');
+            setAlertMessage(
+              'Delivery could not be confirmed.',
+              AlertStatus.ERROR,
+            );
           }}
         />
       )}
diff --git a/apps/frontend/src/containers/profilePage.tsx b/apps/frontend/src/containers/profilePage.tsx
index d8d5b6fad..72b221e51 100644
--- a/apps/frontend/src/containers/profilePage.tsx
+++ b/apps/frontend/src/containers/profilePage.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Box, Center, Heading, Spinner, Text } from '@chakra-ui/react';
 import ApiClient from '../api/apiClient';
-import { Role, UpdateProfileFields, User } from '../types/types';
+import { AlertStatus, Role, UpdateProfileFields, User } from '../types/types';
 import ProfileLeftPanel from '@components/forms/profileLeftPanel';
 import ProfileAccountInfo from '@components/forms/profileAccountInfo';
 import { getInitials } from '@utils/utils';
@@ -36,7 +36,7 @@ const ProfilePage: React.FC = () => {
             const pantry = await ApiClient.getPantry(pantryId);
             setOrgName(pantry.pantryName);
           } catch {
-            setAlertMessage('Failed to fetch pantry data.');
+            setAlertMessage('Failed to fetch pantry data.', AlertStatus.ERROR);
           }
         } else if (user.role === Role.FOODMANUFACTURER) {
           try {
@@ -45,11 +45,17 @@ const ProfilePage: React.FC = () => {
             const fm = await ApiClient.getFoodManufacturer(fmId);
             setOrgName(fm.foodManufacturerName);
           } catch {
-            setAlertMessage('Failed to fetch food manufacturer data.');
+            setAlertMessage(
+              'Failed to fetch food manufacturer data.',
+              AlertStatus.ERROR,
+            );
           }
         }
       } catch {
-        setAlertMessage('Authentication error. Please log in and try again.');
+        setAlertMessage(
+          'Authentication error. Please log in and try again.',
+          AlertStatus.ERROR,
+        );
       } finally {
         setIsLoading(false);
       }
@@ -59,7 +65,7 @@ const ProfilePage: React.FC = () => {
 
   const handleSave = async (fields: UpdateProfileFields): Promise<boolean> => {
     if (!profile) {
-      setAlertMessage('Profile not found.');
+      setAlertMessage('Profile not found.', AlertStatus.ERROR);
       return false;
     }
 
@@ -71,14 +77,18 @@ const ProfilePage: React.FC = () => {
       if (axios.isAxiosError(error)) {
         const status = error.response?.status;
         if (status === 400 || status === 404) {
-          setAlertMessage(error.response?.data?.message);
+          setAlertMessage(error.response?.data?.message, AlertStatus.ERROR);
         } else {
           setAlertMessage(
             'Profile unable to be edited. Please try again later.',
+            AlertStatus.ERROR,
           );
         }
       } else {
-        setAlertMessage('An unexpected error occurred. Please try again.');
+        setAlertMessage(
+          'An unexpected error occurred. Please try again.',
+          AlertStatus.ERROR,
+        );
       }
       return false;
     }
@@ -110,7 +120,7 @@ const ProfilePage: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/volunteerAssignedPantries.tsx b/apps/frontend/src/containers/volunteerAssignedPantries.tsx
index 27ec4da93..6cb9673bd 100644
--- a/apps/frontend/src/containers/volunteerAssignedPantries.tsx
+++ b/apps/frontend/src/containers/volunteerAssignedPantries.tsx
@@ -12,7 +12,7 @@ import {
   Input,
 } from '@chakra-ui/react';
 import ApiClient from '@api/apiClient';
-import { Pantry, User } from 'types/types';
+import { AlertStatus, Pantry, User } from '../types/types';
 import { RefrigeratedDonation } from '../types/pantryEnums';
 import { FloatingAlert } from '@components/floatingAlert';
 import { useNavigate } from 'react-router-dom';
@@ -38,7 +38,10 @@ const AssignedPantries: React.FC = () => {
         user = await ApiClient.getMe();
         userId = user.id;
       } catch {
-        setAlertMessage('Authentication error. Please log in and try again.');
+        setAlertMessage(
+          'Authentication error. Please log in and try again.',
+          AlertStatus.ERROR,
+        );
         setIsLoading(false);
         return;
       }
@@ -47,7 +50,7 @@ const AssignedPantries: React.FC = () => {
         const data = await ApiClient.getVolunteerPantries(userId);
         setPantries(data);
       } catch {
-        setAlertMessage('Error fetching assigned pantries');
+        setAlertMessage('Error fetching assigned pantries', AlertStatus.ERROR);
       } finally {
         setIsLoading(false);
       }
@@ -119,7 +122,7 @@ const AssignedPantries: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/volunteerDashboard.tsx b/apps/frontend/src/containers/volunteerDashboard.tsx
index c33843670..5e210c6f3 100644
--- a/apps/frontend/src/containers/volunteerDashboard.tsx
+++ b/apps/frontend/src/containers/volunteerDashboard.tsx
@@ -1,7 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import { Box, Heading, Text } from '@chakra-ui/react';
 import DashboardCard, { ORDER_STATUS_BADGE } from '@components/dashboardCard';
-import { FoodRequestSummaryDto, User, VolunteerOrder } from '../types/types';
+import {
+  AlertStatus,
+  FoodRequestSummaryDto,
+  User,
+  VolunteerOrder,
+} from '../types/types';
 import { DashboardCardType } from '@components/dashboardCard';
 import ApiClient from '@api/apiClient';
 import { useAlert } from '../hooks/alert';
@@ -25,7 +30,7 @@ const VolunteerDashboard: React.FC = () => {
         const currentUser = await ApiClient.getMe();
         setUser(currentUser);
       } catch {
-        setAlertMessage('Error fetching user information');
+        setAlertMessage('Error fetching user information', AlertStatus.ERROR);
         return;
       }
 
@@ -38,14 +43,14 @@ const VolunteerDashboard: React.FC = () => {
         );
         setRecentFoodRequests(sorted.slice(0, 2));
       } catch {
-        setAlertMessage('Error fetching food requests');
+        setAlertMessage('Error fetching food requests', AlertStatus.ERROR);
       }
 
       try {
         const orders = await ApiClient.getVolunteerRecentOrders();
         setRecentOrders(orders);
       } catch {
-        setAlertMessage('Error fetching orders');
+        setAlertMessage('Error fetching orders', AlertStatus.ERROR);
       }
     };
     fetchDashboardData();
@@ -59,7 +64,7 @@ const VolunteerDashboard: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status={'error'}
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/containers/volunteerManagement.tsx b/apps/frontend/src/containers/volunteerManagement.tsx
index efe5caafa..197a50f1e 100644
--- a/apps/frontend/src/containers/volunteerManagement.tsx
+++ b/apps/frontend/src/containers/volunteerManagement.tsx
@@ -15,7 +15,7 @@ import {
   Link,
 } from '@chakra-ui/react';
 import { SearchIcon, ChevronRight, ChevronLeft } from 'lucide-react';
-import { User } from '../types/types';
+import { AlertStatus, User } from '../types/types';
 import ApiClient from '@api/apiClient';
 import NewVolunteerModal from '@components/forms/addNewVolunteerModal';
 import { FloatingAlert } from '@components/floatingAlert';
@@ -28,8 +28,7 @@ const VolunteerManagement: React.FC = () => {
   const [volunteers, setVolunteers] = useState<User[]>([]);
   const [searchName, setSearchName] = useState<string>('');
 
-  const [errorAlertState, setErrorMessage] = useAlert();
-  const [successAlertState, setSuccessMessage] = useAlert();
+  const [alertState, setAlertMessage] = useAlert();
 
   const pageSize = 8;
 
@@ -39,12 +38,12 @@ const VolunteerManagement: React.FC = () => {
         const allVolunteers = await ApiClient.getVolunteers();
         setVolunteers(allVolunteers);
       } catch {
-        setErrorMessage('Error fetching volunteers');
+        setAlertMessage('Error fetching volunteers', AlertStatus.ERROR);
       }
     };
 
     fetchVolunteers();
-  }, [setErrorMessage]);
+  }, [setAlertMessage]);
 
   useEffect(() => {
     setCurrentPage(1);
@@ -71,19 +70,11 @@ const VolunteerManagement: React.FC = () => {
       <Text textStyle="h1" color="gray.light">
         Volunteer Management
       </Text>
-      {errorAlertState && (
+      {alertState && (
         <FloatingAlert
-          key={errorAlertState.id}
-          message={errorAlertState.message}
-          status="error"
-          timeout={6000}
-        />
-      )}
-      {successAlertState && (
-        <FloatingAlert
-          key={successAlertState.id}
-          message={successAlertState.message}
-          status="info"
+          key={alertState.id}
+          message={alertState.message}
+          status={alertState.status}
           timeout={6000}
         />
       )}
@@ -122,10 +113,13 @@ const VolunteerManagement: React.FC = () => {
             </InputGroup>
             <NewVolunteerModal
               onSubmitSuccess={() => {
-                setSuccessMessage('Volunteer added.');
+                setAlertMessage('Volunteer added.', AlertStatus.INFO);
               }}
               onSubmitFail={() => {
-                setErrorMessage('Volunteer could not be added.');
+                setAlertMessage(
+                  'Volunteer could not be added.',
+                  AlertStatus.ERROR,
+                );
               }}
             />
           </Flex>
diff --git a/apps/frontend/src/containers/volunteerOrderManagement.tsx b/apps/frontend/src/containers/volunteerOrderManagement.tsx
index 39b0db4c9..bc4787d63 100644
--- a/apps/frontend/src/containers/volunteerOrderManagement.tsx
+++ b/apps/frontend/src/containers/volunteerOrderManagement.tsx
@@ -35,6 +35,7 @@ import {
   VolunteerOrder,
   VolunteerAction,
   User,
+  AlertStatus,
 } from '../types/types';
 import OrderDetailsModal from '@components/forms/orderDetailsModal';
 import CompleteRequiredActionsModal from '@components/forms/completeRequiredActionsModal';
@@ -119,7 +120,10 @@ const VolunteerOrderManagement: React.FC = () => {
         userId = user.id;
         setCurrentUser(user);
       } catch {
-        setAlertMessage('Authentication error. Please log in and try again.');
+        setAlertMessage(
+          'Authentication error. Please log in and try again.',
+          AlertStatus.ERROR,
+        );
         setIsLoading(false);
         return;
       }
@@ -156,7 +160,7 @@ const VolunteerOrderManagement: React.FC = () => {
         };
         setCurrentPages(initialPages);
       } catch {
-        setAlertMessage('Error fetching assigned orders');
+        setAlertMessage('Error fetching assigned orders', AlertStatus.ERROR);
       } finally {
         setIsLoading(false);
       }
@@ -224,7 +228,7 @@ const VolunteerOrderManagement: React.FC = () => {
         },
       }));
     } else {
-      setAlertMessage('Selected pantry has no orders');
+      setAlertMessage('Selected pantry has no orders', AlertStatus.ERROR);
       navigate(ROUTES.VOLUNTEER_ORDER_MANAGEMENT, { replace: true });
     }
   }, [searchParams, statusOrders, navigate, setAlertMessage]);
@@ -286,7 +290,7 @@ const VolunteerOrderManagement: React.FC = () => {
         <FloatingAlert
           key={alertState.id}
           message={alertState.message}
-          status="error"
+          status={alertState.status}
           timeout={6000}
         />
       )}
diff --git a/apps/frontend/src/hooks/alert.ts b/apps/frontend/src/hooks/alert.ts
index 0a2c609b3..a89990ce4 100644
--- a/apps/frontend/src/hooks/alert.ts
+++ b/apps/frontend/src/hooks/alert.ts
@@ -1,17 +1,25 @@
 import { useCallback, useRef, useState } from 'react';
+import { AlertStatus } from '../types/types';
 
 export interface AlertState {
   message: string;
+  status: AlertStatus;
   id: number;
 }
 
-export function useAlert(): [AlertState | null, (message: string) => void] {
+export function useAlert(): [
+  AlertState | null,
+  (message: string, status: AlertStatus) => void,
+] {
   const [alertState, setAlertState] = useState<AlertState | null>(null);
   const idRef = useRef<number>(0);
 
-  const setAlertMessage = useCallback((message: string) => {
-    setAlertState({ message, id: idRef.current++ });
-  }, []);
+  const setAlertMessage = useCallback(
+    (message: string, status: AlertStatus) => {
+      setAlertState({ message, status, id: idRef.current++ });
+    },
+    [],
+  );
 
   return [alertState, setAlertMessage];
 }
diff --git a/apps/frontend/src/types/types.ts b/apps/frontend/src/types/types.ts
index d42b0b539..fe4f111db 100644
--- a/apps/frontend/src/types/types.ts
+++ b/apps/frontend/src/types/types.ts
@@ -471,7 +471,6 @@ export interface CreateFoodRequestBody {
 }
 
 export interface CreateDonationDto {
-  foodManufacturerId: number;
   recurrenceFreq?: number;
   recurrence: RecurrenceEnum;
   repeatOnDays?: RepeatOnState;
@@ -611,3 +610,8 @@ export interface UpdateDonationItemDetailsDto {
   estimatedValue?: number;
   foodRescue?: boolean;
 }
+
+export enum AlertStatus {
+  INFO = 'info',
+  ERROR = 'error',
+}