ieeeuoft · AidanHT · Jun 26, 2026 · Jun 26, 2026
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -13,14 +13,14 @@ jobs:
         working-directory: hackathon_site
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -42,12 +42,12 @@ jobs:
         working-directory: hackathon_site
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
       - name: Install dependencies
@@ -60,12 +60,12 @@ jobs:
         working-directory: hackathon_site/dashboard/frontend
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
       - name: Install dependencies

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -13,14 +13,14 @@ jobs:
         working-directory: hackathon_site
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v1
+      - name: Set up Python 3.10
+        uses: actions/setup-python@v5
         with:
-          python-version: 3.8
+          python-version: '3.10'
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
@@ -42,12 +42,12 @@ jobs:
         working-directory: hackathon_site
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
       - name: Install dependencies
@@ -62,12 +62,12 @@ jobs:
         working-directory: hackathon_site/dashboard/frontend
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: '16.x'
       - name: Install dependencies

diff --git a/hackathon_site/dashboard/frontend/src/api/helpers.ts b/hackathon_site/dashboard/frontend/src/api/helpers.ts
@@ -40,11 +40,11 @@ export const teamOrderListSerialization = (
             const hardwareItems: Record<number, OrderItemTableRow> = {};
             const hardwareRequested: Record<number, number> = {};
             const returnedItems: Record<string, ReturnedItem> = {};
-            order.request.forEach(
+            (order.request ?? []).forEach(
                 (hardware) =>
                     (hardwareRequested[hardware.id] = hardware.requested_quantity)
             );
-            order.items.forEach(({ id, hardware_id, part_returned_health }) => {
+            (order.items ?? []).forEach(({ id, hardware_id, part_returned_health }) => {
                 if (part_returned_health && part_returned_health !== "Rejected") {
                     const returnItemKey = `${hardware_id}-${part_returned_health}`;
                     if (returnedItems[returnItemKey])
@@ -92,7 +92,7 @@ export const teamOrderListSerialization = (
             const hardwareInTableRow = Object.values(hardwareItems);
 
             // Check if ALL order items have a part_returned_health status (i.e., they are all returned or rejected)
-            const allItemsReturnedOrRejected = order.items.every(
+            const allItemsReturnedOrRejected = (order.items ?? []).every(
                 (item) => item.part_returned_health !== null
             );
 

diff --git a/hackathon_site/dashboard/frontend/src/components/cart/CartSummary/CartSummary.test.tsx b/hackathon_site/dashboard/frontend/src/components/cart/CartSummary/CartSummary.test.tsx
@@ -63,13 +63,15 @@ export const mockHardwareSignOutDates = (
 
 describe("Render cartQuantity", () => {
     it(`Renders correctly when it reads the number ${cartQuantity}`, async () => {
-        const { getByText } = render(
+        const { getByTestId } = render(
             <Provider store={store}>
                 <CartSummary />
             </Provider>
         );
         await waitFor(() => {
-            expect(getByText(cartQuantity.toString())).toBeInTheDocument();
+            expect(getByTestId("cart-quantity-total")).toHaveTextContent(
+                cartQuantity.toString()
+            );
         });
     });
     // TODO: fix failing test case

diff --git a/hackathon_site/dashboard/frontend/src/components/dashboard/ItemTable/ItemTable.test.tsx b/hackathon_site/dashboard/frontend/src/components/dashboard/ItemTable/ItemTable.test.tsx
@@ -23,7 +23,7 @@ describe("<PendingTables />", () => {
         });
         const { getByText, queryByText } = render(<PendingTables />, { store });
         expect(getByText(/pending orders/i)).toBeInTheDocument();
-        expect(queryByText("In progress")).toBeInTheDocument();
+        expect(queryByText("Submitted")).toBeInTheDocument();
         mockPendingOrdersInTable.map(({ id }) => {
             expect(getByText(`Order #${id}`)).toBeInTheDocument();
         });

diff --git a/hackathon_site/dashboard/frontend/src/components/dashboard/ItemTable/ItemTable.tsx b/hackathon_site/dashboard/frontend/src/components/dashboard/ItemTable/ItemTable.tsx
@@ -247,6 +247,10 @@ export const PendingTables = () => {
 
     const submitCancelOrderModal = async (cancelOrderId: number | null) => {
         if (cancelOrderId != null) {
+            // Close the modal immediately (matching the "Go Back" dismiss path) so it
+            // never gets stuck open if the order refresh below is slow or fails.
+            setShowCancelOrderModal(false);
+
             // Refresh orders first to get latest status
             await dispatch(getTeamOrders());
 
@@ -266,7 +270,6 @@ export const PendingTables = () => {
                     })
                 );
             }
-            setShowCancelOrderModal(false);
         }
     };
 

diff --git a/hackathon_site/dashboard/frontend/src/components/general/OrderTables/OrderTables.test.tsx b/hackathon_site/dashboard/frontend/src/components/general/OrderTables/OrderTables.test.tsx
@@ -10,7 +10,7 @@ describe("<ChipStatus />", () => {
 
     test("Pending status", () => {
         const { getByText } = render(<ChipStatus status="Submitted" />);
-        expect(getByText("In progress")).toBeInTheDocument();
+        expect(getByText("Submitted")).toBeInTheDocument();
     });
 
     test("Error status", () => {

diff --git a/...site/dashboard/frontend/src/components/inventory/ProductOverview/ProductOverview.test.tsx b/...site/dashboard/frontend/src/components/inventory/ProductOverview/ProductOverview.test.tsx
@@ -82,7 +82,7 @@ describe("<ProductOverview />", () => {
         // Check if the main section, detailInfoSection, and add to cart section works
         expect(getByText("Category")).toBeInTheDocument();
         expect(getByText("Datasheet")).toBeInTheDocument();
-        expect(getByText("Add to cart")).toBeInTheDocument();
+        expect(getByText(/Add to cart/)).toBeInTheDocument();
     });
 
     test("Category label doesn't appear when there are no categories", async () => {
@@ -170,7 +170,7 @@ describe("<ProductOverview />", () => {
         // Check if the main section, detailInfoSection, and add to cart section works
         expect(getByText("Category")).toBeInTheDocument();
         expect(getByText("Datasheet")).toBeInTheDocument();
-        expect(getByText("Add to cart")).toBeInTheDocument();
+        expect(getByText(/Add to cart/)).toBeInTheDocument();
         expect(queryByText("Notes")).not.toBeInTheDocument();
     });
 
@@ -273,14 +273,18 @@ describe("<ProductOverview />", () => {
         );
 
         // by default, quantity is 1
-        const button = getByText("Add to cart");
+        const button = getByText(/Add to cart/);
 
         await waitFor(() => {
             fireEvent.click(button);
         });
 
         expect(cartSelectors.selectAll(store.getState())).toEqual([
-            { hardware_id: mockHardware[0].id, quantity: 1 },
+            {
+                hardware_id: mockHardware[0].id,
+                quantity: 1,
+                credits: mockHardware[0].credits,
+            },
         ]);
         expect(
             getByText(`Added 1 ${mockHardware[0].name} item(s) to your cart.`)
@@ -320,7 +324,7 @@ describe("<ProductOverview />", () => {
         );
 
         // by default, quantity is 1
-        const button = getByText("Add to cart");
+        const button = getByText(/Add to cart/);
 
         await waitFor(() => {
             fireEvent.click(button);
@@ -402,13 +406,14 @@ describe("<EnhancedAddToCartForm />", () => {
         const { getByText, getByLabelText } = render(
             <EnhancedAddToCartForm
                 quantityRemaining={0}
+                credits={5}
                 maxPerTeam={null}
                 hardwareId={1}
                 name="Arduino"
             />
         );
 
-        const button = getByText("Add to cart").closest("button");
+        const button = getByText(/Add to cart/).closest("button");
         const select = getByLabelText("Qty");
 
         expect(button).toBeDisabled();
@@ -419,13 +424,14 @@ describe("<EnhancedAddToCartForm />", () => {
         const { getByText, getByLabelText } = render(
             <EnhancedAddToCartForm
                 quantityRemaining={3}
+                credits={5}
                 maxPerTeam={0}
                 hardwareId={1}
                 name="Arduino"
             />
         );
 
-        const button = getByText("Add to cart").closest("button");
+        const button = getByText(/Add to cart/).closest("button");
         const select = getByLabelText("Qty");
 
         expect(button).toBeDisabled();
@@ -436,6 +442,7 @@ describe("<EnhancedAddToCartForm />", () => {
         const { queryByText, getByText, getByRole } = render(
             <EnhancedAddToCartForm
                 quantityRemaining={3}
+                credits={5}
                 maxPerTeam={2}
                 hardwareId={1}
                 name="Arduino"
@@ -452,6 +459,7 @@ describe("<EnhancedAddToCartForm />", () => {
         const { getByText, getByRole } = render(
             <EnhancedAddToCartForm
                 quantityRemaining={3}
+                credits={5}
                 maxPerTeam={null}
                 hardwareId={1}
                 name="Arduino"
@@ -468,13 +476,14 @@ describe("<EnhancedAddToCartForm />", () => {
         const { getByText } = render(
             <EnhancedAddToCartForm
                 quantityRemaining={3}
+                credits={5}
                 maxPerTeam={5}
                 hardwareId={1}
                 name="Arduino"
             />
         );
 
-        const button = getByText("Add to cart").closest("button");
+        const button = getByText(/Add to cart/).closest("button");
         expect(button).toBeDisabled();
     });
 });