diff --git a/apps/backend/src/foodRequests/request.controller.spec.ts b/apps/backend/src/foodRequests/request.controller.spec.ts
new file mode 100644
index 00000000..71c35ca4
--- /dev/null
+++ b/apps/backend/src/foodRequests/request.controller.spec.ts
@@ -0,0 +1,322 @@
+import { RequestsService } from './request.service';
+import { RequestsController } from './request.controller';
+import { Test, TestingModule } from '@nestjs/testing';
+import { mock } from 'jest-mock-extended';
+import { AWSS3Service } from '../aws/aws-s3.service';
+import { OrdersService } from '../orders/order.service';
+import { Readable } from 'stream';
+import { FoodRequest } from './request.entity';
+import { RequestSize } from './types';
+import { OrderStatus } from '../orders/types';
+
+const mockRequestsService = mock<RequestsService>();
+const mockOrdersService = mock<OrdersService>();
+const mockAWSS3Service = mock<AWSS3Service>();
+
+const foodRequest: Partial<FoodRequest> = {
+  requestId: 1,
+  pantryId: 1,
+};
+
+describe('RequestsController', () => {
+  let controller: RequestsController;
+
+  beforeEach(async () => {
+    mockRequestsService.findOne.mockReset();
+    mockRequestsService.find.mockReset();
+    mockRequestsService.create.mockReset();
+    mockRequestsService.updateDeliveryDetails?.mockReset();
+    mockAWSS3Service.upload.mockReset();
+    mockOrdersService.updateStatus.mockReset();
+
+    const module: TestingModule = await Test.createTestingModule({
+      controllers: [RequestsController],
+      providers: [
+        {
+          provide: RequestsService,
+          useValue: mockRequestsService,
+        },
+        {
+          provide: OrdersService,
+          useValue: mockOrdersService,
+        },
+        {
+          provide: AWSS3Service,
+          useValue: mockAWSS3Service,
+        },
+      ],
+    }).compile();
+
+    controller = module.get<RequestsController>(RequestsController);
+  });
+
+  it('should be defined', () => {
+    expect(controller).toBeDefined();
+  });
+
+  describe('GET /:requestId', () => {
+    it('should call requestsService.findOne and return a specific food request', async () => {
+      const requestId = 1;
+
+      mockRequestsService.findOne.mockResolvedValueOnce(
+        foodRequest as FoodRequest,
+      );
+
+      const result = await controller.getRequest(requestId);
+
+      expect(result).toEqual(foodRequest);
+      expect(mockRequestsService.findOne).toHaveBeenCalledWith(requestId);
+    });
+  });
+
+  describe('GET /get-all-requests/:pantryId', () => {
+    it('should call requestsService.find and return all food requests for a specific pantry', async () => {
+      const foodRequests: Partial<FoodRequest>[] = [
+        foodRequest,
+        {
+          requestId: 2,
+          pantryId: 1,
+        },
+      ];
+      const pantryId = 1;
+
+      mockRequestsService.find.mockResolvedValueOnce(
+        foodRequests as FoodRequest[],
+      );
+
+      const result = await controller.getAllPantryRequests(pantryId);
+
+      expect(result).toEqual(foodRequests);
+      expect(mockRequestsService.find).toHaveBeenCalledWith(pantryId);
+    });
+  });
+
+  describe('POST /create', () => {
+    it('should call requestsService.create and return the created food request', async () => {
+      const createBody: Partial<FoodRequest> = {
+        pantryId: 1,
+        requestedSize: RequestSize.MEDIUM,
+        requestedItems: ['Test item 1', 'Test item 2'],
+        additionalInformation: 'Test information.',
+        dateReceived: null,
+        feedback: null,
+        photos: null,
+      };
+
+      const createdRequest: Partial<FoodRequest> = {
+        requestId: 1,
+        ...createBody,
+        requestedAt: new Date(),
+        order: null,
+      };
+
+      mockRequestsService.create.mockResolvedValueOnce(
+        createdRequest as FoodRequest,
+      );
+
+      const result = await controller.createRequest(createBody as FoodRequest);
+
+      expect(result).toEqual(createdRequest);
+      expect(mockRequestsService.create).toHaveBeenCalledWith(
+        createBody.pantryId,
+        createBody.requestedSize,
+        createBody.requestedItems,
+        createBody.additionalInformation,
+        createBody.dateReceived,
+        createBody.feedback,
+        createBody.photos,
+      );
+    });
+  });
+
+  describe('POST /:requestId/confirm-delivery', () => {
+    it('should upload photos, update the order, then update the request', async () => {
+      const requestId = 1;
+
+      const body = {
+        dateReceived: new Date().toISOString(),
+        feedback: 'Nice delivery!',
+      };
+
+      // Mock Photos
+      const mockStream = new Readable();
+      mockStream._read = () => {};
+
+      const photos: Express.Multer.File[] = [
+        {
+          fieldname: 'photos',
+          originalname: 'photo1.jpg',
+          encoding: '7bit',
+          mimetype: 'image/jpeg',
+          buffer: Buffer.from('image1'),
+          size: 1000,
+          destination: '',
+          filename: '',
+          path: '',
+          stream: mockStream,
+        },
+        {
+          fieldname: 'photos',
+          originalname: 'photo2.jpg',
+          encoding: '7bit',
+          mimetype: 'image/jpeg',
+          buffer: Buffer.from('image2'),
+          size: 2000,
+          destination: '',
+          filename: '',
+          path: '',
+          stream: mockStream,
+        },
+      ];
+
+      const uploadedUrls = [
+        'https://fake-s3/photo1.jpg',
+        'https://fake-s3/photo2.jpg',
+      ];
+
+      // Mock AWS upload
+      mockAWSS3Service.upload.mockResolvedValue(uploadedUrls);
+
+      // Mock RequestsService.findOne
+      mockRequestsService.findOne.mockResolvedValue({
+        requestId,
+        pantryId: 1,
+        order: { orderId: 99 },
+      } as FoodRequest);
+
+      mockOrdersService.updateStatus.mockResolvedValue();
+
+      const updatedRequest: Partial<FoodRequest> = {
+        requestId,
+        pantryId: 1,
+        dateReceived: new Date(body.dateReceived),
+        feedback: body.feedback,
+        photos: uploadedUrls,
+      };
+
+      mockRequestsService.updateDeliveryDetails.mockResolvedValue(
+        updatedRequest as FoodRequest,
+      );
+
+      const result = await controller.confirmDelivery(requestId, body, photos);
+
+      expect(mockAWSS3Service.upload).toHaveBeenCalledWith(photos);
+
+      expect(mockRequestsService.findOne).toHaveBeenCalledWith(requestId);
+
+      expect(mockOrdersService.updateStatus).toHaveBeenCalledWith(
+        99,
+        OrderStatus.DELIVERED,
+      );
+
+      expect(mockRequestsService.updateDeliveryDetails).toHaveBeenCalledWith(
+        requestId,
+        new Date(body.dateReceived),
+        body.feedback,
+        uploadedUrls,
+      );
+
+      expect(result).toEqual(updatedRequest);
+    });
+
+    it('should handle no photos being uploaded', async () => {
+      const requestId = 1;
+
+      const body = {
+        dateReceived: new Date().toISOString(),
+        feedback: 'No photos delivery!',
+      };
+
+      mockRequestsService.findOne.mockResolvedValue({
+        requestId,
+        pantryId: 1,
+        order: { orderId: 100 },
+      } as FoodRequest);
+
+      mockOrdersService.updateStatus.mockResolvedValue();
+
+      const updatedRequest: Partial<FoodRequest> = {
+        requestId,
+        pantryId: 1,
+        dateReceived: new Date(body.dateReceived),
+        feedback: body.feedback,
+        photos: [],
+      };
+
+      mockRequestsService.updateDeliveryDetails.mockResolvedValue(
+        updatedRequest as FoodRequest,
+      );
+
+      const result = await controller.confirmDelivery(requestId, body);
+
+      expect(mockAWSS3Service.upload).not.toHaveBeenCalled();
+      expect(mockRequestsService.findOne).toHaveBeenCalledWith(requestId);
+      expect(mockOrdersService.updateStatus).toHaveBeenCalledWith(
+        100,
+        OrderStatus.DELIVERED,
+      );
+      expect(mockRequestsService.updateDeliveryDetails).toHaveBeenCalledWith(
+        requestId,
+        new Date(body.dateReceived),
+        body.feedback,
+        [],
+      );
+      expect(result).toEqual(updatedRequest);
+    });
+
+    it('should handle empty photos array', async () => {
+      const requestId = 1;
+
+      const body = {
+        dateReceived: new Date().toISOString(),
+        feedback: 'Empty photos array delivery!',
+      };
+
+      mockRequestsService.findOne.mockResolvedValue({
+        requestId,
+        pantryId: 1,
+        order: { orderId: 101 },
+      } as FoodRequest);
+
+      mockOrdersService.updateStatus.mockResolvedValue();
+
+      const updatedRequest: Partial<FoodRequest> = {
+        requestId,
+        pantryId: 1,
+        dateReceived: new Date(body.dateReceived),
+        feedback: body.feedback,
+        photos: [],
+      };
+
+      mockRequestsService.updateDeliveryDetails.mockResolvedValue(
+        updatedRequest as FoodRequest,
+      );
+
+      const result = await controller.confirmDelivery(requestId, body, []);
+
+      expect(mockAWSS3Service.upload).not.toHaveBeenCalled();
+      expect(mockRequestsService.findOne).toHaveBeenCalledWith(requestId);
+      expect(mockOrdersService.updateStatus).toHaveBeenCalledWith(
+        101,
+        OrderStatus.DELIVERED,
+      );
+      expect(mockRequestsService.updateDeliveryDetails).toHaveBeenCalledWith(
+        requestId,
+        new Date(body.dateReceived),
+        body.feedback,
+        [],
+      );
+      expect(result).toEqual(updatedRequest);
+    });
+
+    it('should throw an error for invalid date', async () => {
+      await expect(
+        controller.confirmDelivery(
+          1,
+          { dateReceived: 'bad-date', feedback: '' },
+          [],
+        ),
+      ).rejects.toThrow('Invalid date format for deliveryDate');
+    });
+  });
+});
diff --git a/apps/backend/src/foodRequests/request.controller.ts b/apps/backend/src/foodRequests/request.controller.ts
index e3a93727..1f449491 100644
--- a/apps/backend/src/foodRequests/request.controller.ts
+++ b/apps/backend/src/foodRequests/request.controller.ts
@@ -22,7 +22,7 @@ import { OrderStatus } from '../orders/types';
 
 @Controller('requests')
 // @UseInterceptors()
-export class FoodRequestsController {
+export class RequestsController {
   constructor(
     private requestsService: RequestsService,
     private awsS3Service: AWSS3Service,
@@ -43,14 +43,6 @@ export class FoodRequestsController {
     return this.requestsService.find(pantryId);
   }
 
-  @Get('get-order/:requestId')
-  async getOrderByRequestId(
-    @Param('requestId', ParseIntPipe) requestId: number,
-  ): Promise<Order> {
-    const request = await this.requestsService.findOne(requestId);
-    return request.order;
-  }
-
   @Post('/create')
   @ApiBody({
     description: 'Details for creating a food request',
diff --git a/apps/backend/src/foodRequests/request.module.ts b/apps/backend/src/foodRequests/request.module.ts
index baf98bcd..14a605d8 100644
--- a/apps/backend/src/foodRequests/request.module.ts
+++ b/apps/backend/src/foodRequests/request.module.ts
@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { FoodRequestsController } from './request.controller';
+import { RequestsController } from './request.controller';
 import { FoodRequest } from './request.entity';
 import { RequestsService } from './request.service';
 import { JwtStrategy } from '../auth/jwt.strategy';
@@ -9,14 +9,15 @@ import { AWSS3Module } from '../aws/aws-s3.module';
 import { MulterModule } from '@nestjs/platform-express';
 import { OrdersService } from '../orders/order.service';
 import { Order } from '../orders/order.entity';
+import { Pantry } from '../pantries/pantries.entity';
 
 @Module({
   imports: [
     AWSS3Module,
     MulterModule.register({ dest: './uploads' }),
-    TypeOrmModule.forFeature([FoodRequest, Order]),
+    TypeOrmModule.forFeature([FoodRequest, Order, Pantry]),
   ],
-  controllers: [FoodRequestsController],
+  controllers: [RequestsController],
   providers: [RequestsService, OrdersService, AuthService, JwtStrategy],
 })
 export class RequestsModule {}
diff --git a/apps/backend/src/foodRequests/request.service.spec.ts b/apps/backend/src/foodRequests/request.service.spec.ts
new file mode 100644
index 00000000..cc69a5a3
--- /dev/null
+++ b/apps/backend/src/foodRequests/request.service.spec.ts
@@ -0,0 +1,357 @@
+import { Test } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+import { Repository } from 'typeorm';
+import { FoodRequest } from './request.entity';
+import { RequestsService } from './request.service';
+import { mock } from 'jest-mock-extended';
+import { Pantry } from '../pantries/pantries.entity';
+import { RequestSize } from './types';
+import { Order } from '../orders/order.entity';
+import { OrderStatus } from '../orders/types';
+
+const mockRequestsRepository = mock<Repository<FoodRequest>>();
+const mockPantryRepository = mock<Repository<Pantry>>();
+
+const mockRequest: Partial<FoodRequest> = {
+  requestId: 1,
+  pantryId: 1,
+  requestedItems: ['Canned Goods', 'Vegetables'],
+  additionalInformation: 'No onions, please.',
+  requestedAt: null,
+  dateReceived: null,
+  feedback: null,
+  photos: null,
+  order: null,
+};
+
+describe('RequestsService', () => {
+  let service: RequestsService;
+
+  beforeAll(async () => {
+    // Reset the mock repository before compiling module
+    mockRequestsRepository.findOne.mockReset();
+    mockRequestsRepository.create.mockReset();
+    mockRequestsRepository.save.mockReset();
+    mockRequestsRepository.find.mockReset();
+    mockPantryRepository.findOneBy.mockReset();
+
+    const module = await Test.createTestingModule({
+      providers: [
+        RequestsService,
+        {
+          provide: getRepositoryToken(FoodRequest),
+          useValue: mockRequestsRepository,
+        },
+        {
+          provide: getRepositoryToken(Pantry),
+          useValue: mockPantryRepository,
+        },
+      ],
+    }).compile();
+
+    service = module.get<RequestsService>(RequestsService);
+  });
+
+  beforeEach(() => {
+    mockRequestsRepository.findOne.mockReset();
+    mockRequestsRepository.create.mockReset();
+    mockRequestsRepository.save.mockReset();
+    mockRequestsRepository.find.mockReset();
+    mockPantryRepository.findOneBy.mockReset();
+  });
+
+  it('should be defined', () => {
+    expect(service).toBeDefined();
+  });
+
+  describe('findOne', () => {
+    it('should return a food request with the corresponding id', async () => {
+      const requestId = 1;
+      mockRequestsRepository.findOne.mockResolvedValueOnce(
+        mockRequest as FoodRequest,
+      );
+      const result = await service.findOne(requestId);
+      expect(result).toEqual(mockRequest);
+      expect(mockRequestsRepository.findOne).toHaveBeenCalledWith({
+        where: { requestId },
+        relations: ['order'],
+      });
+    });
+
+    it('should throw an error if the request id is not found', async () => {
+      const requestId = 999;
+
+      mockRequestsRepository.findOne.mockResolvedValueOnce(null);
+
+      await expect(service.findOne(requestId)).rejects.toThrow(
+        `Request ${requestId} not found`,
+      );
+
+      expect(mockRequestsRepository.findOne).toHaveBeenCalledWith({
+        where: { requestId },
+        relations: ['order'],
+      });
+    });
+  });
+
+  describe('create', () => {
+    it('should successfully create and return a new food request', async () => {
+      mockPantryRepository.findOneBy.mockResolvedValueOnce({
+        pantryId: 1,
+      } as unknown as Pantry);
+      mockRequestsRepository.create.mockReturnValueOnce(
+        mockRequest as FoodRequest,
+      );
+      mockRequestsRepository.save.mockResolvedValueOnce(
+        mockRequest as FoodRequest,
+      );
+      mockRequestsRepository.find.mockResolvedValueOnce([
+        mockRequest as FoodRequest,
+      ]);
+
+      const result = await service.create(
+        mockRequest.pantryId,
+        mockRequest.requestedSize,
+        mockRequest.requestedItems,
+        mockRequest.additionalInformation,
+        mockRequest.dateReceived,
+        mockRequest.feedback,
+        mockRequest.photos,
+      );
+
+      expect(result).toEqual(mockRequest);
+      expect(mockRequestsRepository.create).toHaveBeenCalledWith({
+        pantryId: mockRequest.pantryId,
+        requestedSize: mockRequest.requestedSize,
+        requestedItems: mockRequest.requestedItems,
+        additionalInformation: mockRequest.additionalInformation,
+        dateReceived: mockRequest.dateReceived,
+        feedback: mockRequest.feedback,
+        photos: mockRequest.photos,
+      });
+      expect(mockRequestsRepository.save).toHaveBeenCalledWith(mockRequest);
+    });
+
+    it('should throw an error if the pantry ID does not exist', async () => {
+      const invalidPantryId = 999;
+
+      await expect(
+        service.create(
+          invalidPantryId,
+          RequestSize.MEDIUM,
+          ['Canned Goods', 'Vegetables'],
+          'Additional info',
+          null,
+          null,
+          null,
+        ),
+      ).rejects.toThrow(`Pantry ${invalidPantryId} not found`);
+
+      expect(mockRequestsRepository.create).not.toHaveBeenCalled();
+      expect(mockRequestsRepository.save).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('find', () => {
+    it('should return all food requests for a specific pantry', async () => {
+      const mockRequests: Partial<FoodRequest>[] = [
+        mockRequest,
+        {
+          requestId: 2,
+          pantryId: 1,
+          requestedSize: RequestSize.LARGE,
+          requestedItems: ['Rice', 'Beans'],
+          additionalInformation: 'Gluten-free items only.',
+          requestedAt: null,
+          dateReceived: null,
+          feedback: null,
+          photos: null,
+          order: null,
+        },
+        {
+          requestId: 3,
+          pantryId: 2,
+          requestedSize: RequestSize.SMALL,
+          requestedItems: ['Fruits', 'Snacks'],
+          additionalInformation: 'No nuts, please.',
+          requestedAt: null,
+          dateReceived: null,
+          feedback: null,
+          photos: null,
+          order: null,
+        },
+      ];
+      const pantryId = 1;
+      mockRequestsRepository.find.mockResolvedValueOnce(
+        mockRequests.slice(0, 2) as FoodRequest[],
+      );
+
+      const result = await service.find(pantryId);
+
+      expect(result).toEqual(mockRequests.slice(0, 2));
+      expect(mockRequestsRepository.find).toHaveBeenCalledWith({
+        where: { pantryId },
+        relations: ['order'],
+      });
+    });
+  });
+
+  describe('updateDeliveryDetails', () => {
+    it('should update and return the food request with new delivery details', async () => {
+      const mockOrder: Partial<Order> = {
+        orderId: 1,
+        pantry: null,
+        request: null,
+        requestId: 1,
+        foodManufacturer: null,
+        shippedBy: 1,
+        status: OrderStatus.SHIPPED,
+        createdAt: new Date(),
+        shippedAt: new Date(),
+        deliveredAt: null,
+      };
+
+      const mockRequest2: Partial<FoodRequest> = {
+        ...mockRequest,
+        order: mockOrder as Order,
+      };
+
+      const requestId = 1;
+      const deliveryDate = new Date();
+      const feedback = 'Good delivery!';
+      const photos = ['photo1.jpg', 'photo2.jpg'];
+
+      mockRequestsRepository.findOne.mockResolvedValueOnce(
+        mockRequest2 as FoodRequest,
+      );
+      mockRequestsRepository.save.mockResolvedValueOnce({
+        ...mockRequest,
+        dateReceived: deliveryDate,
+        feedback,
+        photos,
+        order: {
+          ...(mockOrder as Order),
+          status: OrderStatus.DELIVERED,
+        } as Order,
+      } as FoodRequest);
+
+      const result = await service.updateDeliveryDetails(
+        requestId,
+        deliveryDate,
+        feedback,
+        photos,
+      );
+
+      expect(result).toEqual({
+        ...mockRequest,
+        dateReceived: deliveryDate,
+        feedback,
+        photos,
+        order: { ...mockOrder, status: 'delivered' },
+      });
+
+      expect(mockRequestsRepository.findOne).toHaveBeenCalledWith({
+        where: { requestId },
+        relations: ['order'],
+      });
+
+      expect(mockRequestsRepository.save).toHaveBeenCalledWith({
+        ...mockRequest,
+        dateReceived: deliveryDate,
+        feedback,
+        photos,
+        order: { ...mockOrder, status: 'delivered' },
+      });
+    });
+
+    it('should throw an error if the request ID is invalid', async () => {
+      const requestId = 999;
+      const deliveryDate = new Date();
+      const feedback = 'Good delivery!';
+      const photos = ['photo1.jpg', 'photo2.jpg'];
+
+      mockRequestsRepository.findOne.mockResolvedValueOnce(null);
+
+      await expect(
+        service.updateDeliveryDetails(
+          requestId,
+          deliveryDate,
+          feedback,
+          photos,
+        ),
+      ).rejects.toThrow('Invalid request ID');
+
+      expect(mockRequestsRepository.findOne).toHaveBeenCalledWith({
+        where: { requestId },
+        relations: ['order'],
+      });
+    });
+
+    it('should throw an error if there is no associated order', async () => {
+      const requestId = 1;
+      const deliveryDate = new Date();
+      const feedback = 'Good delivery!';
+      const photos = ['photo1.jpg', 'photo2.jpg'];
+
+      mockRequestsRepository.findOne.mockResolvedValueOnce(
+        mockRequest as FoodRequest,
+      );
+
+      await expect(
+        service.updateDeliveryDetails(
+          requestId,
+          deliveryDate,
+          feedback,
+          photos,
+        ),
+      ).rejects.toThrow('No associated order found for this request');
+
+      expect(mockRequestsRepository.findOne).toHaveBeenCalledWith({
+        where: { requestId },
+        relations: ['order'],
+      });
+    });
+
+    it('should throw an error if the order does not have a food manufacturer', async () => {
+      const mockOrder: Partial<Order> = {
+        orderId: 1,
+        pantry: null,
+        request: null,
+        requestId: 1,
+        foodManufacturer: null,
+        shippedBy: null,
+        status: OrderStatus.SHIPPED,
+        createdAt: new Date(),
+        shippedAt: new Date(),
+        deliveredAt: null,
+      };
+      const mockRequest2: Partial<FoodRequest> = {
+        ...mockRequest,
+        order: mockOrder as Order,
+      };
+
+      const requestId = 1;
+      const deliveryDate = new Date();
+      const feedback = 'Good delivery!';
+      const photos = ['photo1.jpg', 'photo2.jpg'];
+
+      mockRequestsRepository.findOne.mockResolvedValueOnce(
+        mockRequest2 as FoodRequest,
+      );
+
+      await expect(
+        service.updateDeliveryDetails(
+          requestId,
+          deliveryDate,
+          feedback,
+          photos,
+        ),
+      ).rejects.toThrow('No associated food manufacturer found for this order');
+
+      expect(mockRequestsRepository.findOne).toHaveBeenCalledWith({
+        where: { requestId },
+        relations: ['order'],
+      });
+    });
+  });
+});
diff --git a/apps/backend/src/foodRequests/request.service.ts b/apps/backend/src/foodRequests/request.service.ts
index d20d296e..32e600ba 100644
--- a/apps/backend/src/foodRequests/request.service.ts
+++ b/apps/backend/src/foodRequests/request.service.ts
@@ -9,11 +9,13 @@ import { FoodRequest } from './request.entity';
 import { validateId } from '../utils/validation.utils';
 import { RequestSize } from './types';
 import { OrderStatus } from '../orders/types';
+import { Pantry } from '../pantries/pantries.entity';
 
 @Injectable()
 export class RequestsService {
   constructor(
     @InjectRepository(FoodRequest) private repo: Repository<FoodRequest>,
+    @InjectRepository(Pantry) private pantryRepo: Repository<Pantry>,
   ) {}
 
   async findOne(requestId: number): Promise<FoodRequest> {
@@ -39,6 +41,13 @@ export class RequestsService {
     feedback: string | undefined,
     photos: string[] | undefined,
   ): Promise<FoodRequest> {
+    validateId(pantryId, 'Pantry');
+
+    const pantry = await this.pantryRepo.findOneBy({ pantryId });
+    if (!pantry) {
+      throw new NotFoundException(`Pantry ${pantryId} not found`);
+    }
+
     const foodRequest = this.repo.create({
       pantryId,
       requestedSize,
diff --git a/apps/backend/src/migrations/1764816885341-RemoveUnusedStatuses.ts b/apps/backend/src/migrations/1764816885341-RemoveUnusedStatuses.ts
index 6419e233..4c35fd0f 100644
--- a/apps/backend/src/migrations/1764816885341-RemoveUnusedStatuses.ts
+++ b/apps/backend/src/migrations/1764816885341-RemoveUnusedStatuses.ts
@@ -1,25 +1,24 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
+import { MigrationInterface, QueryRunner } from 'typeorm';
 
 export class RemoveUnusedStatuses1764816885341 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(
+      `ALTER TABLE allocations DROP COLUMN IF EXISTS status;`,
+    );
+    await queryRunner.query(
+      `ALTER TABLE donation_items DROP COLUMN IF EXISTS status;`,
+    );
+  }
 
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(
-            `ALTER TABLE allocations DROP COLUMN IF EXISTS status;`
-        );
-        await queryRunner.query(
-            `ALTER TABLE donation_items DROP COLUMN IF EXISTS status;`
-        );
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`
             ALTER TABLE allocations
             ADD COLUMN status VARCHAR(25) NOT NULL DEFAULT 'pending';
         `);
 
-        await queryRunner.query(`
+    await queryRunner.query(`
             ALTER TABLE donation_items
             ADD COLUMN status VARCHAR(25) NOT NULL DEFAULT 'available';
         `);
-    }
+  }
 }
diff --git a/apps/backend/src/pantries/dtos/pantry-application.dto.ts b/apps/backend/src/pantries/dtos/pantry-application.dto.ts
index 42510915..c7473b0f 100644
--- a/apps/backend/src/pantries/dtos/pantry-application.dto.ts
+++ b/apps/backend/src/pantries/dtos/pantry-application.dto.ts
@@ -52,7 +52,7 @@ export class PantryApplicationDto {
   @IsNotEmpty()
   @MaxLength(255)
   emailContactOther?: string;
-  
+
   @IsOptional()
   @IsString()
   @IsNotEmpty()
diff --git a/apps/backend/src/utils/validation.utils.spec.ts b/apps/backend/src/utils/validation.utils.spec.ts
new file mode 100644
index 00000000..6b390840
--- /dev/null
+++ b/apps/backend/src/utils/validation.utils.spec.ts
@@ -0,0 +1,14 @@
+import { BadRequestException } from '@nestjs/common';
+import { validateId } from './validation.utils';
+
+describe('validateId', () => {
+  it('should not throw an error for a valid ID', () => {
+    expect(() => validateId(5, 'User')).not.toThrow();
+  });
+
+  it('should throw BadRequestException for ID < 1', () => {
+    expect(() => validateId(0, 'User')).toThrow(
+      new BadRequestException('Invalid User ID'),
+    );
+  });
+});
diff --git a/apps/frontend/src/api/apiClient.ts b/apps/frontend/src/api/apiClient.ts
index a548bfa5..1cc69f84 100644
--- a/apps/frontend/src/api/apiClient.ts
+++ b/apps/frontend/src/api/apiClient.ts
@@ -188,12 +188,6 @@ export class ApiClient {
     return this.axiosInstance.get(`api/orders/${orderId}`) as Promise<Order>;
   }
 
-  public async getOrderByRequestId(requestId: number): Promise<Order> {
-    return this.axiosInstance.get(
-      `api/requests/get-order/${requestId}`,
-    ) as Promise<Order>;
-  }
-
   async getAllAllocationsByOrder(orderId: number): Promise<Allocation[]> {
     return this.axiosInstance
       .get(`api/orders/${orderId}/allocations`)
diff --git a/apps/frontend/src/components/forms/pantryApplicationForm.tsx b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
index 94abfe3a..df185caa 100644
--- a/apps/frontend/src/components/forms/pantryApplicationForm.tsx
+++ b/apps/frontend/src/components/forms/pantryApplicationForm.tsx
@@ -67,18 +67,22 @@ const activityOptions = [
 
 const PantryApplicationForm: React.FC = () => {
   const [contactPhone, setContactPhone] = useState<string>('');
-  const [secondaryContactPhone, setSecondaryContactPhone] = useState<string>('');
+  const [secondaryContactPhone, setSecondaryContactPhone] =
+    useState<string>('');
   const [activities, setActivities] = useState<string[]>([]);
   const allergenClientsExactOption: string = 'I have an exact number';
 
   const [allergenClients, setAllergenClients] = useState<string | undefined>();
   const [restrictions, setRestrictions] = useState<string[]>([]);
-  const [reserveFoodForAllergic, setReserveFoodForAllergic] = useState<string>();
-  const [differentMailingAddress, setDifferentMailingAddress] = useState<boolean | null>();
+  const [reserveFoodForAllergic, setReserveFoodForAllergic] =
+    useState<string>();
+  const [differentMailingAddress, setDifferentMailingAddress] = useState<
+    boolean | null
+  >();
   const [otherEmailContact, setOtherEmailContact] = useState<boolean>(false);
 
   const sectionTitleStyles = {
-    fontFamily: "inter",
+    fontFamily: 'inter',
     fontWeight: '600',
     fontSize: 'md',
     color: 'gray.dark',
@@ -86,16 +90,16 @@ const PantryApplicationForm: React.FC = () => {
   };
 
   const sectionSubtitleStyles = {
-    fontFamily: "inter",
+    fontFamily: 'inter',
     fontWeight: '400',
     color: 'gray.light',
     mb: '2.25em',
     fontSize: 'sm',
-  }
+  };
 
   const fieldHeaderStyles = {
     color: 'neutral.800',
-    fontFamily: "inter",
+    fontFamily: 'inter',
     fontSize: 'sm',
     fontWeight: '600',
   };
@@ -103,96 +107,121 @@ const PantryApplicationForm: React.FC = () => {
   return (
     <Box width="100%" mx="11em" my="4em">
       <Box as="section" mb="2.75em">
-        <Heading textStyle="h1" fontWeight="normal" mb=".5em" >
+        <Heading textStyle="h1" fontWeight="normal" mb=".5em">
           Partner Pantry Application
         </Heading>
         <Text textStyle="p" color="gray.light">
-          Thank you for your interest in partnering with Securing Safe Food (SSF) to help 
-          serve clients with food allergies and other adverse reactions to foods.
+          Thank you for your interest in partnering with Securing Safe Food
+          (SSF) to help serve clients with food allergies and other adverse
+          reactions to foods.
         </Text>
       </Box>
-      <Box 
-        as="section" bg="#FEFEFE" p="2em" 
-        border="1px solid" borderColor="neutral.200" rounded="sm"
+      <Box
+        as="section"
+        bg="#FEFEFE"
+        p="2em"
+        border="1px solid"
+        borderColor="neutral.200"
+        rounded="sm"
       >
         <Form method="post" action="/pantry-application">
-          <Heading textStyle="h3" mb="1em" color="gray.dark" >
+          <Heading textStyle="h3" mb="1em" color="gray.dark">
             Pantry Application Form
           </Heading>
-          <Stack gap="1em" mb="2em" color="gray.light" textStyle="p" fontWeight="400">
+          <Stack
+            gap="1em"
+            mb="2em"
+            color="gray.light"
+            textStyle="p"
+            fontWeight="400"
+          >
             <Text>
-              This application helps us understand your pantry’s capacity and interest in 
-              distributing allergen-friendly food. We’ll ask about your pantry’s current 
-              practices, storage capabilities, and communication preferences.
+              This application helps us understand your pantry’s capacity and
+              interest in distributing allergen-friendly food. We’ll ask about
+              your pantry’s current practices, storage capabilities, and
+              communication preferences.
             </Text>
             <Text mb=".5em">
-              Please answer as accurately as possible. If you have any questions or need help, 
-              don’t hesitate to contact the SSF team.
+              Please answer as accurately as possible. If you have any questions
+              or need help, don’t hesitate to contact the SSF team.
             </Text>
             <Separator size="sm" color="neutral.100" />
           </Stack>
-          
-          <Text {...sectionTitleStyles}>
-            Primary Contact Information
-          </Text>
+
+          <Text {...sectionTitleStyles}>Primary Contact Information</Text>
           <SimpleGrid columns={2} columnGap={9} rowGap={10} mb="2.5em">
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 First Name
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="contactFirstName" type="text" borderColor="neutral.100" />
+              <Input
+                name="contactFirstName"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Last Name
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="contactLastName" type="text" borderColor="neutral.100" />
+              <Input
+                name="contactLastName"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Phone Number
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
               <USPhoneInput
                 value={contactPhone}
                 onChange={setContactPhone}
-                inputProps={{ name: 'contactPhone', borderColor: 'neutral.100' }}
+                inputProps={{
+                  name: 'contactPhone',
+                  borderColor: 'neutral.100',
+                }}
               />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Email Address
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="contactEmail" type="email" borderColor="neutral.100" />
+              <Input
+                name="contactEmail"
+                type="email"
+                borderColor="neutral.100"
+              />
             </Field.Root>
           </SimpleGrid>
           <Field.Root required mb=".75em">
             <Field.Label {...fieldHeaderStyles} mb=".5em">
-              Is there someone at your pantry who can regularly check and respond to emails from SSF as needed?{' '}
-              <Field.RequiredIndicator color="red"/>
+              Is there someone at your pantry who can regularly check and
+              respond to emails from SSF as needed?{' '}
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
+            <RadioGroup.Root
               name="hasEmailContact"
               variant="solid"
-              onValueChange={(e: {value: string}) => setOtherEmailContact(e.value === 'Other')}
+              onValueChange={(e: { value: string }) =>
+                setOtherEmailContact(e.value === 'Other')
+              }
             >
               <Stack>
                 {['Yes', 'No', 'Other'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -201,127 +230,151 @@ const PantryApplicationForm: React.FC = () => {
             </RadioGroup.Root>
           </Field.Root>
           <Field.Root required={otherEmailContact} mb="2.5em">
-            <Input 
-              name="emailContactOther" 
-              type="text" 
-              borderColor="neutral.100" 
+            <Input
+              name="emailContactOther"
+              type="text"
+              borderColor="neutral.100"
               placeholder="If you selected other, please specify."
-              _placeholder={{ color: "neutral.800" }}
+              _placeholder={{ color: 'neutral.800' }}
               maxW="30em"
             />
           </Field.Root>
 
-          <Separator size="sm" color="neutral.100" mb="3em"/>
+          <Separator size="sm" color="neutral.100" mb="3em" />
 
-          <Text {...sectionTitleStyles}>
-            Secondary Contact Information
-          </Text>
+          <Text {...sectionTitleStyles}>Secondary Contact Information</Text>
           <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="4em">
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                First Name
-              </Field.Label>
-              <Input name="secondaryContactFirstName" type="text" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>First Name</Field.Label>
+              <Input
+                name="secondaryContactFirstName"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Last Name
-              </Field.Label>
-              <Input name="secondaryContactLastName" type="text" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>Last Name</Field.Label>
+              <Input
+                name="secondaryContactLastName"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Phone Number
-              </Field.Label>
+              <Field.Label {...fieldHeaderStyles}>Phone Number</Field.Label>
               <USPhoneInput
                 value={secondaryContactPhone}
                 onChange={setSecondaryContactPhone}
                 allowEmpty={true}
-                inputProps={{ name: 'secondaryContactPhone', borderColor: 'neutral.100' }}
+                inputProps={{
+                  name: 'secondaryContactPhone',
+                  borderColor: 'neutral.100',
+                }}
               />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Email Address
-              </Field.Label>
-              <Input name="secondaryContactEmail" type="email" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>Email Address</Field.Label>
+              <Input
+                name="secondaryContactEmail"
+                type="email"
+                borderColor="neutral.100"
+              />
             </Field.Root>
           </SimpleGrid>
 
-          <Separator size="sm" color="neutral.100" mb="3em"/>
-          
+          <Separator size="sm" color="neutral.100" mb="3em" />
+
           <Text {...sectionTitleStyles} mb="0">
             Food Shipment Address
           </Text>
           <Text {...sectionSubtitleStyles}>
             Please list your address for <b>food shipments</b>.
           </Text>
-          <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="2em" >
+          <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="2em">
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Address Line 1
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="shipmentAddressLine1" type="text" borderColor="neutral.100" />
+              <Input
+                name="shipmentAddressLine1"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Address Line 2
-              </Field.Label>
-              <Input name="shipmentAddressLine2" type="text" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>Address Line 2</Field.Label>
+              <Input
+                name="shipmentAddressLine2"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 City/Town
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="shipmentAddressCity" type="text" borderColor="neutral.100" />
+              <Input
+                name="shipmentAddressCity"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 State/Region/Province
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="shipmentAddressState" type="text" borderColor="neutral.100" />
+              <Input
+                name="shipmentAddressState"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root required>
               <Field.Label {...fieldHeaderStyles}>
                 Zip/Post Code
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Field.Label>
-              <Input name="shipmentAddressZip" type="text" borderColor="neutral.100" />
+              <Input
+                name="shipmentAddressZip"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
             <Field.Root>
-              <Field.Label {...fieldHeaderStyles}>
-                Country
-              </Field.Label>
-              <Input name="shipmentAddressCountry" type="text" borderColor="neutral.100" />
+              <Field.Label {...fieldHeaderStyles}>Country</Field.Label>
+              <Input
+                name="shipmentAddressCountry"
+                type="text"
+                borderColor="neutral.100"
+              />
             </Field.Root>
           </SimpleGrid>
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles} mb=".5em">
-              Does this address differ from your pantry's mailing address for documents?{' '}
-              <Field.RequiredIndicator color="red"/>
+              Does this address differ from your pantry's mailing address for
+              documents? <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
+            <RadioGroup.Root
               variant="solid"
-              onValueChange={(e: {value: string}) => setDifferentMailingAddress(e.value === 'Yes')}
+              onValueChange={(e: { value: string }) =>
+                setDifferentMailingAddress(e.value === 'Yes')
+              }
               name="differentMailingAddress"
             >
               <Stack>
                 {['Yes', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700" 
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -331,28 +384,22 @@ const PantryApplicationForm: React.FC = () => {
           </Field.Root>
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles} mb=".5em">
-              Would your pantry be able to accept food deliveries 
-              during standard business hours Mon-Fri?{' '}
-              <Field.RequiredIndicator color="red"/>
+              Would your pantry be able to accept food deliveries during
+              standard business hours Mon-Fri?{' '}
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
-              name="acceptFoodDeliveries"
-              variant="solid"
-            >
+            <RadioGroup.Root name="acceptFoodDeliveries" variant="solid">
               <Stack>
                 {['Yes', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
                     <RadioGroup.ItemHiddenInput required />
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -364,10 +411,13 @@ const PantryApplicationForm: React.FC = () => {
             <Field.Label {...fieldHeaderStyles}>
               Please note any delivery window restrictions.
             </Field.Label>
-            <Textarea name="deliveryWindowInstructions" borderColor="neutral.100" />
+            <Textarea
+              name="deliveryWindowInstructions"
+              borderColor="neutral.100"
+            />
           </Field.Root>
 
-          <Separator size="sm" color="neutral.100" my="3em"/>
+          <Separator size="sm" color="neutral.100" my="3em" />
 
           {differentMailingAddress && (
             <>
@@ -377,61 +427,81 @@ const PantryApplicationForm: React.FC = () => {
               <Text {...sectionSubtitleStyles}>
                 Please list your mailing address for <b>documents</b>.
               </Text>
-              <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="4em" >
+              <SimpleGrid columns={2} columnGap={9} rowGap={9} mb="4em">
                 <Field.Root required={differentMailingAddress}>
                   <Field.Label {...fieldHeaderStyles}>
                     Address Line 1
-                    <Field.RequiredIndicator color="red"/>
+                    <Field.RequiredIndicator color="red" />
                   </Field.Label>
-                  <Input name="mailingAddressLine1" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressLine1"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root>
                   <Field.Label {...fieldHeaderStyles}>
                     Address Line 2
                   </Field.Label>
-                  <Input name="mailingAddressLine2" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressLine2"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root required={differentMailingAddress}>
                   <Field.Label {...fieldHeaderStyles}>
                     City/Town
-                    <Field.RequiredIndicator color="red"/>
+                    <Field.RequiredIndicator color="red" />
                   </Field.Label>
-                  <Input name="mailingAddressCity" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressCity"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root required={differentMailingAddress}>
                   <Field.Label {...fieldHeaderStyles}>
                     State/Region/Province
-                    <Field.RequiredIndicator color="red"/>
+                    <Field.RequiredIndicator color="red" />
                   </Field.Label>
-                  <Input name="mailingAddressState" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressState"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root required={differentMailingAddress}>
                   <Field.Label {...fieldHeaderStyles}>
                     Zip/Post Code
-                    <Field.RequiredIndicator color="red"/>
+                    <Field.RequiredIndicator color="red" />
                   </Field.Label>
-                  <Input name="mailingAddressZip" type="text" borderColor="neutral.100" />
+                  <Input
+                    name="mailingAddressZip"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
                 <Field.Root>
-                  <Field.Label {...fieldHeaderStyles}>
-                    Country
-                  </Field.Label>
-                  <Input name="mailingAddressCountry" type="text" borderColor="neutral.100" />
+                  <Field.Label {...fieldHeaderStyles}>Country</Field.Label>
+                  <Input
+                    name="mailingAddressCountry"
+                    type="text"
+                    borderColor="neutral.100"
+                  />
                 </Field.Root>
               </SimpleGrid>
 
-              <Separator size="sm" color="neutral.100" my="3em"/>
+              <Separator size="sm" color="neutral.100" my="3em" />
             </>
           )}
-          
-          <Text {...sectionTitleStyles}>
-            Pantry Details
-          </Text>
+
+          <Text {...sectionTitleStyles}>Pantry Details</Text>
           <Field.Root required mb="2em">
             <Field.Label asChild>
               <Text {...fieldHeaderStyles}>
                 Pantry Name
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Text>
             </Field.Label>
             <Input name="pantryName" type="text" borderColor="neutral.100" />
@@ -440,7 +510,7 @@ const PantryApplicationForm: React.FC = () => {
             <Field.Label {...fieldHeaderStyles}>
               Approximately how many allergen-avoidant clients does your pantry
               serve?
-              <Field.RequiredIndicator color="red"/>
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
             <NativeSelect.Root>
               <NativeSelect.Field
@@ -465,7 +535,7 @@ const PantryApplicationForm: React.FC = () => {
                   </option>
                 ))}
               </NativeSelect.Field>
-              <NativeSelectIndicator/>
+              <NativeSelectIndicator />
             </NativeSelect.Root>
           </Field.Root>
           {allergenClients === allergenClientsExactOption && (
@@ -492,7 +562,12 @@ const PantryApplicationForm: React.FC = () => {
             </Field.Label>
 
             {restrictions.map((value) => (
-              <input type="hidden" name="restrictions" key={value} value={value} />
+              <input
+                type="hidden"
+                name="restrictions"
+                key={value}
+                value={value}
+              />
             ))}
 
             <Menu.Root closeOnSelect={false}>
@@ -502,7 +577,7 @@ const PantryApplicationForm: React.FC = () => {
                   pr={2}
                   w="full"
                   bgColor="white"
-                  color='neutral.800'
+                  color="neutral.800"
                   borderColor="neutral.100"
                   justifyContent="space-between"
                   textStyle="p2"
@@ -513,15 +588,15 @@ const PantryApplicationForm: React.FC = () => {
                     : 'Select restrictions'}
                   <ChevronDownIcon />
 
-                  <input 
+                  <input
                     type="text"
                     name="restrictions-required"
                     value={restrictions.length > 0 ? 'selected' : ''}
                     required
-                    style={{ 
+                    style={{
                       position: 'absolute',
                       opacity: 0,
-                      pointerEvents: 'none'
+                      pointerEvents: 'none',
                     }}
                   />
                 </Button>
@@ -574,7 +649,7 @@ const PantryApplicationForm: React.FC = () => {
             {restrictions.length > 0 && (
               <Flex wrap="wrap" mt={1} gap={2}>
                 {restrictions.map((value) => (
-                  <Tag.Root 
+                  <Tag.Root
                     key={value}
                     bg="teal.100"
                     p={2}
@@ -583,10 +658,10 @@ const PantryApplicationForm: React.FC = () => {
                   >
                     <Tag.Label>{value}</Tag.Label>
                     <Tag.EndElement ml={4}>
-                      <Tag.CloseTrigger 
+                      <Tag.CloseTrigger
                         onClick={() =>
                           setRestrictions((prev) =>
-                            prev.filter((item) => item !== value)
+                            prev.filter((item) => item !== value),
                           )
                         }
                         style={{ cursor: 'pointer' }}
@@ -601,8 +676,10 @@ const PantryApplicationForm: React.FC = () => {
           {restrictions.find((option) =>
             otherRestrictionsOptions.includes(option),
           ) && (
-            <Field.Root 
-              required={restrictions.find((option) => otherRestrictionsOptions.includes(option))}
+            <Field.Root
+              required={restrictions.find((option) =>
+                otherRestrictionsOptions.includes(option),
+              )}
               mb="2em"
             >
               <Field.Label {...fieldHeaderStyles}>
@@ -614,27 +691,26 @@ const PantryApplicationForm: React.FC = () => {
           )}
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles}>
-              Would you be able to accept frozen donations that require refrigeration or freezing?
-              <Field.RequiredIndicator color="red"/>
+              Would you be able to accept frozen donations that require
+              refrigeration or freezing?
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
-              name="refrigeratedDonation"
-              variant="solid"
-            >
+            <RadioGroup.Root name="refrigeratedDonation" variant="solid">
               <Stack>
-                {['Yes, always', 'No', 'Sometimes (check in before sending)'].map((value) => (
+                {[
+                  'Yes, always',
+                  'No',
+                  'Sometimes (check in before sending)',
+                ].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -647,26 +723,20 @@ const PantryApplicationForm: React.FC = () => {
             <Field.Label {...fieldHeaderStyles}>
               Do you have a dedicated shelf or section of your pantry for
               allergy-friendly items?
-              <Field.RequiredIndicator color="red"/>
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <RadioGroup.Root 
-              name="dedicatedAllergyFriendly"
-              variant="solid"
-            >
+            <RadioGroup.Root name="dedicatedAllergyFriendly" variant="solid">
               <Stack>
                 {['Yes', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -677,34 +747,33 @@ const PantryApplicationForm: React.FC = () => {
 
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles}>
-              Are you willing to reserve our food shipments for allergen-avoidant
-              individuals?{' '}
-              <Field.RequiredIndicator color="red"/>
+              Are you willing to reserve our food shipments for
+              allergen-avoidant individuals?{' '}
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
             <Field.HelperText color="neutral.600" mb=".5em">
-              For example, grouping allergen-friendly items on a separate shelf or 
-              in separate bins and encouraging non-allergic clients to save these 
-              items for clients who do not have other safe food options.
+              For example, grouping allergen-friendly items on a separate shelf
+              or in separate bins and encouraging non-allergic clients to save
+              these items for clients who do not have other safe food options.
             </Field.HelperText>
-            <RadioGroup.Root 
+            <RadioGroup.Root
               name="reserveFoodForAllergic"
               variant="solid"
-              onValueChange={(e: {value: string}) => setReserveFoodForAllergic(e.value)}
+              onValueChange={(e: { value: string }) =>
+                setReserveFoodForAllergic(e.value)
+              }
             >
               <Stack>
                 {['Yes', 'Some', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
-                    <RadioGroup.ItemHiddenInput required/>
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemHiddenInput required />
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText 
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -716,10 +785,15 @@ const PantryApplicationForm: React.FC = () => {
           {reserveFoodForAllergic === 'Yes' && (
             <Field.Root mb="2em">
               <Field.Label {...fieldHeaderStyles}>
-                How would you work to ensure that allergen-friendly foods are distributed to 
-                clients with food allergies or other adverse reactions to foods?
+                How would you work to ensure that allergen-friendly foods are
+                distributed to clients with food allergies or other adverse
+                reactions to foods?
               </Field.Label>
-              <Textarea name="reservationExplanation" borderColor="neutral.100" autoresize />
+              <Textarea
+                name="reservationExplanation"
+                borderColor="neutral.100"
+                autoresize
+              />
             </Field.Root>
           )}
 
@@ -728,7 +802,11 @@ const PantryApplicationForm: React.FC = () => {
               <Field.Label {...fieldHeaderStyles}>
                 Please explain why you selected "Some."
               </Field.Label>
-              <Textarea name="reservationExplanation" borderColor="neutral.100" autoresize />
+              <Textarea
+                name="reservationExplanation"
+                borderColor="neutral.100"
+                autoresize
+              />
             </Field.Root>
           )}
 
@@ -736,7 +814,7 @@ const PantryApplicationForm: React.FC = () => {
             <Field.Label {...fieldHeaderStyles}>
               How often do allergen-avoidant clients visit your food pantry?
             </Field.Label>
-            <NativeSelect.Root >
+            <NativeSelect.Root>
               <NativeSelect.Field
                 placeholder="Select an option"
                 name="clientVisitFrequency"
@@ -763,7 +841,7 @@ const PantryApplicationForm: React.FC = () => {
               Are you confident in identifying the top 9 allergens in an
               ingredient list?
             </Field.Label>
-            <NativeSelect.Root >
+            <NativeSelect.Root>
               <NativeSelect.Field
                 placeholder="Select an option"
                 name="identifyAllergensConfidence"
@@ -792,18 +870,20 @@ const PantryApplicationForm: React.FC = () => {
               Do you serve allergen-avoidant or food-allergic children at your
               pantry?
             </Field.Label>
-            <NativeSelect.Root >
+            <NativeSelect.Root>
               <NativeSelect.Field
                 placeholder="Select an option"
                 name="serveAllergicChildren"
                 borderColor="neutral.100"
                 color="neutral.800"
               >
-                {['Yes, many (> 10)', 'Yes, a few (< 10)', 'No'].map((value) => (
-                  <option key={value} value={value}>
-                    {value}
-                  </option>
-                ))}
+                {['Yes, many (> 10)', 'Yes, a few (< 10)', 'No'].map(
+                  (value) => (
+                    <option key={value} value={value}>
+                      {value}
+                    </option>
+                  ),
+                )}
               </NativeSelect.Field>
               <NativeSelectIndicator />
             </NativeSelect.Root>
@@ -819,7 +899,12 @@ const PantryApplicationForm: React.FC = () => {
             </Field.Label>
 
             {activities.map((value) => (
-              <input type="hidden" name="activities" key={value} value={value} />
+              <input
+                type="hidden"
+                name="activities"
+                key={value}
+                value={value}
+              />
             ))}
 
             <Menu.Root closeOnSelect={false}>
@@ -829,7 +914,7 @@ const PantryApplicationForm: React.FC = () => {
                   pr={2}
                   w="full"
                   bgColor="white"
-                  color='neutral.800'
+                  color="neutral.800"
                   borderColor="neutral.100"
                   justifyContent="space-between"
                   textStyle="p2"
@@ -840,15 +925,15 @@ const PantryApplicationForm: React.FC = () => {
                     : 'Select activities'}
                   <ChevronDownIcon />
 
-                  <input 
+                  <input
                     type="text"
                     name="activities-required"
                     value={activities.length > 0 ? 'selected' : ''}
                     required
-                    style={{ 
+                    style={{
                       position: 'absolute',
                       opacity: 0,
-                      pointerEvents: 'none'
+                      pointerEvents: 'none',
                     }}
                   />
                 </Button>
@@ -901,7 +986,7 @@ const PantryApplicationForm: React.FC = () => {
             {activities.length > 0 && (
               <Flex wrap="wrap" mt={1} gap={2}>
                 {activities.map((value) => (
-                  <Tag.Root 
+                  <Tag.Root
                     key={value}
                     bg="teal.100"
                     p={2}
@@ -910,10 +995,10 @@ const PantryApplicationForm: React.FC = () => {
                   >
                     <Tag.Label>{value}</Tag.Label>
                     <Tag.EndElement ml={4}>
-                      <Tag.CloseTrigger 
+                      <Tag.CloseTrigger
                         onClick={() =>
                           setActivities((prev) =>
-                            prev.filter((item) => item !== value)
+                            prev.filter((item) => item !== value),
                           )
                         }
                         style={{ cursor: 'pointer' }}
@@ -928,17 +1013,18 @@ const PantryApplicationForm: React.FC = () => {
               following are additional ways to help us better support you!
               Please select all that apply.
             </Field.HelperText>
-          </Field.Root>       
+          </Field.Root>
           <Field.Root required={activities.includes('Something else')} mb="2em">
             <Field.Label {...fieldHeaderStyles}>
-              Please list any comments/concerns related to the previous question.
+              Please list any comments/concerns related to the previous
+              question.
               {activities.includes('Something else') && (
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               )}
             </Field.Label>
-            <Textarea 
-              name="activitiesComments" 
-              borderColor="neutral.100" 
+            <Textarea
+              name="activitiesComments"
+              borderColor="neutral.100"
               autoresize
             />
             <Field.HelperText color="neutral.600">
@@ -947,48 +1033,51 @@ const PantryApplicationForm: React.FC = () => {
           </Field.Root>
           <Field.Root required mb="2em">
             <Field.Label {...fieldHeaderStyles}>
-              What types of allergen-free items, if any, do you currently have in
-              stock?
-              <Field.RequiredIndicator color="red"/>
+              What types of allergen-free items, if any, do you currently have
+              in stock?
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <Textarea name="itemsInStock" borderColor="neutral.100" autoresize />
+            <Textarea
+              name="itemsInStock"
+              borderColor="neutral.100"
+              autoresize
+            />
             <Field.HelperText color="neutral.600">
-              For example, gluten-free breads, sunflower seed butters, nondairy beverages, etc.
+              For example, gluten-free breads, sunflower seed butters, nondairy
+              beverages, etc.
             </Field.HelperText>
           </Field.Root>
           <Field.Root required mb="4em">
             <Field.Label {...fieldHeaderStyles}>
               Do allergen-avoidant clients at your pantry ever request a greater
               variety of items or not have enough options? Please explain.
-              <Field.RequiredIndicator color="red"/>
+              <Field.RequiredIndicator color="red" />
             </Field.Label>
-            <Textarea name="needMoreOptions" borderColor="neutral.100" autoresize />
+            <Textarea
+              name="needMoreOptions"
+              borderColor="neutral.100"
+              autoresize
+            />
           </Field.Root>
 
-          <Separator size="sm" color="neutral.100" my="3em"/>
+          <Separator size="sm" color="neutral.100" my="3em" />
 
           <Field.Root mb="2em">
             <Field.Label {...fieldHeaderStyles}>
               Would you like to subscribe to our quarterly newsletter?
             </Field.Label>
-            <RadioGroup.Root 
-              name="newsletterSubscription"
-              variant="solid"
-            >
+            <RadioGroup.Root name="newsletterSubscription" variant="solid">
               <Stack>
                 {['Yes', 'No'].map((value) => (
                   <RadioGroup.Item key={value} value={value}>
                     <RadioGroup.ItemHiddenInput />
-                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }} >
-                      <RadioGroup.ItemIndicator 
-                        border="1px solid" 
+                    <RadioGroup.ItemControl _checked={{ bg: 'neutral.800' }}>
+                      <RadioGroup.ItemIndicator
+                        border="1px solid"
                         borderColor="neutral.100"
                       />
                     </RadioGroup.ItemControl>
-                    <RadioGroup.ItemText
-                      color="neutral.700"
-                      textStyle="p2"
-                    >
+                    <RadioGroup.ItemText color="neutral.700" textStyle="p2">
                       {value}
                     </RadioGroup.ItemText>
                   </RadioGroup.Item>
@@ -998,32 +1087,29 @@ const PantryApplicationForm: React.FC = () => {
           </Field.Root>
           <Field.Root required mb="4em">
             <Checkbox.Root>
-              <Checkbox.HiddenInput/>
-              <Checkbox.Control 
-                border="1px solid" 
-                borderColor="neutral.100" 
+              <Checkbox.HiddenInput />
+              <Checkbox.Control
+                border="1px solid"
+                borderColor="neutral.100"
                 _checked={{ bg: 'neutral.800' }}
               />
               <Checkbox.Label {...fieldHeaderStyles}>
                 By submitting this form, you agree to our Privacy Policy.{' '}
-                <Field.RequiredIndicator color="red"/>
+                <Field.RequiredIndicator color="red" />
               </Checkbox.Label>
             </Checkbox.Root>
           </Field.Root>
           <Box display="flex" gap={2} justifyContent="flex-end" mb={6}>
             <Button
-              border="1px solid" 
-              color="neutral.800" 
+              border="1px solid"
+              color="neutral.800"
               borderColor="neutral.200"
               fontWeight={600}
               bg="white"
             >
               Cancel
             </Button>
-            <Button 
-              type="submit" bg="blue.ssf" 
-              fontWeight={600} px={8}
-            >
+            <Button type="submit" bg="blue.ssf" fontWeight={600} px={8}>
               Submit Application
             </Button>
           </Box>
@@ -1040,12 +1126,18 @@ export const submitPantryApplicationForm: ActionFunction = async ({
   const pantryApplicationData = new Map();
 
   const ActivityStorageMap: Record<string, string> = {
-    'Create a labeled, allergy-friendly shelf or shelves': Activity.CREATE_LABELED_SHELF,
-    'Provide clients and staff/volunteers with educational pamphlets': Activity.PROVIDE_EDUCATIONAL_PAMPHLETS,
-    "Use a spreadsheet to track clients' medical dietary needs and distribution of SSF items per month": Activity.TRACK_DIETARY_NEEDS,
-    'Post allergen-free resource flyers throughout pantry': Activity.POST_RESOURCE_FLYERS,
-    'Survey your clients to determine their medical dietary needs': Activity.SURVEY_CLIENTS,
-    'Collect feedback from allergen-avoidant clients on SSF foods': Activity.COLLECT_FEEDBACK,
+    'Create a labeled, allergy-friendly shelf or shelves':
+      Activity.CREATE_LABELED_SHELF,
+    'Provide clients and staff/volunteers with educational pamphlets':
+      Activity.PROVIDE_EDUCATIONAL_PAMPHLETS,
+    "Use a spreadsheet to track clients' medical dietary needs and distribution of SSF items per month":
+      Activity.TRACK_DIETARY_NEEDS,
+    'Post allergen-free resource flyers throughout pantry':
+      Activity.POST_RESOURCE_FLYERS,
+    'Survey your clients to determine their medical dietary needs':
+      Activity.SURVEY_CLIENTS,
+    'Collect feedback from allergen-avoidant clients on SSF foods':
+      Activity.COLLECT_FEEDBACK,
     'Something else': Activity.SOMETHING_ELSE,
   };
 
@@ -1055,39 +1147,69 @@ export const submitPantryApplicationForm: ActionFunction = async ({
     restrictions.push(restrictionsOther as string);
   }
   pantryApplicationData.set('restrictions', restrictions);
-  form.delete('restrictions')
+  form.delete('restrictions');
   form.delete('restrictionsOther');
 
   const selectedActivities = form.getAll('activities') as string[];
-  const convertedActivities = selectedActivities.map((activity) => ActivityStorageMap[activity]);
+  const convertedActivities = selectedActivities.map(
+    (activity) => ActivityStorageMap[activity],
+  );
   pantryApplicationData.set('activities', convertedActivities);
   form.delete('activities');
 
-  pantryApplicationData.set('newsletterSubscription', form.get("newsletterSubscription") === "Yes");
-  pantryApplicationData.set('acceptFoodDeliveries', form.get("acceptFoodDeliveries") === "Yes");
-  pantryApplicationData.set('dedicatedAllergyFriendly', form.get("dedicatedAllergyFriendly") === "Yes");
-  pantryApplicationData.set('hasEmailContact', form.get("hasEmailContact") === "Yes");
-  form.delete('newsletterSubscription')
-  form.delete('acceptFoodDeliveries')
-  form.delete('dedicatedAllergyFriendly')
-  form.delete('hasEmailContact')
+  pantryApplicationData.set(
+    'newsletterSubscription',
+    form.get('newsletterSubscription') === 'Yes',
+  );
+  pantryApplicationData.set(
+    'acceptFoodDeliveries',
+    form.get('acceptFoodDeliveries') === 'Yes',
+  );
+  pantryApplicationData.set(
+    'dedicatedAllergyFriendly',
+    form.get('dedicatedAllergyFriendly') === 'Yes',
+  );
+  pantryApplicationData.set(
+    'hasEmailContact',
+    form.get('hasEmailContact') === 'Yes',
+  );
+  form.delete('newsletterSubscription');
+  form.delete('acceptFoodDeliveries');
+  form.delete('dedicatedAllergyFriendly');
+  form.delete('hasEmailContact');
 
   // Handle mailing address
-  if (form.get("differentMailingAddress") === "No") {
-    pantryApplicationData.set('mailingAddressLine1', form.get('shipmentAddressLine1'));
-    pantryApplicationData.set('mailingAddressLine2', form.get('shipmentAddressLine2') || null);
-    pantryApplicationData.set('mailingAddressCity', form.get('shipmentAddressCity'));
-    pantryApplicationData.set('mailingAddressState', form.get('shipmentAddressState'));
-    pantryApplicationData.set('mailingAddressZip', form.get('shipmentAddressZip'));
-    pantryApplicationData.set('mailingAddressCountry', form.get('shipmentAddressCountry') || null);
+  if (form.get('differentMailingAddress') === 'No') {
+    pantryApplicationData.set(
+      'mailingAddressLine1',
+      form.get('shipmentAddressLine1'),
+    );
+    pantryApplicationData.set(
+      'mailingAddressLine2',
+      form.get('shipmentAddressLine2') || null,
+    );
+    pantryApplicationData.set(
+      'mailingAddressCity',
+      form.get('shipmentAddressCity'),
+    );
+    pantryApplicationData.set(
+      'mailingAddressState',
+      form.get('shipmentAddressState'),
+    );
+    pantryApplicationData.set(
+      'mailingAddressZip',
+      form.get('shipmentAddressZip'),
+    );
+    pantryApplicationData.set(
+      'mailingAddressCountry',
+      form.get('shipmentAddressCountry') || null,
+    );
   }
-  form.delete('differentMailingAddress')
+  form.delete('differentMailingAddress');
 
   // Replace the answer for allergenClients with the answer
   // for allergenClientsExact if it is given
-  const allergenClientsExact = form.get(
-    'allergenClientsExact',
-  );
+  const allergenClientsExact = form.get('allergenClientsExact');
   if ((allergenClientsExact ?? '') !== '') {
     pantryApplicationData.set('allergenClients', allergenClientsExact);
   }
@@ -1098,7 +1220,7 @@ export const submitPantryApplicationForm: ActionFunction = async ({
     if (value === '') {
       pantryApplicationData.set(key, null);
     } else {
-      pantryApplicationData.set(key, value)
+      pantryApplicationData.set(key, value);
     }
   });
 
@@ -1120,12 +1242,14 @@ export const submitPantryApplicationForm: ActionFunction = async ({
         );
       } else {
         alert('Form submission failed; please try again');
-        console.log(error)
+        console.log(error);
       }
     },
   );
 
-  return submissionSuccessful ? redirect('/pantry-application/submitted') : null;
+  return submissionSuccessful
+    ? redirect('/pantry-application/submitted')
+    : null;
 };
 
 export default PantryApplicationForm;
diff --git a/apps/frontend/src/components/forms/usPhoneInput.tsx b/apps/frontend/src/components/forms/usPhoneInput.tsx
index 7dd3dc16..dd172c16 100644
--- a/apps/frontend/src/components/forms/usPhoneInput.tsx
+++ b/apps/frontend/src/components/forms/usPhoneInput.tsx
@@ -46,8 +46,9 @@ export const USPhoneInput: React.FC<USPhoneInputProps> = ({
       // +1 country code is automatically added to data.phone, so after removing
       // all non-digits, a length of 0-1 means the field is empty
       // (the input does not allow non-digit characters)
-      const digits = data.phone.replace(/\D/g, '')
-      const isEmpty = !data.phone || data.phone.trim() === '' || digits.length <= 1;
+      const digits = data.phone.replace(/\D/g, '');
+      const isEmpty =
+        !data.phone || data.phone.trim() === '' || digits.length <= 1;
 
       onChange(isEmpty ? '' : data.phone);
 
diff --git a/apps/frontend/src/main.tsx b/apps/frontend/src/main.tsx
index 10110223..7f571895 100644
--- a/apps/frontend/src/main.tsx
+++ b/apps/frontend/src/main.tsx
@@ -14,4 +14,4 @@ root.render(
       <App />
     </ChakraProvider>
   </StrictMode>,
-);
\ No newline at end of file
+);
diff --git a/apps/frontend/src/theme.ts b/apps/frontend/src/theme.ts
index bcea681f..874fae37 100644
--- a/apps/frontend/src/theme.ts
+++ b/apps/frontend/src/theme.ts
@@ -1,4 +1,9 @@
-import { createSystem, defaultConfig, defineConfig, defineTextStyles } from '@chakra-ui/react';
+import {
+  createSystem,
+  defaultConfig,
+  defineConfig,
+  defineTextStyles,
+} from '@chakra-ui/react';
 
 const textStyles = defineTextStyles({
   body: {
@@ -57,7 +62,7 @@ const customConfig = defineConfig({
       colors: {
         white: { value: '#fff' },
         black: { value: '#000' },
-        blue: { 
+        blue: {
           ssf: { value: '#2B5061' },
           100: { value: '#bee3f8' },
         },
@@ -77,14 +82,14 @@ const customConfig = defineConfig({
           800: { value: '#414141' },
           900: { value: '#212529' },
         },
-        gray: { 
+        gray: {
           light: { value: '#515151' },
           dark: { value: '#111' },
         },
         teal: {
           400: { value: '#A9D5DB' },
           100: { value: '#E9F4F6' },
-        }
+        },
       },
       fonts: {
         instrument: { value: `'Instrument Serif', serif` },
@@ -100,10 +105,10 @@ const customConfig = defineConfig({
     'h1, h2, h3, h4, h5, h6': {
       fontFamily: 'heading',
     },
-    'body': {
+    body: {
       bg: '#FAFAFA',
     },
   },
 });
 
-export const system = createSystem(defaultConfig, customConfig); 
\ No newline at end of file
+export const system = createSystem(defaultConfig, customConfig);