diff --git a/README.md b/README.md
index 27837d521..40658a715 100644
--- a/README.md
+++ b/README.md
@@ -33,5 +33,5 @@ yarn test
 
 To run a particular workspace's unit tests from root:
 ```bash
-yarn test --selectProjects [workspace-name]
+yarn test --project [workspace-name]
 ```
diff --git a/apps/parsley/package.json b/apps/parsley/package.json
index 647eab1ce..8c8af76f8 100644
--- a/apps/parsley/package.json
+++ b/apps/parsley/package.json
@@ -19,7 +19,7 @@
     "deploy:prod": "env-cmd -e production ts-node scripts/deploy/run-deploy",
     "deploy:do-not-use": ". ./scripts/deploy/deploy.sh",
     "dev": "env-cmd -e devLocal -r .env-cmdrc.local.json vite",
-    "evg-db-ops": "yarn --cwd='../..' evg-db-ops",
+    "evg-db-ops": "../../scripts/evg-db-ops.sh",
     "staging": "env-cmd -e devStaging -r .env-cmdrc.local.json vite",
     "prod": "env-cmd -e devProduction -r .env-cmdrc.local.json vite",
     "eslint:fix": "yarn eslint:strict --fix",
@@ -60,7 +60,7 @@
     "@leafygreen-ui/select": "12.0.0",
     "@leafygreen-ui/side-nav": "14.1.0",
     "@leafygreen-ui/tabs": "11.1.13",
-    "@leafygreen-ui/text-input": "12.1.12",
+    "@leafygreen-ui/text-input": "13.0.2",
     "@leafygreen-ui/toast": "6.1.24",
     "@leafygreen-ui/toggle": "10.0.4",
     "@leafygreen-ui/tooltip": "10.0.10",
diff --git a/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/__snapshots__/DetailsMenu_Default.storyshot b/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/__snapshots__/DetailsMenu_Default.storyshot
index 6be480ab0..56c28a130 100644
--- a/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/__snapshots__/DetailsMenu_Default.storyshot
+++ b/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/__snapshots__/DetailsMenu_Default.storyshot
@@ -121,51 +121,67 @@
                       class="css-500t56-RangeInputWrapper egajxj62"
                     >
                       <div
-                        class="css-1esou8m-RangeInput egajxj61 leafygreen-ui-90q1a7"
+                        aria-labelledby="Range Lower Bound"
+                        class="leafygreen-ui-1br9h7w css-1esou8m-RangeInput egajxj61"
+                        data-lgid="lg-text_input"
                       >
                         <div
-                          class="leafygreen-ui-lzja97"
+                          class="leafygreen-ui-1iyoj2o"
+                        />
+                        <div
+                          class="leafygreen-ui-1c0ck9t"
                         >
-                          <input
-                            aria-invalid="false"
-                            aria-labelledby="Range Lower Bound"
-                            autocomplete="on"
-                            class="leafygreen-ui-lkup3q"
-                            data-cy="range-lower-bound"
-                            id="textinput-3"
-                            min="0"
-                            placeholder="0"
-                            required=""
-                            type="number"
-                            value=""
-                          />
                           <div
-                            class="lg-ui-icon-selector-0000 leafygreen-ui-dhxvhh"
-                          />
+                            class="leafygreen-ui-1ago99h"
+                          >
+                            <input
+                              aria-describedby=""
+                              aria-disabled="false"
+                              aria-invalid="false"
+                              aria-labelledby="Range Lower Bound"
+                              autocomplete="on"
+                              class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                              data-cy="range-lower-bound"
+                              id="lg-form-field-input-27"
+                              min="0"
+                              placeholder="0"
+                              required=""
+                              type="number"
+                              value=""
+                            />
+                          </div>
                         </div>
                       </div>
                       <div
-                        class="css-1esou8m-RangeInput egajxj61 leafygreen-ui-90q1a7"
+                        aria-labelledby="Range Upper Bound"
+                        class="leafygreen-ui-1br9h7w css-1esou8m-RangeInput egajxj61"
+                        data-lgid="lg-text_input"
                       >
                         <div
-                          class="leafygreen-ui-lzja97"
+                          class="leafygreen-ui-1iyoj2o"
+                        />
+                        <div
+                          class="leafygreen-ui-1c0ck9t"
                         >
-                          <input
-                            aria-invalid="false"
-                            aria-labelledby="Range Upper Bound"
-                            autocomplete="on"
-                            class="leafygreen-ui-lkup3q"
-                            data-cy="range-upper-bound"
-                            id="textinput-4"
-                            min="0"
-                            placeholder="100"
-                            required=""
-                            type="number"
-                            value=""
-                          />
                           <div
-                            class="lg-ui-icon-selector-0000 leafygreen-ui-dhxvhh"
-                          />
+                            class="leafygreen-ui-1ago99h"
+                          >
+                            <input
+                              aria-describedby=""
+                              aria-disabled="false"
+                              aria-invalid="false"
+                              aria-labelledby="Range Upper Bound"
+                              autocomplete="on"
+                              class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                              data-cy="range-upper-bound"
+                              id="lg-form-field-input-31"
+                              min="0"
+                              placeholder="100"
+                              required=""
+                              type="number"
+                              value=""
+                            />
+                          </div>
                         </div>
                       </div>
                     </div>
diff --git a/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/__snapshots__/DetailsMenu_WithDownloadedLog.storyshot b/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/__snapshots__/DetailsMenu_WithDownloadedLog.storyshot
index 2f4dbfdd1..ccd6cf0fc 100644
--- a/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/__snapshots__/DetailsMenu_WithDownloadedLog.storyshot
+++ b/apps/parsley/src/components/DetailsMenu/DetailsMenuCard/__snapshots__/DetailsMenu_WithDownloadedLog.storyshot
@@ -22,12 +22,12 @@
             role="tablist"
           >
             <button
-              aria-controls="tab-panel-23"
+              aria-controls="tab-panel-39"
               aria-selected="true"
               class="leafygreen-ui-oq6if2"
               data-cy="search-and-filter-tab"
               data-text="Search & Filter"
-              id="tab-24"
+              id="tab-40"
               name="Search & Filter"
               role="tab"
               tabindex="0"
@@ -39,12 +39,12 @@
               </div>
             </button>
             <button
-              aria-controls="tab-panel-25"
+              aria-controls="tab-panel-41"
               aria-selected="false"
               class="leafygreen-ui-1vvp6ij"
               data-cy="log-viewing-tab"
               data-text="Log Viewing"
-              id="tab-26"
+              id="tab-42"
               name="Log Viewing"
               role="tab"
               tabindex="-1"
@@ -66,9 +66,9 @@
         </div>
         <div>
           <div
-            aria-labelledby="tab-24"
+            aria-labelledby="tab-40"
             data-cy="search-and-filter-tab"
-            id="tab-panel-23"
+            id="tab-panel-39"
             role="tabpanel"
           >
             <div
@@ -121,51 +121,67 @@
                       class="css-500t56-RangeInputWrapper egajxj62"
                     >
                       <div
-                        class="css-1esou8m-RangeInput egajxj61 leafygreen-ui-90q1a7"
+                        aria-labelledby="Range Lower Bound"
+                        class="leafygreen-ui-1br9h7w css-1esou8m-RangeInput egajxj61"
+                        data-lgid="lg-text_input"
                       >
                         <div
-                          class="leafygreen-ui-lzja97"
+                          class="leafygreen-ui-1iyoj2o"
+                        />
+                        <div
+                          class="leafygreen-ui-1c0ck9t"
                         >
-                          <input
-                            aria-invalid="false"
-                            aria-labelledby="Range Lower Bound"
-                            autocomplete="on"
-                            class="leafygreen-ui-lkup3q"
-                            data-cy="range-lower-bound"
-                            id="textinput-7"
-                            min="0"
-                            placeholder="0"
-                            required=""
-                            type="number"
-                            value=""
-                          />
                           <div
-                            class="lg-ui-icon-selector-0000 leafygreen-ui-dhxvhh"
-                          />
+                            class="leafygreen-ui-1ago99h"
+                          >
+                            <input
+                              aria-describedby=""
+                              aria-disabled="false"
+                              aria-invalid="false"
+                              aria-labelledby="Range Lower Bound"
+                              autocomplete="on"
+                              class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                              data-cy="range-lower-bound"
+                              id="lg-form-field-input-63"
+                              min="0"
+                              placeholder="0"
+                              required=""
+                              type="number"
+                              value=""
+                            />
+                          </div>
                         </div>
                       </div>
                       <div
-                        class="css-1esou8m-RangeInput egajxj61 leafygreen-ui-90q1a7"
+                        aria-labelledby="Range Upper Bound"
+                        class="leafygreen-ui-1br9h7w css-1esou8m-RangeInput egajxj61"
+                        data-lgid="lg-text_input"
                       >
                         <div
-                          class="leafygreen-ui-lzja97"
+                          class="leafygreen-ui-1iyoj2o"
+                        />
+                        <div
+                          class="leafygreen-ui-1c0ck9t"
                         >
-                          <input
-                            aria-invalid="false"
-                            aria-labelledby="Range Upper Bound"
-                            autocomplete="on"
-                            class="leafygreen-ui-lkup3q"
-                            data-cy="range-upper-bound"
-                            id="textinput-8"
-                            min="0"
-                            placeholder="100"
-                            required=""
-                            type="number"
-                            value=""
-                          />
                           <div
-                            class="lg-ui-icon-selector-0000 leafygreen-ui-dhxvhh"
-                          />
+                            class="leafygreen-ui-1ago99h"
+                          >
+                            <input
+                              aria-describedby=""
+                              aria-disabled="false"
+                              aria-invalid="false"
+                              aria-labelledby="Range Upper Bound"
+                              autocomplete="on"
+                              class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                              data-cy="range-upper-bound"
+                              id="lg-form-field-input-67"
+                              min="0"
+                              placeholder="100"
+                              required=""
+                              type="number"
+                              value=""
+                            />
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -566,9 +582,9 @@
             </div>
           </div>
           <div
-            aria-labelledby="tab-26"
+            aria-labelledby="tab-42"
             data-cy="log-viewing-tab"
-            id="tab-panel-25"
+            id="tab-panel-41"
             role="tabpanel"
           />
         </div>
diff --git a/apps/parsley/src/components/Search/SearchBar/SearchBar.test.tsx b/apps/parsley/src/components/Search/SearchBar/SearchBar.test.tsx
index 967aca725..eca276f63 100644
--- a/apps/parsley/src/components/Search/SearchBar/SearchBar.test.tsx
+++ b/apps/parsley/src/components/Search/SearchBar/SearchBar.test.tsx
@@ -1,3 +1,4 @@
+import { getTestUtils } from "@leafygreen-ui/text-input";
 import { DIRECTION } from "context/LogContext/types";
 import { render, screen, userEvent, waitFor } from "test_utils";
 import SearchBar from ".";
@@ -9,11 +10,12 @@ describe("searchbar", () => {
 
   it("disables properly", () => {
     render(<SearchBar disabled />);
+    const { isDisabled } = getTestUtils();
     expect(screen.getByDataCy("searchbar-select")).toHaveAttribute(
       "aria-disabled",
       "true",
     );
-    expect(screen.getByDataCy("searchbar-input")).toBeDisabled();
+    expect(isDisabled()).toBe(true);
   });
   it("should be able to paginate forwards by pressing Enter and keep focus", async () => {
     const user = userEvent.setup();
diff --git a/apps/parsley/src/components/Search/SearchBar/__snapshots__/SearchBar_Default.storyshot b/apps/parsley/src/components/Search/SearchBar/__snapshots__/SearchBar_Default.storyshot
index 2a1a286ec..2361f405a 100644
--- a/apps/parsley/src/components/Search/SearchBar/__snapshots__/SearchBar_Default.storyshot
+++ b/apps/parsley/src/components/Search/SearchBar/__snapshots__/SearchBar_Default.storyshot
@@ -7,8 +7,8 @@
       data-lgid="lg-select"
     >
       <button
-        aria-controls="select-198-menu"
-        aria-describedby="select-198-description"
+        aria-controls="select-230-menu"
+        aria-describedby="select-230-description"
         aria-disabled="false"
         aria-expanded="false"
         aria-invalid="false"
@@ -17,7 +17,7 @@
         data-cy="searchbar-select"
         data-lgid="lg-button"
         data-testid="leafygreen-ui-select-menubutton"
-        id="select-199"
+        id="select-231"
         type="button"
         value="filter"
       >
@@ -119,45 +119,66 @@
         class="css-mk4qpy-TextInputWrapper e1j7n2io1"
       >
         <div
-          class="css-j29pku-StyledInput etjwcg12 leafygreen-ui-90q1a7"
+          aria-labelledby="searchbar-input"
+          class="leafygreen-ui-1br9h7w css-j29pku-StyledInput etjwcg12"
+          data-lgid="lg-text_input"
         >
           <div
-            class="leafygreen-ui-lzja97"
+            class="leafygreen-ui-1iyoj2o"
+          />
+          <div
+            class="leafygreen-ui-os8x4a"
           >
-            <input
-              aria-invalid="true"
-              aria-labelledby="searchbar-input"
-              autocomplete="on"
-              class="leafygreen-ui-18wtnk9"
-              data-cy="searchbar-input"
-              id="textinput-9"
-              placeholder="optional, regexp to search"
-              required=""
-              spellcheck="false"
-              type="text"
-              value=""
-            />
             <div
-              class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
+              class="leafygreen-ui-1ago99h"
             >
-              <svg
-                alt=""
-                aria-hidden="true"
-                class="leafygreen-ui-1lzd8bx"
-                height="16"
-                role="presentation"
-                viewBox="0 0 16 16"
-                width="16"
-              >
-                <path
-                  clip-rule="evenodd"
-                  d="M8.8639 1.51357C8.49039 0.828811 7.50961 0.828811 7.1361 1.51357L1.12218 12.5388C0.763263 13.1968 1.23814 14 1.98608 14H14.0139C14.7619 14 15.2367 13.1968 14.8778 12.5388L8.8639 1.51357ZM7 5C7 4.44772 7.44772 4 8 4C8.55228 4 9 4.44772 9 5V9C9 9.55228 8.55228 10 8 10C7.44772 10 7 9.55228 7 9V5ZM9 12C9 12.5523 8.55228 13 8 13C7.44772 13 7 12.5523 7 12C7 11.4477 7.44772 11 8 11C8.55228 11 9 11.4477 9 12Z"
-                  fill="currentColor"
-                  fill-rule="evenodd"
-                />
-              </svg>
+              <input
+                aria-describedby="lg-form-field-description-234"
+                aria-disabled="false"
+                aria-invalid="true"
+                aria-labelledby="searchbar-input"
+                autocomplete="on"
+                class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                data-cy="searchbar-input"
+                id="lg-form-field-input-235"
+                placeholder="optional, regexp to search"
+                required=""
+                spellcheck="false"
+                type="text"
+                value=""
+              />
             </div>
           </div>
+          <div
+            class="leafygreen-ui-15w6x3f"
+          >
+            <svg
+              aria-hidden="true"
+              class="leafygreen-ui-160ryfb"
+              fill="none"
+              height="16"
+              role="img"
+              title="Error"
+              viewBox="0 0 16 16"
+              width="16"
+              xmlns="http://www.w3.org/2000/svg"
+            >
+              <path
+                clip-rule="evenodd"
+                d="M8.864 1.514a.983.983 0 0 0-1.728 0L1.122 12.539A.987.987 0 0 0 1.986 14h12.028a.987.987 0 0 0 .864-1.461L8.864 1.514ZM7 5a1 1 0 0 1 2 0v4a1 1 0 0 1-2 0V5Zm2 7a1 1 0 1 1-2 0 1 1 0 0 1 2 0Z"
+                fill="currentColor"
+                fill-rule="evenodd"
+              />
+            </svg>
+            <p
+              class="leafygreen-ui-jvw8or"
+              data-lgid="lg-form_field-error_message"
+              data-testid="lg-form_field-error_message"
+              id="lg-form-field-description-234"
+            >
+              This input needs your attention
+            </p>
+          </div>
         </div>
         <div
           class="css-4bamt4-IconWrapper e1j7n2io0"
diff --git a/apps/parsley/src/components/Search/SearchBar/__snapshots__/SearchBar_WithSearchSuggestions.storyshot b/apps/parsley/src/components/Search/SearchBar/__snapshots__/SearchBar_WithSearchSuggestions.storyshot
index 37fd484dc..2ab633bd5 100644
--- a/apps/parsley/src/components/Search/SearchBar/__snapshots__/SearchBar_WithSearchSuggestions.storyshot
+++ b/apps/parsley/src/components/Search/SearchBar/__snapshots__/SearchBar_WithSearchSuggestions.storyshot
@@ -7,8 +7,8 @@
       data-lgid="lg-select"
     >
       <button
-        aria-controls="select-201-menu"
-        aria-describedby="select-201-description"
+        aria-controls="select-237-menu"
+        aria-describedby="select-237-description"
         aria-disabled="false"
         aria-expanded="false"
         aria-invalid="false"
@@ -17,7 +17,7 @@
         data-cy="searchbar-select"
         data-lgid="lg-button"
         data-testid="leafygreen-ui-select-menubutton"
-        id="select-202"
+        id="select-238"
         type="button"
         value="filter"
       >
@@ -119,27 +119,35 @@
         class="css-mk4qpy-TextInputWrapper e1j7n2io1"
       >
         <div
-          class="css-j29pku-StyledInput etjwcg12 leafygreen-ui-90q1a7"
+          aria-labelledby="searchbar-input"
+          class="leafygreen-ui-1br9h7w css-j29pku-StyledInput etjwcg12"
+          data-lgid="lg-text_input"
         >
           <div
-            class="leafygreen-ui-lzja97"
+            class="leafygreen-ui-1iyoj2o"
+          />
+          <div
+            class="leafygreen-ui-95c1iv"
           >
-            <input
-              aria-invalid="false"
-              aria-labelledby="searchbar-input"
-              autocomplete="on"
-              class="leafygreen-ui-1kmfbzh"
-              data-cy="searchbar-input"
-              id="textinput-10"
-              placeholder="optional, regexp to search"
-              required=""
-              spellcheck="false"
-              type="text"
-              value=""
-            />
             <div
-              class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-            />
+              class="leafygreen-ui-1ago99h"
+            >
+              <input
+                aria-describedby=""
+                aria-disabled="false"
+                aria-invalid="false"
+                aria-labelledby="searchbar-input"
+                autocomplete="on"
+                class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                data-cy="searchbar-input"
+                id="lg-form-field-input-242"
+                placeholder="optional, regexp to search"
+                required=""
+                spellcheck="false"
+                type="text"
+                value=""
+              />
+            </div>
           </div>
         </div>
         <div
diff --git a/apps/parsley/src/components/SidePanel/NavGroup/FilterNavGroup/FilterGroup/__snapshots__/FilterGroup_Default.storyshot b/apps/parsley/src/components/SidePanel/NavGroup/FilterNavGroup/FilterGroup/__snapshots__/FilterGroup_Default.storyshot
index b540e589d..bc651269e 100644
--- a/apps/parsley/src/components/SidePanel/NavGroup/FilterNavGroup/FilterGroup/__snapshots__/FilterGroup_Default.storyshot
+++ b/apps/parsley/src/components/SidePanel/NavGroup/FilterNavGroup/FilterGroup/__snapshots__/FilterGroup_Default.storyshot
@@ -129,8 +129,8 @@
               Case
             </div>
             <div
-              aria-label="segmented-control-205"
-              aria-owns="segmented-control-205-0 segmented-control-205-1"
+              aria-label="segmented-control-245"
+              aria-owns="segmented-control-245-0 segmented-control-245-1"
               class="leafygreen-ui-18en4yf"
               role="tablist"
             >
@@ -146,7 +146,7 @@
                     aria-controls="Toggle case sensitivity"
                     aria-selected="false"
                     class="leafygreen-ui-ypz97o"
-                    id="segmented-control-205-0"
+                    id="segmented-control-245-0"
                     role="tab"
                     tabindex="-1"
                     type="button"
@@ -175,7 +175,7 @@
                     aria-controls="Toggle case sensitivity"
                     aria-selected="true"
                     class="leafygreen-ui-ypz97o"
-                    id="segmented-control-205-1"
+                    id="segmented-control-245-1"
                     role="tab"
                     tabindex="0"
                     type="button"
@@ -209,8 +209,8 @@
               Match
             </div>
             <div
-              aria-label="segmented-control-206"
-              aria-owns="segmented-control-206-0 segmented-control-206-1"
+              aria-label="segmented-control-246"
+              aria-owns="segmented-control-246-0 segmented-control-246-1"
               class="leafygreen-ui-18en4yf"
               role="tablist"
             >
@@ -226,7 +226,7 @@
                     aria-controls="Toggle match type"
                     aria-selected="true"
                     class="leafygreen-ui-ypz97o"
-                    id="segmented-control-206-0"
+                    id="segmented-control-246-0"
                     role="tab"
                     tabindex="0"
                     type="button"
@@ -255,7 +255,7 @@
                     aria-controls="Toggle match type"
                     aria-selected="false"
                     class="leafygreen-ui-ypz97o"
-                    id="segmented-control-206-1"
+                    id="segmented-control-246-1"
                     role="tab"
                     tabindex="-1"
                     type="button"
diff --git a/apps/parsley/src/components/SidePanel/__snapshots__/SidePanel_Default.storyshot b/apps/parsley/src/components/SidePanel/__snapshots__/SidePanel_Default.storyshot
index fb934d703..d5dbf0078 100644
--- a/apps/parsley/src/components/SidePanel/__snapshots__/SidePanel_Default.storyshot
+++ b/apps/parsley/src/components/SidePanel/__snapshots__/SidePanel_Default.storyshot
@@ -12,7 +12,7 @@
         <nav
           aria-label="Side panel"
           class="leafygreen-ui-fw8ayd"
-          id="side-nav-213"
+          id="side-nav-253"
         >
           <div
             class="leafygreen-ui-1nmawjt"
@@ -29,7 +29,7 @@
                   <div
                     class="leafygreen-ui-g6ml2m"
                     data-testid="side-nav-group-header-label"
-                    id="menu-group-label-id-209"
+                    id="menu-group-label-id-249"
                   >
                     <div
                       class="leafygreen-ui-1rnl6t5"
@@ -86,7 +86,7 @@
                     </div>
                   </div>
                   <ul
-                    aria-labelledby="menu-group-label-id-209"
+                    aria-labelledby="menu-group-label-id-249"
                     class="leafygreen-ui-bdnco"
                   >
                     <div
@@ -223,8 +223,8 @@
                                   Case
                                 </div>
                                 <div
-                                  aria-label="segmented-control-214"
-                                  aria-owns="segmented-control-214-0 segmented-control-214-1"
+                                  aria-label="segmented-control-254"
+                                  aria-owns="segmented-control-254-0 segmented-control-254-1"
                                   class="leafygreen-ui-18en4yf"
                                   role="tablist"
                                 >
@@ -240,7 +240,7 @@
                                         aria-controls="Toggle case sensitivity"
                                         aria-selected="true"
                                         class="leafygreen-ui-ypz97o"
-                                        id="segmented-control-214-0"
+                                        id="segmented-control-254-0"
                                         role="tab"
                                         tabindex="0"
                                         type="button"
@@ -269,7 +269,7 @@
                                         aria-controls="Toggle case sensitivity"
                                         aria-selected="false"
                                         class="leafygreen-ui-ypz97o"
-                                        id="segmented-control-214-1"
+                                        id="segmented-control-254-1"
                                         role="tab"
                                         tabindex="-1"
                                         type="button"
@@ -303,8 +303,8 @@
                                   Match
                                 </div>
                                 <div
-                                  aria-label="segmented-control-215"
-                                  aria-owns="segmented-control-215-0 segmented-control-215-1"
+                                  aria-label="segmented-control-255"
+                                  aria-owns="segmented-control-255-0 segmented-control-255-1"
                                   class="leafygreen-ui-18en4yf"
                                   role="tablist"
                                 >
@@ -320,7 +320,7 @@
                                         aria-controls="Toggle match type"
                                         aria-selected="true"
                                         class="leafygreen-ui-ypz97o"
-                                        id="segmented-control-215-0"
+                                        id="segmented-control-255-0"
                                         role="tab"
                                         tabindex="0"
                                         type="button"
@@ -349,7 +349,7 @@
                                         aria-controls="Toggle match type"
                                         aria-selected="false"
                                         class="leafygreen-ui-ypz97o"
-                                        id="segmented-control-215-1"
+                                        id="segmented-control-255-1"
                                         role="tab"
                                         tabindex="-1"
                                         type="button"
@@ -387,7 +387,7 @@
                   <div
                     class="leafygreen-ui-g6ml2m"
                     data-testid="side-nav-group-header-label"
-                    id="menu-group-label-id-210"
+                    id="menu-group-label-id-250"
                   >
                     <div
                       class="leafygreen-ui-1rnl6t5"
@@ -442,7 +442,7 @@
                     </div>
                   </div>
                   <ul
-                    aria-labelledby="menu-group-label-id-210"
+                    aria-labelledby="menu-group-label-id-250"
                     class="leafygreen-ui-bdnco"
                   >
                     <div
@@ -494,7 +494,7 @@
                   <div
                     class="leafygreen-ui-g6ml2m"
                     data-testid="side-nav-group-header-label"
-                    id="menu-group-label-id-211"
+                    id="menu-group-label-id-251"
                   >
                     <div
                       class="leafygreen-ui-1rnl6t5"
@@ -542,7 +542,7 @@
                     </div>
                   </div>
                   <ul
-                    aria-labelledby="menu-group-label-id-211"
+                    aria-labelledby="menu-group-label-id-251"
                     class="leafygreen-ui-bdnco"
                   >
                     <div
@@ -713,7 +713,7 @@
           </div>
         </nav>
         <button
-          aria-controls="side-nav-213"
+          aria-controls="side-nav-253"
           aria-expanded="true"
           aria-label="Collapse navigation"
           class="leafygreen-ui-v87gj9"
diff --git a/apps/spruce/.storybook/preview.tsx b/apps/spruce/.storybook/preview.tsx
index 24e918a72..4d048ba65 100644
--- a/apps/spruce/.storybook/preview.tsx
+++ b/apps/spruce/.storybook/preview.tsx
@@ -63,5 +63,6 @@ export const decorators: Decorator[] = [
     });
     return <RouterProvider router={memoryRouter} />;
   },
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   WithApolloClient,
 ];
diff --git a/apps/spruce/babel.config.js b/apps/spruce/babel.config.js
deleted file mode 100644
index 29a6550d5..000000000
--- a/apps/spruce/babel.config.js
+++ /dev/null
@@ -1,26 +0,0 @@
-module.exports = {
-  presets: [
-    "react-app",
-    [
-      "@babel/preset-react",
-      {
-        runtime: "automatic",
-        importSource: "@emotion/react",
-      },
-    ],
-    "@babel/preset-typescript",
-  ],
-  plugins: [
-    [
-      "import",
-      {
-        libraryName: "antd",
-        libraryDirectory: "lib",
-        style: "css",
-      },
-      "antd",
-    ],
-    "@emotion/babel-plugin",
-    "import-graphql",
-  ],
-};
diff --git a/apps/spruce/config/vitest/setupTests.ts b/apps/spruce/config/vitest/setupTests.ts
index 058730628..7a58488e1 100644
--- a/apps/spruce/config/vitest/setupTests.ts
+++ b/apps/spruce/config/vitest/setupTests.ts
@@ -14,6 +14,7 @@ window.crypto.randomUUID = (() => {
 // Workaround for a bug in @testing-library/react.
 // It prevents Vitest's fake timers from functioning with user-event.
 // https://github.com/testing-library/react-testing-library/issues/1197
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 globalThis.jest = {
   ...globalThis.jest,
   advanceTimersByTime: vi.advanceTimersByTime.bind(vi),
diff --git a/apps/spruce/cypress/integration/distroSettings/general_section.ts b/apps/spruce/cypress/integration/distroSettings/general_section.ts
index 4d052daf1..9495d4e43 100644
--- a/apps/spruce/cypress/integration/distroSettings/general_section.ts
+++ b/apps/spruce/cypress/integration/distroSettings/general_section.ts
@@ -1,6 +1,5 @@
 import { save } from "./utils";
 
-// TODO: https://jira.mongodb.org/browse/DEVPROD-6656 - Uncomment the Warnings assertions when the backend supports it
 describe("general section", () => {
   beforeEach(() => {
     cy.visit("/distro/localhost/settings/general");
@@ -17,7 +16,7 @@ describe("general section", () => {
     cy.contains("button", "Add alias").click();
     cy.getInputByLabel("Alias").type("localhost-alias");
     cy.getInputByLabel("Notes").type("this is a note");
-    // cy.getInputByLabel("Warnings").type("this is a warning");
+    cy.getInputByLabel("Warnings").type("this is a warning");
     cy.getInputByLabel("Disable shallow clone for this distro").check({
       force: true,
     });
@@ -29,7 +28,7 @@ describe("general section", () => {
     cy.reload();
     cy.getInputByLabel("Alias").should("have.value", "localhost-alias");
     cy.getInputByLabel("Notes").should("have.value", "this is a note");
-    // cy.getInputByLabel("Warnings").should("have.value", "this is a warning");
+    cy.getInputByLabel("Warnings").should("have.value", "this is a warning");
     cy.getInputByLabel("Disable shallow clone for this distro").should(
       "be.checked",
     );
@@ -38,7 +37,7 @@ describe("general section", () => {
     // Undo changes.
     cy.dataCy("delete-item-button").click();
     cy.getInputByLabel("Notes").clear();
-    // cy.getInputByLabel("Warnings").clear();
+    cy.getInputByLabel("Warnings").clear();
     cy.getInputByLabel("Disable shallow clone for this distro").uncheck({
       force: true,
     });
diff --git a/apps/spruce/cypress/integration/myPatches/my_patches.ts b/apps/spruce/cypress/integration/myPatches/my_patches.ts
index 4c1426623..2ca62b239 100644
--- a/apps/spruce/cypress/integration/myPatches/my_patches.ts
+++ b/apps/spruce/cypress/integration/myPatches/my_patches.ts
@@ -71,7 +71,37 @@ describe("My Patches Page", () => {
         "/version/5ecedafb562343215a7ff297/tasks?statuses=success",
       );
   });
-
+  describe("Patch submission selctor", () => {
+    it("Clicking the patch submission selector updates the URL, and renders patches", () => {
+      cy.visit(MY_PATCHES_ROUTE);
+      cy.dataCy("requester-selector").click();
+      const cliPatchTitle = "main: EVG-7823 add a commit queue message (#4048)";
+      const prPatchTitle =
+        "evergreen-ci/evergreen' pull request #3186 by bsamek: EVG-7425 Don't send ShouldExit to unprovisioned hosts (https://github.com/evergreen-ci/evergreen/pull/3186)";
+      cy.dataCy("patch-card").first().contains(cliPatchTitle);
+      cy.dataCy("github_pull_request-option").click();
+      urlSearchParamsAreUpdated({
+        pathname: MY_PATCHES_ROUTE,
+        paramName: "requesters",
+        search: "github_pull_request",
+      });
+      cy.dataCy("patch-card").first().contains(prPatchTitle);
+      cy.dataCy("patch_request-option").click();
+      urlSearchParamsAreUpdated({
+        pathname: MY_PATCHES_ROUTE,
+        paramName: "requesters",
+        search: "github_pull_request,patch_request",
+      });
+      cy.dataCy("patch-card").first().contains(cliPatchTitle);
+      cy.dataCy("github_pull_request-option").click();
+      urlSearchParamsAreUpdated({
+        pathname: MY_PATCHES_ROUTE,
+        paramName: "requesters",
+        search: "patch_request",
+      });
+      cy.dataCy("patch-card").first().contains(cliPatchTitle);
+    });
+  });
   describe("Commit queue checkbox", () => {
     it("Clicking the commit queue checkbox updates the URL, requests patches and renders patches", () => {
       cy.visit(MY_PATCHES_ROUTE);
diff --git a/apps/spruce/cypress/integration/projectSettings/access.ts b/apps/spruce/cypress/integration/projectSettings/access.ts
index d50d0d1ab..831d6d898 100644
--- a/apps/spruce/cypress/integration/projectSettings/access.ts
+++ b/apps/spruce/cypress/integration/projectSettings/access.ts
@@ -38,6 +38,7 @@ describe("Access page", () => {
     cy.validateToast("success", "Successfully updated project");
     // Assert persistence
     cy.reload();
+    saveButtonEnabled(false);
     cy.get("@usernameInput").should("not.exist");
   });
 
diff --git a/apps/spruce/cypress/integration/projectSettings/not_defaulting_to_repo.ts b/apps/spruce/cypress/integration/projectSettings/not_defaulting_to_repo.ts
index cdf341d0b..85c979936 100644
--- a/apps/spruce/cypress/integration/projectSettings/not_defaulting_to_repo.ts
+++ b/apps/spruce/cypress/integration/projectSettings/not_defaulting_to_repo.ts
@@ -57,7 +57,7 @@ describe("Project Settings when not defaulting to repo", () => {
       clickSave();
       cy.validateToast("success", "Successfully updated project");
       cy.dataCy("var-value-input").should("have.value", "{REDACTED}");
-      cy.dataCy("var-name-input").should("be.disabled");
+      cy.dataCy("var-name-input").should("have.attr", "aria-disabled", "true");
       cy.dataCy("var-value-input").should("be.disabled");
       cy.dataCy("var-private-input").should(
         "have.attr",
diff --git a/apps/spruce/cypress/integration/projectSettings/repo_settings.ts b/apps/spruce/cypress/integration/projectSettings/repo_settings.ts
index 1dc1f56e2..4cfdafce4 100644
--- a/apps/spruce/cypress/integration/projectSettings/repo_settings.ts
+++ b/apps/spruce/cypress/integration/projectSettings/repo_settings.ts
@@ -89,9 +89,17 @@ describe("Repo Settings", () => {
           .scrollIntoView();
         cy.get("@patchDefAccordion").click();
         cy.dataCy("variant-tags-input").should("have.value", "vtag");
-        cy.dataCy("variant-tags-input").should("be.disabled");
+        cy.dataCy("variant-tags-input").should(
+          "have.attr",
+          "aria-disabled",
+          "true",
+        );
         cy.dataCy("task-tags-input").should("have.value", "ttag");
-        cy.dataCy("task-tags-input").should("be.disabled");
+        cy.dataCy("task-tags-input").should(
+          "have.attr",
+          "aria-disabled",
+          "true",
+        );
         cy.contains(
           "A GitHub Patch Definition must be specified for this feature to run.",
         ).should("not.exist");
@@ -205,7 +213,9 @@ describe("Repo Settings", () => {
         .parentsUntil("div")
         .first()
         .click({ force: true });
-      cy.dataCy("expandable-card").find("input").should("be.disabled");
+      cy.dataCy("expandable-card")
+        .find("input")
+        .should("have.attr", "aria-disabled", "true");
       cy.dataCy("expandable-card").find("button").should("be.disabled");
     });
 
diff --git a/apps/spruce/package.json b/apps/spruce/package.json
index 87f83f196..8fbbfa651 100644
--- a/apps/spruce/package.json
+++ b/apps/spruce/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spruce",
-  "version": "4.1.21",
+  "version": "4.1.22",
   "private": true,
   "scripts": {
     "bootstrap-logkeeper": "./scripts/bootstrap-logkeeper.sh",
@@ -25,7 +25,7 @@
     "eslint:fix": "yarn eslint:strict --fix",
     "eslint:staged": "STRICT=1 eslint",
     "eslint:strict": "STRICT=1 eslint .",
-    "evg-db-ops": "yarn --cwd='../..' evg-db-ops",
+    "evg-db-ops": "../../scripts/evg-db-ops.sh",
     "prepare": "yarn --cwd='../..' prepare",
     "prettier-run": "prettier --write",
     "prod": "env-cmd -e devProduction -r .env-cmdrc.local.json yarn start",
@@ -89,7 +89,7 @@
     "@leafygreen-ui/table": "12.6.3",
     "@leafygreen-ui/tabs": "11.0.4",
     "@leafygreen-ui/text-area": "8.1.3",
-    "@leafygreen-ui/text-input": "12.1.12",
+    "@leafygreen-ui/text-input": "13.0.2",
     "@leafygreen-ui/toast": "6.1.24",
     "@leafygreen-ui/toggle": "10.0.17",
     "@leafygreen-ui/tokens": "2.5.2",
@@ -124,9 +124,6 @@
     "react-virtuoso": "^4.7.10"
   },
   "devDependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.17.12",
-    "@babel/preset-react": "^7.12.13",
-    "@babel/preset-typescript": "7.21.5",
     "@emotion/babel-plugin": "11.11.0",
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/typescript": "4.0.1",
@@ -154,10 +151,7 @@
     "@types/react": "18.2.0",
     "@types/react-dom": "18.2.0",
     "@vitejs/plugin-react": "4.2.1",
-    "babel-loader": "^9.1.3",
-    "babel-plugin-import": "^1.13.6",
     "babel-plugin-import-graphql": "^2.8.1",
-    "babel-preset-react-app": "^10.0.1",
     "camelcase": "^6.1.0",
     "cypress": "12.17.1",
     "eslint": "8.56.0",
@@ -176,7 +170,7 @@
     "replace-in-file": "7.1.0",
     "rollup-plugin-visualizer": "^5.12.0",
     "serve-handler": "^6.1.5",
-    "simple-git": "3.19.1",
+    "simple-git": "3.24.0",
     "storybook": "7.4.0",
     "storybook-addon-apollo-client": "^4.1.4",
     "ts-node": "10.9.1",
diff --git a/apps/spruce/scripts/check-schema-and-codegen/index.test.ts b/apps/spruce/scripts/check-schema-and-codegen/index.test.ts
index 072392495..861a6b996 100644
--- a/apps/spruce/scripts/check-schema-and-codegen/index.test.ts
+++ b/apps/spruce/scripts/check-schema-and-codegen/index.test.ts
@@ -18,6 +18,7 @@ vi.mock("./utils.ts", () => ({
 }));
 
 describe("checkSchemaAndCodegen", () => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let consoleErrorSpy;
   beforeEach(() => {
     consoleErrorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
@@ -38,6 +39,7 @@ describe("checkSchemaAndCodegen", () => {
       new Error("TypeError: fetch failed"),
     );
     await expect(checkSchemaAndCodegenCore()).resolves.toBe(0);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       "An error occured during GQL types validation: Error: TypeError: fetch failed",
     );
@@ -46,6 +48,7 @@ describe("checkSchemaAndCodegen", () => {
   it("returns 1 when checkIsAncestor is false and the files are the same", async () => {
     vi.mocked(checkIsAncestor).mockResolvedValue(false);
     await expect(checkSchemaAndCodegenCore()).resolves.toBe(1);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       "GQL types validation failed: Your local Evergreen code is missing commit {getLatestCommitFromRemote()}. Pull Evergreen and run 'yarn codegen'.",
     );
@@ -57,6 +60,7 @@ describe("checkSchemaAndCodegen", () => {
       .mockReturnValueOnce(Buffer.from("content1"))
       .mockReturnValueOnce(Buffer.from("content2"));
     await expect(checkSchemaAndCodegenCore()).resolves.toBe(1);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       "GQL types validation failed: Your local Evergreen code is missing commit {getLatestCommitFromRemote()}. Pull Evergreen and run 'yarn codegen'.",
     );
@@ -71,6 +75,7 @@ describe("checkSchemaAndCodegen", () => {
       .mockReturnValueOnce(Buffer.from("content1"))
       .mockReturnValueOnce(Buffer.from("content2"));
     await expect(checkSchemaAndCodegenCore()).resolves.toBe(1);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(consoleErrorSpy).toHaveBeenCalledWith(
       "GQL types validation failed: Your GQL types file ({path.resolve()}) is outdated. Run 'yarn codegen'.",
     );
diff --git a/apps/spruce/scripts/check-schema-and-codegen/utils.ts b/apps/spruce/scripts/check-schema-and-codegen/utils.ts
index b23ffb984..6aad2ef3e 100644
--- a/apps/spruce/scripts/check-schema-and-codegen/utils.ts
+++ b/apps/spruce/scripts/check-schema-and-codegen/utils.ts
@@ -1,8 +1,8 @@
-import dns from "dns";
-import fs from "fs";
-import os from "os";
+// @ts-nocheck - FIXME. There are TypeScript errors in this file that prevent it from compiling under strict mode.
 import { generate } from "@graphql-codegen/cli";
 import { execSync } from "child_process";
+import fs from "fs";
+import os from "os";
 import process from "process";
 import { getConfig } from "../../codegen";
 
@@ -67,7 +67,7 @@ export const generateTypes = async (): Promise<string> => {
       generatedFileName,
       silent: true,
     }),
-    true
+    true,
   );
   return generatedFileName;
 };
diff --git a/apps/spruce/scripts/deploy/deploy-production.test.ts b/apps/spruce/scripts/deploy/deploy-production.test.ts
index a2b5324ea..4345ba76f 100644
--- a/apps/spruce/scripts/deploy/deploy-production.test.ts
+++ b/apps/spruce/scripts/deploy/deploy-production.test.ts
@@ -12,8 +12,11 @@ vi.mock("./utils/deploy");
 vi.mock("./utils/environment");
 
 describe("deploy-production", () => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let consoleLogMock;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let processExitMock;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let consoleErrorMock;
 
   beforeEach(() => {
@@ -37,6 +40,7 @@ describe("deploy-production", () => {
 
       expect(tagUtils.deleteTag).toHaveBeenCalled();
       expect(tagUtils.pushTags).toHaveBeenCalled();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleLogMock).toHaveBeenCalledWith(
         "Check Evergreen for deploy progress.",
       );
@@ -48,6 +52,7 @@ describe("deploy-production", () => {
       await evergreenDeploy();
       expect(tagUtils.deleteTag).not.toHaveBeenCalled();
       expect(tagUtils.pushTags).not.toHaveBeenCalled();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleLogMock).toHaveBeenCalledWith(
         "Deploy canceled. If systems are experiencing an outage and you'd like to push the deploy directly to S3, run yarn deploy:prod --local.",
       );
@@ -63,10 +68,13 @@ describe("deploy-production", () => {
         "getCurrentlyDeployedCommit mock",
       );
       await evergreenDeploy();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleLogMock).toHaveBeenCalledTimes(2);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleLogMock).toHaveBeenCalledWith(
         "Currently Deployed Commit: getCurrentlyDeployedCommit mock",
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleLogMock).toHaveBeenCalledWith(
         "Commit messages:\ngetCommitMessages result",
       );
@@ -81,8 +89,11 @@ describe("deploy-production", () => {
         throw e;
       });
       expect(await evergreenDeploy());
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleErrorMock).toHaveBeenCalledWith(e);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleLogMock).toHaveBeenCalledWith("Deploy failed.");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(processExitMock).toHaveBeenCalledWith(1);
     });
   });
@@ -107,10 +118,13 @@ describe("deploy-production", () => {
         throw e;
       });
       await localDeploy();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleErrorMock).toHaveBeenCalledWith(e);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleErrorMock).toHaveBeenCalledWith(
         "Local deploy failed. Aborting.",
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(processExitMock).toHaveBeenCalledWith(1);
     });
   });
@@ -119,12 +133,15 @@ describe("deploy-production", () => {
     it("returns exit code 1 when not running in CI", async () => {
       vi.mocked(isRunningOnCI).mockReturnValue(false);
       await ciDeploy();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleErrorMock).toHaveBeenCalledWith(
         new Error("Not running on CI"),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(consoleErrorMock).toHaveBeenCalledWith(
         "CI deploy failed. Aborting.",
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(processExitMock).toHaveBeenCalledWith(1);
     });
 
diff --git a/apps/spruce/src/analytics/task/useAnnotationAnalytics.ts b/apps/spruce/src/analytics/task/useAnnotationAnalytics.ts
index 84b4e4dc5..97d250e81 100644
--- a/apps/spruce/src/analytics/task/useAnnotationAnalytics.ts
+++ b/apps/spruce/src/analytics/task/useAnnotationAnalytics.ts
@@ -34,6 +34,7 @@ export const useAnnotationAnalytics = () => {
     AnnotationEventDataQuery,
     AnnotationEventDataQueryVariables
   >(ANNOTATION_EVENT_DATA, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { taskId, execution },
     fetchPolicy: "cache-first",
   });
@@ -41,6 +42,7 @@ export const useAnnotationAnalytics = () => {
   const { data: bbData } = useQuery<BuildBaronQuery, BuildBaronQueryVariables>(
     BUILD_BARON,
     {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       variables: { taskId, execution },
       fetchPolicy: "cache-first",
     },
diff --git a/apps/spruce/src/analytics/task/useTaskAnalytics.ts b/apps/spruce/src/analytics/task/useTaskAnalytics.ts
index 49f58d0cf..3629e5101 100644
--- a/apps/spruce/src/analytics/task/useTaskAnalytics.ts
+++ b/apps/spruce/src/analytics/task/useTaskAnalytics.ts
@@ -74,6 +74,7 @@ export const useTaskAnalytics = () => {
 
   const [execution] = useQueryParam(RequiredQueryParams.Execution, 0);
   const { data: eventData } = useQuery<TaskQuery, TaskQueryVariables>(TASK, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { taskId, execution },
     fetchPolicy: "cache-first",
   });
@@ -81,6 +82,7 @@ export const useTaskAnalytics = () => {
   const {
     failedTestCount,
     latestExecution,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     project: { identifier } = { identifier: null },
     status: taskStatus,
   } = eventData?.task || {};
diff --git a/apps/spruce/src/analytics/useAnalyticsRoot.ts b/apps/spruce/src/analytics/useAnalyticsRoot.ts
index 3d2a8efcb..d4670fb9a 100644
--- a/apps/spruce/src/analytics/useAnalyticsRoot.ts
+++ b/apps/spruce/src/analytics/useAnalyticsRoot.ts
@@ -18,6 +18,7 @@ export const useAnalyticsRoot = <Action extends ActionType>(
       const userId = localStorage.getItem("userId");
       addPageAction<Action, P>(action, {
         object,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         userId,
         ...attributes,
       });
diff --git a/apps/spruce/src/components/Accordion/index.tsx b/apps/spruce/src/components/Accordion/index.tsx
index fb3149643..1b60bcbba 100644
--- a/apps/spruce/src/components/Accordion/index.tsx
+++ b/apps/spruce/src/components/Accordion/index.tsx
@@ -99,9 +99,9 @@ const AnimatedAccordion = styled.div<{
 }>`
   /* This is used to calculate a fixed height for the Accordion since height
       transitions require a fixed height for their end height */
-  max-height: ${({ hide }): string => (hide ? "0px" : "9999px")};
-  overflow-y: ${({ hide }): string => hide && "hidden"};
-  ${({ disableAnimation, hide }): string =>
+  max-height: ${({ hide }) => (hide ? "0px" : "9999px")};
+  overflow-y: ${({ hide }) => hide && "hidden"};
+  ${({ disableAnimation, hide }) =>
     !disableAnimation &&
     `transition: ${
       hide
@@ -109,11 +109,11 @@ const AnimatedAccordion = styled.div<{
         : "max-height 0.6s ease-in-out"
     }`};
 `;
+
 const ContentsContainer = styled.div`
-  margin-left: ${(props: { indent: boolean }): string =>
-    props.indent && size.s};
+  margin-left: ${(props: { indent: boolean }) => props.indent && size.s};
 `;
 
 const SubtitleContainer = styled.div<{ showCaret: boolean }>`
-  ${({ showCaret }): string => showCaret && `margin-left: ${size.s};`}
+  ${({ showCaret }) => showCaret && `margin-left: ${size.s};`}
 `;
diff --git a/apps/spruce/src/components/Banners/AdminBanner.test.tsx b/apps/spruce/src/components/Banners/AdminBanner.test.tsx
index 6601398eb..51351afdf 100644
--- a/apps/spruce/src/components/Banners/AdminBanner.test.tsx
+++ b/apps/spruce/src/components/Banners/AdminBanner.test.tsx
@@ -11,6 +11,7 @@ describe("site banner", () => {
   });
 
   it("renders a warning banner", async () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.banner = "Warning to users";
     render(
       <MockedProvider mocks={[mock]}>
@@ -23,7 +24,9 @@ describe("site banner", () => {
   });
 
   it("renders an announcement banner", async () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.banner = "New feature announcement";
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.bannerTheme = "announcement";
     render(
       <MockedProvider mocks={[mock]}>
@@ -36,7 +39,9 @@ describe("site banner", () => {
   });
 
   it("renders a danger banner", async () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.banner = "Note of severe system outage";
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.bannerTheme = "important";
     render(
       <MockedProvider mocks={[mock]}>
@@ -49,7 +54,9 @@ describe("site banner", () => {
   });
 
   it("renders an info banner", async () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.banner = "Some information";
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.bannerTheme = "information";
     render(
       <MockedProvider mocks={[mock]}>
@@ -62,7 +69,9 @@ describe("site banner", () => {
   });
 
   it("renders an info banner when the theme is empty", async () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.banner = "General announcement";
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.bannerTheme = "";
     render(
       <MockedProvider mocks={[mock]}>
@@ -75,7 +84,9 @@ describe("site banner", () => {
   });
 
   it("renders an info banner when the theme is invalid", async () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.banner = "This is not an ideal banner";
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mock.result.data.spruceConfig.bannerTheme = "invalid";
     render(
       <MockedProvider mocks={[mock]}>
diff --git a/apps/spruce/src/components/Banners/ProjectBanner.tsx b/apps/spruce/src/components/Banners/ProjectBanner.tsx
index 44e111217..542d60811 100644
--- a/apps/spruce/src/components/Banners/ProjectBanner.tsx
+++ b/apps/spruce/src/components/Banners/ProjectBanner.tsx
@@ -24,5 +24,6 @@ export const ProjectBanner: React.FC<ProjectBannerProps> = ({
   if (!text) {
     return null;
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return <PortalBanner banner={<SiteBanner text={text} theme={theme} />} />;
 };
diff --git a/apps/spruce/src/components/Banners/RepotrackerBanner.test.tsx b/apps/spruce/src/components/Banners/RepotrackerBanner.test.tsx
index 177525e3c..92e1eac0d 100644
--- a/apps/spruce/src/components/Banners/RepotrackerBanner.test.tsx
+++ b/apps/spruce/src/components/Banners/RepotrackerBanner.test.tsx
@@ -28,6 +28,7 @@ describe("repotracker banner", () => {
   afterEach(() => {
     const bannerContainer = document.getElementById("banner-container");
     const body = document.body as HTMLElement;
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     body.removeChild(bannerContainer);
   });
 
@@ -100,6 +101,7 @@ describe("repotracker banner", () => {
       expect(screen.queryByDataCy("repotracker-error-trigger")).toBeVisible();
 
       // Open modal.
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("repotracker-error-trigger"));
       await waitFor(() => {
         expect(screen.queryByDataCy("repotracker-error-modal")).toBeVisible();
diff --git a/apps/spruce/src/components/Banners/SiteBanner.tsx b/apps/spruce/src/components/Banners/SiteBanner.tsx
index cba9adc27..485508f72 100644
--- a/apps/spruce/src/components/Banners/SiteBanner.tsx
+++ b/apps/spruce/src/components/Banners/SiteBanner.tsx
@@ -30,6 +30,7 @@ export const SiteBanner: React.FC<SiteBannerProps> = ({ text, theme }) => {
       onClose={hideBanner}
       variant={variant}
     >
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {jiraLinkify(text, jiraHost)}
     </Banner>
   ) : null;
diff --git a/apps/spruce/src/components/Banners/SlackNotificationBanner.tsx b/apps/spruce/src/components/Banners/SlackNotificationBanner.tsx
index 3e9241506..a549573ae 100644
--- a/apps/spruce/src/components/Banners/SlackNotificationBanner.tsx
+++ b/apps/spruce/src/components/Banners/SlackNotificationBanner.tsx
@@ -80,6 +80,7 @@ export const SlackNotificationBanner = () => {
   // this prevents a flicker of the banner on initial load
   const hasSetNotifications =
     !notifications &&
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     (isNotificationSet(patchFirstFailure) || isNotificationSet(patchFinish));
 
   const shouldShowSlackBanner =
@@ -106,6 +107,7 @@ export const SlackNotificationBanner = () => {
         <TextInput
           label="Slack Username"
           data-cy="slack-username-input"
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           value={slackUsername}
           onChange={(e) => setSlackUsername(e.target.value)}
           onKeyPress={(e) => e.key === "Enter" && saveNotificationSettings()}
diff --git a/apps/spruce/src/components/ButtonDropdown.tsx b/apps/spruce/src/components/ButtonDropdown.tsx
index 4de498adb..c279607ff 100644
--- a/apps/spruce/src/components/ButtonDropdown.tsx
+++ b/apps/spruce/src/components/ButtonDropdown.tsx
@@ -37,6 +37,7 @@ export const ButtonDropdown: React.FC<Props> = ({
     popoverZIndex={zIndex.popover}
     adjustOnMutation
     open={open}
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     setOpen={setOpen}
   >
     {dropdownItems}
diff --git a/apps/spruce/src/components/CodeChanges/index.tsx b/apps/spruce/src/components/CodeChanges/index.tsx
index 8c087ac7e..896a0e441 100644
--- a/apps/spruce/src/components/CodeChanges/index.tsx
+++ b/apps/spruce/src/components/CodeChanges/index.tsx
@@ -41,6 +41,7 @@ export const CodeChanges: React.FC<CodeChangesProps> = ({ patchId }) => {
   if (error) {
     return <div id="patch-error">{error.message}</div>;
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!moduleCodeChanges.length) {
     return (
       <Title className="cy-no-code-changes">
@@ -50,6 +51,7 @@ export const CodeChanges: React.FC<CodeChangesProps> = ({ patchId }) => {
   }
   return (
     <div data-cy="code-changes">
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {moduleCodeChanges.map((modCodeChange) => {
         const { branchName, fileDiffs, htmlLink, rawLink } = modCodeChange;
 
diff --git a/apps/spruce/src/components/CodeChangesBadge.tsx b/apps/spruce/src/components/CodeChangesBadge.tsx
index 89afcdd59..e189bcaf0 100644
--- a/apps/spruce/src/components/CodeChangesBadge.tsx
+++ b/apps/spruce/src/components/CodeChangesBadge.tsx
@@ -34,6 +34,7 @@ const { green, red } = palette;
 
 const FileDiffTextContainer = styled("span")`
   ${(props: { type: string; hasValue: boolean }): string =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     props.hasValue &&
     (props.type === "+" ? `color: ${green.dark1};` : `color: ${red.base};`)}
   &:nth-of-type(2) {
diff --git a/apps/spruce/src/components/CodeChangesTable/index.tsx b/apps/spruce/src/components/CodeChangesTable/index.tsx
index c4a048853..65747f52e 100644
--- a/apps/spruce/src/components/CodeChangesTable/index.tsx
+++ b/apps/spruce/src/components/CodeChangesTable/index.tsx
@@ -36,8 +36,10 @@ const columns = [
     header: "File Name",
     meta: { width: "70%" },
     cell: ({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       getValue,
       row: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         original: { diffLink },
       },
     }) => (
@@ -54,11 +56,13 @@ const columns = [
   {
     accessorKey: "additions",
     header: "Additions",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => <FileDiffText value={getValue()} type="+" />,
   },
   {
     accessorKey: "deletions",
     header: "Deletions",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => <FileDiffText value={getValue()} type="-" />,
   },
 ];
diff --git a/apps/spruce/src/components/CommitChartLabel/CommitChartLabel.test.tsx b/apps/spruce/src/components/CommitChartLabel/CommitChartLabel.test.tsx
index 8fa5581e5..cd72e7b0f 100644
--- a/apps/spruce/src/components/CommitChartLabel/CommitChartLabel.test.tsx
+++ b/apps/spruce/src/components/CommitChartLabel/CommitChartLabel.test.tsx
@@ -4,6 +4,7 @@ import { renderWithRouterMatch, screen, userEvent, waitFor } from "test_utils";
 import { shortenGithash } from "utils/string";
 import CommitChartLabel from ".";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const RenderCommitChartLabel = ({ version }) => (
   <MockedProvider mocks={[getSpruceConfigMock]}>
     <CommitChartLabel
@@ -68,6 +69,7 @@ describe("commitChartLabel", () => {
     renderWithRouterMatch(<RenderCommitChartLabel version={versionLong} />);
 
     expect(screen.queryByDataCy("long-commit-message-tooltip")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("more"));
     await waitFor(() => {
       expect(
diff --git a/apps/spruce/src/components/CommitChartLabel/index.tsx b/apps/spruce/src/components/CommitChartLabel/index.tsx
index 5c9884bca..0e27a21c0 100644
--- a/apps/spruce/src/components/CommitChartLabel/index.tsx
+++ b/apps/spruce/src/components/CommitChartLabel/index.tsx
@@ -75,11 +75,15 @@ const CommitChartLabel: React.FC<Props> = ({
           <StyledRouterLink
             onClick={onClickUpstreamProject}
             to={getTriggerRoute({
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               triggerType,
               upstreamTask,
               upstreamVersion,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               upstreamRevision,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               upstreamOwner,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               upstreamRepo,
             })}
           >
@@ -91,6 +95,7 @@ const CommitChartLabel: React.FC<Props> = ({
       <LabelText>
         {jiraLinkify(
           shortenMessage ? shortenedMessage : message,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           jiraHost,
           onClickJiraTicket,
         )}
diff --git a/apps/spruce/src/components/ConditionalWrapper/ConditionalWrapper.test.tsx b/apps/spruce/src/components/ConditionalWrapper/ConditionalWrapper.test.tsx
index 2d4948b4e..5fe4d0488 100644
--- a/apps/spruce/src/components/ConditionalWrapper/ConditionalWrapper.test.tsx
+++ b/apps/spruce/src/components/ConditionalWrapper/ConditionalWrapper.test.tsx
@@ -1,7 +1,9 @@
 import { render, screen } from "test_utils";
 import { ConditionalWrapper } from "./index";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Wrapper1 = ({ children }) => <div data-cy="wrapper-1">{children}</div>;
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Wrapper2 = ({ children }) => <div data-cy="wrapper-2">{children}</div>;
 
 describe("conditionalWrapper", () => {
diff --git a/apps/spruce/src/components/DayPicker/index.tsx b/apps/spruce/src/components/DayPicker/index.tsx
index f6b756c3d..1ec9fac0f 100644
--- a/apps/spruce/src/components/DayPicker/index.tsx
+++ b/apps/spruce/src/components/DayPicker/index.tsx
@@ -2,19 +2,11 @@ import { useCallback, useState } from "react";
 import styled from "@emotion/styled";
 import { palette } from "@leafygreen-ui/palette";
 import { transitionDuration } from "@leafygreen-ui/tokens";
+import { days } from "constants/fieldMaps";
 import { size } from "constants/tokens";
 
 const { gray, white } = palette;
 
-const days = [
-  "Sunday",
-  "Monday",
-  "Tuesday",
-  "Wednesday",
-  "Thursday",
-  "Friday",
-  "Saturday",
-];
 const emptyState = new Array(days.length).fill(false);
 
 type DayPickerState = Array<boolean>;
diff --git a/apps/spruce/src/components/Dropdown/Dropdown.test.tsx b/apps/spruce/src/components/Dropdown/Dropdown.test.tsx
index 8918efd07..e0258f356 100644
--- a/apps/spruce/src/components/Dropdown/Dropdown.test.tsx
+++ b/apps/spruce/src/components/Dropdown/Dropdown.test.tsx
@@ -29,6 +29,7 @@ describe("dropdown", () => {
     expect(screen.queryByText("Some Children")).not.toBeInTheDocument();
     await user.click(button);
     expect(screen.getByText("Some Children")).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("Some Children"));
     expect(screen.getByText("Some Children")).toBeInTheDocument();
   });
diff --git a/apps/spruce/src/components/Dropdown/index.tsx b/apps/spruce/src/components/Dropdown/index.tsx
index 7763395f2..753e4ba2e 100644
--- a/apps/spruce/src/components/Dropdown/index.tsx
+++ b/apps/spruce/src/components/Dropdown/index.tsx
@@ -89,6 +89,7 @@ class DropdownWithRef extends Component<
   DropdownWithRefProps,
   DropdownWithRefState
 > {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   constructor(props) {
     super(props);
     this.state = {
diff --git a/apps/spruce/src/components/EditableTagField/EditableTagField.test.tsx b/apps/spruce/src/components/EditableTagField/EditableTagField.test.tsx
index b80a106af..a1917eda4 100644
--- a/apps/spruce/src/components/EditableTagField/EditableTagField.test.tsx
+++ b/apps/spruce/src/components/EditableTagField/EditableTagField.test.tsx
@@ -156,6 +156,7 @@ describe("editableTagField", () => {
     expect(screen.queryAllByDataCy("user-tag-row")).toHaveLength(3);
     expect(screen.queryByDataCy("add-tag-button")).toBeVisible();
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("add-tag-button"));
 
     expect(screen.queryByDataCy("add-tag-button")).toBeNull();
diff --git a/apps/spruce/src/components/EditableTagField/TagRow.tsx b/apps/spruce/src/components/EditableTagField/TagRow.tsx
index 64e265e07..9247a1810 100644
--- a/apps/spruce/src/components/EditableTagField/TagRow.tsx
+++ b/apps/spruce/src/components/EditableTagField/TagRow.tsx
@@ -26,6 +26,7 @@ export const TagRow: React.FC<TagRowProps> = ({
   onUpdateTag,
   tag,
 }) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const [state, dispatch] = useReducer(reducer, getInitialState(tag, isNewTag));
 
   const tagId = useMemo(() => crypto.randomUUID(), []);
@@ -44,6 +45,7 @@ export const TagRow: React.FC<TagRowProps> = ({
                 id={`tag_key_${tagId}`}
                 value={key}
                 onChange={(e) =>
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   dispatch({ type: "updateTag", key: e.target.value })
                 }
                 data-cy="user-tag-key-field"
@@ -57,6 +59,7 @@ export const TagRow: React.FC<TagRowProps> = ({
                 id={`tag_value_${tagId}`}
                 value={value}
                 onChange={(e) =>
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   dispatch({ type: "updateTag", value: e.target.value })
                 }
                 data-cy="user-tag-value-field"
@@ -69,6 +72,7 @@ export const TagRow: React.FC<TagRowProps> = ({
                 aria-label="Update tag"
                 disabled={
                   !isInputValid ||
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   ((isNewTag || key !== tag.key) && !isValidKey(key))
                 }
               >
@@ -76,11 +80,14 @@ export const TagRow: React.FC<TagRowProps> = ({
                   glyph="Checkmark"
                   data-cy="user-tag-edit-icon"
                   onClick={() => {
+                    // @ts-expect-error: FIXME. This comment was added by an automated script.
                     dispatch({
                       type: isNewTag ? "cancelNewTag" : "inActive",
                     });
+                    // @ts-expect-error: FIXME. This comment was added by an automated script.
                     onUpdateTag(
                       { key, value },
+                      // @ts-expect-error: FIXME. This comment was added by an automated script.
                       !isNewTag && key !== tag.key ? tag.key : undefined,
                     );
                   }}
@@ -92,8 +99,10 @@ export const TagRow: React.FC<TagRowProps> = ({
                   glyph="Trash"
                   onClick={
                     isNewTag
-                      ? () => dispatch({ type: "cancelNewTag" })
-                      : () => onDelete(tag.key)
+                      ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+                        () => dispatch({ type: "cancelNewTag" })
+                      : // @ts-expect-error: FIXME. This comment was added by an automated script.
+                        () => onDelete(tag.key)
                   }
                   data-cy="user-tag-trash-icon"
                 />
@@ -105,6 +114,7 @@ export const TagRow: React.FC<TagRowProps> = ({
       {!shouldShowNewTag && (
         <ButtonContainer>
           <PlusButton
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             onClick={() => dispatch({ type: "newTag" })}
             data-cy="add-tag-button"
           >
diff --git a/apps/spruce/src/components/EditableTagField/__snapshots__/EditableTagField_Default.storyshot b/apps/spruce/src/components/EditableTagField/__snapshots__/EditableTagField_Default.storyshot
index df51e0298..211101811 100644
--- a/apps/spruce/src/components/EditableTagField/__snapshots__/EditableTagField_Default.storyshot
+++ b/apps/spruce/src/components/EditableTagField/__snapshots__/EditableTagField_Default.storyshot
@@ -16,34 +16,42 @@
             class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
           >
             <div
-              class="leafygreen-ui-90q1a7"
+              class="leafygreen-ui-1br9h7w"
+              data-lgid="lg-text_input"
             >
               <div
-                class="leafygreen-ui-e3fvh5"
+                class="leafygreen-ui-au9iil"
               >
                 <label
-                  class="leafygreen-ui-t01kw4"
+                  class="leafygreen-ui-1qjbbjd"
+                  data-lgid="lg-label"
+                  data-testid="lg-form_field-label"
                   for="tag_key_1"
+                  id="lg-form-field-label-3"
                 >
                   Key
                 </label>
               </div>
               <div
-                class="leafygreen-ui-lzja97"
+                class="leafygreen-ui-95c1iv"
               >
-                <input
-                  aria-invalid="false"
-                  autocomplete="on"
-                  class="leafygreen-ui-1kmfbzh"
-                  data-cy="user-tag-key-field"
-                  id="tag_key_1"
-                  required=""
-                  type="text"
-                  value="keyA"
-                />
                 <div
-                  class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                />
+                  class="leafygreen-ui-1ago99h"
+                >
+                  <input
+                    aria-describedby=""
+                    aria-disabled="false"
+                    aria-invalid="false"
+                    aria-labelledby="lg-form-field-label-3"
+                    autocomplete="on"
+                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                    data-cy="user-tag-key-field"
+                    id="tag_key_1"
+                    required=""
+                    type="text"
+                    value="keyA"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -55,34 +63,42 @@
             class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
           >
             <div
-              class="leafygreen-ui-90q1a7"
+              class="leafygreen-ui-1br9h7w"
+              data-lgid="lg-text_input"
             >
               <div
-                class="leafygreen-ui-e3fvh5"
+                class="leafygreen-ui-au9iil"
               >
                 <label
-                  class="leafygreen-ui-t01kw4"
+                  class="leafygreen-ui-1qjbbjd"
+                  data-lgid="lg-label"
+                  data-testid="lg-form_field-label"
                   for="tag_value_1"
+                  id="lg-form-field-label-7"
                 >
                   Value
                 </label>
               </div>
               <div
-                class="leafygreen-ui-lzja97"
+                class="leafygreen-ui-95c1iv"
               >
-                <input
-                  aria-invalid="false"
-                  autocomplete="on"
-                  class="leafygreen-ui-1kmfbzh"
-                  data-cy="user-tag-value-field"
-                  id="tag_value_1"
-                  required=""
-                  type="text"
-                  value="valueA"
-                />
                 <div
-                  class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                />
+                  class="leafygreen-ui-1ago99h"
+                >
+                  <input
+                    aria-describedby=""
+                    aria-disabled="false"
+                    aria-invalid="false"
+                    aria-labelledby="lg-form-field-label-7"
+                    autocomplete="on"
+                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                    data-cy="user-tag-value-field"
+                    id="tag_value_1"
+                    required=""
+                    type="text"
+                    value="valueA"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -136,34 +152,42 @@
             class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
           >
             <div
-              class="leafygreen-ui-90q1a7"
+              class="leafygreen-ui-1br9h7w"
+              data-lgid="lg-text_input"
             >
               <div
-                class="leafygreen-ui-e3fvh5"
+                class="leafygreen-ui-au9iil"
               >
                 <label
-                  class="leafygreen-ui-t01kw4"
+                  class="leafygreen-ui-1qjbbjd"
+                  data-lgid="lg-label"
+                  data-testid="lg-form_field-label"
                   for="tag_key_2"
+                  id="lg-form-field-label-11"
                 >
                   Key
                 </label>
               </div>
               <div
-                class="leafygreen-ui-lzja97"
+                class="leafygreen-ui-95c1iv"
               >
-                <input
-                  aria-invalid="false"
-                  autocomplete="on"
-                  class="leafygreen-ui-1kmfbzh"
-                  data-cy="user-tag-key-field"
-                  id="tag_key_2"
-                  required=""
-                  type="text"
-                  value="keyB"
-                />
                 <div
-                  class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                />
+                  class="leafygreen-ui-1ago99h"
+                >
+                  <input
+                    aria-describedby=""
+                    aria-disabled="false"
+                    aria-invalid="false"
+                    aria-labelledby="lg-form-field-label-11"
+                    autocomplete="on"
+                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                    data-cy="user-tag-key-field"
+                    id="tag_key_2"
+                    required=""
+                    type="text"
+                    value="keyB"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -175,34 +199,42 @@
             class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
           >
             <div
-              class="leafygreen-ui-90q1a7"
+              class="leafygreen-ui-1br9h7w"
+              data-lgid="lg-text_input"
             >
               <div
-                class="leafygreen-ui-e3fvh5"
+                class="leafygreen-ui-au9iil"
               >
                 <label
-                  class="leafygreen-ui-t01kw4"
+                  class="leafygreen-ui-1qjbbjd"
+                  data-lgid="lg-label"
+                  data-testid="lg-form_field-label"
                   for="tag_value_2"
+                  id="lg-form-field-label-15"
                 >
                   Value
                 </label>
               </div>
               <div
-                class="leafygreen-ui-lzja97"
+                class="leafygreen-ui-95c1iv"
               >
-                <input
-                  aria-invalid="false"
-                  autocomplete="on"
-                  class="leafygreen-ui-1kmfbzh"
-                  data-cy="user-tag-value-field"
-                  id="tag_value_2"
-                  required=""
-                  type="text"
-                  value="valueB"
-                />
                 <div
-                  class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                />
+                  class="leafygreen-ui-1ago99h"
+                >
+                  <input
+                    aria-describedby=""
+                    aria-disabled="false"
+                    aria-invalid="false"
+                    aria-labelledby="lg-form-field-label-15"
+                    autocomplete="on"
+                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                    data-cy="user-tag-value-field"
+                    id="tag_value_2"
+                    required=""
+                    type="text"
+                    value="valueB"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -256,34 +288,42 @@
             class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
           >
             <div
-              class="leafygreen-ui-90q1a7"
+              class="leafygreen-ui-1br9h7w"
+              data-lgid="lg-text_input"
             >
               <div
-                class="leafygreen-ui-e3fvh5"
+                class="leafygreen-ui-au9iil"
               >
                 <label
-                  class="leafygreen-ui-t01kw4"
+                  class="leafygreen-ui-1qjbbjd"
+                  data-lgid="lg-label"
+                  data-testid="lg-form_field-label"
                   for="tag_key_3"
+                  id="lg-form-field-label-19"
                 >
                   Key
                 </label>
               </div>
               <div
-                class="leafygreen-ui-lzja97"
+                class="leafygreen-ui-95c1iv"
               >
-                <input
-                  aria-invalid="false"
-                  autocomplete="on"
-                  class="leafygreen-ui-1kmfbzh"
-                  data-cy="user-tag-key-field"
-                  id="tag_key_3"
-                  required=""
-                  type="text"
-                  value="keyC"
-                />
                 <div
-                  class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                />
+                  class="leafygreen-ui-1ago99h"
+                >
+                  <input
+                    aria-describedby=""
+                    aria-disabled="false"
+                    aria-invalid="false"
+                    aria-labelledby="lg-form-field-label-19"
+                    autocomplete="on"
+                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                    data-cy="user-tag-key-field"
+                    id="tag_key_3"
+                    required=""
+                    type="text"
+                    value="keyC"
+                  />
+                </div>
               </div>
             </div>
           </div>
@@ -295,34 +335,42 @@
             class="css-jmhbun-FlexColumnContainer-Section e161fbrp1"
           >
             <div
-              class="leafygreen-ui-90q1a7"
+              class="leafygreen-ui-1br9h7w"
+              data-lgid="lg-text_input"
             >
               <div
-                class="leafygreen-ui-e3fvh5"
+                class="leafygreen-ui-au9iil"
               >
                 <label
-                  class="leafygreen-ui-t01kw4"
+                  class="leafygreen-ui-1qjbbjd"
+                  data-lgid="lg-label"
+                  data-testid="lg-form_field-label"
                   for="tag_value_3"
+                  id="lg-form-field-label-23"
                 >
                   Value
                 </label>
               </div>
               <div
-                class="leafygreen-ui-lzja97"
+                class="leafygreen-ui-95c1iv"
               >
-                <input
-                  aria-invalid="false"
-                  autocomplete="on"
-                  class="leafygreen-ui-1kmfbzh"
-                  data-cy="user-tag-value-field"
-                  id="tag_value_3"
-                  required=""
-                  type="text"
-                  value="valueC"
-                />
                 <div
-                  class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                />
+                  class="leafygreen-ui-1ago99h"
+                >
+                  <input
+                    aria-describedby=""
+                    aria-disabled="false"
+                    aria-invalid="false"
+                    aria-labelledby="lg-form-field-label-23"
+                    autocomplete="on"
+                    class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                    data-cy="user-tag-value-field"
+                    id="tag_value_3"
+                    required=""
+                    type="text"
+                    value="valueC"
+                  />
+                </div>
               </div>
             </div>
           </div>
diff --git a/apps/spruce/src/components/EditableTagField/index.tsx b/apps/spruce/src/components/EditableTagField/index.tsx
index d66c62516..9032ee0f6 100644
--- a/apps/spruce/src/components/EditableTagField/index.tsx
+++ b/apps/spruce/src/components/EditableTagField/index.tsx
@@ -65,12 +65,14 @@ export const EditableTagField: React.FC<EditableTagFieldProps> = ({
           tag={tag}
           onDelete={deleteHandler}
           key={tag.key}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           onUpdateTag={updateTagHandler}
           isValidKey={validateKey}
           buttonText={buttonText}
         />
       ))}
       <TagRow
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         onUpdateTag={updateTagHandler}
         isNewTag
         isValidKey={validateKey}
diff --git a/apps/spruce/src/components/EditableTagField/tagRowReducer.ts b/apps/spruce/src/components/EditableTagField/tagRowReducer.ts
index b5730a812..abb7fc245 100644
--- a/apps/spruce/src/components/EditableTagField/tagRowReducer.ts
+++ b/apps/spruce/src/components/EditableTagField/tagRowReducer.ts
@@ -52,6 +52,7 @@ export const reducer = (state: State, action: Action) => {
     case "inActive":
       return { ...state, canSave: false };
     case "cancelNewTag":
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       return getInitialState(undefined, true);
     default:
       throw new Error("Unknown action type");
diff --git a/apps/spruce/src/components/ErrorHandling/ErrorBoundary.tsx b/apps/spruce/src/components/ErrorHandling/ErrorBoundary.tsx
index 1ec73ae7f..338b8b34a 100644
--- a/apps/spruce/src/components/ErrorHandling/ErrorBoundary.tsx
+++ b/apps/spruce/src/components/ErrorHandling/ErrorBoundary.tsx
@@ -12,6 +12,7 @@ class DefaultErrorBoundary extends Component<
   DefaultErrorBoundaryProps,
   { hasError: boolean }
 > {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   constructor(props) {
     super(props);
     this.state = { hasError: false };
@@ -22,6 +23,7 @@ class DefaultErrorBoundary extends Component<
     return { hasError: true };
   }
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   componentDidCatch(error, errorInfo) {
     console.error({ error, errorInfo });
   }
diff --git a/apps/spruce/src/components/Feedback/index.tsx b/apps/spruce/src/components/Feedback/index.tsx
index 90fbc88ba..4c7da1d4c 100644
--- a/apps/spruce/src/components/Feedback/index.tsx
+++ b/apps/spruce/src/components/Feedback/index.tsx
@@ -15,7 +15,9 @@ export const Feedback: React.FC = () => {
   const spruceConfig = useSpruceConfig();
   const jiraHost = spruceConfig?.jira?.host;
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const jiraBugUrl = getJiraBugUrl(jiraHost);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const jiraImprovementUrl = getJiraImprovementUrl(jiraHost);
 
   return (
diff --git a/apps/spruce/src/components/FilterBadges/FilterBadges.test.tsx b/apps/spruce/src/components/FilterBadges/FilterBadges.test.tsx
index 819e9e139..5e7237ab6 100644
--- a/apps/spruce/src/components/FilterBadges/FilterBadges.test.tsx
+++ b/apps/spruce/src/components/FilterBadges/FilterBadges.test.tsx
@@ -84,9 +84,11 @@ describe("filterBadges", () => {
         onClearAll={vi.fn()}
       />,
     );
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("see 2 more"));
     expect(screen.getByDataCy("see-more-modal")).toBeInTheDocument();
     expect(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       within(screen.queryByDataCy("see-more-modal")).queryAllByDataCy(
         "filter-badge",
       ),
@@ -165,6 +167,7 @@ describe("filterBadges", () => {
     const truncatedBadge = screen.queryByDataCy("filter-badge");
     expect(truncatedBadge).toBeInTheDocument();
     expect(truncatedBadge).not.toHaveTextContent(longName);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(truncatedBadge);
     await waitFor(() => {
       expect(screen.queryByText(longName)).toBeVisible();
diff --git a/apps/spruce/src/components/FilterBadges/__snapshots__/FilterBadges_Default.storyshot b/apps/spruce/src/components/FilterBadges/__snapshots__/FilterBadges_Default.storyshot
index c7fe04cf1..8d0b1ad80 100644
--- a/apps/spruce/src/components/FilterBadges/__snapshots__/FilterBadges_Default.storyshot
+++ b/apps/spruce/src/components/FilterBadges/__snapshots__/FilterBadges_Default.storyshot
@@ -51,65 +51,81 @@
     </div>
     <div>
       <div
-        class="leafygreen-ui-90q1a7"
+        class="leafygreen-ui-1br9h7w"
+        data-lgid="lg-text_input"
       >
         <div
-          class="leafygreen-ui-e3fvh5"
+          class="leafygreen-ui-au9iil"
         >
           <label
-            class="leafygreen-ui-t01kw4"
-            for="textinput-1"
+            class="leafygreen-ui-1qjbbjd"
+            data-lgid="lg-label"
+            data-testid="lg-form_field-label"
+            for="lg-form-field-input-31"
+            id="lg-form-field-label-28"
           >
             key
           </label>
         </div>
         <div
-          class="leafygreen-ui-lzja97"
+          class="leafygreen-ui-95c1iv"
         >
-          <input
-            aria-invalid="false"
-            autocomplete="on"
-            class="leafygreen-ui-1kmfbzh"
-            id="textinput-1"
-            placeholder="key"
-            required=""
-            type="text"
-            value=""
-          />
           <div
-            class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-          />
+            class="leafygreen-ui-1ago99h"
+          >
+            <input
+              aria-describedby=""
+              aria-disabled="false"
+              aria-invalid="false"
+              aria-labelledby="lg-form-field-label-28"
+              autocomplete="on"
+              class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+              id="lg-form-field-input-31"
+              placeholder="key"
+              required=""
+              type="text"
+              value=""
+            />
+          </div>
         </div>
       </div>
       <div
-        class="leafygreen-ui-90q1a7"
+        class="leafygreen-ui-1br9h7w"
+        data-lgid="lg-text_input"
       >
         <div
-          class="leafygreen-ui-e3fvh5"
+          class="leafygreen-ui-au9iil"
         >
           <label
-            class="leafygreen-ui-t01kw4"
-            for="textinput-2"
+            class="leafygreen-ui-1qjbbjd"
+            data-lgid="lg-label"
+            data-testid="lg-form_field-label"
+            for="lg-form-field-input-35"
+            id="lg-form-field-label-32"
           >
             value
           </label>
         </div>
         <div
-          class="leafygreen-ui-lzja97"
+          class="leafygreen-ui-95c1iv"
         >
-          <input
-            aria-invalid="false"
-            autocomplete="on"
-            class="leafygreen-ui-1kmfbzh"
-            id="textinput-2"
-            placeholder="value"
-            required=""
-            type="text"
-            value=""
-          />
           <div
-            class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-          />
+            class="leafygreen-ui-1ago99h"
+          >
+            <input
+              aria-describedby=""
+              aria-disabled="false"
+              aria-invalid="false"
+              aria-labelledby="lg-form-field-label-32"
+              autocomplete="on"
+              class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+              id="lg-form-field-input-35"
+              placeholder="value"
+              required=""
+              type="text"
+              value=""
+            />
+          </div>
         </div>
       </div>
       <button
diff --git a/apps/spruce/src/components/FilterBadges/useFilterBadgeQueryParams.test.tsx b/apps/spruce/src/components/FilterBadges/useFilterBadgeQueryParams.test.tsx
index 9bc44d6b5..6057acd1a 100644
--- a/apps/spruce/src/components/FilterBadges/useFilterBadgeQueryParams.test.tsx
+++ b/apps/spruce/src/components/FilterBadges/useFilterBadgeQueryParams.test.tsx
@@ -69,6 +69,7 @@ describe("filterBadges - queryParams", () => {
     expect(badge).toHaveTextContent("buildVariants: variant1");
     const closeBadge = screen.queryByDataCy("close-badge");
     expect(closeBadge).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(closeBadge);
 
     expect(screen.queryByDataCy("filter-badge")).toBeNull();
@@ -106,6 +107,7 @@ describe("filterBadges - queryParams", () => {
     let badges = screen.queryAllByDataCy("filter-badge");
     expect(badges).toHaveLength(4);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("clear-all-filters"));
     badges = screen.queryAllByDataCy("filter-badge");
     expect(badges).toHaveLength(0);
@@ -124,6 +126,7 @@ describe("filterBadges - queryParams", () => {
     let badges = screen.queryAllByDataCy("filter-badge");
     expect(badges).toHaveLength(4);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("clear-all-filters"));
     badges = screen.queryAllByDataCy("filter-badge");
     expect(badges).toHaveLength(0);
diff --git a/apps/spruce/src/components/FilterBadges/useFilterBadgeQueryParams.ts b/apps/spruce/src/components/FilterBadges/useFilterBadgeQueryParams.ts
index 6fe7e0bc9..fd4a0b50e 100644
--- a/apps/spruce/src/components/FilterBadges/useFilterBadgeQueryParams.ts
+++ b/apps/spruce/src/components/FilterBadges/useFilterBadgeQueryParams.ts
@@ -28,12 +28,14 @@ const useFilterBadgeQueryParams = (validQueryParams: Set<string>) => {
     Object.keys(params)
       .filter((badge) => validQueryParams.has(badge))
       .forEach((v) => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         params[v] = undefined;
       });
     updateQueryParams(params);
   };
   const handleOnRemove = (badge: FilterBadgeType) => {
     const updatedParam = popQueryParams(queryParams[badge.key], badge.value);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     updateQueryParams({ [badge.key]: updatedParam });
   };
 
diff --git a/apps/spruce/src/components/GroupedTaskStatusBadge/GroupedTaskStatusBadge.test.tsx b/apps/spruce/src/components/GroupedTaskStatusBadge/GroupedTaskStatusBadge.test.tsx
index 93c4a2a30..31f03082e 100644
--- a/apps/spruce/src/components/GroupedTaskStatusBadge/GroupedTaskStatusBadge.test.tsx
+++ b/apps/spruce/src/components/GroupedTaskStatusBadge/GroupedTaskStatusBadge.test.tsx
@@ -28,6 +28,7 @@ describe("groupedTaskStatusBadgeIcon", () => {
     );
     const badge = screen.queryByDataCy("grouped-task-status-badge");
     expect(badge).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(badge);
     expect(onClick).toHaveBeenCalledWith();
   });
@@ -80,6 +81,7 @@ describe("groupedTaskStatusBadgeIcon", () => {
         screen.queryByDataCy("grouped-task-status-badge-tooltip"),
       ).toBeNull();
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("grouped-task-status-badge"));
     await waitFor(() => {
       expect(
diff --git a/apps/spruce/src/components/GroupedTaskStatusBadge/index.tsx b/apps/spruce/src/components/GroupedTaskStatusBadge/index.tsx
index c11c71b82..5171145a8 100644
--- a/apps/spruce/src/components/GroupedTaskStatusBadge/index.tsx
+++ b/apps/spruce/src/components/GroupedTaskStatusBadge/index.tsx
@@ -23,6 +23,7 @@ export const GroupedTaskStatusBadge: React.FC<GroupedTaskStatusBadgeProps> = ({
   status,
   statusCounts,
 }) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { border, fill, text } = mapUmbrellaStatusColors[status];
 
   return (
@@ -61,6 +62,7 @@ export const GroupedTaskStatusBadge: React.FC<GroupedTaskStatusBadgeProps> = ({
               <TaskStatusIcon status={taskStatus} size={16} />
               <span>
                 <Count>{taskCount}</Count>{" "}
+                {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
                 {taskStatusToCopy[taskStatus] ?? taskStatus}
               </span>
             </Row>
diff --git a/apps/spruce/src/components/Header/NavDropdown/index.tsx b/apps/spruce/src/components/Header/NavDropdown/index.tsx
index 9c38ff02e..f992023b6 100644
--- a/apps/spruce/src/components/Header/NavDropdown/index.tsx
+++ b/apps/spruce/src/components/Header/NavDropdown/index.tsx
@@ -38,6 +38,7 @@ const NavDropdownItem: React.FC<NavDropdownItemType> = ({
       {text}
     </MenuItem>
   ) : (
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     <MenuItem as="a" data-cy={itemDataCy} onClick={closeMenu} href={href}>
       {text}
     </MenuItem>
diff --git a/apps/spruce/src/components/Header/Navbar.tsx b/apps/spruce/src/components/Header/Navbar.tsx
index 871461919..60be8efc5 100644
--- a/apps/spruce/src/components/Header/Navbar.tsx
+++ b/apps/spruce/src/components/Header/Navbar.tsx
@@ -83,8 +83,8 @@ export const Navbar: React.FC = () => {
         >
           Project Health
         </PrimaryLink>
-
         <PrimaryLink
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           to={getUserPatchesRoute(userId)}
           onClick={() => sendEvent({ name: "Click My Patches Link" })}
         >
@@ -96,6 +96,7 @@ export const Navbar: React.FC = () => {
         >
           My Hosts
         </PrimaryLink>
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         <AuxiliaryDropdown projectIdentifier={projectIdentifier} />
       </NavActionContainer>
       <NavActionContainer>
diff --git a/apps/spruce/src/components/Header/UserDropdown.tsx b/apps/spruce/src/components/Header/UserDropdown.tsx
index d63301c51..2a87f63fa 100644
--- a/apps/spruce/src/components/Header/UserDropdown.tsx
+++ b/apps/spruce/src/components/Header/UserDropdown.tsx
@@ -44,6 +44,7 @@ export const UserDropdown = () => {
     <NavDropdown
       dataCy="user-dropdown-link"
       menuItems={menuItems}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       title={displayName}
     />
   );
diff --git a/apps/spruce/src/components/HistoryTable/Cell/Cell.test.tsx b/apps/spruce/src/components/HistoryTable/Cell/Cell.test.tsx
index 6181979bf..419aaf408 100644
--- a/apps/spruce/src/components/HistoryTable/Cell/Cell.test.tsx
+++ b/apps/spruce/src/components/HistoryTable/Cell/Cell.test.tsx
@@ -85,6 +85,7 @@ describe("taskCell", () => {
         loading={false}
       />,
     );
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("history-table-icon"));
     await screen.findByText("some-test");
     expect(screen.getByDataCy("test-tooltip")).toBeInTheDocument();
diff --git a/apps/spruce/src/components/HistoryTable/ColumnPaginationButtons.tsx b/apps/spruce/src/components/HistoryTable/ColumnPaginationButtons.tsx
index 45bcc7ef4..30827fc5e 100644
--- a/apps/spruce/src/components/HistoryTable/ColumnPaginationButtons.tsx
+++ b/apps/spruce/src/components/HistoryTable/ColumnPaginationButtons.tsx
@@ -15,11 +15,17 @@ const ColumnPaginationButtons: React.FC<ColumnPaginationButtonProps> = ({
   onClickPrev = () => {},
 }) => {
   const {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     currentPage,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     hasNextPage,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     hasPreviousPage,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     nextPage,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     pageCount,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     previousPage,
   } = useHistoryTable();
   const handleOnClickNext = () => {
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTable.stories.tsx b/apps/spruce/src/components/HistoryTable/HistoryTable.stories.tsx
index 5d02692e5..f4f69e397 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTable.stories.tsx
+++ b/apps/spruce/src/components/HistoryTable/HistoryTable.stories.tsx
@@ -33,6 +33,7 @@ interface HistoryTableWrapperProps {
   type?: "variant" | "task";
 }
 const HistoryTableWrapper: React.FC<HistoryTableWrapperProps> = ({ type }) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { addColumns, ingestNewCommits } = useHistoryTable();
   const [isLoading, setIsLoading] = useState(false);
   const [oldData, setOldData] = useState(mainlineCommitData);
@@ -51,6 +52,7 @@ const HistoryTableWrapper: React.FC<HistoryTableWrapperProps> = ({ type }) => {
 
   const loadMore = useCallback(() => {
     setIsLoading(true);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     timeoutRef.current = setTimeout(() => {
       setIsLoading(false);
       const newData = generateNewCommitData(oldData);
@@ -63,6 +65,7 @@ const HistoryTableWrapper: React.FC<HistoryTableWrapperProps> = ({ type }) => {
   return (
     <div style={{ height: 600, width: "100%", border: "red 1px solid" }}>
       <HistoryTable loadMoreItems={loadMore} loading={isLoading}>
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         {type === "task" ? TaskHistoryRow : VariantHistoryRow}
       </HistoryTable>
     </div>
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTable.tsx b/apps/spruce/src/components/HistoryTable/HistoryTable.tsx
index d2ef62f56..4e4eca781 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTable.tsx
+++ b/apps/spruce/src/components/HistoryTable/HistoryTable.tsx
@@ -27,15 +27,21 @@ const HistoryTable: React.FC<HistoryTableProps> = ({
   loading,
 }) => {
   const {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     onChangeTableWidth,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     processedCommitCount,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     processedCommits,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     selectedCommit,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     visibleColumns,
   } = useHistoryTable();
 
   const ref = useRef<HTMLDivElement>(null);
   const listRef = useRef<VirtuosoHandle>(null);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const size = useDimensions(ref);
   const throttledOnChangeTableWidth = useMemo(
     () => throttle(onChangeTableWidth, 400),
@@ -98,6 +104,7 @@ const HistoryTable: React.FC<HistoryTableProps> = ({
                 numLoadingRows={10}
               />
             ) : (
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               <EndOfHistoryRow>{finalRowCopy}</EndOfHistoryRow>
             ),
         }}
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTableContext.test.tsx b/apps/spruce/src/components/HistoryTable/HistoryTableContext.test.tsx
index 33fe15904..87b89f195 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTableContext.test.tsx
+++ b/apps/spruce/src/components/HistoryTable/HistoryTableContext.test.tsx
@@ -3,6 +3,7 @@ import { HistoryTableProvider, useHistoryTable } from "./HistoryTableContext";
 import { columns, mainlineCommitData } from "./testData";
 import { rowType, CommitRowType } from "./types";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const wrapper = ({ children }) => (
   <HistoryTableProvider>{children}</HistoryTableProvider>
 );
@@ -41,9 +42,11 @@ describe("historyTableContext", () => {
       versions: mainlineCommitData.versions.slice(0, 1),
     };
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(splitMainlineCommitDataPart1);
     });
     // Filter out the column date separators
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const processedCommits = result.current.processedCommits.filter(
       (c) => c.type !== rowType.DATE_SEPARATOR,
     );
@@ -52,19 +55,26 @@ describe("historyTableContext", () => {
       splitMainlineCommitDataPart1.versions.length,
     );
     // First element should be the date separator
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(0)).toBe(true);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(0)).toStrictEqual<CommitRowType>({
       type: rowType.DATE_SEPARATOR,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: splitMainlineCommitDataPart1.versions[0].version.createTime,
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(1)).toBe(true);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(1)).toStrictEqual<CommitRowType>({
       type: rowType.COMMIT,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: splitMainlineCommitDataPart1.versions[0].version.createTime,
       commit: splitMainlineCommitDataPart1.versions[0].version,
 
       selected: false,
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(2)).toBe(false);
   });
   it("should process additional commits when they are passed in", () => {
@@ -79,23 +89,33 @@ describe("historyTableContext", () => {
     };
     // Fetch new commit
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(splitMainlineCommitDataPart1);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(0)).toBeTruthy();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(0)).toStrictEqual<CommitRowType>({
       type: rowType.DATE_SEPARATOR,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: splitMainlineCommitDataPart1.versions[0].version.createTime,
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(1)).toBeTruthy();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(2)).toBeFalsy();
 
     // Fetch another new commit
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(splitMainlineCommitDataPart2);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(2)).toBeTruthy();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(2)).toStrictEqual<CommitRowType>({
       type: rowType.COMMIT,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: splitMainlineCommitDataPart2.versions[0].version.createTime,
       commit: splitMainlineCommitDataPart2.versions[0].version,
 
@@ -116,12 +136,16 @@ describe("historyTableContext", () => {
       prevPageOrderNumber: 6798,
     };
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(commitDate1);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.commitCount).toBe(6798);
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(commitDate2);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.commitCount).toBe(4);
   });
   it("should add a line separator between commits when they are a different date", () => {
@@ -135,33 +159,48 @@ describe("historyTableContext", () => {
       versions: [mainlineCommitData.versions[2]],
     };
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(commitDate1);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(0)).toBeTruthy();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(0)).toStrictEqual<CommitRowType>({
       type: rowType.DATE_SEPARATOR,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: commitDate1.versions[0].version.createTime,
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(1)).toBeTruthy();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(1)).toStrictEqual<CommitRowType>({
       type: rowType.COMMIT,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: commitDate1.versions[0].version.createTime,
       commit: commitDate1.versions[0].version,
 
       selected: false,
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(2)).toBeFalsy();
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(commitDate2);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(2)).toBeTruthy();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(2)).toStrictEqual<CommitRowType>({
       type: rowType.DATE_SEPARATOR,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: commitDate2.versions[0].version.createTime,
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(3)).toBeTruthy();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(3)).toStrictEqual<CommitRowType>({
       type: rowType.COMMIT,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: commitDate2.versions[0].version.createTime,
       commit: commitDate2.versions[0].version,
 
@@ -176,21 +215,28 @@ describe("historyTableContext", () => {
     };
     const { rolledUpVersions } = expandableMainlineCommitData.versions[1];
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(expandableMainlineCommitData);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.isItemLoaded(3)).toBe(true);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(3)).toStrictEqual<CommitRowType>({
       type: rowType.FOLDED_COMMITS,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: rolledUpVersions[0].createTime,
       rolledUpCommits: rolledUpVersions,
       selected: false,
       expanded: false,
     });
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.toggleRowExpansion(3, true);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.getItem(3)).toStrictEqual<CommitRowType>({
       type: rowType.FOLDED_COMMITS,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       date: rolledUpVersions[0].createTime,
       rolledUpCommits: rolledUpVersions,
       selected: false,
@@ -204,72 +250,105 @@ describe("historyTableContext", () => {
       versions: [mainlineCommitData.versions[0]],
     };
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(duplicateCommitData);
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.processedCommits).toHaveLength(2);
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.ingestNewCommits(duplicateCommitData);
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.processedCommits).toHaveLength(2);
   });
   describe("columns", () => {
     it("should initially load in a set of columns and only display the first 7", () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(7);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(0, 7));
     });
     it("should be able to paginate forward on visible columns", () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(7);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(0, 7));
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.nextPage();
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(7);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(7, 14));
     });
     it("should be able to paginate backwards on visible columns", () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(7);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(0, 7));
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.hasNextPage).toBeTruthy();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.hasPreviousPage).toBeFalsy();
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.nextPage();
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.hasPreviousPage).toBeTruthy();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(7);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(7, 14));
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.previousPage();
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.hasPreviousPage).toBeFalsy();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(7);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(0, 7));
     });
     it("should not be able to paginate backwards on non existent pages", () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.hasPreviousPage).toBeFalsy();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(7);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(0, 7));
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.previousPage();
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(7);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(0, 7));
     });
   });
@@ -277,43 +356,62 @@ describe("historyTableContext", () => {
     it(`correctly changes table width to 3000`, () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.onChangeTableWidth(3000);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.pageCount).toBe(2);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(18);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(0, 18));
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.currentPage).toBe(0);
     });
     it(`correctly changes table width to 5000`, () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.onChangeTableWidth(5000);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.pageCount).toBe(1);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(25);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns);
     });
     it(`correctly changes table width to 200`, () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.onChangeTableWidth(200);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.pageCount).toBe(25);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toHaveLength(1);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.visibleColumns).toStrictEqual(columns.slice(0, 1));
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.currentPage).toBe(0);
     });
     it(`should not mutate the reducer state if the screen width is adjusted and number of columns 
     that fit on the screen is unchanged`, () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
       });
       const initialState = { ...result.current };
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.onChangeTableWidth(1300);
       });
       expect(result.current).toStrictEqual(initialState);
@@ -322,21 +420,28 @@ describe("historyTableContext", () => {
       that fit on the screen changes`, () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.addColumns(columns);
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.nextPage();
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.currentPage).toBe(1);
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.onChangeTableWidth(6000);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.currentPage).toBe(0);
     });
   });
   describe("test filters", () => {
     it("should add new test filters when they are passed in", () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.historyTableFilters).toStrictEqual([]);
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.setHistoryTableFilters([
           {
             testName: "test-name",
@@ -348,6 +453,7 @@ describe("historyTableContext", () => {
           },
         ]);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.historyTableFilters).toStrictEqual([
         {
           testName: "test-name",
@@ -361,8 +467,10 @@ describe("historyTableContext", () => {
     });
     it("should overwrite test filters when new ones are passed in", () => {
       const { result } = renderHook(() => useHistoryTable(), { wrapper });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.historyTableFilters).toStrictEqual([]);
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.setHistoryTableFilters([
           {
             testName: "test-name",
@@ -374,6 +482,7 @@ describe("historyTableContext", () => {
           },
         ]);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.historyTableFilters).toStrictEqual([
         {
           testName: "test-name",
@@ -385,6 +494,7 @@ describe("historyTableContext", () => {
         },
       ]);
       act(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         result.current.setHistoryTableFilters([
           {
             testName: "test-new",
@@ -396,6 +506,7 @@ describe("historyTableContext", () => {
           },
         ]);
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.historyTableFilters).toStrictEqual([
         {
           testName: "test-new",
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTableContext.tsx b/apps/spruce/src/components/HistoryTable/HistoryTableContext.tsx
index c5553862f..0d25b019a 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTableContext.tsx
+++ b/apps/spruce/src/components/HistoryTable/HistoryTableContext.tsx
@@ -85,6 +85,7 @@ const HistoryTableProvider: React.FC<HistoryTableProviderProps> = ({
       visibleColumns,
     },
     dispatch,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
   ] = useReducer(reducer, initialState);
 
   const isItemLoaded = (index: number) => processedCommitCount > index;
@@ -92,6 +93,7 @@ const HistoryTableProvider: React.FC<HistoryTableProviderProps> = ({
   const getItem = (index: number) => processedCommits[index];
 
   const onChangeTableWidth = useCallback((width: number) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     dispatch({ type: "onChangeTableWidth", width });
   }, []);
   const historyTableState = useMemo(
@@ -110,20 +112,28 @@ const HistoryTableProvider: React.FC<HistoryTableProviderProps> = ({
       selectedCommit,
       visibleColumns,
       addColumns: (columns: string[]) =>
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         dispatch({ type: "addColumns", columns }),
       ingestNewCommits: (
         commits: MainlineCommitsForHistoryQuery["mainlineCommits"],
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
       ) => dispatch({ type: "ingestNewCommits", commits }),
       markSelectedRowVisited: () =>
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         dispatch({ type: "markSelectedRowVisited" }),
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       nextPage: () => dispatch({ type: "nextPageColumns" }),
       onChangeTableWidth,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       previousPage: () => dispatch({ type: "prevPageColumns" }),
       setSelectedCommit: (order: number) =>
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         dispatch({ type: "setSelectedCommit", order }),
       setHistoryTableFilters: (filters: TestFilter[]) =>
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         dispatch({ type: "setHistoryTableFilters", filters }),
       toggleRowExpansion: (rowIndex: number, expanded: boolean) => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         dispatch({
           type: "toggleRowExpansion",
           rowIndex,
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTableIcon/HistoryTableIcon.test.tsx b/apps/spruce/src/components/HistoryTable/HistoryTableIcon/HistoryTableIcon.test.tsx
index a3464a58d..256f14510 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTableIcon/HistoryTableIcon.test.tsx
+++ b/apps/spruce/src/components/HistoryTable/HistoryTableIcon/HistoryTableIcon.test.tsx
@@ -11,6 +11,7 @@ describe("historyTableIcon", () => {
     );
     const icon = screen.queryByDataCy("history-table-icon");
     expect(icon).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(icon);
     expect(onClick).toHaveBeenCalledWith();
   });
@@ -20,6 +21,7 @@ describe("historyTableIcon", () => {
     render(<HistoryTableIcon status={TaskStatus.Succeeded} />);
     const icon = screen.queryByDataCy("history-table-icon");
     expect(icon).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(icon);
     expect(screen.queryByText("test a")).not.toBeInTheDocument();
   });
@@ -34,6 +36,7 @@ describe("historyTableIcon", () => {
     );
     const icon = screen.queryByDataCy("history-table-icon");
     expect(icon).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(icon);
     await waitFor(() => {
       expect(screen.queryByText("test a")).toBeVisible();
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/FoldedCommit/FoldedCommit.test.tsx b/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/FoldedCommit/FoldedCommit.test.tsx
index c636aa4ae..54bcaf361 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/FoldedCommit/FoldedCommit.test.tsx
+++ b/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/FoldedCommit/FoldedCommit.test.tsx
@@ -48,6 +48,7 @@ describe("foldedCommit", () => {
         />
       </MockedProvider>,
     );
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("Expand 5 inactive"));
     expect(screen.queryByText("Expand 5 inactive")).toBeNull();
     expect(screen.getByText("Collapse 5 inactive")).toBeInTheDocument();
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/FoldedCommit/index.tsx b/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/FoldedCommit/index.tsx
index 49526be98..81700ad8b 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/FoldedCommit/index.tsx
+++ b/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/FoldedCommit/index.tsx
@@ -44,6 +44,7 @@ const FoldedCommit: React.FC<FoldedCommitProps> = ({
     [numVisibleCols],
   );
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const commits = rolledUpCommits.map((commit) => (
     <StyledRowContainer key={commit.id} data-cy="folded-commit">
       <LabelCellContainer>
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/index.tsx b/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/index.tsx
index b300adf99..6c85ef0f0 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/index.tsx
+++ b/apps/spruce/src/components/HistoryTable/HistoryTableRow/BaseRow/index.tsx
@@ -40,6 +40,7 @@ const BaseRow: React.FC<RowProps> = ({
     onClickUpstreamProject,
     onToggleFoldedCommit,
   } = eventHandlers;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { columnLimit, toggleRowExpansion } = useHistoryTable();
 
   switch (data.type) {
diff --git a/apps/spruce/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch_Default.storyshot b/apps/spruce/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch_Default.storyshot
index 57056773c..c75e069c8 100644
--- a/apps/spruce/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch_Default.storyshot
+++ b/apps/spruce/src/components/HistoryTable/HistoryTableTestSearch/__snapshots__/HistoryTableTestSearch_Default.storyshot
@@ -9,35 +9,43 @@
         class="css-mk4qpy-TextInputWrapper e13gwrw81"
       >
         <div
-          class="leafygreen-ui-90q1a7"
+          aria-label="history-table-test-search-input"
+          class="leafygreen-ui-1br9h7w"
+          data-lgid="lg-text_input"
         >
           <div
-            class="leafygreen-ui-e3fvh5"
+            class="leafygreen-ui-au9iil"
           >
             <label
-              class="leafygreen-ui-t01kw4"
-              for="textinput-3"
+              class="leafygreen-ui-1qjbbjd"
+              data-lgid="lg-label"
+              data-testid="lg-form_field-label"
+              for="lg-form-field-input-65"
+              id="lg-form-field-label-62"
             >
               Filter by Failed Tests
             </label>
           </div>
           <div
-            class="leafygreen-ui-lzja97"
+            class="leafygreen-ui-95c1iv"
           >
-            <input
-              aria-invalid="false"
-              aria-label="history-table-test-search-input"
-              autocomplete="on"
-              class="leafygreen-ui-1kmfbzh"
-              id="textinput-3"
-              placeholder="Search test name regex"
-              required=""
-              type="search"
-              value=""
-            />
             <div
-              class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-            />
+              class="leafygreen-ui-1ago99h"
+            >
+              <input
+                aria-describedby=""
+                aria-disabled="false"
+                aria-invalid="false"
+                aria-labelledby="lg-form-field-label-62"
+                autocomplete="on"
+                class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                id="lg-form-field-input-65"
+                placeholder="Search test name regex"
+                required=""
+                type="search"
+                value=""
+              />
+            </div>
           </div>
         </div>
         <div
diff --git a/apps/spruce/src/components/HistoryTable/historyTableContextReducer.ts b/apps/spruce/src/components/HistoryTable/historyTableContextReducer.ts
index 5291bc0d9..575d03af1 100644
--- a/apps/spruce/src/components/HistoryTable/historyTableContextReducer.ts
+++ b/apps/spruce/src/components/HistoryTable/historyTableContextReducer.ts
@@ -20,7 +20,9 @@ type Action =
 
 type cacheShape = Map<
   number,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   | mainlineCommits["versions"][0]["version"]
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   | mainlineCommits["versions"][0]["rolledUpVersions"][0]
 >;
 export interface HistoryTableReducerState {
@@ -29,6 +31,7 @@ export interface HistoryTableReducerState {
   columns: string[];
   columnLimit: number;
   commitCount: number;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   loadedCommits: mainlineCommits["versions"];
   pageCount: number;
   processedCommits: CommitRowType[];
@@ -58,26 +61,33 @@ export const reducer = (state: HistoryTableReducerState, action: Action) => {
       // This also performantly handles deduplication of commits at the expense of memory
       const updatedObjectCache = objectifyCommits(
         state.commitCache,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         action.commits.versions,
       );
       if (updatedObjectCache.size > state.commitCache.size) {
         // Check if our selected commit has been loaded
         const { processedCommits, selectedCommitRowIndex } = processCommits({
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           newCommits: action.commits.versions,
           existingCommits: state.processedCommits,
           selectedCommitOrder: state.selectedCommit?.order,
         });
         let { commitCount } = state;
         // If there are no previous commits, we can set the commitCount to be the first commit's order.
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         if (action.commits.prevPageOrderNumber == null) {
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           for (let i = 0; i < action.commits.versions.length; i++) {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             if (action.commits.versions[i].version) {
               // We set the commitCount to double the order number just so we have room for non commit rows (date separators) and (folded commits)
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               commitCount = action.commits.versions[i].version.order * 2;
               break;
             }
           }
           // if we have no more commits we have processed everything and know how many commits we have so set the value to that
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
         } else if (action.commits.nextPageOrderNumber == null) {
           commitCount = processedCommits.length;
         }
@@ -214,13 +224,16 @@ export const reducer = (state: HistoryTableReducerState, action: Action) => {
 // This is used to performantly track if we have seen a commit before and avoid duplicating it
 const objectifyCommits = (
   cache: cacheShape,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   newCommits: mainlineCommits["versions"],
 ) => {
   const obj = new Map(cache);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   newCommits.forEach((commit) => {
     if (commit.version) {
       obj.set(commit.version.order, commit.version);
     } else if (commit.rolledUpVersions) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       commit.rolledUpVersions.forEach((version) => {
         obj.set(version.order, version);
       });
@@ -234,6 +247,7 @@ const commitOrderToRowIndex = (order: number, commit: CommitRowType) => {
     return commit.commit.order === order;
   }
   if (commit.type === rowType.FOLDED_COMMITS) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     return commit.rolledUpCommits.some((elem) => elem.order === order);
   }
   return false;
diff --git a/apps/spruce/src/components/HistoryTable/hooks/test-utils.tsx b/apps/spruce/src/components/HistoryTable/hooks/test-utils.tsx
index aae17911c..5ae494a40 100644
--- a/apps/spruce/src/components/HistoryTable/hooks/test-utils.tsx
+++ b/apps/spruce/src/components/HistoryTable/hooks/test-utils.tsx
@@ -14,6 +14,7 @@ const initialState: HistoryTableReducerState = {
   commitCount: 10,
   visibleColumns: [],
   columnLimit: 7,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   selectedCommit: null,
 };
 
diff --git a/apps/spruce/src/components/HistoryTable/hooks/useColumns.ts b/apps/spruce/src/components/HistoryTable/hooks/useColumns.ts
index 5132c045a..20ce531e4 100644
--- a/apps/spruce/src/components/HistoryTable/hooks/useColumns.ts
+++ b/apps/spruce/src/components/HistoryTable/hooks/useColumns.ts
@@ -13,6 +13,7 @@ const useColumns = <T>(allColumns: T[], accessFunc: (column: T) => string) => {
     () => parseQueryString(search),
     [search],
   );
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { addColumns } = useHistoryTable();
 
   const selectedColumnsInQuery = useMemo(
diff --git a/apps/spruce/src/components/HistoryTable/hooks/useJumpToCommit.ts b/apps/spruce/src/components/HistoryTable/hooks/useJumpToCommit.ts
index 525f712dd..977a33600 100644
--- a/apps/spruce/src/components/HistoryTable/hooks/useJumpToCommit.ts
+++ b/apps/spruce/src/components/HistoryTable/hooks/useJumpToCommit.ts
@@ -15,6 +15,7 @@ const useJumpToCommit = () => {
   const skipOrderNumber =
     parseInt(getString(skipOrderNumberParam), 10) || undefined;
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { setSelectedCommit } = useHistoryTable();
   useEffect(() => {
     if (skipOrderNumber) {
diff --git a/apps/spruce/src/components/HistoryTable/hooks/useTestFilters.tsx b/apps/spruce/src/components/HistoryTable/hooks/useTestFilters.tsx
index 4c2dd1009..7880e21b9 100644
--- a/apps/spruce/src/components/HistoryTable/hooks/useTestFilters.tsx
+++ b/apps/spruce/src/components/HistoryTable/hooks/useTestFilters.tsx
@@ -9,6 +9,7 @@ const { toArray } = array;
 
 const useTestFilters = () => {
   const { search } = useLocation();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { setHistoryTableFilters } = useHistoryTable();
   useEffect(() => {
     const queryParams = parseQueryString(search);
diff --git a/apps/spruce/src/components/HistoryTable/hooks/useTestResults.test.tsx b/apps/spruce/src/components/HistoryTable/hooks/useTestResults.test.tsx
index 07449d055..ef4842b25 100644
--- a/apps/spruce/src/components/HistoryTable/hooks/useTestResults.test.tsx
+++ b/apps/spruce/src/components/HistoryTable/hooks/useTestResults.test.tsx
@@ -49,9 +49,12 @@ describe("useTestResults", () => {
       failingTests: [],
     });
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.historyTable.ingestNewCommits(mainlineCommitData);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.historyTable.processedCommitCount).toBe(9);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.historyTable.getItem(0)).toMatchObject({
       type: rowType.DATE_SEPARATOR,
     });
@@ -78,9 +81,12 @@ describe("useTestResults", () => {
       failingTests: [],
     });
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.historyTable.ingestNewCommits(mainlineCommitData);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.historyTable.processedCommitCount).toBe(9);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.historyTable.getItem(2)).toMatchObject({
       type: rowType.COMMIT,
     });
@@ -113,13 +119,17 @@ describe("useTestResults", () => {
       loading: false,
     });
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.historyTable.ingestNewCommits(mainlineCommitData);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.historyTable.processedCommitCount).toBe(9);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.historyTable.getItem(2)).toMatchObject({
       type: rowType.COMMIT,
     });
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.historyTable.setHistoryTableFilters([
         { testName: "TestJiraIntegration", testStatus: TestStatus.Failed },
       ]);
@@ -152,13 +162,17 @@ describe("useTestResults", () => {
       failingTests: [],
     });
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.historyTable.ingestNewCommits(mainlineCommitData);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.historyTable.processedCommitCount).toBe(9);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.historyTable.getItem(2)).toMatchObject({
       type: rowType.COMMIT,
     });
     act(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       result.current.historyTable.setHistoryTableFilters([
         { testName: "NotARealTest", testStatus: TestStatus.Failed },
       ]);
diff --git a/apps/spruce/src/components/HistoryTable/hooks/useTestResults.ts b/apps/spruce/src/components/HistoryTable/hooks/useTestResults.ts
index b31a62b87..0a38aad65 100644
--- a/apps/spruce/src/components/HistoryTable/hooks/useTestResults.ts
+++ b/apps/spruce/src/components/HistoryTable/hooks/useTestResults.ts
@@ -18,6 +18,7 @@ const { convertArrayToObject } = array;
  * @returns getTaskMetadata - a function that given a task id returns the test results for that task
  */
 const useTestResults = (rowIndex: number) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { getItem, historyTableFilters } = useHistoryTable();
   let taskIds: string[] = [];
   let versionId = "";
@@ -28,7 +29,9 @@ const useTestResults = (rowIndex: number) => {
 
   const commit = getItem(rowIndex);
   if (commit && commit.type === rowType.COMMIT && commit.commit) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     taskIds = commit.commit.buildVariants.flatMap((buildVariant) =>
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       buildVariant.tasks.map((task) => task.id),
     );
     versionId = commit.commit.id;
diff --git a/apps/spruce/src/components/HistoryTable/types.ts b/apps/spruce/src/components/HistoryTable/types.ts
index 6148f5178..7ea975669 100644
--- a/apps/spruce/src/components/HistoryTable/types.ts
+++ b/apps/spruce/src/components/HistoryTable/types.ts
@@ -3,6 +3,7 @@ import { Unpacked } from "types/utils";
 
 export interface FoldedCommitsRow {
   type: rowType.FOLDED_COMMITS;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   rolledUpCommits: Unpacked<mainlineCommits["versions"]>["rolledUpVersions"];
   date: Date;
   selected: boolean;
@@ -17,6 +18,7 @@ export interface DateSeparatorRow {
 
 export interface CommitRow {
   type: rowType.COMMIT;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   commit: Unpacked<mainlineCommits["versions"]>["version"];
   date: Date;
   selected: boolean;
diff --git a/apps/spruce/src/components/HistoryTable/utils.test.ts b/apps/spruce/src/components/HistoryTable/utils.test.ts
index 5f67bdce5..057cd9ec0 100644
--- a/apps/spruce/src/components/HistoryTable/utils.test.ts
+++ b/apps/spruce/src/components/HistoryTable/utils.test.ts
@@ -31,11 +31,13 @@ describe("historyTable utils", () => {
       });
       expect(processedCommits).toStrictEqual<CommitRowType[]>([
         {
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           date: firstCommit.version.createTime,
           type: rowType.DATE_SEPARATOR,
         },
         {
           commit: firstCommit.version,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           date: firstCommit.version.createTime,
           type: rowType.COMMIT,
           selected: false,
@@ -55,17 +57,20 @@ describe("historyTable utils", () => {
         });
         expect(processedCommits).toStrictEqual<CommitRowType[]>([
           {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: firstCommit.version.createTime,
             type: rowType.DATE_SEPARATOR,
           },
           {
             commit: firstCommit.version,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: firstCommit.version.createTime,
             type: rowType.COMMIT,
             selected: false,
           },
           {
             commit: secondCommit.version,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: secondCommit.version.createTime,
             type: rowType.COMMIT,
             selected: false,
@@ -80,21 +85,25 @@ describe("historyTable utils", () => {
         });
         expect(processedCommits).toStrictEqual<CommitRowType[]>([
           {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: firstCommit.version.createTime,
             type: rowType.DATE_SEPARATOR,
           },
           {
             commit: firstCommit.version,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: firstCommit.version.createTime,
             type: rowType.COMMIT,
             selected: false,
           },
           {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: thirdCommit.version.createTime,
             type: rowType.DATE_SEPARATOR,
           },
           {
             commit: thirdCommit.version,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: thirdCommit.version.createTime,
             type: rowType.COMMIT,
             selected: false,
@@ -114,11 +123,13 @@ describe("historyTable utils", () => {
         });
         expect(processedCommits).toStrictEqual<CommitRowType[]>([
           {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: foldedUpCommits.rolledUpVersions[0].createTime,
             type: rowType.DATE_SEPARATOR,
           },
           {
             rolledUpCommits: foldedUpCommits.rolledUpVersions,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: foldedUpCommits.rolledUpVersions[0].createTime,
             type: rowType.FOLDED_COMMITS,
             selected: false,
@@ -131,11 +142,13 @@ describe("historyTable utils", () => {
           newCommits: [foldedUpCommits],
           existingCommits: [
             {
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               date: firstCommit.version.createTime,
               type: rowType.DATE_SEPARATOR,
             },
             {
               commit: firstCommit.version,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               date: firstCommit.version.createTime,
               type: rowType.COMMIT,
               selected: false,
@@ -145,21 +158,25 @@ describe("historyTable utils", () => {
         });
         expect(processedCommits).toStrictEqual<CommitRowType[]>([
           {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: firstCommit.version.createTime,
             type: rowType.DATE_SEPARATOR,
           },
           {
             commit: firstCommit.version,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: firstCommit.version.createTime,
             type: rowType.COMMIT,
             selected: false,
           },
           {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: foldedUpCommits.rolledUpVersions[0].createTime,
             type: rowType.DATE_SEPARATOR,
           },
           {
             rolledUpCommits: foldedUpCommits.rolledUpVersions,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: foldedUpCommits.rolledUpVersions[0].createTime,
             type: rowType.FOLDED_COMMITS,
             selected: false,
@@ -178,11 +195,13 @@ describe("historyTable utils", () => {
         });
         expect(processedCommits).toStrictEqual([
           {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: mainlineCommitData.versions[0].version.createTime,
             type: rowType.DATE_SEPARATOR,
           },
           {
             commit: mainlineCommitData.versions[0].version,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: mainlineCommitData.versions[0].version.createTime,
             type: rowType.COMMIT,
             selected: true,
@@ -198,11 +217,13 @@ describe("historyTable utils", () => {
         });
         expect(processedCommits).toStrictEqual([
           {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: mainlineCommitData.versions[0].version.createTime,
             type: rowType.DATE_SEPARATOR,
           },
           {
             commit: mainlineCommitData.versions[0].version,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             date: mainlineCommitData.versions[0].version.createTime,
             type: rowType.COMMIT,
 
diff --git a/apps/spruce/src/components/HistoryTable/utils.ts b/apps/spruce/src/components/HistoryTable/utils.ts
index 0ce869edb..6f5cb58ed 100644
--- a/apps/spruce/src/components/HistoryTable/utils.ts
+++ b/apps/spruce/src/components/HistoryTable/utils.ts
@@ -14,6 +14,7 @@ export const processCommits = ({
   newCommits,
   selectedCommitOrder,
 }: {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   newCommits: mainlineCommits["versions"];
   existingCommits: CommitRowType[];
   selectedCommitOrder: number | null;
@@ -101,6 +102,7 @@ export const processCommits = ({
   return { processedCommits, selectedCommitRowIndex };
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const identifyCommitType = (commit: mainlineCommits["versions"][0]) => {
   if (commit.version) {
     return rowType.COMMIT;
@@ -122,6 +124,7 @@ const isSameDay = (date1: string | Date, date2: string | Date) => {
 };
 
 const hasSelectedCommit = (
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   rolledUpUpVersions: Unpacked<mainlineCommits["versions"]>["rolledUpVersions"],
   selectedCommitOrder: number | null,
 ) => {
@@ -129,6 +132,7 @@ const hasSelectedCommit = (
     return false;
   }
   return rolledUpUpVersions.some(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     (version) => version.order === selectedCommitOrder,
   );
 };
diff --git a/apps/spruce/src/components/HostStatusBadge/HostStatusBadge.stories.tsx b/apps/spruce/src/components/HostStatusBadge/HostStatusBadge.stories.tsx
index 57cae3729..c3daed33e 100644
--- a/apps/spruce/src/components/HostStatusBadge/HostStatusBadge.stories.tsx
+++ b/apps/spruce/src/components/HostStatusBadge/HostStatusBadge.stories.tsx
@@ -14,6 +14,7 @@ export const Default: CustomStoryObj<typeof HostStatusBadge> = {
     <Container>
       {Object.keys(HostStatus).map((status) => (
         <Wrapper key={`badge_${status}`}>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <HostStatusBadge status={HostStatus[status]} />
         </Wrapper>
       ))}
diff --git a/apps/spruce/src/components/Hosts/UpdateStatusModal.tsx b/apps/spruce/src/components/Hosts/UpdateStatusModal.tsx
index 56312c7e6..09dbfcea0 100644
--- a/apps/spruce/src/components/Hosts/UpdateStatusModal.tsx
+++ b/apps/spruce/src/components/Hosts/UpdateStatusModal.tsx
@@ -31,6 +31,7 @@ export const UpdateStatusModal: React.FC<Props> = ({
 }) => {
   const dispatchToast = useToastContext();
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const [status, setHostStatus] = useState<UpdateHostStatus>(null);
 
   const [notes, setNotesValue] = useState<string>("");
@@ -38,6 +39,7 @@ export const UpdateStatusModal: React.FC<Props> = ({
   const hostsTableAnalytics = useHostsTableAnalytics(isSingleHost);
 
   const resetForm = () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     setHostStatus(null);
     setNotesValue("");
   };
diff --git a/apps/spruce/src/components/Icon/Icon.stories.tsx b/apps/spruce/src/components/Icon/Icon.stories.tsx
index b541e637b..462b9e8a1 100644
--- a/apps/spruce/src/components/Icon/Icon.stories.tsx
+++ b/apps/spruce/src/components/Icon/Icon.stories.tsx
@@ -20,6 +20,7 @@ export const Icons: CustomStoryObj<typeof Icon> = {
     <Container>
       {Object.keys(glyphs).map((name) => (
         <IconContainer key={name}>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <Icon glyph={name} size={s} {...rest} />
           <span>{name}</span>
         </IconContainer>
diff --git a/apps/spruce/src/components/Icon/icons/index.tsx b/apps/spruce/src/components/Icon/icons/index.tsx
index cfeded92e..975d89e81 100644
--- a/apps/spruce/src/components/Icon/icons/index.tsx
+++ b/apps/spruce/src/components/Icon/icons/index.tsx
@@ -140,6 +140,7 @@ export const SystemFailure: React.ComponentType<LeafygreenIconProps> = ({
   </svg>
 );
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const TimedOut = ({ className, fill, size = 16 }) => (
   <svg
     className={className}
diff --git a/apps/spruce/src/components/Icon/index.ts b/apps/spruce/src/components/Icon/index.ts
index b56e71380..06f5f6d98 100644
--- a/apps/spruce/src/components/Icon/index.ts
+++ b/apps/spruce/src/components/Icon/index.ts
@@ -7,4 +7,5 @@ const glyphMap = {
 };
 
 export { glyphMap as glyphs, Size };
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export default createIconComponent(glyphMap);
diff --git a/apps/spruce/src/components/IconTooltip/IconTooltip.stories.tsx b/apps/spruce/src/components/IconTooltip/IconTooltip.stories.tsx
index 482d6d9bb..691db7934 100644
--- a/apps/spruce/src/components/IconTooltip/IconTooltip.stories.tsx
+++ b/apps/spruce/src/components/IconTooltip/IconTooltip.stories.tsx
@@ -21,6 +21,7 @@ export const Icons: CustomStoryObj<IconTooltipProps> = {
     <Container>
       {Object.keys(glyphs).map((name) => (
         <IconContainer key={name}>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <IconTooltip glyph={name} size={s} {...rest}>
             {children}
           </IconTooltip>
diff --git a/apps/spruce/src/components/Notifications/form/event.ts b/apps/spruce/src/components/Notifications/form/event.ts
index e3e2300dc..a14201a54 100644
--- a/apps/spruce/src/components/Notifications/form/event.ts
+++ b/apps/spruce/src/components/Notifications/form/event.ts
@@ -59,6 +59,7 @@ const buildSelect = {
   oneOf: [
     ...Object.keys(requesterSubscriberOptions).map((r) => ({
       type: "string" as "string",
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       title: requesterSubscriberOptions[r],
       enum: [r],
     })),
@@ -72,6 +73,7 @@ const failureSelect = {
   oneOf: [
     ...Object.keys(failureTypeSubscriberOptions).map((f) => ({
       type: "string" as "string",
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       title: failureTypeSubscriberOptions[f],
       enum: [f],
     })),
diff --git a/apps/spruce/src/components/Notifications/index.tsx b/apps/spruce/src/components/Notifications/index.tsx
index 993795612..01374c3bc 100644
--- a/apps/spruce/src/components/Notifications/index.tsx
+++ b/apps/spruce/src/components/Notifications/index.tsx
@@ -90,8 +90,10 @@ export const NotificationModal: React.FC<NotificationModalProps> = ({
   const onClickSave = () => {
     const subscription = getGqlPayload(type, triggers, resourceId, formState);
     saveSubscription({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       variables: { subscription },
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     sendAnalyticsEvent(subscription);
     onCancel();
   };
diff --git a/apps/spruce/src/components/Notifications/utils.ts b/apps/spruce/src/components/Notifications/utils.ts
index bef6b502c..4a5af0c30 100644
--- a/apps/spruce/src/components/Notifications/utils.ts
+++ b/apps/spruce/src/components/Notifications/utils.ts
@@ -44,6 +44,7 @@ const extraFieldsFormToGql = (
   }
   const extraFields = {};
   extraFieldsToInclude.forEach((e) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     extraFields[e.key] = extraFieldsForm[e.key].toString();
   });
   return extraFields;
@@ -65,6 +66,7 @@ export const getGqlPayload = (
   } = event;
 
   const triggerData = extraFieldsFormToGql(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     extraFields,
     formState.event.extraFields,
   );
@@ -75,6 +77,7 @@ export const getGqlPayload = (
   );
 
   const method = formState.notification.notificationSelect;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const subscriber = formState.notification[getTargetForMethod(method)];
 
   const selectors =
@@ -105,6 +108,7 @@ export const getGqlPayload = (
 export const hasInitialError = (formState: FormState) => {
   const trigger = formState.event.eventSelect;
   const method = formState.notification.notificationSelect;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const target = formState.notification[getTargetForMethod(method)];
   if (!trigger || !method || !target) {
     return true;
diff --git a/apps/spruce/src/components/PageSizeSelector/PageSizeSelector.test.tsx b/apps/spruce/src/components/PageSizeSelector/PageSizeSelector.test.tsx
index 081d3af61..d0e92e9aa 100644
--- a/apps/spruce/src/components/PageSizeSelector/PageSizeSelector.test.tsx
+++ b/apps/spruce/src/components/PageSizeSelector/PageSizeSelector.test.tsx
@@ -14,6 +14,7 @@ describe("pageSizeSelector", () => {
     );
     await user.click(screen.getByRole("button", { name: "10 / page" }));
     expect(screen.queryByText("20 / page")).toBeVisible();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("20 / page"));
     expect(onChange).toHaveBeenCalledWith(20);
   });
diff --git a/apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector_Default.storyshot b/apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector_Default.storyshot
index 76a267a6e..199593e3d 100644
--- a/apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector_Default.storyshot
+++ b/apps/spruce/src/components/PageSizeSelector/__snapshots__/PageSizeSelector_Default.storyshot
@@ -4,8 +4,8 @@
     data-lgid="lg-select"
   >
     <button
-      aria-controls="select-184-menu"
-      aria-describedby="select-184-description"
+      aria-controls="select-220-menu"
+      aria-describedby="select-220-description"
       aria-disabled="false"
       aria-expanded="false"
       aria-invalid="false"
@@ -13,7 +13,7 @@
       class="lg-ui-button-0000 leafygreen-ui-c19aul"
       data-lgid="lg-button"
       data-testid="leafygreen-ui-select-menubutton"
-      id="select-185"
+      id="select-221"
       type="button"
       value="10"
     >
diff --git a/apps/spruce/src/components/PageTitle/index.tsx b/apps/spruce/src/components/PageTitle/index.tsx
index c1118aaaa..31a214d6d 100644
--- a/apps/spruce/src/components/PageTitle/index.tsx
+++ b/apps/spruce/src/components/PageTitle/index.tsx
@@ -17,6 +17,7 @@ interface Props {
   children?: React.ReactNode;
 }
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const TitleTypography: React.FC<TitleTypographyProps> = ({
   children,
   size,
diff --git a/apps/spruce/src/components/Pagination/Pagination.stories.tsx b/apps/spruce/src/components/Pagination/Pagination.stories.tsx
index 06e759b53..1aaa1a404 100644
--- a/apps/spruce/src/components/Pagination/Pagination.stories.tsx
+++ b/apps/spruce/src/components/Pagination/Pagination.stories.tsx
@@ -23,6 +23,7 @@ export const Default: CustomStoryObj<typeof Pagination> = {
   args: {
     totalResults: 100,
     pageSize: 10,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     onChange: null,
   },
 };
diff --git a/apps/spruce/src/components/PatchActionButtons/ScheduleUndispatchedBaseTasks.tsx b/apps/spruce/src/components/PatchActionButtons/ScheduleUndispatchedBaseTasks.tsx
index 3a2a86751..6d6aeec98 100644
--- a/apps/spruce/src/components/PatchActionButtons/ScheduleUndispatchedBaseTasks.tsx
+++ b/apps/spruce/src/components/PatchActionButtons/ScheduleUndispatchedBaseTasks.tsx
@@ -27,6 +27,7 @@ export const ScheduleUndispatchedBaseTasks: React.FC<Props> = ({
     ScheduleUndispatchedBaseTasksMutationVariables
   >(SCHEDULE_UNDISPATCHED_BASE_TASKS, {
     onCompleted({ scheduleUndispatchedBaseTasks }) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       const successMessage = `Successfully scheduled ${scheduleUndispatchedBaseTasks.length} tasks`;
       dispatchToast.success(successMessage);
     },
diff --git a/apps/spruce/src/components/PatchActionButtons/addNotification/PatchNotificationModal.tsx b/apps/spruce/src/components/PatchActionButtons/addNotification/PatchNotificationModal.tsx
index 4abc5dad9..968a5e8be 100644
--- a/apps/spruce/src/components/PatchActionButtons/addNotification/PatchNotificationModal.tsx
+++ b/apps/spruce/src/components/PatchActionButtons/addNotification/PatchNotificationModal.tsx
@@ -15,12 +15,14 @@ export const PatchNotificationModal: React.FC<ModalProps> = ({
   visible,
 }) => {
   const { [slugs.versionId]: versionId } = useParams();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { sendEvent } = useVersionAnalytics(versionId);
 
   return (
     <NotificationModal
       data-cy="patch-notification-modal"
       onCancel={onCancel}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       resourceId={versionId}
       sendAnalyticsEvent={(subscription) =>
         sendEvent({ name: "Add Notification", subscription })
diff --git a/apps/spruce/src/components/PatchesPage/PatchCard/index.tsx b/apps/spruce/src/components/PatchesPage/PatchCard/index.tsx
index 129a8886b..c3a4d6d21 100644
--- a/apps/spruce/src/components/PatchesPage/PatchCard/index.tsx
+++ b/apps/spruce/src/components/PatchesPage/PatchCard/index.tsx
@@ -56,12 +56,14 @@ export const PatchCard: React.FC<Props> = ({
   status,
   versionFull,
 }) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const createDate = new Date(createTime);
   const getDateCopy = useDateFormat();
   const { id: versionId, taskStatusStats } = versionFull || {};
   const { stats } = groupStatusesByUmbrellaStatus(
     taskStatusStats?.counts ?? [],
   );
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const isUnconfigured = isPatchUnconfigured({ alias, activated });
   let patchProject = null;
   if (pageType === "project") {
@@ -93,6 +95,7 @@ export const PatchCard: React.FC<Props> = ({
       status={umbrellaStatus}
       count={count}
       statusCounts={statusCounts}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       href={getVersionRoute(versionId, {
         statuses: mapUmbrellaStatusToQueryParam[umbrellaStatus],
       })}
diff --git a/apps/spruce/src/components/PatchesPage/RequesterSelector.tsx b/apps/spruce/src/components/PatchesPage/RequesterSelector.tsx
new file mode 100644
index 000000000..3660a2d8c
--- /dev/null
+++ b/apps/spruce/src/components/PatchesPage/RequesterSelector.tsx
@@ -0,0 +1,44 @@
+import { Combobox, ComboboxOption } from "@leafygreen-ui/combobox";
+import { githubPRRequester, patchRequester } from "constants/patch";
+import { requesterSubscriberOptions } from "constants/triggers";
+import { useStatusesFilter } from "hooks";
+import { PatchPageQueryParams } from "types/patch";
+
+export const RequesterSelector: React.FC = () => {
+  const { inputValue: statusVal, setAndSubmitInputValue: statusValOnChange } =
+    useStatusesFilter({ urlParam: PatchPageQueryParams.Requesters });
+
+  return (
+    <Combobox
+      label=""
+      data-cy="requester-selector"
+      placeholder="Patch submission"
+      value={statusVal}
+      multiselect
+      onChange={statusValOnChange}
+      overflow="scroll-x"
+    >
+      {options.map(({ displayName, key, value }) => (
+        <ComboboxOption
+          key={key}
+          value={value}
+          displayName={displayName}
+          data-cy={`${value}-option`}
+        />
+      ))}
+    </Combobox>
+  );
+};
+
+const options = [
+  {
+    displayName: requesterSubscriberOptions[githubPRRequester],
+    value: githubPRRequester,
+    key: githubPRRequester,
+  },
+  {
+    displayName: requesterSubscriberOptions[patchRequester],
+    value: patchRequester,
+    key: patchRequester,
+  },
+];
diff --git a/apps/spruce/src/components/PatchesPage/StatusSelector.tsx b/apps/spruce/src/components/PatchesPage/StatusSelector.tsx
index fd860afdd..8869c5598 100644
--- a/apps/spruce/src/components/PatchesPage/StatusSelector.tsx
+++ b/apps/spruce/src/components/PatchesPage/StatusSelector.tsx
@@ -17,7 +17,8 @@ export const StatusSelector: React.FC = () => {
       data-cy="my-patch-status-select"
       buttonText={`Patch Status: ${
         statusVal.length
-          ? statusVal.map((v) => statusValToCopy[v]).join(", ")
+          ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+            statusVal.map((v) => statusValToCopy[v]).join(", ")
           : noFilterMessage
       }`}
     >
diff --git a/apps/spruce/src/components/PatchesPage/usePatchesQueryParams.ts b/apps/spruce/src/components/PatchesPage/usePatchesQueryParams.ts
index 4735de986..a8be2c442 100644
--- a/apps/spruce/src/components/PatchesPage/usePatchesQueryParams.ts
+++ b/apps/spruce/src/components/PatchesPage/usePatchesQueryParams.ts
@@ -13,13 +13,17 @@ import { PatchPageQueryParams, ALL_PATCH_STATUS } from "types/patch";
  */
 export const usePatchesQueryParams = (): Omit<
   Required<PatchesInput>,
-  "includeCommitQueue" | "onlyCommitQueue" | "requesters"
+  "includeCommitQueue" | "onlyCommitQueue"
 > => {
   const [patchName] = useQueryParam<string>(PatchPageQueryParams.PatchName, "");
   const [rawStatuses] = useQueryParam<string[]>(
     PatchPageQueryParams.Statuses,
     [],
   );
+  const [requesters] = useQueryParam<string[]>(
+    PatchPageQueryParams.Requesters,
+    [],
+  );
   const [hidden] = useQueryParam(PatchPageQueryParams.Hidden, false);
   const { limit, page } = usePagination();
   const statuses = rawStatuses.filter((v) => v && v !== ALL_PATCH_STATUS);
@@ -28,6 +32,7 @@ export const usePatchesQueryParams = (): Omit<
     includeHidden: hidden || Cookies.get(INCLUDE_HIDDEN_PATCHES) === "true",
     page,
     patchName: `${patchName}`,
+    requesters,
     statuses,
   };
 };
diff --git a/apps/spruce/src/components/PodStatusBadge/PodStatusBadge.stories.tsx b/apps/spruce/src/components/PodStatusBadge/PodStatusBadge.stories.tsx
index bd1ed3fd0..190a09973 100644
--- a/apps/spruce/src/components/PodStatusBadge/PodStatusBadge.stories.tsx
+++ b/apps/spruce/src/components/PodStatusBadge/PodStatusBadge.stories.tsx
@@ -14,6 +14,7 @@ export const Default: CustomStoryObj<typeof PodStatusBadge> = {
     <Container>
       {Object.keys(PodStatus).map((status) => (
         <Wrapper key={`badge_${status}`}>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <PodStatusBadge status={PodStatus[status]} />
         </Wrapper>
       ))}
diff --git a/apps/spruce/src/components/ProjectSelect/ProjectOptionGroup.tsx b/apps/spruce/src/components/ProjectSelect/ProjectOptionGroup.tsx
index a6a17c273..1ddb84968 100644
--- a/apps/spruce/src/components/ProjectSelect/ProjectOptionGroup.tsx
+++ b/apps/spruce/src/components/ProjectSelect/ProjectOptionGroup.tsx
@@ -54,6 +54,7 @@ export const ProjectOptionGroup: React.FC<OptionGroupProps> = ({
       <Overline
         css={hoverStyles}
         role="button"
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         onClick={() => onClick(repoIdentifier)}
       >
         {name}
diff --git a/apps/spruce/src/components/ProjectSelect/ProjectSelect.test.tsx b/apps/spruce/src/components/ProjectSelect/ProjectSelect.test.tsx
index fee6ac132..f48655fdc 100644
--- a/apps/spruce/src/components/ProjectSelect/ProjectSelect.test.tsx
+++ b/apps/spruce/src/components/ProjectSelect/ProjectSelect.test.tsx
@@ -50,12 +50,14 @@ describe("projectSelect", () => {
         expect(screen.getByDataCy("project-select")).toBeInTheDocument();
       });
       expect(screen.queryByDataCy("project-select-options")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("project-select"));
       expect(screen.getByDataCy("project-select-options")).toBeInTheDocument();
 
       let options = await screen.findAllByDataCy("project-display-name");
       expect(options).toHaveLength(6);
       await user.type(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByDataCy("project-select-search-input"),
         "logkeeper",
       );
@@ -79,10 +81,12 @@ describe("projectSelect", () => {
         expect(screen.getByDataCy("project-select")).toBeInTheDocument();
       });
       expect(screen.queryByDataCy("project-select-options")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("project-select"));
       expect(screen.getByDataCy("project-select-options")).toBeInTheDocument();
 
       await user.type(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByDataCy("project-select-search-input"),
         "aaa/totally-different-name",
       );
@@ -131,12 +135,14 @@ describe("projectSelect", () => {
         expect(screen.getByDataCy("project-select")).toBeInTheDocument();
       });
       expect(screen.queryByDataCy("project-select-options")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("project-select"));
       expect(screen.getByDataCy("project-select-options")).toBeInTheDocument();
 
       let options = await screen.findAllByDataCy("project-display-name");
       expect(options).toHaveLength(5);
       await user.type(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByDataCy("project-select-search-input"),
         "evergreen",
       );
@@ -161,10 +167,12 @@ describe("projectSelect", () => {
         expect(screen.getByDataCy("project-select")).toBeInTheDocument();
       });
       expect(screen.queryByDataCy("project-select-options")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("project-select"));
       expect(screen.getByDataCy("project-select-options")).toBeInTheDocument();
 
       await user.type(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByDataCy("project-select-search-input"),
         "aaa/totally-different-name",
       );
@@ -195,6 +203,7 @@ describe("projectSelect", () => {
         expect(screen.getByDataCy("project-select")).toBeInTheDocument();
       });
       expect(screen.queryByDataCy("project-select-options")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("project-select"));
       expect(screen.getByDataCy("project-select-options")).toBeInTheDocument();
       // Favorited projects should appear twice.
@@ -218,6 +227,7 @@ describe("projectSelect", () => {
         expect(screen.getByDataCy("project-select")).toBeInTheDocument();
       });
       expect(screen.queryByDataCy("project-select-options")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("project-select"));
       expect(screen.getByDataCy("project-select-options")).toBeInTheDocument();
 
@@ -245,6 +255,7 @@ describe("projectSelect", () => {
         expect(screen.getByDataCy("project-select")).toBeInTheDocument();
       });
       expect(screen.queryByDataCy("project-select-options")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("project-select"));
       expect(screen.getByDataCy("project-select-options")).toBeInTheDocument();
       const options = await screen.findAllByDataCy("project-display-name");
diff --git a/apps/spruce/src/components/ProjectSelect/index.tsx b/apps/spruce/src/components/ProjectSelect/index.tsx
index 888c37ca9..91001929b 100644
--- a/apps/spruce/src/components/ProjectSelect/index.tsx
+++ b/apps/spruce/src/components/ProjectSelect/index.tsx
@@ -49,6 +49,7 @@ export const ProjectSelect: React.FC<ProjectSelectProps> = ({
     : projectsLoading;
 
   const allProjects = getProjects(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     projectsData,
     viewableProjectsData,
     isProjectSettingsPage,
@@ -96,6 +97,7 @@ export const ProjectSelect: React.FC<ProjectSelectProps> = ({
   return (
     <SearchableDropdown
       label={showLabel ? "Project" : null}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       value={
         selectedProject?.displayName ||
         selectedProject?.identifier ||
@@ -113,6 +115,7 @@ export const ProjectSelect: React.FC<ProjectSelectProps> = ({
           name={projectGroup.groupDisplayName}
           onClick={onClick}
           repoIdentifier={projectGroup?.repo?.id}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           canClickOnRepoGroup={isProjectSettingsPage && projectGroup?.repo?.id}
         />
       )}
@@ -135,6 +138,7 @@ const filterDisabledProjects = (
 ) =>
   projects.reduce(
     ([enabled, disabled], project) =>
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       project.enabled === false
         ? [enabled, [...disabled, project]]
         : [[...enabled, project], disabled],
@@ -174,8 +178,10 @@ const getProjects: GetProjectsType = (
   // For Project Settings pages, move disabled projects to the bottom of the dropdown
   const projectGroups = viewableProjectsData?.viewableProjectRefs ?? [];
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const disabledProjects = [];
   const enabledProjectGroups = projectGroups.map((projectGroup) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const [enabled, disabled] = filterDisabledProjects(projectGroup.projects);
     disabledProjects.push(...disabled);
     return {
@@ -192,7 +198,8 @@ const getProjects: GetProjectsType = (
     },
     ...enabledProjectGroups,
     ...(disabledProjects.length
-      ? [{ groupDisplayName: "Disabled Projects", projects: disabledProjects }]
+      ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+        [{ groupDisplayName: "Disabled Projects", projects: disabledProjects }]
       : []),
   ];
 };
diff --git a/apps/spruce/src/components/Redirects/UserPatchesRedirect.tsx b/apps/spruce/src/components/Redirects/UserPatchesRedirect.tsx
index c9365a01c..9f3126704 100644
--- a/apps/spruce/src/components/Redirects/UserPatchesRedirect.tsx
+++ b/apps/spruce/src/components/Redirects/UserPatchesRedirect.tsx
@@ -3,5 +3,6 @@ import { getUserPatchesRoute, slugs } from "constants/routes";
 
 export const UserPatchesRedirect: React.FC = () => {
   const { [slugs.userId]: userId } = useParams();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return <Navigate replace to={getUserPatchesRoute(userId)} />;
 };
diff --git a/apps/spruce/src/components/ScheduleTasksModal/reducer.ts b/apps/spruce/src/components/ScheduleTasksModal/reducer.ts
index d5bb03e3e..1dfe21af4 100644
--- a/apps/spruce/src/components/ScheduleTasksModal/reducer.ts
+++ b/apps/spruce/src/components/ScheduleTasksModal/reducer.ts
@@ -28,6 +28,7 @@ export const reducer = (state: State, action: Action): State => {
       return {
         ...state,
         sortedBuildVariantGroups: getSortedBuildVariantGroups(action.taskData),
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         allTasks: action.taskData?.version?.tasks?.data.map(({ id }) => id),
       };
     case "toggleTask":
@@ -69,16 +70,20 @@ export const initialState: State = {
 const getSortedBuildVariantGroups = (
   data?: UndispatchedTasksQuery,
 ): BVGroupEntry[] => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const bvGroups: BVGroupsInterface = data?.version?.tasks?.data.reduce(
     (acc, task) => {
       const { buildVariant, buildVariantDisplayName, displayName, id } = task;
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       if (!acc[buildVariant]) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         acc[buildVariant] = {
           tasks: [{ id, displayName }],
           buildVariantDisplayName,
           buildVariant,
         };
       } else {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         acc[buildVariant].tasks.push({ id, displayName });
       }
       return acc;
diff --git a/apps/spruce/src/components/SearchableDropdown/SearchableDropdown.stories.tsx b/apps/spruce/src/components/SearchableDropdown/SearchableDropdown.stories.tsx
index a9f19d17b..b3f7e3f57 100644
--- a/apps/spruce/src/components/SearchableDropdown/SearchableDropdown.stories.tsx
+++ b/apps/spruce/src/components/SearchableDropdown/SearchableDropdown.stories.tsx
@@ -35,6 +35,7 @@ export const CustomOption: CustomStoryObj<
           value: "3",
         },
       ]}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       optionRenderer={(option, onClick, isChecked) => (
         <button
           onClick={() => onClick(option.value)}
@@ -52,6 +53,7 @@ export const CustomOption: CustomStoryObj<
   ),
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Dropdown = (props) => {
   const [value, setValue] = useState([]);
   return <SearchableDropdown {...props} value={value} onChange={setValue} />;
diff --git a/apps/spruce/src/components/SearchableDropdown/SearchableDropdown.test.tsx b/apps/spruce/src/components/SearchableDropdown/SearchableDropdown.test.tsx
index ba72968fe..7198d56a6 100644
--- a/apps/spruce/src/components/SearchableDropdown/SearchableDropdown.test.tsx
+++ b/apps/spruce/src/components/SearchableDropdown/SearchableDropdown.test.tsx
@@ -29,10 +29,12 @@ describe("searchableDropdown", () => {
     expect(
       screen.queryByDataCy("searchable-dropdown-options"),
     ).not.toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("searchable-dropdown"));
     expect(
       screen.getByDataCy("searchable-dropdown-options"),
     ).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("searchable-dropdown"));
     expect(
       screen.queryByDataCy("searchable-dropdown-options"),
@@ -51,6 +53,7 @@ describe("searchableDropdown", () => {
     expect(
       screen.queryByDataCy("searchable-dropdown-options"),
     ).not.toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("searchable-dropdown"));
     expect(
       screen.getByDataCy("searchable-dropdown-options"),
@@ -62,6 +65,7 @@ describe("searchableDropdown", () => {
       2,
     );
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("searchable-dropdown-search-input"),
       "spru",
     );
@@ -80,20 +84,24 @@ describe("searchableDropdown", () => {
       }),
     );
     // use text input to filter and click on document body (which closes the dropdown).
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("searchable-dropdown"));
     expect(screen.queryAllByDataCy("searchable-dropdown-option")).toHaveLength(
       2,
     );
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("searchable-dropdown-search-input"),
       "spru",
     );
     expect(screen.queryAllByDataCy("searchable-dropdown-option")).toHaveLength(
       1,
     );
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("spruce"));
 
     // when reopening the dropdown, the text input should be cleared and all options should be visible.
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("searchable-dropdown"));
     expect(screen.queryAllByDataCy("searchable-dropdown-option")).toHaveLength(
       2,
@@ -106,6 +114,7 @@ describe("searchableDropdown", () => {
   it("should use custom search function when passed in", async () => {
     const user = userEvent.setup();
     const searchFunc = vi.fn((options, match) =>
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       options.filter((o) => o === match),
     );
     render(
@@ -116,12 +125,14 @@ describe("searchableDropdown", () => {
         searchFunc,
       }),
     );
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("searchable-dropdown"));
 
     expect(
       screen.getByDataCy("searchable-dropdown-search-input"),
     ).toBeInTheDocument();
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("searchable-dropdown-search-input"),
       "spruce",
     );
@@ -146,10 +157,12 @@ describe("searchableDropdown", () => {
       expect(
         screen.queryByDataCy("searchable-dropdown-options"),
       ).not.toBeInTheDocument();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
       expect(
         screen.getByDataCy("searchable-dropdown-options"),
       ).toBeInTheDocument();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByText("spruce"));
       expect(onChange).toHaveBeenCalledWith("spruce");
       expect(
@@ -176,20 +189,24 @@ describe("searchableDropdown", () => {
         }),
       );
       // use text input to filter and select an option.
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
       expect(
         screen.queryAllByDataCy("searchable-dropdown-option"),
       ).toHaveLength(2);
       await user.type(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByDataCy("searchable-dropdown-search-input"),
         "spru",
       );
       expect(
         screen.queryAllByDataCy("searchable-dropdown-option"),
       ).toHaveLength(1);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByText("spruce"));
 
       // when reopening the dropdown, the text input should be cleared and all options should be visible.
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
       expect(
         screen.queryAllByDataCy("searchable-dropdown-option"),
@@ -208,6 +225,7 @@ describe("searchableDropdown", () => {
           options: ["evergreen", "spruce"],
         }),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
       expect(
         screen.queryAllByDataCy("searchable-dropdown-option"),
@@ -231,10 +249,12 @@ describe("searchableDropdown", () => {
       expect(
         screen.queryByDataCy("searchable-dropdown-options"),
       ).not.toBeInTheDocument();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
       expect(
         screen.getByDataCy("searchable-dropdown-options"),
       ).toBeInTheDocument();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByText("spruce"));
       expect(onChange).toHaveBeenCalledWith(["spruce"]);
 
@@ -258,6 +278,7 @@ describe("searchableDropdown", () => {
           allowMultiSelect: true,
         }),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByText("evergreen"));
       expect(onChange).toHaveBeenCalledWith(["spruce", "evergreen"]);
     });
@@ -273,17 +294,20 @@ describe("searchableDropdown", () => {
         }),
       );
       // use text input to filter and select an option.
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
       expect(
         screen.queryAllByDataCy("searchable-dropdown-option"),
       ).toHaveLength(3);
       await user.type(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByDataCy("searchable-dropdown-search-input"),
         "s",
       );
       expect(
         screen.queryAllByDataCy("searchable-dropdown-option"),
       ).toHaveLength(2);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByText("spruce"));
 
       // the dropdown should not be closed and the search state should not be reset.
@@ -305,6 +329,7 @@ describe("searchableDropdown", () => {
           allowMultiSelect: true,
         }),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
       expect(
         screen.queryAllByDataCy("searchable-dropdown-option"),
@@ -341,6 +366,7 @@ describe("searchableDropdown", () => {
           ),
         }),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
       expect(screen.getByText("Evergreen")).toBeInTheDocument();
       expect(screen.getByText("Spruce")).toBeInTheDocument();
@@ -376,9 +402,11 @@ describe("searchableDropdown", () => {
           ),
         }),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("searchable-dropdown"));
 
       expect(screen.getByText("Spruce")).toBeInTheDocument();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByText("Spruce"));
       expect(onChange).toHaveBeenCalledWith("spruce");
     });
@@ -389,6 +417,7 @@ describe("searchableDropdown", () => {
           value: "evergreen",
           onChange: vi.fn(),
           options: ["evergreen", "spruce"],
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           buttonRenderer: (option: string) => (
             <b className="just-a-test">{option}</b>
           ),
diff --git a/apps/spruce/src/components/SearchableDropdown/index.tsx b/apps/spruce/src/components/SearchableDropdown/index.tsx
index c48c253bf..b29f22ed5 100644
--- a/apps/spruce/src/components/SearchableDropdown/index.tsx
+++ b/apps/spruce/src/components/SearchableDropdown/index.tsx
@@ -27,7 +27,9 @@ export interface SearchableDropdownProps<T> {
   options?: T[] | string[];
   optionRenderer?: (
     option: T,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     onClick: (selectedV) => void,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     isChecked: (selectedV) => boolean,
   ) => React.ReactNode;
   searchFunc?: (options: T[], match: string) => T[];
@@ -79,6 +81,7 @@ const SearchableDropdown = <T extends {}>({
     // Close the dropdown after user makes a selection only if it isn't a multiselect
     if (!allowMultiSelect) {
       if (DropdownRef.current) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         DropdownRef.current.setIsOpen(false);
       }
       resetSearch();
@@ -86,7 +89,8 @@ const SearchableDropdown = <T extends {}>({
   };
 
   const option = optionRenderer
-    ? (v: T) => optionRenderer(v, onClick, isChecked)
+    ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+      (v: T) => optionRenderer(v, onClick, isChecked)
     : (v: T) => (
         <SearchableDropdownOption
           key={`searchable_dropdown_option_${v}`}
@@ -111,6 +115,7 @@ const SearchableDropdown = <T extends {}>({
     () => (e: ChangeEvent<HTMLInputElement>) => {
       const { value: searchTerm } = e.target;
       setSearch(searchTerm);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       let filteredOptions = [];
 
       if (options) {
@@ -128,6 +133,7 @@ const SearchableDropdown = <T extends {}>({
         }
       }
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setVisibleOptions(filteredOptions);
     },
     [searchFunc, options],
@@ -201,6 +207,7 @@ export const SearchableDropdownOption = <T extends {}>({
           height={12}
           width={12}
           fill={blue.base}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           checked={isChecked}
         />
       </CheckmarkContainer>
diff --git a/apps/spruce/src/components/SetPriority/SetPriority.test.tsx b/apps/spruce/src/components/SetPriority/SetPriority.test.tsx
index 1bf6f8153..48012ec03 100644
--- a/apps/spruce/src/components/SetPriority/SetPriority.test.tsx
+++ b/apps/spruce/src/components/SetPriority/SetPriority.test.tsx
@@ -22,11 +22,13 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-patch"));
       expect(
         screen.queryByDataCy("set-patch-priority-popconfirm"),
       ).toBeVisible();
       expect(screen.queryByDataCy("priority-default-message")).toBeVisible();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("patch-priority-input"), "9");
       expect(screen.queryByDataCy("priority-default-message")).toBeVisible();
     });
@@ -40,11 +42,13 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-patch"));
       expect(
         screen.queryByDataCy("set-patch-priority-popconfirm"),
       ).toBeVisible();
       expect(screen.queryByDataCy("priority-warning-message")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("patch-priority-input"), "99");
       expect(screen.queryByDataCy("priority-warning-message")).toBeVisible();
     });
@@ -58,11 +62,13 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-patch"));
       expect(
         screen.queryByDataCy("set-patch-priority-popconfirm"),
       ).toBeVisible();
       expect(screen.queryByDataCy("priority-admin-message")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("patch-priority-input"), "999");
       expect(screen.queryByDataCy("priority-admin-message")).toBeVisible();
     });
@@ -76,10 +82,12 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-patch"));
       expect(
         screen.queryByDataCy("set-patch-priority-popconfirm"),
       ).toBeVisible();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("patch-priority-input"), "99");
       await user.click(screen.getByRole("button", { name: "Set" }));
       expect(dispatchToast.success).toHaveBeenCalledTimes(1);
@@ -96,6 +104,7 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-task"));
       expect(
         screen.queryByDataCy("set-task-priority-popconfirm"),
@@ -112,6 +121,7 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-task"));
       await waitFor(() => {
         expect(
@@ -119,6 +129,7 @@ describe("setPriority", () => {
         ).toBeVisible();
       });
       expect(screen.queryByDataCy("priority-default-message")).toBeVisible();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("task-priority-input"), "9");
       expect(screen.queryByDataCy("priority-default-message")).toBeVisible();
     });
@@ -132,6 +143,7 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-task"));
       await waitFor(() => {
         expect(
@@ -139,6 +151,7 @@ describe("setPriority", () => {
         ).toBeVisible();
       });
       expect(screen.queryByDataCy("priority-warning-message")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("task-priority-input"), "99");
       expect(screen.queryByDataCy("priority-warning-message")).toBeVisible();
     });
@@ -152,6 +165,7 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-task"));
       await waitFor(() => {
         expect(
@@ -159,6 +173,7 @@ describe("setPriority", () => {
         ).toBeVisible();
       });
       expect(screen.queryByDataCy("priority-admin-message")).toBeNull();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("task-priority-input"), "999");
       expect(screen.queryByDataCy("priority-admin-message")).toBeVisible();
     });
@@ -172,12 +187,14 @@ describe("setPriority", () => {
       );
       renderWithRouterMatch(<Component />);
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("prioritize-task"));
       await waitFor(() => {
         expect(
           screen.queryByDataCy("set-task-priority-popconfirm"),
         ).toBeVisible();
       });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("task-priority-input"), "99");
       await user.click(screen.getByRole("button", { name: "Set" }));
       await waitFor(() =>
diff --git a/apps/spruce/src/components/SetPriority/index.tsx b/apps/spruce/src/components/SetPriority/index.tsx
index 73e7565ac..b3414dc02 100644
--- a/apps/spruce/src/components/SetPriority/index.tsx
+++ b/apps/spruce/src/components/SetPriority/index.tsx
@@ -39,6 +39,7 @@ const SetPriority: React.FC<SetPriorityProps> = ({
   taskId,
   versionId,
 }) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { sendEvent: sendVersionEvent } = useVersionAnalytics(versionId);
   const { sendEvent: sendTaskEvent } = useTaskAnalytics();
   const dispatchToast = useToastContext();
@@ -67,6 +68,7 @@ const SetPriority: React.FC<SetPriorityProps> = ({
   >(SET_TASK_PRIORITY, {
     onCompleted: (data) => {
       dispatchToast.success(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         data.setTaskPriority.priority >= 0
           ? `Priority for task updated to ${data.setTaskPriority.priority}`
           : `Task was successfully disabled`,
@@ -82,6 +84,7 @@ const SetPriority: React.FC<SetPriorityProps> = ({
       setTaskPriority({ variables: { taskId, priority } });
       sendTaskEvent({ name: "Set Priority", priority });
     } else {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setVersionPriority({ variables: { versionId, priority } });
       sendVersionEvent({ name: "Set Priority", priority });
     }
diff --git a/apps/spruce/src/components/Settings/Context.tsx b/apps/spruce/src/components/Settings/Context.tsx
index 856675f04..cd12e73b7 100644
--- a/apps/spruce/src/components/Settings/Context.tsx
+++ b/apps/spruce/src/components/Settings/Context.tsx
@@ -8,6 +8,7 @@ import {
   useReducer,
 } from "react";
 import debounce from "lodash.debounce";
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 import isEqual from "lodash.isequal";
 import { SpruceFormProps } from "components/SpruceForm/types";
 import { FormToGqlFunction, SettingsRoutes } from "./types";
@@ -16,6 +17,7 @@ type OnChangeParams<
   T extends SettingsRoutes,
   FormStateMap extends Record<T, any>,
 > = Pick<
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   Parameters<SpruceFormProps<FormStateMap[T]>["onChange"]>[0],
   "formData" | "errors"
 >;
@@ -100,7 +102,9 @@ const reducer =
           (s, [tab, data]) => ({
             ...s,
             [tab]: {
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               ...s[tab],
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               initialData: getTransformer[tab](data),
             },
           }),
@@ -134,6 +138,7 @@ const useSettingsState = <
   FormStateMap extends Record<T, any>,
 >(
   routes: T[],
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   getTransformer: Record<T, (...any) => any>,
 ): SettingsState<T, FormStateMap> => {
   const [state, dispatch] = useReducer(
diff --git a/apps/spruce/src/components/Settings/EventLog/EventDiffTable.tsx b/apps/spruce/src/components/Settings/EventLog/EventDiffTable.tsx
index e763cd78e..2470f5207 100644
--- a/apps/spruce/src/components/Settings/EventLog/EventDiffTable.tsx
+++ b/apps/spruce/src/components/Settings/EventLog/EventDiffTable.tsx
@@ -47,6 +47,7 @@ const CellText = styled.span`
 
 const renderEventValue = (value: EventValue): string => {
   if (value === null || value === undefined) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     return null;
   }
   if (typeof value === "boolean") {
diff --git a/apps/spruce/src/components/Settings/EventLog/eventLogDiffs.test.ts b/apps/spruce/src/components/Settings/EventLog/eventLogDiffs.test.ts
index 56e2da9b6..89a1823d8 100644
--- a/apps/spruce/src/components/Settings/EventLog/eventLogDiffs.test.ts
+++ b/apps/spruce/src/components/Settings/EventLog/eventLogDiffs.test.ts
@@ -4,11 +4,13 @@ import { getEventDiffLines } from "./eventLogDiffs";
 
 const beforeAddition: Subset<ProjectEventSettings> = {
   __typename: "ProjectEventSettings",
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   projectRef: {
     __typename: "Project",
     identifier: "viewTest",
     patchTriggerAliases: [],
   },
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   vars: {
     __typename: "ProjectVars",
     vars: { newVariable: "so new" },
@@ -21,6 +23,7 @@ const afterAddition: Subset<ProjectEventSettings> = {
     __typename: "Project",
     identifier: "viewTest",
     patchTriggerAliases: [
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       {
         __typename: "PatchTriggerAlias",
         alias: "newAlias",
@@ -28,6 +31,7 @@ const afterAddition: Subset<ProjectEventSettings> = {
       },
     ],
   },
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   vars: {
     __typename: "ProjectVars",
     vars: { newVariable: "so new" },
@@ -40,6 +44,7 @@ const beforeUpdate: Subset<ProjectEventSettings> = {
     __typename: "Project",
     identifier: "viewTest",
     patchTriggerAliases: [
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       {
         __typename: "PatchTriggerAlias",
         alias: "newAlias",
@@ -47,6 +52,7 @@ const beforeUpdate: Subset<ProjectEventSettings> = {
       },
     ],
   },
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   vars: {
     __typename: "ProjectVars",
     vars: { newVariable: "so new" },
@@ -58,6 +64,7 @@ const afterUpdate: Subset<ProjectEventSettings> = {
     __typename: "Project",
     identifier: "viewTest",
     patchTriggerAliases: [
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       {
         __typename: "PatchTriggerAlias",
         alias: "noLongerNewAlias",
@@ -65,6 +72,7 @@ const afterUpdate: Subset<ProjectEventSettings> = {
       },
     ],
   },
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   vars: {
     __typename: "ProjectVars",
     vars: { newVariable: "so new" },
@@ -73,11 +81,13 @@ const afterUpdate: Subset<ProjectEventSettings> = {
 
 const beforeDeletion: Subset<ProjectEventSettings> = {
   __typename: "ProjectEventSettings",
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   projectRef: {
     __typename: "Project",
     identifier: "viewTest",
     patchTriggerAliases: [],
   },
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   vars: {
     __typename: "ProjectVars",
     vars: { newVariable: "so new" },
@@ -86,11 +96,13 @@ const beforeDeletion: Subset<ProjectEventSettings> = {
 
 const afterDeletion: Subset<ProjectEventSettings> = {
   __typename: "ProjectEventSettings",
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   projectRef: {
     __typename: "Project",
     identifier: "viewTest",
     patchTriggerAliases: [],
   },
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   vars: {
     __typename: "ProjectVars",
     vars: {},
@@ -99,6 +111,7 @@ const afterDeletion: Subset<ProjectEventSettings> = {
 
 describe("should transform event diffs to key, before and after", () => {
   it("should transform updates", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const diffLines = getEventDiffLines(beforeUpdate, afterUpdate);
     expect(diffLines).toStrictEqual([
       {
@@ -109,6 +122,7 @@ describe("should transform event diffs to key, before and after", () => {
     ]);
   });
   it("should transform additions", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const diffLines = getEventDiffLines(beforeAddition, afterAddition);
     expect(diffLines).toStrictEqual([
       {
@@ -124,6 +138,7 @@ describe("should transform event diffs to key, before and after", () => {
     ]);
   });
   it("should transform deletions", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const diffLines = getEventDiffLines(beforeDeletion, afterDeletion);
     expect(diffLines).toStrictEqual([
       {
diff --git a/apps/spruce/src/components/Settings/EventLog/eventLogDiffs.ts b/apps/spruce/src/components/Settings/EventLog/eventLogDiffs.ts
index b8bd28af4..7d3341590 100644
--- a/apps/spruce/src/components/Settings/EventLog/eventLogDiffs.ts
+++ b/apps/spruce/src/components/Settings/EventLog/eventLogDiffs.ts
@@ -4,18 +4,22 @@ import { Event, EventDiffLine, EventValue } from "./types";
 
 const { omitTypename } = string;
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const isObject = (val) => val && typeof val === "object" && !Array.isArray(val);
 
 const addDelimiter = (a: string, b: string): string => (a ? `${a}.${b}` : b);
 
 const getDiffProperties = (eventObj: object): string[] => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const paths = (obj = {}, head = "") =>
     Object.entries(obj).reduce((event, [key, value]) => {
       const fullPath = addDelimiter(head, key);
 
       return isObject(value)
-        ? event.concat(paths(value, fullPath))
-        : event.concat(fullPath);
+        ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+          event.concat(paths(value, fullPath))
+        : // @ts-expect-error: FIXME. This comment was added by an automated script.
+          event.concat(fullPath);
     }, []);
   return paths(eventObj);
 };
@@ -24,6 +28,7 @@ const formatArrayElements = (eventKey: string): string =>
   eventKey.replace(/.[0-9]./g, (x) => `[${x[1]}].`);
 
 const getNestedObject = (nestedObj: object, pathArr: string[]): EventValue =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   pathArr.reduce((obj, key) => (obj ? obj[key] : undefined), nestedObj);
 
 export const getEventDiffLines = (
diff --git a/apps/spruce/src/components/Settings/Form.test.tsx b/apps/spruce/src/components/Settings/Form.test.tsx
index 7b59e90bf..e9c45fad6 100644
--- a/apps/spruce/src/components/Settings/Form.test.tsx
+++ b/apps/spruce/src/components/Settings/Form.test.tsx
@@ -53,6 +53,7 @@ describe("context-based form", () => {
 
   it("applies a validate function that shows an error message", async () => {
     const user = userEvent.setup();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     render(<Component tab="bar" validate={barValidator} />, {
       wrapper: TestProvider,
     });
@@ -67,8 +68,14 @@ describe("context-based form", () => {
     render(<Component tab="bar" disabled />, {
       wrapper: TestProvider,
     });
-    expect(screen.getByLabelText("Name")).toBeDisabled();
-    expect(screen.getByLabelText("Age")).toBeDisabled();
+    expect(screen.getByLabelText("Name")).toHaveAttribute(
+      "aria-disabled",
+      "true",
+    );
+    expect(screen.getByLabelText("Age")).toHaveAttribute(
+      "aria-disabled",
+      "true",
+    );
   });
 });
 
diff --git a/apps/spruce/src/components/Settings/NavigationWarningModal.tsx b/apps/spruce/src/components/Settings/NavigationWarningModal.tsx
index 74073b57e..ba7dcc701 100644
--- a/apps/spruce/src/components/Settings/NavigationWarningModal.tsx
+++ b/apps/spruce/src/components/Settings/NavigationWarningModal.tsx
@@ -13,6 +13,7 @@ export type NavigationModalProps = {
   }>;
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const NavigationWarningModal: React.FC<NavigationModalProps> = ({
   shouldBlock,
   unsavedTabs,
diff --git a/apps/spruce/src/components/Settings/test-utils.tsx b/apps/spruce/src/components/Settings/test-utils.tsx
index c51b972dd..480db83b5 100644
--- a/apps/spruce/src/components/Settings/test-utils.tsx
+++ b/apps/spruce/src/components/Settings/test-utils.tsx
@@ -31,6 +31,7 @@ const formToGqlMap = {
 
 const TestContext = createSettingsContext<TestRoutes, FormStateMap>();
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const TestProvider = ({ children }) => {
   const { getTab, saveTab, setInitialData, tabs, updateForm } =
     useSettingsState(["foo", "bar"], formToGqlMap);
@@ -58,10 +59,13 @@ const useTestContext = (): SettingsState<TestRoutes, FormStateMap> => {
       "useProjectSettingsContext must be used within a ProjectSettingsProvider",
     );
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return context;
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const useHasUnsavedTab = getUseHasUnsavedTab(TestContext);
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const usePopulateForm = getUsePopulateForm(TestContext);
 
 export { TestProvider, useHasUnsavedTab, usePopulateForm, useTestContext };
diff --git a/apps/spruce/src/components/Spawn/DetailsCard.tsx b/apps/spruce/src/components/Spawn/DetailsCard.tsx
index 6656565c4..54797be3c 100644
--- a/apps/spruce/src/components/Spawn/DetailsCard.tsx
+++ b/apps/spruce/src/components/Spawn/DetailsCard.tsx
@@ -19,6 +19,7 @@ interface CardItem {
 }
 
 const CardField: React.FC<CardItem> = ({ label, value }) =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   value !== undefined && (
     <FieldContainer>
       <FieldName>{label}</FieldName>
diff --git a/apps/spruce/src/components/Spawn/MountVolumeSelect.tsx b/apps/spruce/src/components/Spawn/MountVolumeSelect.tsx
index ace735834..6303aa4a7 100644
--- a/apps/spruce/src/components/Spawn/MountVolumeSelect.tsx
+++ b/apps/spruce/src/components/Spawn/MountVolumeSelect.tsx
@@ -41,6 +41,7 @@ export const MountVolumeSelect = ({
       dispatchToast.error(`There was an error loading hosts: ${e.message}`);
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   // set host dropdown options
@@ -53,6 +54,7 @@ export const MountVolumeSelect = ({
       const opts = data.myHosts
         // Filter hosts that do not have the same availability zone as the volume.
         .filter(({ availabilityZone, status }) =>
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           canUpdateHost(status, availabilityZone),
         )
         // Map host to a displayName and ID for the dropdown <Option />
diff --git a/apps/spruce/src/components/Spawn/editHostModal/getFormSchema.tsx b/apps/spruce/src/components/Spawn/editHostModal/getFormSchema.tsx
index 10c20765c..35f40d44a 100644
--- a/apps/spruce/src/components/Spawn/editHostModal/getFormSchema.tsx
+++ b/apps/spruce/src/components/Spawn/editHostModal/getFormSchema.tsx
@@ -15,9 +15,8 @@ interface Props {
   canEditRdpPassword: boolean;
   canEditSshKeys: boolean;
   disableExpirationCheckbox: boolean;
-  hostUptimeValidation?: {
+  hostUptimeWarnings?: {
     enabledHoursCount: number;
-    errors: string[];
     warnings: string[];
   };
   instanceTypes: string[];
@@ -32,7 +31,7 @@ export const getFormSchema = ({
   canEditRdpPassword,
   canEditSshKeys,
   disableExpirationCheckbox,
-  hostUptimeValidation,
+  hostUptimeWarnings,
   instanceTypes,
   myPublicKeys,
   noExpirationCheckboxTooltip,
@@ -41,7 +40,7 @@ export const getFormSchema = ({
 }: Props): ReturnType<GetFormSchema> => {
   const expirationDetails = getExpirationDetailsSchema({
     disableExpirationCheckbox,
-    hostUptimeValidation,
+    hostUptimeWarnings,
     noExpirationCheckboxTooltip,
     timeZone,
   });
@@ -114,7 +113,9 @@ export const getFormSchema = ({
             },
           },
         },
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         expirationDetails: expirationDetails.schema,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         publicKeySection: publicKeys.schema,
       },
     },
diff --git a/apps/spruce/src/components/Spawn/editHostModal/transformer.ts b/apps/spruce/src/components/Spawn/editHostModal/transformer.ts
index baa6ae859..85d4c162e 100644
--- a/apps/spruce/src/components/Spawn/editHostModal/transformer.ts
+++ b/apps/spruce/src/components/Spawn/editHostModal/transformer.ts
@@ -32,19 +32,27 @@ export const formToGql = ({
     volume,
   } = formData || {};
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { expiration, hostUptime, noExpiration } = expirationDetails;
   const {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     newPublicKey = "",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     newPublicKeyName = "",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     publicKeyNameDropdown = "",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     savePublicKey = false,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     useExisting,
   } = publicKeySection;
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const addedTags = newUserTags.filter((n) =>
     oldUserTags.every((o) => n.key !== o.key || n.value !== o.value),
   );
   const deletedTags = oldUserTags.filter((o) =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     newUserTags.every((n) => n.key !== o.key || n.value !== o.value),
   );
 
diff --git a/apps/spruce/src/components/Spawn/editHostModal/useLoadFormData.ts b/apps/spruce/src/components/Spawn/editHostModal/useLoadFormData.ts
index fbde26c5e..113382a88 100644
--- a/apps/spruce/src/components/Spawn/editHostModal/useLoadFormData.ts
+++ b/apps/spruce/src/components/Spawn/editHostModal/useLoadFormData.ts
@@ -40,6 +40,7 @@ export const useLoadFormData = (host: MyHost) => {
 
   const noExpirationCheckboxTooltip = getNoExpirationCheckboxTooltipCopy({
     disableExpirationCheckbox,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     limit: spruceConfig?.spawnHost?.unexpirableHostsPerUser,
     isVolume: false,
   });
diff --git a/apps/spruce/src/components/Spawn/editHostModal/utils.ts b/apps/spruce/src/components/Spawn/editHostModal/utils.ts
index 216262813..eb371a855 100644
--- a/apps/spruce/src/components/Spawn/editHostModal/utils.ts
+++ b/apps/spruce/src/components/Spawn/editHostModal/utils.ts
@@ -1,4 +1,5 @@
 import { diff } from "deep-object-diff";
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 import isEqual from "lodash.isequal";
 import { EditSpawnHostMutationVariables } from "gql/generated/types";
 
diff --git a/apps/spruce/src/components/Spawn/editVolumeModal/transformer.ts b/apps/spruce/src/components/Spawn/editVolumeModal/transformer.ts
index 6dde792a1..2e04d47b1 100644
--- a/apps/spruce/src/components/Spawn/editVolumeModal/transformer.ts
+++ b/apps/spruce/src/components/Spawn/editVolumeModal/transformer.ts
@@ -11,6 +11,7 @@ export const formToGql = (
     expirationDetails = {} as FormState["expirationDetails"],
     name = "",
   } = updatedFields;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { expiration, noExpiration } = expirationDetails;
 
   return {
diff --git a/apps/spruce/src/components/Spawn/editVolumeModal/useLoadFormData.ts b/apps/spruce/src/components/Spawn/editVolumeModal/useLoadFormData.ts
index 0531ada76..a4c6fb6bc 100644
--- a/apps/spruce/src/components/Spawn/editVolumeModal/useLoadFormData.ts
+++ b/apps/spruce/src/components/Spawn/editVolumeModal/useLoadFormData.ts
@@ -10,6 +10,7 @@ export const useLoadFormData = (volume: TableVolume) => {
   );
   const noExpirationCheckboxTooltip = getNoExpirationCheckboxTooltipCopy({
     disableExpirationCheckbox,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     limit: spruceConfig?.spawnHost?.unexpirableVolumesPerUser,
     isVolume: true,
   });
diff --git a/apps/spruce/src/components/Spawn/getFormSchema.tsx b/apps/spruce/src/components/Spawn/getFormSchema.tsx
index a0723f14e..0a5c6bb8c 100644
--- a/apps/spruce/src/components/Spawn/getFormSchema.tsx
+++ b/apps/spruce/src/components/Spawn/getFormSchema.tsx
@@ -16,16 +16,15 @@ import {
 const today = new Date();
 
 type HostUptimeProps = {
-  hostUptimeValidation?: {
+  hostUptimeWarnings?: {
     enabledHoursCount: number;
-    errors: string[];
     warnings: string[];
   };
   timeZone?: string;
 };
 
 const getHostUptimeSchema = ({
-  hostUptimeValidation,
+  hostUptimeWarnings,
   timeZone,
 }: HostUptimeProps) => ({
   schema: {
@@ -159,13 +158,14 @@ const getHostUptimeSchema = ({
     details: {
       "ui:descriptionNode": (
         <Details
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           timeZone={timeZone}
-          totalUptimeHours={hostUptimeValidation?.enabledHoursCount}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
+          totalUptimeHours={hostUptimeWarnings?.enabledHoursCount}
         />
       ),
       "ui:showLabel": false,
-      "ui:warnings": hostUptimeValidation?.warnings,
-      "ui:errors": hostUptimeValidation?.errors,
+      "ui:warnings": hostUptimeWarnings?.warnings,
     },
   },
 });
@@ -183,9 +183,8 @@ const Details: React.FC<{ timeZone: string; totalUptimeHours: number }> = ({
 
 type ExpirationProps = {
   disableExpirationCheckbox: boolean;
-  hostUptimeValidation?: {
+  hostUptimeWarnings?: {
     enabledHoursCount: number;
-    errors: string[];
     warnings: string[];
   };
   noExpirationCheckboxTooltip?: string;
@@ -194,12 +193,12 @@ type ExpirationProps = {
 
 export const getExpirationDetailsSchema = ({
   disableExpirationCheckbox,
-  hostUptimeValidation,
+  hostUptimeWarnings,
   noExpirationCheckboxTooltip,
   timeZone,
 }: ExpirationProps) => {
   const defaultExpiration = getDefaultExpiration();
-  const hostUptime = getHostUptimeSchema({ hostUptimeValidation, timeZone });
+  const hostUptime = getHostUptimeSchema({ hostUptimeWarnings, timeZone });
   return {
     schema: {
       title: "Expiration Details",
diff --git a/apps/spruce/src/components/Spawn/index.tsx b/apps/spruce/src/components/Spawn/index.tsx
index a0f4c22d7..93e365d81 100644
--- a/apps/spruce/src/components/Spawn/index.tsx
+++ b/apps/spruce/src/components/Spawn/index.tsx
@@ -3,7 +3,9 @@ export { DetailsCard } from "./DetailsCard";
 export { MountVolumeSelect } from "./MountVolumeSelect";
 export {
   defaultSleepSchedule,
+  getEnabledHoursCount,
   getHostUptimeFromGql,
-  validateUptimeSchedule,
+  getHostUptimeWarnings,
+  isNullSleepSchedule,
   validator,
 } from "./utils";
diff --git a/apps/spruce/src/components/Spawn/spawnHostModal/Widgets/DistroDropdown.tsx b/apps/spruce/src/components/Spawn/spawnHostModal/Widgets/DistroDropdown.tsx
index 912905f5d..9b3a1f21d 100644
--- a/apps/spruce/src/components/Spawn/spawnHostModal/Widgets/DistroDropdown.tsx
+++ b/apps/spruce/src/components/Spawn/spawnHostModal/Widgets/DistroDropdown.tsx
@@ -81,6 +81,7 @@ const categorizeDistros = (distros: DistroValue[]): DistroGroup[] =>
         categoryIndex = 0;
       }
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       accum[categoryIndex].distros.push(name);
 
       return accum;
diff --git a/apps/spruce/src/components/Spawn/spawnHostModal/getFormSchema.tsx b/apps/spruce/src/components/Spawn/spawnHostModal/getFormSchema.tsx
index 740cefa89..882fdfb3f 100644
--- a/apps/spruce/src/components/Spawn/spawnHostModal/getFormSchema.tsx
+++ b/apps/spruce/src/components/Spawn/spawnHostModal/getFormSchema.tsx
@@ -25,9 +25,8 @@ interface Props {
     isVirtualWorkStation: boolean;
     name?: string;
   }[];
-  hostUptimeValidation?: {
+  hostUptimeWarnings?: {
     enabledHoursCount: number;
-    errors: string[];
     warnings: string[];
   };
   isMigration: boolean;
@@ -47,7 +46,7 @@ export const getFormSchema = ({
   disableExpirationCheckbox,
   distroIdQueryParam,
   distros,
-  hostUptimeValidation,
+  hostUptimeWarnings,
   isMigration,
   isVirtualWorkstation,
   myPublicKeys,
@@ -74,7 +73,7 @@ export const getFormSchema = ({
 
   const expirationDetails = getExpirationDetailsSchema({
     disableExpirationCheckbox,
-    hostUptimeValidation,
+    hostUptimeWarnings,
     noExpirationCheckboxTooltip,
     timeZone,
   });
@@ -93,6 +92,7 @@ export const getFormSchema = ({
               type: "string" as "string",
               title: "Distro",
               default: distroIdQueryParam,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               enum: distros?.map(({ name }) => name),
               minLength: 1,
             },
@@ -111,7 +111,9 @@ export const getFormSchema = ({
             },
           },
         },
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         publicKeySection: publicKeys.schema,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         expirationDetails: expirationDetails.schema,
         optionalInformationTitle: {
           title: "Optional Host Details",
@@ -373,6 +375,7 @@ export const getFormSchema = ({
             "ui:customLabel": (
               <>
                 Load data for <b>{taskDisplayName}</b> on <b>{buildVariant}</b>{" "}
+                {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
                 @ <b>{shortenGithash(revision)}</b> onto host at startup
               </>
             ),
diff --git a/apps/spruce/src/components/Spawn/spawnHostModal/transformer.ts b/apps/spruce/src/components/Spawn/spawnHostModal/transformer.ts
index ec96cf382..e14404787 100644
--- a/apps/spruce/src/components/Spawn/spawnHostModal/transformer.ts
+++ b/apps/spruce/src/components/Spawn/spawnHostModal/transformer.ts
@@ -30,10 +30,12 @@ export const formToGql = ({
     homeVolumeDetails,
     loadData,
     publicKeySection,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     requiredSection: { distro, region },
     setupScriptSection,
     userdataScriptSection,
   } = formData || {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { hostUptime } = expirationDetails;
   return {
     isVirtualWorkStation,
@@ -42,11 +44,14 @@ export const formToGql = ({
       : null,
     expiration: expirationDetails?.noExpiration
       ? null
-      : new Date(expirationDetails?.expiration),
+      : // @ts-expect-error: FIXME. This comment was added by an automated script.
+        new Date(expirationDetails?.expiration),
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     noExpiration: expirationDetails?.noExpiration,
     sleepSchedule:
       expirationDetails?.noExpiration && hostUptime
-        ? getSleepSchedule(hostUptime, timeZone)
+        ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+          getSleepSchedule(hostUptime, timeZone)
         : null,
     volumeId:
       migrateVolumeId ||
@@ -58,17 +63,21 @@ export const formToGql = ({
       isVirtualWorkStation &&
       (!homeVolumeDetails?.selectExistingVolume ||
         !homeVolumeDetails?.volumeSelect)
-        ? homeVolumeDetails.volumeSize || DEFAULT_VOLUME_SIZE
+        ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+          homeVolumeDetails.volumeSize || DEFAULT_VOLUME_SIZE
         : null,
     publicKey: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       name: publicKeySection?.useExisting
         ? publicKeySection?.publicKeyNameDropdown
         : publicKeySection?.newPublicKeyName ?? "",
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       key: publicKeySection?.useExisting
         ? myPublicKeys.find(
             ({ name }) => name === publicKeySection?.publicKeyNameDropdown,
           )?.key
-        : stripNewLines(publicKeySection.newPublicKey),
+        : // @ts-expect-error: FIXME. This comment was added by an automated script.
+          stripNewLines(publicKeySection.newPublicKey),
     },
     savePublicKey:
       !publicKeySection?.useExisting && !!publicKeySection?.savePublicKey,
@@ -76,7 +85,8 @@ export const formToGql = ({
     region,
     taskId:
       loadData?.loadDataOntoHostAtStartup && validateTask(spawnTaskData)
-        ? spawnTaskData.id
+        ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+          spawnTaskData.id
         : null,
     useProjectSetupScript: !!(
       loadData?.loadDataOntoHostAtStartup &&
diff --git a/apps/spruce/src/components/Spawn/spawnHostModal/useLoadFormSchemaData.ts b/apps/spruce/src/components/Spawn/spawnHostModal/useLoadFormSchemaData.ts
index 4de575c44..60a179c2b 100644
--- a/apps/spruce/src/components/Spawn/spawnHostModal/useLoadFormSchemaData.ts
+++ b/apps/spruce/src/components/Spawn/spawnHostModal/useLoadFormSchemaData.ts
@@ -59,6 +59,7 @@ export const useLoadFormSchemaData = (p?: Props) => {
   );
   const noExpirationCheckboxTooltip = getNoExpirationCheckboxTooltipCopy({
     disableExpirationCheckbox,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     limit: spruceConfig?.spawnHost?.unexpirableHostsPerUser,
     isVolume: false,
   });
diff --git a/apps/spruce/src/components/Spawn/spawnVolumeModal/transformer.ts b/apps/spruce/src/components/Spawn/spawnVolumeModal/transformer.ts
index 5fa9476a6..fcbc894e9 100644
--- a/apps/spruce/src/components/Spawn/spawnVolumeModal/transformer.ts
+++ b/apps/spruce/src/components/Spawn/spawnVolumeModal/transformer.ts
@@ -16,10 +16,14 @@ export const formToGql = ({
   const { expiration, noExpiration } = expirationDetails || {};
 
   return {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     availabilityZone,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     size,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     type,
     noExpiration,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expiration: noExpiration ? null : new Date(expiration),
     host: mountToHost || null,
   };
diff --git a/apps/spruce/src/components/Spawn/spawnVolumeModal/useLoadFormData.ts b/apps/spruce/src/components/Spawn/spawnVolumeModal/useLoadFormData.ts
index caae06cbf..e65d266d9 100644
--- a/apps/spruce/src/components/Spawn/spawnVolumeModal/useLoadFormData.ts
+++ b/apps/spruce/src/components/Spawn/spawnVolumeModal/useLoadFormData.ts
@@ -32,6 +32,7 @@ export const useLoadFormData = () => {
 
   const noExpirationCheckboxTooltip = getNoExpirationCheckboxTooltipCopy({
     disableExpirationCheckbox,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     limit: spruceConfig?.spawnHost?.unexpirableVolumesPerUser,
     isVolume: true,
   });
diff --git a/apps/spruce/src/components/Spawn/utils/hostUptime.test.ts b/apps/spruce/src/components/Spawn/utils/hostUptime.test.ts
index b99e877f2..011305a00 100644
--- a/apps/spruce/src/components/Spawn/utils/hostUptime.test.ts
+++ b/apps/spruce/src/components/Spawn/utils/hostUptime.test.ts
@@ -1,8 +1,9 @@
 import {
   getHostUptimeFromGql,
+  getHostUptimeWarnings,
+  getNextHostStart,
   getSleepSchedule,
   matchesDefaultUptimeSchedule,
-  validateUptimeSchedule,
   validator,
 } from "./hostUptime";
 
@@ -81,7 +82,7 @@ describe("validator", () => {
         },
       },
       // @ts-expect-error
-      { expirationDetails: { hostUptime: { addError: f } } },
+      { expirationDetails: { hostUptime: { details: { addError: f } } } },
     );
     expect(f).toHaveBeenCalledTimes(0);
   });
@@ -106,7 +107,7 @@ describe("validator", () => {
         },
       },
       // @ts-expect-error
-      { expirationDetails: { hostUptime: { addError: f } } },
+      { expirationDetails: { hostUptime: { details: { addError: f } } } },
     );
     expect(f).toHaveBeenCalledTimes(1);
   });
@@ -131,7 +132,7 @@ describe("validator", () => {
         },
       },
       // @ts-expect-error
-      { expirationDetails: { hostUptime: { addError: f } } },
+      { expirationDetails: { hostUptime: { details: { addError: f } } } },
     );
     expect(f).toHaveBeenCalledTimes(0);
   });
@@ -282,58 +283,104 @@ describe("getSleepSchedule", () => {
   });
 });
 
-describe("validateUptimeSchedule", () => {
+describe("getHostUptimeWarnings", () => {
   it("returns no errors when under recommended time", () => {
     expect(
-      validateUptimeSchedule({
-        enabledWeekdays: [false, false, true, true, true, true, false],
+      getHostUptimeWarnings({
+        enabledHoursCount: 60,
+        enabledWeekdaysCount: 5,
         runContinuously: false,
-        startTime:
-          "Sun Dec 31 1899 08:00:00 GMT+0000 (Coordinated Universal Time)",
-        stopTime:
-          "Sun Dec 31 1899 20:00:00 GMT+0000 (Coordinated Universal Time)",
-        useDefaultUptimeSchedule: true,
       }),
-    ).toStrictEqual({
-      enabledHoursCount: 60,
-      errors: [],
-      warnings: [],
-    });
+    ).toStrictEqual([]);
   });
 
   it("returns a warning when over recommended time", () => {
     expect(
-      validateUptimeSchedule({
-        enabledWeekdays: [false, true, true, true, true, true, true],
+      getHostUptimeWarnings({
+        enabledHoursCount: 144,
+        enabledWeekdaysCount: 6,
         runContinuously: true,
-        startTime:
-          "Sun Dec 31 1899 08:00:00 GMT+0000 (Coordinated Universal Time)",
-        stopTime:
-          "Sun Dec 31 1899 20:00:00 GMT+0000 (Coordinated Universal Time)",
-        useDefaultUptimeSchedule: false,
       }),
-    ).toStrictEqual({
-      enabledHoursCount: 144,
-      errors: [],
-      warnings: ["Consider pausing your host for 2 days per week."],
-    });
+    ).toStrictEqual(["Consider pausing your host for 2 days per week."]);
   });
 
-  it("returns an error when over allowed time", () => {
+  it("does not return a warning when over allowed time", () => {
     expect(
-      validateUptimeSchedule({
-        enabledWeekdays: [true, true, true, true, true, true, true],
+      getHostUptimeWarnings({
+        enabledHoursCount: 168,
+        enabledWeekdaysCount: 7,
         runContinuously: true,
-        startTime:
-          "Sun Dec 31 1899 08:00:00 GMT+0000 (Coordinated Universal Time)",
-        stopTime:
-          "Sun Dec 31 1899 20:00:00 GMT+0000 (Coordinated Universal Time)",
-        useDefaultUptimeSchedule: false,
       }),
-    ).toStrictEqual({
-      enabledHoursCount: 168,
-      errors: ["Please pause your host for at least 1 day per week."],
-      warnings: [],
+    ).toStrictEqual([]);
+  });
+});
+
+describe("getNextHostStart", () => {
+  it("calculates the next start with time", () => {
+    const sched = {
+      dailyStartTime: "08:00",
+      dailyStopTime: "20:00",
+      permanentlyExempt: true,
+      shouldKeepOff: true,
+      timeZone: "America/New_York",
+      wholeWeekdaysOff: [0, 6],
+    };
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
+    const monday = new Date(null, null);
+    expect(getNextHostStart(sched, monday)).toStrictEqual({
+      nextStartDay: "Tuesday",
+      nextStartTime: "8:00",
+    });
+  });
+
+  it("calculates the next start with time when current day is off", () => {
+    const sched = {
+      dailyStartTime: "08:00",
+      dailyStopTime: "20:00",
+      permanentlyExempt: true,
+      shouldKeepOff: true,
+      timeZone: "America/New_York",
+      wholeWeekdaysOff: [0, 1, 6],
+    };
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
+    const monday = new Date(null, null);
+    expect(getNextHostStart(sched, monday)).toStrictEqual({
+      nextStartDay: "Tuesday",
+      nextStartTime: "8:00",
+    });
+  });
+
+  it("calculates the next start when running continuously", () => {
+    const sched = {
+      dailyStartTime: "",
+      dailyStopTime: "",
+      permanentlyExempt: true,
+      shouldKeepOff: true,
+      timeZone: "America/New_York",
+      wholeWeekdaysOff: [0, 6],
+    };
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
+    const monday = new Date(null, null);
+    expect(getNextHostStart(sched, monday)).toStrictEqual({
+      nextStartDay: "Monday",
+      nextStartTime: null,
+    });
+  });
+
+  it("calculates the next start when running continuously and current day is off", () => {
+    const sched = {
+      dailyStartTime: "",
+      dailyStopTime: "",
+      permanentlyExempt: true,
+      shouldKeepOff: true,
+      timeZone: "America/New_York",
+      wholeWeekdaysOff: [0, 1, 6],
+    };
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
+    const monday = new Date(null, null);
+    expect(getNextHostStart(sched, monday)).toStrictEqual({
+      nextStartDay: "Tuesday",
+      nextStartTime: null,
     });
   });
 });
diff --git a/apps/spruce/src/components/Spawn/utils/hostUptime.ts b/apps/spruce/src/components/Spawn/utils/hostUptime.ts
index 8fe9a7f55..b30811c22 100644
--- a/apps/spruce/src/components/Spawn/utils/hostUptime.ts
+++ b/apps/spruce/src/components/Spawn/utils/hostUptime.ts
@@ -1,7 +1,8 @@
-import { differenceInHours, parse } from "date-fns";
+import { differenceInHours, isTomorrow, parse } from "date-fns";
 import { ValidateProps } from "components/SpruceForm";
-import { SleepScheduleInput } from "gql/generated/types";
-import { MyHost } from "types/spawn";
+import { days } from "constants/fieldMaps";
+import { SleepSchedule, SleepScheduleInput } from "gql/generated/types";
+import { Optional } from "types/utils";
 import { arraySymmetricDifference } from "utils/array";
 import { isProduction } from "utils/environmentVariables";
 
@@ -10,11 +11,14 @@ const hoursInDay = 24;
 const defaultStartHour = 8;
 const defaultStopHour = 20;
 const defaultScheduleWeeklyHourCount = 60;
+const defaultScheduleWeekdaysCount = 5;
 
 const suggestedUptimeHours = (daysInWeek - 2) * hoursInDay;
 export const maxUptimeHours = (daysInWeek - 1) * hoursInDay;
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const defaultStartDate = new Date(null, null, null, defaultStartHour);
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const defaultStopDate = new Date(null, null, null, defaultStopHour);
 
 export type HostUptime = {
@@ -27,96 +31,71 @@ export type HostUptime = {
       runContinuously: boolean;
     };
   };
+  details?: null;
 };
 
 type ValidateInput = {
-  enabledWeekdays: boolean[];
-  stopTime: string;
+  enabledHoursCount: number;
+  enabledWeekdaysCount: number;
   runContinuously: boolean;
-  startTime: string;
-  useDefaultUptimeSchedule: boolean;
 };
 
-export const validateUptimeSchedule = ({
-  enabledWeekdays,
+export const getHostUptimeWarnings = ({
+  enabledHoursCount,
+  enabledWeekdaysCount,
   runContinuously,
-  startTime,
-  stopTime,
-  useDefaultUptimeSchedule,
-}: ValidateInput): {
-  enabledHoursCount: number;
-  errors: string[];
-  warnings: string[];
-} => {
-  if (useDefaultUptimeSchedule) {
-    return {
-      enabledHoursCount: defaultScheduleWeeklyHourCount,
-      errors: [],
-      warnings: [],
-    };
-  }
-
-  const { enabledHoursCount, enabledWeekdaysCount } = getEnabledHoursCount({
-    enabledWeekdays,
-    stopTime,
-    runContinuously,
-    startTime,
-  });
-
+}: ValidateInput): string[] => {
   if (enabledHoursCount > maxUptimeHours) {
-    // Return error based on whether runContinously enabled
-    if (runContinuously) {
-      return {
-        enabledHoursCount,
-        errors: ["Please pause your host for at least 1 day per week."],
-        warnings: [],
-      };
-    }
-    const hourlyRequirement = Math.floor(maxUptimeHours / enabledWeekdaysCount);
-    return {
-      enabledHoursCount,
-      errors: [
-        `Please reduce your host uptime to a max of ${hourlyRequirement} hours per day.`,
-      ],
-      warnings: [],
-    };
+    // This state represents an error, which is handled by the RJSF validator.
+    return [];
   }
 
   if (enabledHoursCount > suggestedUptimeHours) {
     // Return warning based on whether runContinuously enabled
     if (runContinuously) {
-      return {
-        enabledHoursCount,
-        errors: [],
-        warnings: ["Consider pausing your host for 2 days per week."],
-      };
+      return ["Consider pausing your host for 2 days per week."];
     }
     const hourlySuggestion = Math.floor(
       suggestedUptimeHours / enabledWeekdaysCount,
     );
-    return {
-      enabledHoursCount,
-      errors: [],
-      warnings: [
-        `Consider running your host for ${hourlySuggestion} hours per day or fewer.`,
-      ],
-    };
+    return [
+      `Consider running your host for ${hourlySuggestion} hours per day or fewer.`,
+    ];
   }
+
   // No error
-  return {
-    enabledHoursCount,
-    errors: [],
-    warnings: [],
-  };
+  return [];
 };
 
-export const getEnabledHoursCount = ({
-  enabledWeekdays,
-  runContinuously,
-  startTime,
-  stopTime,
-}: Omit<ValidateInput, "useDefaultUptimeSchedule">) => {
+export const getEnabledHoursCount = (
+  hostUptime: HostUptime,
+): { enabledHoursCount: number; enabledWeekdaysCount: number } => {
+  if (!hostUptime) {
+    return {
+      enabledHoursCount: defaultScheduleWeeklyHourCount,
+      enabledWeekdaysCount: defaultScheduleWeekdaysCount,
+    };
+  }
+
+  const {
+    sleepSchedule: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      enabledWeekdays,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      timeSelection: { runContinuously, startTime, stopTime },
+    },
+    useDefaultUptimeSchedule,
+  } = hostUptime;
+
+  if (useDefaultUptimeSchedule) {
+    return {
+      enabledHoursCount: defaultScheduleWeeklyHourCount,
+      enabledWeekdaysCount: defaultScheduleWeekdaysCount,
+    };
+  }
+
   const enabledWeekdaysCount =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     enabledWeekdays?.filter((day) => day).length ?? 0;
   const enabledHoursCount = runContinuously
     ? enabledWeekdaysCount * hoursInDay
@@ -136,7 +115,9 @@ export const getSleepSchedule = (
   }
 
   const {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     enabledWeekdays,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     timeSelection: { runContinuously, startTime, stopTime },
   } = sleepSchedule;
 
@@ -146,6 +127,7 @@ export const getSleepSchedule = (
     permanentlyExempt: false,
     timeZone,
     shouldKeepOff: false,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     wholeWeekdaysOff: enabledWeekdays.reduce((accum, isEnabled, i) => {
       if (!isEnabled) {
         accum.push(i);
@@ -155,6 +137,7 @@ export const getSleepSchedule = (
   };
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const getDailyUptime = ({ startTime, stopTime }) =>
   differenceInHours(new Date(stopTime), new Date(startTime));
 
@@ -165,17 +148,16 @@ const toTimeString = (date: Date): string =>
     minute: "2-digit",
   });
 
-export const defaultSleepSchedule: Omit<SleepScheduleInput, "timeZone"> = {
+export const defaultSleepSchedule: Optional<SleepScheduleInput, "timeZone"> = {
   dailyStartTime: toTimeString(defaultStartDate),
   dailyStopTime: toTimeString(defaultStopDate),
   permanentlyExempt: false,
-  // TODO: Add pause
   shouldKeepOff: false,
   wholeWeekdaysOff: [0, 6],
 };
 
 export const getHostUptimeFromGql = (
-  sleepSchedule: MyHost["sleepSchedule"],
+  sleepSchedule: Optional<SleepSchedule, "timeZone">,
 ): HostUptime => {
   const { dailyStartTime, dailyStopTime, wholeWeekdaysOff } = sleepSchedule;
 
@@ -191,11 +173,13 @@ export const getHostUptimeFromGql = (
               startTime: parse(
                 dailyStartTime,
                 "HH:mm",
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 new Date(null, null),
               ).toString(),
               stopTime: parse(
                 dailyStopTime,
                 "HH:mm",
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 new Date(null, null),
               ).toString(),
               runContinuously: false,
@@ -210,7 +194,7 @@ export const getHostUptimeFromGql = (
 };
 
 export const matchesDefaultUptimeSchedule = (
-  sleepSchedule: MyHost["sleepSchedule"],
+  sleepSchedule: Optional<SleepSchedule, "timeZone">,
 ): boolean => {
   const { dailyStartTime, dailyStopTime, wholeWeekdaysOff } = sleepSchedule;
 
@@ -235,22 +219,89 @@ export const validator = (({ expirationDetails }, errors) => {
   if (!hostUptime || noExpiration === false) return errors;
 
   const { sleepSchedule, useDefaultUptimeSchedule } = hostUptime;
-  const { enabledWeekdays, timeSelection } = sleepSchedule;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
+  const { timeSelection } = sleepSchedule;
 
   if (useDefaultUptimeSchedule) {
     return errors;
   }
 
-  const { enabledHoursCount } = getEnabledHoursCount({
-    enabledWeekdays,
-    ...timeSelection,
-  });
+  const { enabledHoursCount, enabledWeekdaysCount } =
+    getEnabledHoursCount(hostUptime);
 
   if (enabledHoursCount > maxUptimeHours) {
-    errors.expirationDetails?.hostUptime?.addError("Insufficient hours");
+    // Return error based on whether runContinously enabled
+    if (timeSelection?.runContinuously) {
+      // @ts-expect-error
+      errors.expirationDetails?.hostUptime?.details?.addError?.(
+        "Please pause your host for at least 1 day per week.",
+      );
+      return errors;
+    }
+    const hourlyRequirement = Math.floor(maxUptimeHours / enabledWeekdaysCount);
+    // @ts-expect-error
+    errors.expirationDetails?.hostUptime?.details?.addError?.(
+      `Please reduce your host uptime to a max of ${hourlyRequirement} hours per day.`,
+    );
+    return errors;
   }
 
   return errors;
 }) satisfies ValidateProps<{
   expirationDetails?: { hostUptime?: HostUptime; noExpiration: boolean };
 }>;
+
+/**
+ * isNullSleepSchedule indicates that the sleep schedule is unset.
+ * TODO: When sleep schedules are generally released, we should instead check whether noExpiration is set.
+ * Until then, noExpiration is insufficient because a user may have an unexpirable host running without a sleep schedule.
+ * @param sleepSchedule - sleepSchedule as returned from Evergreen
+ * @returns boolean indicating whether the sleep schedule is effectively unset.
+ */
+export const isNullSleepSchedule = (
+  sleepSchedule: Optional<SleepSchedule, "timeZone">,
+) => {
+  if (!sleepSchedule) return true;
+
+  const { dailyStartTime, dailyStopTime, wholeWeekdaysOff } = sleepSchedule;
+  if (dailyStartTime !== "") return false;
+  if (dailyStopTime !== "") return false;
+  if (arraySymmetricDifference(wholeWeekdaysOff, []).length > 0) return false;
+  return true;
+};
+
+export const getNextHostStart = (
+  { dailyStartTime, wholeWeekdaysOff }: SleepSchedule,
+  todayDate: Date,
+): {
+  nextStartDay: string;
+  nextStartTime: string | null;
+} => {
+  if (dailyStartTime) {
+    const nextStartDate = parse(dailyStartTime, "HH:mm", todayDate);
+    do {
+      nextStartDate.setDate(nextStartDate.getDate() + 1);
+    } while (wholeWeekdaysOff.includes(nextStartDate.getDay()));
+    const nextStartDay: string = isTomorrow(nextStartDate)
+      ? "tomorrow"
+      : days[nextStartDate.getDay()];
+    const nextStartTime: string = `${nextStartDate.getHours()}:${nextStartDate.getMinutes().toString().padStart(2, "0")}`;
+    return { nextStartDay, nextStartTime };
+  }
+
+  const nextStartDate = todayDate;
+  if (!wholeWeekdaysOff.includes(nextStartDate.getDay())) {
+    // Find the next planned off day in the schedule
+    do {
+      nextStartDate.setDate(nextStartDate.getDate() + 1);
+    } while (!wholeWeekdaysOff.includes(nextStartDate.getDay()));
+  }
+  // Find the first active day after that break
+  do {
+    nextStartDate.setDate(nextStartDate.getDate() + 1);
+  } while (wholeWeekdaysOff.includes(nextStartDate.getDay()));
+  const nextStartDay: string = isTomorrow(nextStartDate)
+    ? "tomorrow"
+    : days[nextStartDate.getDay()];
+  return { nextStartDay, nextStartTime: null };
+};
diff --git a/apps/spruce/src/components/Spawn/utils/index.ts b/apps/spruce/src/components/Spawn/utils/index.ts
index 97ce3b90b..81be4dac3 100644
--- a/apps/spruce/src/components/Spawn/utils/index.ts
+++ b/apps/spruce/src/components/Spawn/utils/index.ts
@@ -6,9 +6,12 @@ export {
   defaultSleepSchedule,
   defaultStartDate,
   defaultStopDate,
+  getEnabledHoursCount,
   getHostUptimeFromGql,
+  getHostUptimeWarnings,
+  getNextHostStart,
   getSleepSchedule,
-  validateUptimeSchedule,
+  isNullSleepSchedule,
   validator,
 } from "./hostUptime";
 export type { HostUptime } from "./hostUptime";
diff --git a/apps/spruce/src/components/SpruceForm/FieldTemplates/ObjectFieldTemplates/index.tsx b/apps/spruce/src/components/SpruceForm/FieldTemplates/ObjectFieldTemplates/index.tsx
index 64df0baa9..fdecb6436 100644
--- a/apps/spruce/src/components/SpruceForm/FieldTemplates/ObjectFieldTemplates/index.tsx
+++ b/apps/spruce/src/components/SpruceForm/FieldTemplates/ObjectFieldTemplates/index.tsx
@@ -180,9 +180,11 @@ const StyledBanner = styled(Banner)`
 
 // Extract index of the current field via its ID
 const getIndex = (id: string): number => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!id) return null;
 
   const stringIndex = id.substring(id.lastIndexOf("_") + 1);
   const index = Number(stringIndex);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return Number.isInteger(index) ? index : null;
 };
diff --git a/apps/spruce/src/components/SpruceForm/FieldTemplates/index.tsx b/apps/spruce/src/components/SpruceForm/FieldTemplates/index.tsx
index 53af4b31a..8deda506f 100644
--- a/apps/spruce/src/components/SpruceForm/FieldTemplates/index.tsx
+++ b/apps/spruce/src/components/SpruceForm/FieldTemplates/index.tsx
@@ -11,6 +11,7 @@ export * from "./ObjectFieldTemplates";
 const { gray } = palette;
 
 // Custom field template that does not render fields' titles, as this is handled by LeafyGreen widgets
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const DefaultFieldTemplate: React.FC<FieldTemplateProps> = ({
   children,
   classNames,
@@ -18,6 +19,7 @@ export const DefaultFieldTemplate: React.FC<FieldTemplateProps> = ({
   hidden,
   id,
   label,
+  rawErrors,
   schema,
   uiSchema,
 }) => {
@@ -27,7 +29,7 @@ export const DefaultFieldTemplate: React.FC<FieldTemplateProps> = ({
   const showLabel = uiSchema["ui:showLabel"] ?? true;
   const fieldDataCy = uiSchema["ui:field-data-cy"];
   const descriptionNode = uiSchema["ui:descriptionNode"];
-  const errors = uiSchema["ui:errors"] ?? [];
+  const errors = uiSchema["ui:errors"] ?? (rawErrors?.length ? rawErrors : []);
   const warnings = uiSchema["ui:warnings"] ?? [];
   return (
     !hidden && (
diff --git a/apps/spruce/src/components/SpruceForm/SpruceForm.stories.tsx b/apps/spruce/src/components/SpruceForm/SpruceForm.stories.tsx
index c5620d900..e7e6d8bfc 100644
--- a/apps/spruce/src/components/SpruceForm/SpruceForm.stories.tsx
+++ b/apps/spruce/src/components/SpruceForm/SpruceForm.stories.tsx
@@ -41,8 +41,10 @@ export const Example3: CustomStoryObj<typeof SpruceForm> = {
   ),
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const BaseForm = ({ data, schema, title, uiSchema }) => {
   const [formState, setFormState] = useState(data);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const onChange = (d) => {
     const { formData } = d;
     action("Change Form State")(formData);
diff --git a/apps/spruce/src/components/SpruceForm/SpruceForm.test.tsx b/apps/spruce/src/components/SpruceForm/SpruceForm.test.tsx
index dd893611b..a8f25ddcc 100644
--- a/apps/spruce/src/components/SpruceForm/SpruceForm.test.tsx
+++ b/apps/spruce/src/components/SpruceForm/SpruceForm.test.tsx
@@ -39,8 +39,11 @@ describe("spruce form", () => {
         />
       </SpruceFormContainer>,
     );
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(screen.queryByDataCy("valid-projects-input"));
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("valid-projects-input"), "new value");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("add-button"));
     expect(screen.queryAllByDataCy("new-user-input")).toHaveLength(2);
     await user.type(screen.queryAllByDataCy("new-user-input")[0], "new-user");
@@ -80,7 +83,9 @@ describe("spruce form", () => {
               />
             </SpruceFormContainer>,
           );
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.type(screen.queryByDataCy("text-input"), "new value");
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.clear(screen.queryByDataCy("text-input"));
           expect(screen.queryByDataCy("text-input")).toHaveValue("");
 
@@ -110,7 +115,9 @@ describe("spruce form", () => {
               />
             </SpruceFormContainer>,
           );
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.type(screen.queryByDataCy("text-input"), "new value");
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.clear(screen.queryByDataCy("text-input"));
           expect(screen.queryByDataCy("text-input")).toHaveValue("");
           expect(data).toStrictEqual({
@@ -137,7 +144,9 @@ describe("spruce form", () => {
               />
             </SpruceFormContainer>,
           );
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.type(screen.queryByDataCy("text-input"), "new value");
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.clear(screen.queryByDataCy("text-input"));
           expect(screen.queryByDataCy("text-input")).toHaveValue(
             "myEmptyValue",
@@ -172,7 +181,9 @@ describe("spruce form", () => {
               />
             </SpruceFormContainer>,
           );
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.type(screen.queryByDataCy("text-area"), "new value");
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.clear(screen.queryByDataCy("text-area"));
           expect(screen.queryByDataCy("text-area")).toHaveValue("");
 
@@ -202,7 +213,9 @@ describe("spruce form", () => {
               />
             </SpruceFormContainer>,
           );
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.type(screen.queryByDataCy("text-area"), "new value");
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.clear(screen.queryByDataCy("text-area"));
           expect(screen.queryByDataCy("text-area")).toHaveValue("");
           expect(data).toStrictEqual({
@@ -229,7 +242,9 @@ describe("spruce form", () => {
               />
             </SpruceFormContainer>,
           );
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.type(screen.queryByDataCy("text-area"), "new value");
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           await user.clear(screen.queryByDataCy("text-area"));
           expect(screen.queryByDataCy("text-area")).toHaveValue("myEmptyValue");
           expect(data).toStrictEqual({
@@ -266,6 +281,7 @@ describe("spruce form", () => {
             uiSchema={uiSchema}
           />,
         );
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         await user.click(screen.queryByRole("button"));
         expect(screen.queryAllByText("Vanilla")).toHaveLength(2);
         expect(screen.getByText("Chocolate")).toBeInTheDocument();
@@ -303,6 +319,7 @@ describe("spruce form", () => {
             uiSchema={uiSchema}
           />,
         );
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         await user.click(screen.queryByRole("button"));
 
         // LeafyGreen doesn't label disabled options as such, so instead of checking for a property
@@ -388,7 +405,6 @@ const basicForm = {
         title: "Users",
         items: {
           type: "string" as "string",
-          title: "Username Label",
         },
       },
     },
diff --git a/apps/spruce/src/components/SpruceForm/Widgets/DateTimePicker.tsx b/apps/spruce/src/components/SpruceForm/Widgets/DateTimePicker.tsx
index daf6fa631..0fdf25cfc 100644
--- a/apps/spruce/src/components/SpruceForm/Widgets/DateTimePicker.tsx
+++ b/apps/spruce/src/components/SpruceForm/Widgets/DateTimePicker.tsx
@@ -25,12 +25,15 @@ export const DateTimePicker: React.FC<
   } = options;
 
   const timezone = useUserTimeZone();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const currentDateTime = toZonedTime(new Date(value || null), timezone);
   const isDisabled = disabled || readonly;
   const handleChange = (d: Date) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     onChange(fromZonedTime(d, timezone).toString());
   };
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const disabledDate = (current) => {
     const disablePast = disableBefore ? current < disableBefore : false;
     const disableFuture = disableAfter ? current > disableAfter : false;
@@ -50,6 +53,7 @@ export const DateTimePicker: React.FC<
           // @ts-expect-error
           getPopupContainer={getPopupContainer}
           data-cy="date-picker"
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           onChange={handleChange}
           value={currentDateTime}
           allowClear={false}
@@ -60,6 +64,7 @@ export const DateTimePicker: React.FC<
           // @ts-expect-error
           getPopupContainer={getPopupContainer}
           data-cy="time-picker"
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           onChange={handleChange}
           value={currentDateTime}
           allowClear={false}
@@ -94,11 +99,13 @@ export const TimePicker: React.FC<
   } = options;
   const timezone = useUserTimeZone();
   const currentDateTime = useUtc
-    ? toZonedTime(new Date(value || null), timezone)
+    ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+      toZonedTime(new Date(value || null), timezone)
     : new Date(value || null);
   const isDisabled = disabled || readonly;
   const handleChange = (d: Date) => {
     if (useUtc) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       onChange(fromZonedTime(d, timezone).toString());
     } else {
       onChange(d.toString());
@@ -119,6 +126,7 @@ export const TimePicker: React.FC<
         id={id}
         data-cy="time-picker"
         format={format}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         onChange={handleChange}
         value={currentDateTime}
         allowClear={false}
@@ -130,4 +138,5 @@ export const TimePicker: React.FC<
 
 // Fixes bug where DatePicker won't handle onClick events
 const getPopupContainer = (triggerNode: HTMLElement) =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   triggerNode.parentNode.parentNode;
diff --git a/apps/spruce/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx b/apps/spruce/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
index 3f6be8e1f..db6f200f3 100644
--- a/apps/spruce/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
+++ b/apps/spruce/src/components/SpruceForm/Widgets/LeafyGreenWidgets.tsx
@@ -38,6 +38,7 @@ export const LeafyGreenTextInput: React.FC<
   value,
 }) => {
   const {
+    ariaLabel,
     ariaLabelledBy,
     "data-cy": dataCy,
     description,
@@ -56,15 +57,15 @@ export const LeafyGreenTextInput: React.FC<
     errorMessage: hasError ? errors.join(", ") : null,
     state: hasError ? TextInputState.Error : TextInputState.None,
   };
-
   return (
     <ElementWrapper limitMaxWidth css={elementWrapperCSS}>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <StyledTextInput
         type={inputType}
         data-cy={dataCy}
         value={value === null || value === undefined ? "" : `${value}`}
         aria-labelledby={ariaLabelledBy}
-        label={ariaLabelledBy ? undefined : label}
+        label={label}
         placeholder={placeholder || undefined}
         description={description}
         optional={optional}
@@ -72,7 +73,7 @@ export const LeafyGreenTextInput: React.FC<
         onChange={({ target }) =>
           target.value === "" ? onChange(emptyValue) : onChange(target.value)
         }
-        aria-label={label}
+        aria-label={ariaLabel}
         {...inputProps}
       />
       {!!warnings?.length && (
@@ -303,6 +304,7 @@ export const LeafyGreenRadioBox: React.FC<
         id={id}
         name={label}
         value={valueMap.indexOf(value)}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         onChange={(e) => onChange(valueMap[e.target.value])}
         data-cy={dataCy}
       >
@@ -371,6 +373,7 @@ export const LeafyGreenTextArea: React.FC<SpruceWidgetProps> = ({
   return (
     <ElementWrapper css={elementWrapperCSS}>
       <TextArea
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         ref={el}
         placeholder={placeholder || undefined}
         data-cy={dataCy}
@@ -381,6 +384,7 @@ export const LeafyGreenTextArea: React.FC<SpruceWidgetProps> = ({
         onChange={({ target }) =>
           target.value === "" ? onChange(emptyValue) : onChange(target.value)
         }
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         errorMessage={hasError ? errors.join(", ") : null}
         rows={rows}
         state={hasError ? "error" : "none"}
diff --git a/apps/spruce/src/components/SpruceForm/Widgets/types.ts b/apps/spruce/src/components/SpruceForm/Widgets/types.ts
index d5a47cdb1..8b946a16d 100644
--- a/apps/spruce/src/components/SpruceForm/Widgets/types.ts
+++ b/apps/spruce/src/components/SpruceForm/Widgets/types.ts
@@ -6,6 +6,7 @@ import { SpruceFormProps } from "components/SpruceForm/types";
 export interface SpruceWidgetProps extends WidgetProps {
   options: Partial<{
     "aria-controls": string[];
+    ariaLabel: string;
     "data-cy": string;
     ariaLabelledBy: string;
     bold: boolean;
diff --git a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example1.storyshot b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example1.storyshot
index d4e36b357..4986b25bf 100644
--- a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example1.storyshot
+++ b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example1.storyshot
@@ -42,23 +42,23 @@
                     <label
                       class="leafygreen-ui-qj0u2k"
                       data-lgid="lg-label"
-                      for="select-191"
-                      id="select-190-label"
+                      for="select-227"
+                      id="select-226-label"
                     >
                       Project Cloning Method
                     </label>
                   </div>
                   <button
-                    aria-controls="select-190-menu"
-                    aria-describedby="select-190-description"
+                    aria-controls="select-226-menu"
+                    aria-describedby="select-226-description"
                     aria-disabled="false"
                     aria-expanded="false"
                     aria-invalid="false"
-                    aria-labelledby="select-190-label"
+                    aria-labelledby="select-226-label"
                     class="lg-ui-button-0000 leafygreen-ui-1p6i2zy"
                     data-lgid="lg-button"
                     data-testid="leafygreen-ui-select-menubutton"
-                    id="select-191"
+                    id="select-227"
                     type="button"
                     value="legacy-ssh"
                   >
@@ -174,34 +174,41 @@
                           class="css-cjejq9-ElementWrapper ee4bs9n0"
                         >
                           <div
-                            class="css-1kbcljo-StyledTextInput eevpusu6 leafygreen-ui-90q1a7"
+                            class="leafygreen-ui-1br9h7w css-1kbcljo-StyledTextInput eevpusu6"
+                            data-lgid="lg-text_input"
                           >
                             <div
-                              class="leafygreen-ui-e3fvh5"
+                              class="leafygreen-ui-au9iil"
                             >
                               <label
-                                class="leafygreen-ui-t01kw4"
-                                for="textinput-4"
+                                class="leafygreen-ui-1qjbbjd"
+                                data-lgid="lg-label"
+                                data-testid="lg-form_field-label"
+                                for="lg-form-field-input-231"
+                                id="lg-form-field-label-228"
                               >
                                 key
                               </label>
                             </div>
                             <div
-                              class="leafygreen-ui-lzja97"
+                              class="leafygreen-ui-95c1iv"
                             >
-                              <input
-                                aria-invalid="false"
-                                aria-label="key"
-                                autocomplete="on"
-                                class="leafygreen-ui-1kmfbzh"
-                                id="textinput-4"
-                                required=""
-                                type="text"
-                                value="Sample Input"
-                              />
                               <div
-                                class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                              />
+                                class="leafygreen-ui-1ago99h"
+                              >
+                                <input
+                                  aria-describedby=""
+                                  aria-disabled="false"
+                                  aria-invalid="false"
+                                  aria-labelledby="lg-form-field-label-228"
+                                  autocomplete="on"
+                                  class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                                  id="lg-form-field-input-231"
+                                  required=""
+                                  type="text"
+                                  value="Sample Input"
+                                />
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -214,34 +221,41 @@
                           class="css-cjejq9-ElementWrapper ee4bs9n0"
                         >
                           <div
-                            class="css-1kbcljo-StyledTextInput eevpusu6 leafygreen-ui-90q1a7"
+                            class="leafygreen-ui-1br9h7w css-1kbcljo-StyledTextInput eevpusu6"
+                            data-lgid="lg-text_input"
                           >
                             <div
-                              class="leafygreen-ui-e3fvh5"
+                              class="leafygreen-ui-au9iil"
                             >
                               <label
-                                class="leafygreen-ui-t01kw4"
-                                for="textinput-5"
+                                class="leafygreen-ui-1qjbbjd"
+                                data-lgid="lg-label"
+                                data-testid="lg-form_field-label"
+                                for="lg-form-field-input-235"
+                                id="lg-form-field-label-232"
                               >
                                 value
                               </label>
                             </div>
                             <div
-                              class="leafygreen-ui-lzja97"
+                              class="leafygreen-ui-95c1iv"
                             >
-                              <input
-                                aria-invalid="false"
-                                aria-label="value"
-                                autocomplete="on"
-                                class="leafygreen-ui-1kmfbzh"
-                                id="textinput-5"
-                                required=""
-                                type="text"
-                                value="Sample Input"
-                              />
                               <div
-                                class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                              />
+                                class="leafygreen-ui-1ago99h"
+                              >
+                                <input
+                                  aria-describedby=""
+                                  aria-disabled="false"
+                                  aria-invalid="false"
+                                  aria-labelledby="lg-form-field-label-232"
+                                  autocomplete="on"
+                                  class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                                  id="lg-form-field-input-235"
+                                  required=""
+                                  type="text"
+                                  value="Sample Input"
+                                />
+                              </div>
                             </div>
                           </div>
                         </div>
@@ -298,13 +312,13 @@
                 >
                   <label
                     class="leafygreen-ui-1fi5x3a"
-                    for="textarea-192"
+                    for="textarea-236"
                   >
                     Valid Projects
                   </label>
                   <textarea
                     class="leafygreen-ui-18em0fn"
-                    id="textarea-192"
+                    id="textarea-236"
                     rows="5"
                     title="Valid Projects"
                   />
diff --git a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example2.storyshot b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example2.storyshot
index 9d8996ef8..7591212c1 100644
--- a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example2.storyshot
+++ b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example2.storyshot
@@ -37,16 +37,16 @@
                 >
                   <label
                     class="leafygreen-ui-75mjfl"
-                    for="checkbox-193"
-                    id="checkbox-193-label"
+                    for="checkbox-237"
+                    id="checkbox-237-label"
                   >
                     <input
                       aria-checked="false"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-193-label"
+                      aria-labelledby="checkbox-237-label"
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-193"
+                      id="checkbox-237"
                       type="checkbox"
                     />
                     <div
@@ -94,16 +94,16 @@
                 >
                   <label
                     class="leafygreen-ui-75mjfl"
-                    for="checkbox-194"
-                    id="checkbox-194-label"
+                    for="checkbox-238"
+                    id="checkbox-238-label"
                   >
                     <input
                       aria-checked="false"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-194-label"
+                      aria-labelledby="checkbox-238-label"
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-194"
+                      id="checkbox-238"
                       type="checkbox"
                     />
                     <div
@@ -151,16 +151,16 @@
                 >
                   <label
                     class="leafygreen-ui-75mjfl"
-                    for="checkbox-195"
-                    id="checkbox-195-label"
+                    for="checkbox-239"
+                    id="checkbox-239-label"
                   >
                     <input
                       aria-checked="false"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-195-label"
+                      aria-labelledby="checkbox-239-label"
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-195"
+                      id="checkbox-239"
                       type="checkbox"
                     />
                     <div
@@ -208,17 +208,17 @@
                 >
                   <label
                     class="leafygreen-ui-75mjfl"
-                    for="checkbox-196"
-                    id="checkbox-196-label"
+                    for="checkbox-240"
+                    id="checkbox-240-label"
                   >
                     <input
                       aria-checked="true"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-196-label"
+                      aria-labelledby="checkbox-240-label"
                       checked=""
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-196"
+                      id="checkbox-240"
                       type="checkbox"
                     />
                     <div
@@ -276,7 +276,7 @@
                     >
                       <input
                         aria-checked="false"
-                        aria-describedby="lg-197"
+                        aria-describedby="lg-241"
                         aria-disabled="false"
                         class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
                         id="radio-group--0"
@@ -303,7 +303,7 @@
                     >
                       <input
                         aria-checked="false"
-                        aria-describedby="lg-198"
+                        aria-describedby="lg-242"
                         aria-disabled="false"
                         class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
                         id="radio-group--1"
diff --git a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example3.storyshot b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example3.storyshot
index 598e26087..3ca87380a 100644
--- a/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example3.storyshot
+++ b/apps/spruce/src/components/SpruceForm/__snapshots__/SpruceForm_Example3.storyshot
@@ -37,17 +37,17 @@
                 >
                   <label
                     class="leafygreen-ui-75mjfl"
-                    for="checkbox-199"
-                    id="checkbox-199-label"
+                    for="checkbox-243"
+                    id="checkbox-243-label"
                   >
                     <input
                       aria-checked="true"
                       aria-disabled="false"
                       aria-label="checkbox"
-                      aria-labelledby="checkbox-199-label"
+                      aria-labelledby="checkbox-243-label"
                       checked=""
                       class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
-                      id="checkbox-199"
+                      id="checkbox-243"
                       type="checkbox"
                     />
                     <div
diff --git a/apps/spruce/src/components/SpruceForm/index.tsx b/apps/spruce/src/components/SpruceForm/index.tsx
index 58a6f2e6c..15a8efb32 100644
--- a/apps/spruce/src/components/SpruceForm/index.tsx
+++ b/apps/spruce/src/components/SpruceForm/index.tsx
@@ -26,6 +26,7 @@ export const SpruceForm: React.FC<SpruceFormProps> = ({
     fields={{ ...baseFields, ...fields }}
     schema={schema}
     onChange={onChange}
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     widgets={widgets}
     uiSchema={uiSchema}
     formData={formData}
@@ -37,6 +38,7 @@ export const SpruceForm: React.FC<SpruceFormProps> = ({
     showErrorList={false}
     validate={validate}
     disabled={disabled}
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     customFormats={customFormats(customFormatFields?.jiraHost)}
     liveValidate
     noHtml5Validate
diff --git a/apps/spruce/src/components/SpruceForm/types.ts b/apps/spruce/src/components/SpruceForm/types.ts
index f720e796d..8249ecca1 100644
--- a/apps/spruce/src/components/SpruceForm/types.ts
+++ b/apps/spruce/src/components/SpruceForm/types.ts
@@ -23,6 +23,7 @@ export type SpruceFormProps<A = any> = Pick<
 > &
   Partial<FormProps<A>> & { customFormatFields?: CustomFormatFields };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export type GetFormSchema = (...any) => {
   fields: Record<string, Field>;
   schema: SpruceFormProps["schema"];
diff --git a/apps/spruce/src/components/SpruceLoader/index.tsx b/apps/spruce/src/components/SpruceLoader/index.tsx
index 0f8db0dda..e60b0484b 100644
--- a/apps/spruce/src/components/SpruceLoader/index.tsx
+++ b/apps/spruce/src/components/SpruceLoader/index.tsx
@@ -11,6 +11,7 @@ export const loadable = <
   JSX.LibraryManagedAttributes<C, React.ComponentProps<C>>
 > => {
   const LoadableComponent = lazy(() => loadableComponent());
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const Loadable = (props) => (
     <Suspense fallback={<FullPageLoad />}>
       <LoadableComponent {...props} />
diff --git a/apps/spruce/src/components/Table/BaseTable.tsx b/apps/spruce/src/components/Table/BaseTable.tsx
index 7160be45a..c4344bcda 100644
--- a/apps/spruce/src/components/Table/BaseTable.tsx
+++ b/apps/spruce/src/components/Table/BaseTable.tsx
@@ -75,13 +75,16 @@ export const BaseTable = forwardRef(
     }: SpruceTableProps & TableProps<any>,
     ref: ForwardedRef<HTMLDivElement>,
   ) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const { virtualRows } = table;
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const { rows } = table.getRowModel();
     const hasVirtualRows = virtualRows && virtualRows.length > 0;
     return (
       <>
         <StyledTable data-cy={dataCyTable} table={table} ref={ref} {...args}>
           <TableHead isSticky={hasVirtualRows}>
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             {table.getHeaderGroups().map((headerGroup) => (
               <HeaderRow key={headerGroup.id}>
                 {headerGroup.headers.map((header) => {
@@ -91,6 +94,7 @@ export const BaseTable = forwardRef(
                     <HeaderCell
                       key={header.id}
                       header={header}
+                      // @ts-expect-error: FIXME. This comment was added by an automated script.
                       style={meta?.width && { width: columnDef?.meta?.width }}
                     >
                       {flexRender(columnDef.header, header.getContext())}
@@ -137,12 +141,14 @@ export const BaseTable = forwardRef(
           <TableBody>
             {loading && (
               <TableLoader
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 numColumns={table.getAllColumns().length}
                 numRows={loadingRows}
               />
             )}
             {hasVirtualRows
-              ? virtualRows.map((vr) => {
+              ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+                virtualRows.map((vr) => {
                   const row = rows[vr.index];
                   return (
                     <RenderableRow
@@ -157,6 +163,7 @@ export const BaseTable = forwardRef(
                   <RenderableRow
                     row={row}
                     key={row.id}
+                    // @ts-expect-error: FIXME. This comment was added by an automated script.
                     virtualRow={null}
                     isSelected={selectedRowIndexes.includes(row.index)}
                   />
diff --git a/apps/spruce/src/components/Table/Filters.tsx b/apps/spruce/src/components/Table/Filters.tsx
index 996d57e57..f88d949ca 100644
--- a/apps/spruce/src/components/Table/Filters.tsx
+++ b/apps/spruce/src/components/Table/Filters.tsx
@@ -39,6 +39,7 @@ export const InputFilter = ({
     if (visible && inputEl?.current) {
       // timeout prevents race condition with antd table animation
       const timer = setTimeout(() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         inputEl.current.focus();
       }, 100);
       return () => clearTimeout(timer);
diff --git a/apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl_Default.storyshot b/apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl_Default.storyshot
index 8b8b418a2..faab70607 100644
--- a/apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl_Default.storyshot
+++ b/apps/spruce/src/components/Table/TableControl/__snapshots__/TableControl_Default.storyshot
@@ -126,8 +126,8 @@
         data-lgid="lg-select"
       >
         <button
-          aria-controls="select-200-menu"
-          aria-describedby="select-200-description"
+          aria-controls="select-244-menu"
+          aria-describedby="select-244-description"
           aria-disabled="false"
           aria-expanded="false"
           aria-invalid="false"
@@ -136,7 +136,7 @@
           data-cy="tasks-table-page-size-selector"
           data-lgid="lg-button"
           data-testid="leafygreen-ui-select-menubutton"
-          id="select-201"
+          id="select-245"
           type="button"
           value="10"
         >
diff --git a/apps/spruce/src/components/TablePopover/TableSortIcon.tsx b/apps/spruce/src/components/TablePopover/TableSortIcon.tsx
index c3084d3b7..1236a8bf7 100644
--- a/apps/spruce/src/components/TablePopover/TableSortIcon.tsx
+++ b/apps/spruce/src/components/TablePopover/TableSortIcon.tsx
@@ -43,6 +43,7 @@ export const TableSortIcon: React.FC<TableSortIconProps> = ({
     } else {
       update = undefined;
     }
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     onToggle(update);
   };
 
diff --git a/apps/spruce/src/components/TaskStatusBadge/TaskStatusBadge.stories.tsx b/apps/spruce/src/components/TaskStatusBadge/TaskStatusBadge.stories.tsx
index 08ec3a95e..abd734bb2 100644
--- a/apps/spruce/src/components/TaskStatusBadge/TaskStatusBadge.stories.tsx
+++ b/apps/spruce/src/components/TaskStatusBadge/TaskStatusBadge.stories.tsx
@@ -19,6 +19,7 @@ export const Default: CustomStoryObj<typeof TaskStatusBadge> = {
       <Container>
         {taskStatuses.map((status) => (
           <Wrapper key={`badge_${status}`}>
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             <TaskStatusBadge status={TaskStatus[status]} />
           </Wrapper>
         ))}
diff --git a/apps/spruce/src/components/TaskStatusBadge/index.tsx b/apps/spruce/src/components/TaskStatusBadge/index.tsx
index 91b7fc52b..46df8eea6 100644
--- a/apps/spruce/src/components/TaskStatusBadge/index.tsx
+++ b/apps/spruce/src/components/TaskStatusBadge/index.tsx
@@ -47,10 +47,12 @@ const TaskStatusBadge: React.FC<TaskStatusBadgeProps> = ({
 
   let displayStatus = getStatusBadgeCopy(status);
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (taskStatusToCopy[status] === undefined) {
     const err = new Error(`Status '${status}' is not a valid task status`);
     reportError(err).warning();
   } else {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     displayStatus = getStatusBadgeCopy(taskStatusToCopy[status]);
   }
 
@@ -60,6 +62,7 @@ const TaskStatusBadge: React.FC<TaskStatusBadgeProps> = ({
         condition={!!id}
         wrapper={(children) => (
           <Link
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             to={getTaskRoute(id, {
               execution,
               tab:
@@ -75,6 +78,7 @@ const TaskStatusBadge: React.FC<TaskStatusBadgeProps> = ({
         <StyledBadge
           data-cy="task-status-badge"
           key={status}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           variant={mapTaskStatusToBadgeVariant[status]}
           css={badgeWidthMaxContent}
         >
diff --git a/apps/spruce/src/components/TaskStatusIcon/TaskStatusIcon.stories.tsx b/apps/spruce/src/components/TaskStatusIcon/TaskStatusIcon.stories.tsx
index e96399ad3..b10c2deec 100644
--- a/apps/spruce/src/components/TaskStatusIcon/TaskStatusIcon.stories.tsx
+++ b/apps/spruce/src/components/TaskStatusIcon/TaskStatusIcon.stories.tsx
@@ -27,6 +27,7 @@ export const Default: CustomStoryObj<TaskStatusIconProps> = {
       <Container>
         {taskStatuses.map((status) => (
           <IconContainer key={status}>
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             <TaskStatusIcon status={TaskStatus[status]} size={s} />
             <span>{status}</span>
           </IconContainer>
diff --git a/apps/spruce/src/components/TasksTable/Columns.tsx b/apps/spruce/src/components/TasksTable/Columns.tsx
index d2f573608..ccc56bbf1 100644
--- a/apps/spruce/src/components/TasksTable/Columns.tsx
+++ b/apps/spruce/src/components/TasksTable/Columns.tsx
@@ -134,6 +134,7 @@ export const getColumnsTemplate = ({
         condition={buildVariant !== mergeTaskVariant}
         wrapper={(children) => (
           <StyledRouterLink
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             to={getVariantHistoryRoute(projectIdentifier, buildVariant)}
           >
             {children}
diff --git a/apps/spruce/src/components/TasksTable/TaskLink.tsx b/apps/spruce/src/components/TasksTable/TaskLink.tsx
index 586d1d67d..46a131089 100644
--- a/apps/spruce/src/components/TasksTable/TaskLink.tsx
+++ b/apps/spruce/src/components/TasksTable/TaskLink.tsx
@@ -25,6 +25,7 @@ export const TaskLink: React.FC<TaskLinkProps> = ({
   >
     <WordBreakAll>{taskName}</WordBreakAll>
     {showTaskExecutionLabel && (
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       <Body>Execution {formatZeroIndexForDisplay(execution)}</Body>
     )}
   </StyledRouterLink>
diff --git a/apps/spruce/src/components/TasksTable/TasksTable.stories.tsx b/apps/spruce/src/components/TasksTable/TasksTable.stories.tsx
index adfba27de..8ea4b8914 100644
--- a/apps/spruce/src/components/TasksTable/TasksTable.stories.tsx
+++ b/apps/spruce/src/components/TasksTable/TasksTable.stories.tsx
@@ -10,6 +10,7 @@ export const BaseTaskTable: CustomStoryObj<typeof TasksTable> = {
 };
 
 export const ExecutionTasksTable: CustomStoryObj<typeof TasksTable> = {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   render: () => <TasksTable isPatch tasks={nestedTasks} />,
 };
 
diff --git a/apps/spruce/src/components/TasksTable/index.tsx b/apps/spruce/src/components/TasksTable/index.tsx
index 6015a0c77..a9e734ccd 100644
--- a/apps/spruce/src/components/TasksTable/index.tsx
+++ b/apps/spruce/src/components/TasksTable/index.tsx
@@ -31,6 +31,7 @@ interface TasksTableProps {
   isPatch: boolean;
   loading?: boolean;
   onClickTaskLink?: (taskId: string) => void;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   onColumnHeaderClick?: (sortField) => void;
   onExpand?: (expanded: boolean) => void;
   showTaskExecutionLabel?: boolean;
@@ -88,7 +89,9 @@ const TasksTable: React.FC<TasksTableProps> = ({
           })
     }
     getPopupContainer={(trigger: HTMLElement) => trigger}
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     dataSource={tasks}
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     onChange={tableChangeHandler}
     childrenColumnName="executionTasksFull"
     expandable={{
@@ -103,6 +106,7 @@ interface GetColumnDefsParams {
   baseStatusSelectorProps?: TreeSelectProps;
   isPatch: boolean;
   onClickTaskLink: (s: string) => void;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   onColumnHeaderClick?: (sortField) => void;
   showTaskExecutionLabel?: boolean;
   statusSelectorProps?: TreeSelectProps;
@@ -209,7 +213,9 @@ const getColumnDefs = ({
       status && (
         <TaskStatusBadge
           status={status}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           id={baseTask.id}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           execution={baseTask.execution}
         />
       ),
@@ -244,6 +250,7 @@ const getColumnDefs = ({
         condition={buildVariant !== mergeTaskVariant}
         wrapper={(children) => (
           <StyledRouterLink
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             to={getVariantHistoryRoute(projectIdentifier, buildVariant)}
           >
             {children}
@@ -308,6 +315,7 @@ const getColumnDefsWithSort = ({
     variantInputProps,
   }).map((columnDef) => ({
     ...columnDef,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     ...sortProps[columnDef.key],
   }));
 };
diff --git a/apps/spruce/src/components/TestStatusBadge/index.tsx b/apps/spruce/src/components/TestStatusBadge/index.tsx
index 438dec03a..b58b58143 100644
--- a/apps/spruce/src/components/TestStatusBadge/index.tsx
+++ b/apps/spruce/src/components/TestStatusBadge/index.tsx
@@ -8,9 +8,11 @@ interface TestStatusBadgeProps {
 
 const TestStatusBadge: React.FC<TestStatusBadgeProps> = ({ status }) => (
   <Badge
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variant={statusToBadgeColor[status?.toLowerCase()] || Variant.LightGray}
     key={status}
   >
+    {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
     {statusCopy[status?.toLowerCase()] || status}
   </Badge>
 );
diff --git a/apps/spruce/src/components/TextInputWithGlyph/TextInputWithGlyph.stories.tsx b/apps/spruce/src/components/TextInputWithGlyph/TextInputWithGlyph.stories.tsx
index d48a19066..c8bdf3cb0 100644
--- a/apps/spruce/src/components/TextInputWithGlyph/TextInputWithGlyph.stories.tsx
+++ b/apps/spruce/src/components/TextInputWithGlyph/TextInputWithGlyph.stories.tsx
@@ -17,6 +17,7 @@ export const Default: CustomStoryObj<typeof TextInputWithGlyph> = {
   },
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Input = (props) => {
   const [value, setValue] = useState("");
   return (
diff --git a/apps/spruce/src/components/TextInputWithGlyph/__snapshots__/TextInputWithGlyph_Default.storyshot b/apps/spruce/src/components/TextInputWithGlyph/__snapshots__/TextInputWithGlyph_Default.storyshot
index 57b772c3b..161374e8d 100644
--- a/apps/spruce/src/components/TextInputWithGlyph/__snapshots__/TextInputWithGlyph_Default.storyshot
+++ b/apps/spruce/src/components/TextInputWithGlyph/__snapshots__/TextInputWithGlyph_Default.storyshot
@@ -3,34 +3,42 @@
     class="css-mk4qpy-TextInputWrapper e13gwrw81"
   >
     <div
-      class="leafygreen-ui-90q1a7"
+      class="leafygreen-ui-1br9h7w"
+      data-lgid="lg-text_input"
     >
       <div
-        class="leafygreen-ui-e3fvh5"
+        class="leafygreen-ui-au9iil"
       >
         <label
-          class="leafygreen-ui-t01kw4"
-          for="textinput-6"
+          class="leafygreen-ui-1qjbbjd"
+          data-lgid="lg-label"
+          data-testid="lg-form_field-label"
+          for="lg-form-field-input-249"
+          id="lg-form-field-label-246"
         >
           Some search field
         </label>
       </div>
       <div
-        class="leafygreen-ui-lzja97"
+        class="leafygreen-ui-95c1iv"
       >
-        <input
-          aria-invalid="false"
-          autocomplete="on"
-          class="leafygreen-ui-1kmfbzh"
-          id="textinput-6"
-          placeholder="Search"
-          required=""
-          type="text"
-          value=""
-        />
         <div
-          class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-        />
+          class="leafygreen-ui-1ago99h"
+        >
+          <input
+            aria-describedby=""
+            aria-disabled="false"
+            aria-invalid="false"
+            aria-labelledby="lg-form-field-label-246"
+            autocomplete="on"
+            class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+            id="lg-form-field-input-249"
+            placeholder="Search"
+            required=""
+            type="text"
+            value=""
+          />
+        </div>
       </div>
     </div>
     <div
diff --git a/apps/spruce/src/components/TextInputWithValidation/__snapshots__/TextInputWithValidation_Default.storyshot b/apps/spruce/src/components/TextInputWithValidation/__snapshots__/TextInputWithValidation_Default.storyshot
index 61e865acc..03dc5fdfc 100644
--- a/apps/spruce/src/components/TextInputWithValidation/__snapshots__/TextInputWithValidation_Default.storyshot
+++ b/apps/spruce/src/components/TextInputWithValidation/__snapshots__/TextInputWithValidation_Default.storyshot
@@ -3,33 +3,41 @@
     class="css-mk4qpy-TextInputWrapper e13gwrw81"
   >
     <div
-      class="leafygreen-ui-90q1a7"
+      class="leafygreen-ui-1br9h7w"
+      data-lgid="lg-text_input"
     >
       <div
-        class="leafygreen-ui-e3fvh5"
+        class="leafygreen-ui-au9iil"
       >
         <label
-          class="leafygreen-ui-t01kw4"
-          for="textinput-7"
+          class="leafygreen-ui-1qjbbjd"
+          data-lgid="lg-label"
+          data-testid="lg-form_field-label"
+          for="lg-form-field-input-253"
+          id="lg-form-field-label-250"
         >
           Some search field
         </label>
       </div>
       <div
-        class="leafygreen-ui-lzja97"
+        class="leafygreen-ui-95c1iv"
       >
-        <input
-          aria-invalid="false"
-          autocomplete="on"
-          class="leafygreen-ui-1kmfbzh"
-          id="textinput-7"
-          required=""
-          type="text"
-          value=""
-        />
         <div
-          class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-        />
+          class="leafygreen-ui-1ago99h"
+        >
+          <input
+            aria-describedby=""
+            aria-disabled="false"
+            aria-invalid="false"
+            aria-labelledby="lg-form-field-label-250"
+            autocomplete="on"
+            class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+            id="lg-form-field-input-253"
+            required=""
+            type="text"
+            value=""
+          />
+        </div>
       </div>
     </div>
     <div
diff --git a/apps/spruce/src/components/TextInputWithValidation/index.tsx b/apps/spruce/src/components/TextInputWithValidation/index.tsx
index 2984b9d24..10ed3efc7 100644
--- a/apps/spruce/src/components/TextInputWithValidation/index.tsx
+++ b/apps/spruce/src/components/TextInputWithValidation/index.tsx
@@ -63,6 +63,7 @@ const TextInputWithValidation: React.FC<TextInputWithValidationProps> =
     };
 
     return (
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       <TextInputWithGlyph
         value={input}
         onChange={(e) => handleOnChange(e.target.value)}
diff --git a/apps/spruce/src/components/TreeSelect/TreeSelect.stories.tsx b/apps/spruce/src/components/TreeSelect/TreeSelect.stories.tsx
index fb80e39f1..d9bba143b 100644
--- a/apps/spruce/src/components/TreeSelect/TreeSelect.stories.tsx
+++ b/apps/spruce/src/components/TreeSelect/TreeSelect.stories.tsx
@@ -22,6 +22,7 @@ export const WithDropdown: CustomStoryObj<typeof TreeSelect> = {
 const BaseTreeSelect = (props: TreeSelectProps) => {
   const [value, setValue] = useState([]);
   return (
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     <TreeSelect tData={treeData} state={value} onChange={setValue} {...props} />
   );
 };
diff --git a/apps/spruce/src/components/TreeSelect/TreeSelect.test.tsx b/apps/spruce/src/components/TreeSelect/TreeSelect.test.tsx
index 932ce4c0f..813c92b04 100644
--- a/apps/spruce/src/components/TreeSelect/TreeSelect.test.tsx
+++ b/apps/spruce/src/components/TreeSelect/TreeSelect.test.tsx
@@ -24,6 +24,7 @@ describe("treeSelect", () => {
     const onChange = vi.fn();
     render(<TreeSelect onChange={onChange} state={[]} tData={treeData} />);
     expect(screen.getByText("Pass")).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("Pass"));
     expect(onChange).toHaveBeenCalledWith(["pass"]);
   });
@@ -33,6 +34,7 @@ describe("treeSelect", () => {
     const onChange = vi.fn();
     render(<TreeSelect onChange={onChange} state={[]} tData={treeData} />);
     expect(screen.getByText("All")).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("All"));
     expect(onChange).toHaveBeenCalledWith([
       "all",
@@ -65,6 +67,7 @@ describe("treeSelect", () => {
     expect(screen.queryByLabelText("Failing Umbrella")).toBeChecked();
     expect(screen.queryByLabelText("System Failure")).toBeChecked();
     expect(screen.queryByLabelText("Fail")).toBeChecked();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("Fail"));
     expect(onChange).toHaveBeenCalledWith(["system-failure"]);
   });
@@ -76,6 +79,7 @@ describe("treeSelect", () => {
       <TreeSelect onChange={onChange} state={[]} tData={nestedTreeData} />,
     );
     expect(screen.getByText("Failing Umbrella")).toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByText("Failing Umbrella"));
     expect(onChange).toHaveBeenCalledWith([
       "failing-umbrella",
diff --git a/apps/spruce/src/components/TreeSelect/TreeSelect.tsx b/apps/spruce/src/components/TreeSelect/TreeSelect.tsx
index 4e965fa36..cbb74ae89 100644
--- a/apps/spruce/src/components/TreeSelect/TreeSelect.tsx
+++ b/apps/spruce/src/components/TreeSelect/TreeSelect.tsx
@@ -56,6 +56,7 @@ export const TreeSelect: React.FC<TreeSelectProps> = ({
             const { target } = findNode({ value, tData });
             if (target.children) {
               return accum.filter(
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 (v) => !target.children.find((child) => child.value === v),
               );
             }
@@ -118,6 +119,7 @@ const renderCheckboxes = ({
 }): JSX.Element[] => {
   const rows: JSX.Element[] = [];
   tData.forEach((entry) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     renderCheckboxesHelper({ rows, data: entry, onChange, state, tData });
   });
   return rows;
@@ -204,6 +206,7 @@ const handleOnChange = ({
     }
   } else if (isParent) {
     // has list of children
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const childrenValues = target.children.map((child) => child.value);
     if (isAlreadyChecked) {
       onChange(
@@ -288,6 +291,7 @@ const findNode = ({
     if (curr.value === value) {
       return {
         target: curr,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         parent: null,
         siblings: tData.filter((v) => v.value !== value),
       };
@@ -304,7 +308,9 @@ const findNode = ({
     }
   }
   return {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     target: null,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     parent: null,
     siblings: [],
   };
@@ -316,6 +322,7 @@ const getAllValues = (tData: TreeDataEntry[]): string[] =>
     const childrenValues = currNode.children
       ? currNode.children.map((child) => child.value)
       : [];
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     return accum.concat([currNode.value]).concat(childrenValues);
   }, []);
 
diff --git a/apps/spruce/src/components/TreeSelect/__snapshots__/TreeSelect_Default.storyshot b/apps/spruce/src/components/TreeSelect/__snapshots__/TreeSelect_Default.storyshot
index 6c873fcab..56d0338c4 100644
--- a/apps/spruce/src/components/TreeSelect/__snapshots__/TreeSelect_Default.storyshot
+++ b/apps/spruce/src/components/TreeSelect/__snapshots__/TreeSelect_Default.storyshot
@@ -11,17 +11,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-202"
-          id="checkbox-202-label"
+          for="checkbox-254"
+          id="checkbox-254-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-202-label"
+            aria-labelledby="checkbox-254-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-202"
+            id="checkbox-254"
             type="checkbox"
           />
           <div
@@ -64,17 +64,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-203"
-          id="checkbox-203-label"
+          for="checkbox-255"
+          id="checkbox-255-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-203-label"
+            aria-labelledby="checkbox-255-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-203"
+            id="checkbox-255"
             type="checkbox"
           />
           <div
@@ -117,17 +117,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-204"
-          id="checkbox-204-label"
+          for="checkbox-256"
+          id="checkbox-256-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-204-label"
+            aria-labelledby="checkbox-256-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-204"
+            id="checkbox-256"
             type="checkbox"
           />
           <div
@@ -170,17 +170,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-205"
-          id="checkbox-205-label"
+          for="checkbox-257"
+          id="checkbox-257-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-205-label"
+            aria-labelledby="checkbox-257-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-205"
+            id="checkbox-257"
             type="checkbox"
           />
           <div
@@ -223,17 +223,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-206"
-          id="checkbox-206-label"
+          for="checkbox-258"
+          id="checkbox-258-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-206-label"
+            aria-labelledby="checkbox-258-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-206"
+            id="checkbox-258"
             type="checkbox"
           />
           <div
@@ -276,17 +276,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-207"
-          id="checkbox-207-label"
+          for="checkbox-259"
+          id="checkbox-259-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-207-label"
+            aria-labelledby="checkbox-259-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-207"
+            id="checkbox-259"
             type="checkbox"
           />
           <div
@@ -329,17 +329,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-208"
-          id="checkbox-208-label"
+          for="checkbox-260"
+          id="checkbox-260-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-208-label"
+            aria-labelledby="checkbox-260-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-208"
+            id="checkbox-260"
             type="checkbox"
           />
           <div
@@ -382,17 +382,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-209"
-          id="checkbox-209-label"
+          for="checkbox-261"
+          id="checkbox-261-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-209-label"
+            aria-labelledby="checkbox-261-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-209"
+            id="checkbox-261"
             type="checkbox"
           />
           <div
@@ -435,17 +435,17 @@
       >
         <label
           class="leafygreen-ui-75mjfl"
-          for="checkbox-210"
-          id="checkbox-210-label"
+          for="checkbox-262"
+          id="checkbox-262-label"
         >
           <input
             aria-checked="false"
             aria-disabled="false"
             aria-label="checkbox"
-            aria-labelledby="checkbox-210-label"
+            aria-labelledby="checkbox-262-label"
             class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
             data-cy="checkbox"
-            id="checkbox-210"
+            id="checkbox-262"
             type="checkbox"
           />
           <div
diff --git a/apps/spruce/src/components/TupleSelect/TupleSelect.test.tsx b/apps/spruce/src/components/TupleSelect/TupleSelect.test.tsx
index 9fdf1174f..45fc2023f 100644
--- a/apps/spruce/src/components/TupleSelect/TupleSelect.test.tsx
+++ b/apps/spruce/src/components/TupleSelect/TupleSelect.test.tsx
@@ -51,7 +51,9 @@ describe("tupleSelect", () => {
     const input = screen.queryByDataCy("tuple-select-input");
 
     expect(input).toHaveValue("");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "some-filter");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "{enter}");
     expect(input).toHaveValue("");
   });
@@ -72,8 +74,10 @@ describe("tupleSelect", () => {
     const input = screen.queryByDataCy("tuple-select-input");
 
     expect(input).toHaveValue("");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "bad");
     expect(input).toHaveValue("bad");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "{enter}");
     expect(input).toHaveValue("bad");
     expect(onSubmit).not.toHaveBeenCalled();
diff --git a/apps/spruce/src/components/TupleSelect/__snapshots__/TupleSelect_Default.storyshot b/apps/spruce/src/components/TupleSelect/__snapshots__/TupleSelect_Default.storyshot
index de2b23f97..2f458f3b0 100644
--- a/apps/spruce/src/components/TupleSelect/__snapshots__/TupleSelect_Default.storyshot
+++ b/apps/spruce/src/components/TupleSelect/__snapshots__/TupleSelect_Default.storyshot
@@ -19,8 +19,8 @@
         data-lgid="lg-select"
       >
         <button
-          aria-controls="select-211-menu"
-          aria-describedby="select-211-description"
+          aria-controls="select-263-menu"
+          aria-describedby="select-263-description"
           aria-disabled="false"
           aria-expanded="false"
           aria-invalid="false"
@@ -29,7 +29,7 @@
           data-cy="tuple-select-dropdown"
           data-lgid="lg-button"
           data-testid="leafygreen-ui-select-menubutton"
-          id="select-212"
+          id="select-264"
           type="button"
           value="build_variant"
         >
@@ -77,26 +77,34 @@
         class="e5gn9hl0 css-47706i-TextInputWrapper-GroupedTextInput e13gwrw81"
       >
         <div
-          class="leafygreen-ui-90q1a7"
+          aria-label="Build Variant"
+          class="leafygreen-ui-1br9h7w"
+          data-lgid="lg-text_input"
         >
           <div
-            class="leafygreen-ui-lzja97"
+            class="leafygreen-ui-1iyoj2o"
+          />
+          <div
+            class="leafygreen-ui-95c1iv"
           >
-            <input
-              aria-invalid="false"
-              aria-label="Build Variant"
-              autocomplete="on"
-              class="leafygreen-ui-1kmfbzh"
-              data-cy="tuple-select-input"
-              id="filter-input"
-              placeholder="Search Build Variant names"
-              required=""
-              type="search"
-              value=""
-            />
             <div
-              class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-            />
+              class="leafygreen-ui-1ago99h"
+            >
+              <input
+                aria-describedby=""
+                aria-disabled="false"
+                aria-invalid="false"
+                aria-label="Build Variant"
+                autocomplete="on"
+                class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                data-cy="tuple-select-input"
+                id="filter-input"
+                placeholder="Search Build Variant names"
+                required=""
+                type="text"
+                value=""
+              />
+            </div>
           </div>
         </div>
         <div
diff --git a/apps/spruce/src/components/TupleSelect/index.tsx b/apps/spruce/src/components/TupleSelect/index.tsx
index 571309019..bcd400535 100644
--- a/apps/spruce/src/components/TupleSelect/index.tsx
+++ b/apps/spruce/src/components/TupleSelect/index.tsx
@@ -58,9 +58,11 @@ const TupleSelect: React.FC<TupleSelectProps> = ({
         </GroupedSelect>
         <GroupedTextInput
           id="filter-input"
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           aria-label={selectedOption.displayName}
           data-cy="tuple-select-input"
-          type="search"
+          type="text" // Chrome will overlay a clear "x" button on the input if type is not set to 'search'
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           placeholder={selectedOption.placeHolderText}
           validator={validator}
           validatorErrorMessage={validatorErrorMessage}
diff --git a/apps/spruce/src/components/TupleSelectWithRegexConditional/TupleSelectWithRegexConditional.test.tsx b/apps/spruce/src/components/TupleSelectWithRegexConditional/TupleSelectWithRegexConditional.test.tsx
index 571a7badb..36fb09968 100644
--- a/apps/spruce/src/components/TupleSelectWithRegexConditional/TupleSelectWithRegexConditional.test.tsx
+++ b/apps/spruce/src/components/TupleSelectWithRegexConditional/TupleSelectWithRegexConditional.test.tsx
@@ -50,7 +50,9 @@ describe("tupleSelectWithRegexConditional", () => {
     const input = screen.queryByDataCy("tuple-select-input");
 
     expect(input).toHaveValue("");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "some-filter");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "{enter}");
     expect(input).toHaveValue("");
   });
@@ -71,8 +73,10 @@ describe("tupleSelectWithRegexConditional", () => {
     const input = screen.queryByDataCy("tuple-select-input");
 
     expect(input).toHaveValue("");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "bad");
     expect(input).toHaveValue("bad");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "{enter}");
     expect(input).toHaveValue("bad");
     expect(onSubmit).not.toHaveBeenCalled();
@@ -99,8 +103,10 @@ describe("tupleSelectWithRegexConditional", () => {
     await user.click(screen.getByRole("tab", { name: "EXACT" }));
     const input = screen.queryByDataCy("tuple-select-input");
     expect(input).toHaveValue("");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "some-*");
     expect(input).toHaveValue("some-*");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "{enter}");
     expect(onSubmit).toHaveBeenCalledWith({
       category: "build_variant",
@@ -124,6 +130,7 @@ describe("tupleSelectWithRegexConditional", () => {
     await user.click(screen.getByRole("tab", { name: "EXACT" }));
     const input = screen.queryByDataCy("tuple-select-input");
     expect(input).toHaveValue("");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(input, "*");
     expect(input).toHaveValue("*");
     expect(validator).toHaveBeenCalledWith("");
diff --git a/apps/spruce/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional_WithConditional.storyshot b/apps/spruce/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional_WithConditional.storyshot
index c4a2724fa..a6f78bfcc 100644
--- a/apps/spruce/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional_WithConditional.storyshot
+++ b/apps/spruce/src/components/TupleSelectWithRegexConditional/__snapshots__/TupleSelectWithRegexConditional_WithConditional.storyshot
@@ -15,8 +15,8 @@
           class="leafygreen-ui-ozfao7 css-1qa4isu-PaddedSegmentedControl egmqwjk0"
         >
           <div
-            aria-label="segmented-control-213"
-            aria-owns="segmented-control-213-0 segmented-control-213-1"
+            aria-label="segmented-control-269"
+            aria-owns="segmented-control-269-0 segmented-control-269-1"
             class="leafygreen-ui-18en4yf"
             role="tablist"
           >
@@ -33,7 +33,7 @@
                   aria-controls="tuple-select-with-regex"
                   aria-selected="true"
                   class="leafygreen-ui-ypz97o"
-                  id="segmented-control-213-0"
+                  id="segmented-control-269-0"
                   role="tab"
                   tabindex="0"
                   type="button"
@@ -63,7 +63,7 @@
                   aria-controls="tuple-select-with-regex"
                   aria-selected="false"
                   class="leafygreen-ui-ypz97o"
-                  id="segmented-control-213-1"
+                  id="segmented-control-269-1"
                   role="tab"
                   tabindex="-1"
                   type="button"
@@ -98,8 +98,8 @@
         data-lgid="lg-select"
       >
         <button
-          aria-controls="select-214-menu"
-          aria-describedby="select-214-description"
+          aria-controls="select-270-menu"
+          aria-describedby="select-270-description"
           aria-disabled="false"
           aria-expanded="false"
           aria-invalid="false"
@@ -108,7 +108,7 @@
           data-cy="tuple-select-dropdown"
           data-lgid="lg-button"
           data-testid="leafygreen-ui-select-menubutton"
-          id="select-215"
+          id="select-271"
           type="button"
           value="build_variant"
         >
@@ -156,26 +156,34 @@
         class="e5gn9hl0 css-47706i-TextInputWrapper-GroupedTextInput e13gwrw81"
       >
         <div
-          class="leafygreen-ui-90q1a7"
+          aria-label="Build Variant"
+          class="leafygreen-ui-1br9h7w"
+          data-lgid="lg-text_input"
         >
           <div
-            class="leafygreen-ui-lzja97"
+            class="leafygreen-ui-1iyoj2o"
+          />
+          <div
+            class="leafygreen-ui-95c1iv"
           >
-            <input
-              aria-invalid="false"
-              aria-label="Build Variant"
-              autocomplete="on"
-              class="leafygreen-ui-1kmfbzh"
-              data-cy="tuple-select-input"
-              id="filter-input"
-              placeholder="Search Build Variant names"
-              required=""
-              type="search"
-              value=""
-            />
             <div
-              class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-            />
+              class="leafygreen-ui-1ago99h"
+            >
+              <input
+                aria-describedby=""
+                aria-disabled="false"
+                aria-invalid="false"
+                aria-label="Build Variant"
+                autocomplete="on"
+                class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                data-cy="tuple-select-input"
+                id="filter-input"
+                placeholder="Search Build Variant names"
+                required=""
+                type="text"
+                value=""
+              />
+            </div>
           </div>
         </div>
         <div
diff --git a/apps/spruce/src/components/TupleSelectWithRegexConditional/index.tsx b/apps/spruce/src/components/TupleSelectWithRegexConditional/index.tsx
index e50e18e4e..ac9453a82 100644
--- a/apps/spruce/src/components/TupleSelectWithRegexConditional/index.tsx
+++ b/apps/spruce/src/components/TupleSelectWithRegexConditional/index.tsx
@@ -30,6 +30,7 @@ const TupleSelectWithRegexConditional: React.FC<
     category: string;
     value: string;
   }) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     onSubmit({ category, value: isRegex ? value : escapeRegex(value) });
   };
 
diff --git a/apps/spruce/src/components/VersionRestartModal/VersionRestartModal.tsx b/apps/spruce/src/components/VersionRestartModal/VersionRestartModal.tsx
index c2ee48507..3920f761c 100644
--- a/apps/spruce/src/components/VersionRestartModal/VersionRestartModal.tsx
+++ b/apps/spruce/src/components/VersionRestartModal/VersionRestartModal.tsx
@@ -61,6 +61,7 @@ const VersionRestartModal: React.FC<VersionRestartModalProps> = ({
     BuildVariantsWithChildrenQuery,
     BuildVariantsWithChildrenQueryVariables
   >(BUILD_VARIANTS_WITH_CHILDREN, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: versionId },
     skip: !visible,
   });
@@ -74,6 +75,7 @@ const VersionRestartModal: React.FC<VersionRestartModalProps> = ({
     setVersionStatusFilterTerm,
     toggleSelectedTask,
     versionStatusFilterTerm,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
   } = useVersionTaskStatusSelect(buildVariants, versionId, childVersions);
 
   const setVersionStatus =
@@ -85,6 +87,7 @@ const VersionRestartModal: React.FC<VersionRestartModalProps> = ({
       setBaseStatusFilterTerm({ [childVersionId]: selectedFilters });
     };
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { sendEvent } = useVersionAnalytics(versionId);
 
   const handlePatchRestart = () => {
@@ -94,6 +97,7 @@ const VersionRestartModal: React.FC<VersionRestartModalProps> = ({
     });
     restartVersions({
       variables: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         versionId: version?.id,
         versionsToRestart: getTaskIds(selectedTasks),
         abort: shouldAbortInProgressTasks,
@@ -118,12 +122,17 @@ const VersionRestartModal: React.FC<VersionRestartModalProps> = ({
       ) : (
         <>
           <VersionTasks
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             version={version}
             selectedTasks={selectedTasks}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             setBaseStatusFilterTerm={setVersionBaseStatus(version?.id)}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             setVersionStatusFilterTerm={setVersionStatus(version?.id)}
             toggleSelectedTask={toggleSelectedTask}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             baseStatusFilterTerm={baseStatusFilterTerm[version?.id]}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             versionStatusFilterTerm={versionStatusFilterTerm[version?.id]}
           />
           {childVersions && (
@@ -186,6 +195,7 @@ const selectedArray = (selected: selectedStrings) => {
 
 const selectTasksTotal = (selectedTasks: versionSelectedTasks) =>
   Object.values(selectedTasks).reduce(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     (total, selectedTask) => selectedArray(selectedTask).length + total,
     0,
   );
@@ -194,6 +204,7 @@ const getTaskIds = (selectedTasks: versionSelectedTasks) =>
   Object.entries(selectedTasks)
     .map(([versionId, tasks]) => ({
       versionId,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       taskIds: selectedArray(tasks),
     }))
     .filter(({ taskIds }) => taskIds.length > 0);
diff --git a/apps/spruce/src/components/VersionRestartModal/VersionTasks.tsx b/apps/spruce/src/components/VersionRestartModal/VersionTasks.tsx
index 5d4585463..3cc0d6b28 100644
--- a/apps/spruce/src/components/VersionRestartModal/VersionTasks.tsx
+++ b/apps/spruce/src/components/VersionRestartModal/VersionTasks.tsx
@@ -45,6 +45,7 @@ const VersionTasks: React.FC<VersionTasksProps> = ({
             <BuildVariantAccordion
               versionId={versionId}
               key={`accordion_${patchBuildVariant.variant}`}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               tasks={patchBuildVariant.tasks}
               displayName={patchBuildVariant.displayName}
               selectedTasks={tasks}
diff --git a/apps/spruce/src/components/WelcomeModal/WelcomeModal.test.tsx b/apps/spruce/src/components/WelcomeModal/WelcomeModal.test.tsx
index b0b760421..e724cc1b2 100644
--- a/apps/spruce/src/components/WelcomeModal/WelcomeModal.test.tsx
+++ b/apps/spruce/src/components/WelcomeModal/WelcomeModal.test.tsx
@@ -86,8 +86,10 @@ describe("welcomeModal", () => {
     );
     expect(screen.getByText("Slide 1")).toBeVisible();
     expect(screen.queryByDataCy("carousel-dot-1")).toBeVisible();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("carousel-dot-1"));
     expect(screen.getByText("Slide 2")).toBeVisible();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("carousel-dot-0"));
     expect(screen.getByText("Slide 1")).toBeVisible();
   });
diff --git a/apps/spruce/src/components/styles/Link.tsx b/apps/spruce/src/components/styles/Link.tsx
index 9ff523bb9..15de5469d 100644
--- a/apps/spruce/src/components/styles/Link.tsx
+++ b/apps/spruce/src/components/styles/Link.tsx
@@ -3,6 +3,7 @@ import styled from "@emotion/styled";
 import { Link as LGLink } from "@leafygreen-ui/typography";
 import { Link } from "react-router-dom";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const StyledLink = (props) => (
   <LGLink
     hideExternalIcon
@@ -16,6 +17,7 @@ export const StyledLink = (props) => (
   />
 );
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const StyledRouterLink = (props) => <StyledLink as={Link} {...props} />;
 
 export const ShortenedRouterLink = styled(StyledRouterLink)<{
diff --git a/apps/spruce/src/components/styles/SideNav.tsx b/apps/spruce/src/components/styles/SideNav.tsx
index 1de9bee30..4aaadeaae 100644
--- a/apps/spruce/src/components/styles/SideNav.tsx
+++ b/apps/spruce/src/components/styles/SideNav.tsx
@@ -32,6 +32,7 @@ export const SideNavItemLink: React.FC<SideNavItemProps> = ({
   glyph,
   ...props
 }) => (
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   <StyledSideNavItemLink as={Link} {...props}>
     <StyledBody weight="medium">{children}</StyledBody>
     <Icon glyph="ArrowRight" />
diff --git a/apps/spruce/src/constants/fieldMaps.ts b/apps/spruce/src/constants/fieldMaps.ts
index 3020dece9..3fd45e10f 100644
--- a/apps/spruce/src/constants/fieldMaps.ts
+++ b/apps/spruce/src/constants/fieldMaps.ts
@@ -195,3 +195,13 @@ export const notificationFields = {
   buildBreak: "Build break",
   commitQueue: "Commit queue",
 };
+
+export const days = [
+  "Sunday",
+  "Monday",
+  "Tuesday",
+  "Wednesday",
+  "Thursday",
+  "Friday",
+  "Saturday",
+];
diff --git a/apps/spruce/src/constants/patch.ts b/apps/spruce/src/constants/patch.ts
index fec81a463..dd46fa17c 100644
--- a/apps/spruce/src/constants/patch.ts
+++ b/apps/spruce/src/constants/patch.ts
@@ -1,4 +1,6 @@
 export const commitQueueAlias = "__commit_queue";
 export const commitQueueRequester = "merge_test";
 export const githubMergeRequester = "github_merge_request";
+export const githubPRRequester = "github_pull_request";
+export const patchRequester = "patch_request";
 export const unlinkedPRUsers = new Set(["github_pull_request", "parent_patch"]);
diff --git a/apps/spruce/src/constants/subscription.ts b/apps/spruce/src/constants/subscription.ts
index 7554de322..56a90c4c3 100644
--- a/apps/spruce/src/constants/subscription.ts
+++ b/apps/spruce/src/constants/subscription.ts
@@ -11,8 +11,10 @@ export const getSubscriberText = (subscriberWrapper: SubscriberWrapper) => {
     case NotificationMethods.EMAIL:
       return subscriber.emailSubscriber;
     case NotificationMethods.WEBHOOK:
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       return subscriber.webhookSubscriber.url;
     case NotificationMethods.JIRA_ISSUE:
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       return subscriber.jiraIssueSubscriber.project;
     default:
       return "";
diff --git a/apps/spruce/src/context/toast/__mocks__/index.tsx b/apps/spruce/src/context/toast/__mocks__/index.tsx
index e058b539f..fa547bfbd 100644
--- a/apps/spruce/src/context/toast/__mocks__/index.tsx
+++ b/apps/spruce/src/context/toast/__mocks__/index.tsx
@@ -1,8 +1,5 @@
 import * as toast from "..";
 
-const { useToastContext } = toast;
-type DispatchToast = ReturnType<typeof useToastContext>;
-
 /**
  * RenderFakeToastContext is a utility that takes a React Component which uses useToastContext and returns a
  * React Component which renders the component with the context mocked out.
@@ -11,7 +8,8 @@ type DispatchToast = ReturnType<typeof useToastContext>;
  * @param Component - A React Component which uses useToastContext
  * @returns an object with the Component, the mocked useToastContext, and the dispatchToast methods
  */
-const RenderFakeToastContext = (Component?: React.ReactElement) => {
+const RenderFakeToastContext = (Component: React.ReactElement = <div />) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const dispatchToast: DispatchToast = {
     success: vi.fn(),
     error: vi.fn(),
@@ -28,8 +26,8 @@ const RenderFakeToastContext = (Component?: React.ReactElement) => {
 
   return {
     Component: () => Component,
-    useToastContext: useToastContextSpied,
     dispatchToast,
+    useToastContext: useToastContextSpied,
   };
 };
 
diff --git a/apps/spruce/src/gql/client/link/logGQLErrorsLink.test.ts b/apps/spruce/src/gql/client/link/logGQLErrorsLink.test.ts
index 786335db7..23e3300d6 100644
--- a/apps/spruce/src/gql/client/link/logGQLErrorsLink.test.ts
+++ b/apps/spruce/src/gql/client/link/logGQLErrorsLink.test.ts
@@ -26,6 +26,7 @@ describe("reportingFn", () => {
       path: ["a", "path", "1"],
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     reportingFn(secretFields, operation)(gqlErr);
 
     expect(ErrorReporting.reportError).toHaveBeenCalledTimes(1);
diff --git a/apps/spruce/src/gql/client/link/logGQLToSentryLink.test.ts b/apps/spruce/src/gql/client/link/logGQLToSentryLink.test.ts
index f6108bb91..432d94c0b 100644
--- a/apps/spruce/src/gql/client/link/logGQLToSentryLink.test.ts
+++ b/apps/spruce/src/gql/client/link/logGQLToSentryLink.test.ts
@@ -26,8 +26,10 @@ describe("leaveBreadcrumbLinkMapFn", () => {
       const response = { data: { result: "Success" }, errors: null };
 
       const mappedFn = leaveBreadcrumbMapFn(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         { variables: unfilteredVariables, ...operation },
         secretFields,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
       )(response);
 
       expect(mappedFn).toStrictEqual(response);
diff --git a/apps/spruce/src/gql/fetch/index.ts b/apps/spruce/src/gql/fetch/index.ts
index 1d984713a..43f22e5a8 100644
--- a/apps/spruce/src/gql/fetch/index.ts
+++ b/apps/spruce/src/gql/fetch/index.ts
@@ -7,6 +7,7 @@ export const secretFieldsReq: RequestInit = {
     "content-type": "application/json",
   },
   body: JSON.stringify({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     operationName: (SECRET_FIELDS.definitions[0] as OperationDefinitionNode)
       .name.value,
     query: SECRET_FIELDS.loc?.source.body,
diff --git a/apps/spruce/src/gql/generated/types.ts b/apps/spruce/src/gql/generated/types.ts
index a203f7d55..58a5c5940 100644
--- a/apps/spruce/src/gql/generated/types.ts
+++ b/apps/spruce/src/gql/generated/types.ts
@@ -5307,8 +5307,7 @@ export type UpdatePublicKeyMutation = {
 };
 
 export type UpdateSpawnHostStatusMutationVariables = Exact<{
-  hostId: Scalars["String"]["input"];
-  action: SpawnHostStatusActions;
+  updateSpawnHostStatusInput: UpdateSpawnHostStatusInput;
 }>;
 
 export type UpdateSpawnHostStatusMutation = {
diff --git a/apps/spruce/src/gql/mocks/getSpruceConfig.ts b/apps/spruce/src/gql/mocks/getSpruceConfig.ts
index 2f88dacf5..107926e19 100644
--- a/apps/spruce/src/gql/mocks/getSpruceConfig.ts
+++ b/apps/spruce/src/gql/mocks/getSpruceConfig.ts
@@ -74,7 +74,7 @@ export const getUserSettingsMock: ApolloMock<
     data: {
       userSettings: {
         __typename: "UserSettings",
-        dateFormat: "MM/DD/YYYY",
+        dateFormat: "MM/dd/yyyy",
         githubUser: {
           lastKnownAs: "user",
           __typename: "GithubUser",
diff --git a/apps/spruce/src/gql/mutations/update-spawn-host-status.graphql b/apps/spruce/src/gql/mutations/update-spawn-host-status.graphql
index 3568b6132..5b33bec7c 100644
--- a/apps/spruce/src/gql/mutations/update-spawn-host-status.graphql
+++ b/apps/spruce/src/gql/mutations/update-spawn-host-status.graphql
@@ -1,8 +1,9 @@
 mutation UpdateSpawnHostStatus(
-  $hostId: String!
-  $action: SpawnHostStatusActions!
+  $updateSpawnHostStatusInput: UpdateSpawnHostStatusInput!
 ) {
-  updateSpawnHostStatus(hostId: $hostId, action: $action) {
+  updateSpawnHostStatus(
+    updateSpawnHostStatusInput: $updateSpawnHostStatusInput
+  ) {
     id
     status
   }
diff --git a/apps/spruce/src/hooks/tests/useBreadcrumbRoot.test.tsx b/apps/spruce/src/hooks/tests/useBreadcrumbRoot.test.tsx
index d3258b6b8..936e7b890 100644
--- a/apps/spruce/src/hooks/tests/useBreadcrumbRoot.test.tsx
+++ b/apps/spruce/src/hooks/tests/useBreadcrumbRoot.test.tsx
@@ -15,12 +15,14 @@ const cache = new InMemoryCache({
   },
 });
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const SameUserProvider = ({ children }) => (
   <MockedProvider mocks={[getUserMock, sameUserMock]} cache={cache}>
     {children}
   </MockedProvider>
 );
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const OtherUserProvider = ({ children }) => (
   <MockedProvider mocks={[getUserMock, otherUserMock]} cache={cache}>
     {children}
@@ -75,6 +77,7 @@ const sameUserMock: ApolloMock<OtherUserQuery, OtherUserQueryVariables> = {
         userId: "admin",
         displayName: "Evergreen Admin",
       },
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       currentUser: getUserMock.result.data.user,
     },
   },
@@ -94,6 +97,7 @@ const otherUserMock: ApolloMock<OtherUserQuery, OtherUserQueryVariables> = {
         userId: "john.doe",
         displayName: "John Doe",
       },
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       currentUser: getUserMock.result.data.user,
     },
   },
diff --git a/apps/spruce/src/hooks/tests/useDisableSpawnExpirationCheckbox.test.tsx b/apps/spruce/src/hooks/tests/useDisableSpawnExpirationCheckbox.test.tsx
index e32f5b9f0..af6e65fef 100644
--- a/apps/spruce/src/hooks/tests/useDisableSpawnExpirationCheckbox.test.tsx
+++ b/apps/spruce/src/hooks/tests/useDisableSpawnExpirationCheckbox.test.tsx
@@ -11,7 +11,9 @@ import { renderHook } from "test_utils";
 import { ApolloMock } from "types/gql";
 import { useDisableSpawnExpirationCheckbox } from "..";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const getProvider = (mocks) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const mockedProvider = ({ children }) => (
     <MockedProvider mocks={mocks}>{children}</MockedProvider>
   );
diff --git a/apps/spruce/src/hooks/tests/useGetUserPatchesPageTitleAndLink.test.tsx b/apps/spruce/src/hooks/tests/useGetUserPatchesPageTitleAndLink.test.tsx
index 9e7d6b3a5..855df3c77 100644
--- a/apps/spruce/src/hooks/tests/useGetUserPatchesPageTitleAndLink.test.tsx
+++ b/apps/spruce/src/hooks/tests/useGetUserPatchesPageTitleAndLink.test.tsx
@@ -62,6 +62,7 @@ const mocks: ApolloMock<OtherUserQuery, OtherUserQueryVariables>[] = [
   },
 ];
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Provider = ({ children }) => (
   <MockedProvider mocks={mocks}>{children}</MockedProvider>
 );
@@ -73,8 +74,10 @@ describe("useGetUserPatchesPageTitleAndLink", () => {
       { wrapper: Provider },
     );
     await waitFor(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.title).toBe("My Patches");
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.link).toBe("/user/admin/patches");
   });
 
@@ -84,8 +87,10 @@ describe("useGetUserPatchesPageTitleAndLink", () => {
       { wrapper: Provider },
     );
     await waitFor(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.title).toBe("Justin Mathew's Patches");
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.link).toBe("/user/justin.mathew/patches");
   });
 
@@ -95,8 +100,10 @@ describe("useGetUserPatchesPageTitleAndLink", () => {
       { wrapper: Provider },
     );
     await waitFor(() => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(result.current.title).toBe("Justin Mathews' Patches");
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(result.current.link).toBe("/user/justin.mathews/patches");
   });
 });
diff --git a/apps/spruce/src/hooks/tests/useNetworkStatus.test.tsx b/apps/spruce/src/hooks/tests/useNetworkStatus.test.tsx
index 4e159680f..2d9b31e6a 100644
--- a/apps/spruce/src/hooks/tests/useNetworkStatus.test.tsx
+++ b/apps/spruce/src/hooks/tests/useNetworkStatus.test.tsx
@@ -3,6 +3,7 @@ import { getUserMock } from "gql/mocks/getUser";
 import { useNetworkStatus } from "hooks";
 import { act, renderHook } from "test_utils";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Provider = ({ children }) => (
   <MockedProvider mocks={[getUserMock]}>{children}</MockedProvider>
 );
diff --git a/apps/spruce/src/hooks/tests/usePageVisibility.test.tsx b/apps/spruce/src/hooks/tests/usePageVisibility.test.tsx
index 0444060b6..6522cef91 100644
--- a/apps/spruce/src/hooks/tests/usePageVisibility.test.tsx
+++ b/apps/spruce/src/hooks/tests/usePageVisibility.test.tsx
@@ -3,6 +3,7 @@ import { getUserMock } from "gql/mocks/getUser";
 import { usePageVisibility } from "hooks";
 import { act, renderHook } from "test_utils";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Provider = ({ children }) => (
   <MockedProvider mocks={[getUserMock]}>{children}</MockedProvider>
 );
diff --git a/apps/spruce/src/hooks/tests/usePolling.test.tsx b/apps/spruce/src/hooks/tests/usePolling.test.tsx
index 39f6e03a3..bf6cfe956 100644
--- a/apps/spruce/src/hooks/tests/usePolling.test.tsx
+++ b/apps/spruce/src/hooks/tests/usePolling.test.tsx
@@ -9,6 +9,7 @@ import { renderHook, act } from "test_utils";
 vi.mock("js-cookie");
 const mockedGet = vi.spyOn(Cookie, "get") as MockInstance;
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Provider = ({ children }) => (
   <MockedProvider mocks={[getUserMock]}>{children}</MockedProvider>
 );
diff --git a/apps/spruce/src/hooks/tests/useUpsertQueryParams.test.tsx b/apps/spruce/src/hooks/tests/useUpsertQueryParams.test.tsx
index c6a23322c..7505e45db 100644
--- a/apps/spruce/src/hooks/tests/useUpsertQueryParams.test.tsx
+++ b/apps/spruce/src/hooks/tests/useUpsertQueryParams.test.tsx
@@ -42,8 +42,11 @@ describe("useUpsertQueryParams", () => {
     const category = screen.queryByDataCy("category");
     const value = screen.queryByDataCy("value");
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(category, "category");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(value, "value");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("submit"));
     expect(router.state.location.search).toBe(`?category=value`);
   });
@@ -54,13 +57,19 @@ describe("useUpsertQueryParams", () => {
 
     const category = screen.queryByDataCy("category");
     const value = screen.queryByDataCy("value");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(category, "category");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(value, "value1");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("submit"));
     expect(router.state.location.search).toBe(`?category=value1`);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(value);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(value, "value2");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("submit"));
     expect(router.state.location.search).toBe(`?category=value1,value2`);
   });
@@ -70,13 +79,19 @@ describe("useUpsertQueryParams", () => {
     const { router } = renderWithRouterMatch(<Content />);
     const category = screen.queryByDataCy("category");
     const value = screen.queryByDataCy("value");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(category, "category");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(value, "value1");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("submit"));
     expect(router.state.location.search).toBe(`?category=value1`);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(value);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(value, "value1");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("submit"));
     expect(router.state.location.search).toBe(`?category=value1`);
   });
@@ -86,13 +101,19 @@ describe("useUpsertQueryParams", () => {
     const { router } = renderWithRouterMatch(<Content />);
     const category = screen.queryByDataCy("category");
     const value = screen.queryByDataCy("value");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(category, "category");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(value, "value1");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("submit"));
     expect(router.state.location.search).toBe(`?category=value1`);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(category);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(category, "category2");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("submit"));
     expect(router.state.location.search).toBe(
       `?category=value1&category2=value1`,
diff --git a/apps/spruce/src/hooks/useBreakingTask/index.ts b/apps/spruce/src/hooks/useBreakingTask/index.ts
index 9a5838526..228f5dd5c 100644
--- a/apps/spruce/src/hooks/useBreakingTask/index.ts
+++ b/apps/spruce/src/hooks/useBreakingTask/index.ts
@@ -25,7 +25,9 @@ export const useBreakingTask = (taskId: string) => {
     taskData?.task ?? {};
 
   const bvOptionsBase = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     tasks: [string.applyStrictRegex(displayName)],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variants: [string.applyStrictRegex(buildVariant)],
   };
 
@@ -42,8 +44,10 @@ export const useBreakingTask = (taskId: string) => {
     LastMainlineCommitQuery,
     LastMainlineCommitQueryVariables
   >(LAST_MAINLINE_COMMIT, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     skip: !parentTask || !lastPassingTask || !isFailedTaskStatus(status),
     variables: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       projectIdentifier,
       skipOrderNumber: passingOrderNumber + 2,
       buildVariantOptions: {
@@ -52,6 +56,7 @@ export const useBreakingTask = (taskId: string) => {
       },
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const task = getTaskFromMainlineCommitsQuery(breakingTaskData);
 
   return {
diff --git a/apps/spruce/src/hooks/useConfigurePatch.ts b/apps/spruce/src/hooks/useConfigurePatch.ts
index 0273a6039..02e64b686 100644
--- a/apps/spruce/src/hooks/useConfigurePatch.ts
+++ b/apps/spruce/src/hooks/useConfigurePatch.ts
@@ -51,6 +51,7 @@ const initialState = ({ selectedTab = 0 }: { selectedTab: number }) => ({
   selectedBuildVariantTasks: {},
   patchParams: null,
   selectedTab,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   disableBuildVariantSelect: tabToIndexMap[selectedTab] === PatchTab.Tasks,
 });
 
@@ -120,6 +121,7 @@ const tabToIndexMap = {
 
 // Extract the type of a child patch and append alias field
 export interface ChildPatchAliased
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   extends Unpacked<ConfigurePatchQuery["patch"]["childPatches"]> {
   alias: string;
 }
@@ -152,13 +154,16 @@ export const useConfigurePatch = (
 ): HookResult => {
   const navigate = useNavigate();
   const location = useLocation();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { [slugs.tab]: tab } = useParams<{ [slugs.tab]: PatchTab | null }>();
 
   const { id, project } = patch;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { variants } = project;
   const [state, dispatch] = useReducer(
     reducer,
     initialState({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       selectedTab: tabToIndexMap[tab || PatchTab.Configure],
     }),
   );
@@ -222,6 +227,7 @@ export const useConfigurePatch = (
     setSelectedAliases,
     setSelectedBuildVariants,
     setSelectedBuildVariantTasks,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     setSelectedTab,
   };
 };
@@ -229,11 +235,13 @@ export const useConfigurePatch = (
 // Takes in variant tasks and default selected tasks and returns an object
 // With merged variant and default selected tasks auto selected.
 const initializeTaskState = (
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   variantTasks: ConfigurePatchQuery["patch"]["project"]["variants"],
   defaultSelectedTasks: VariantTask[],
 ) => {
   const defaultTasks = convertArrayToObject(defaultSelectedTasks, "name");
   return variantTasks.reduce(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     (prev, { name: variant, tasks }) => ({
       ...prev,
       [variant]: {
diff --git a/apps/spruce/src/hooks/useDateFormat.ts b/apps/spruce/src/hooks/useDateFormat.ts
index 4e63aa11f..84bcccd9f 100644
--- a/apps/spruce/src/hooks/useDateFormat.ts
+++ b/apps/spruce/src/hooks/useDateFormat.ts
@@ -9,8 +9,11 @@ export const useDateFormat = () => {
 
   return (date: string | number | Date, options: DateCopyOptions = {}) =>
     getDateCopy(date, {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       tz: timezone,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       dateFormat,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       timeFormat,
       ...options,
     });
diff --git a/apps/spruce/src/hooks/useDimensions/useDimensions.test.ts b/apps/spruce/src/hooks/useDimensions/useDimensions.test.ts
index 0073a7c95..131afefea 100644
--- a/apps/spruce/src/hooks/useDimensions/useDimensions.test.ts
+++ b/apps/spruce/src/hooks/useDimensions/useDimensions.test.ts
@@ -2,7 +2,9 @@ import { useDimensions } from "hooks/useDimensions";
 import { act, renderHook } from "test_utils";
 
 describe("useDimensions", () => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let listener;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let disconnectSpy;
 
   beforeEach(() => {
@@ -13,6 +15,7 @@ describe("useDimensions", () => {
       listener = l;
       return {
         observe: () => {},
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         disconnect: disconnectSpy,
         unobserve: () => {},
       };
@@ -20,6 +23,7 @@ describe("useDimensions", () => {
   });
 
   it("validate default value", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const { result } = renderHook(() => useDimensions({ current: null }));
     expect(result.current).toMatchObject({
       width: 0,
@@ -28,7 +32,9 @@ describe("useDimensions", () => {
   });
 
   it("synchronously sets up ResizeObserver listener", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     renderHook(() => useDimensions({ current: null }));
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(typeof listener).toBe("function");
   });
 
@@ -38,7 +44,8 @@ describe("useDimensions", () => {
     );
 
     act(() => {
-      listener!([
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      listener([
         {
           contentRect: {
             width: 200,
@@ -60,7 +67,8 @@ describe("useDimensions", () => {
     );
 
     act(() => {
-      listener!([
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      listener([
         {
           contentRect: {
             width: 200,
@@ -76,7 +84,8 @@ describe("useDimensions", () => {
     });
 
     act(() => {
-      listener!([
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      listener([
         {
           contentRect: {
             width: 100,
@@ -97,10 +106,12 @@ describe("useDimensions", () => {
       useDimensions({ current: document.createElement("div") }),
     );
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(disconnectSpy).toHaveBeenCalledTimes(0);
 
     unmount();
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(disconnectSpy).toHaveBeenCalledTimes(1);
   });
 });
diff --git a/apps/spruce/src/hooks/useLastExecutedTask/index.ts b/apps/spruce/src/hooks/useLastExecutedTask/index.ts
index 11e34858b..06fda91ac 100644
--- a/apps/spruce/src/hooks/useLastExecutedTask/index.ts
+++ b/apps/spruce/src/hooks/useLastExecutedTask/index.ts
@@ -25,7 +25,9 @@ export const useLastExecutedTask = (taskId: string) => {
   const { order: skipOrderNumber } = versionMetadata?.baseVersion ?? {};
 
   const bvOptionsBase = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     tasks: [string.applyStrictRegex(displayName)],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variants: [string.applyStrictRegex(buildVariant)],
   };
 
@@ -37,7 +39,9 @@ export const useLastExecutedTask = (taskId: string) => {
   >(LAST_MAINLINE_COMMIT, {
     skip: !parentTask || isFinishedTaskStatus(parentTask.status),
     variables: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       projectIdentifier,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       skipOrderNumber,
       buildVariantOptions: {
         ...bvOptionsBase,
@@ -45,6 +49,7 @@ export const useLastExecutedTask = (taskId: string) => {
       },
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const task = getTaskFromMainlineCommitsQuery(lastExecutedTaskData);
 
   return {
diff --git a/apps/spruce/src/hooks/useLastPassingTask/index.ts b/apps/spruce/src/hooks/useLastPassingTask/index.ts
index 9f31672e9..1c97c5c91 100644
--- a/apps/spruce/src/hooks/useLastPassingTask/index.ts
+++ b/apps/spruce/src/hooks/useLastPassingTask/index.ts
@@ -24,7 +24,9 @@ export const useLastPassingTask = (taskId: string) => {
   const { order: skipOrderNumber } = versionMetadata?.baseVersion ?? {};
 
   const bvOptionsBase = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     tasks: [string.applyStrictRegex(displayName)],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variants: [string.applyStrictRegex(buildVariant)],
   };
 
@@ -36,7 +38,9 @@ export const useLastPassingTask = (taskId: string) => {
   >(LAST_MAINLINE_COMMIT, {
     skip: !parentTask || parentTask.status === TaskStatus.Succeeded,
     variables: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       projectIdentifier,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       skipOrderNumber,
       buildVariantOptions: {
         ...bvOptionsBase,
@@ -44,6 +48,7 @@ export const useLastPassingTask = (taskId: string) => {
       },
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const task = getTaskFromMainlineCommitsQuery(lastPassingTaskData);
 
   return {
diff --git a/apps/spruce/src/hooks/useLegacyUIURL/index.ts b/apps/spruce/src/hooks/useLegacyUIURL/index.ts
index bcc69ab78..334f49b4e 100644
--- a/apps/spruce/src/hooks/useLegacyUIURL/index.ts
+++ b/apps/spruce/src/hooks/useLegacyUIURL/index.ts
@@ -31,7 +31,9 @@ export const useLegacyUIURL = (): string | null => {
     for (let i = 0; i < legacyUIKeys.length; i++) {
       const matchedPath = matchPath(legacyUIKeys[i], pathname);
       if (matchedPath !== null) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         setId(slugToId(matchedPath.params));
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         setLegacyUIUrl(legacyUIMap[legacyUIKeys[i]]);
         break;
       }
diff --git a/apps/spruce/src/hooks/useOnClickOutside.ts b/apps/spruce/src/hooks/useOnClickOutside.ts
index 045b61fbc..e81b928bc 100644
--- a/apps/spruce/src/hooks/useOnClickOutside.ts
+++ b/apps/spruce/src/hooks/useOnClickOutside.ts
@@ -13,6 +13,7 @@ export const useOnClickOutside = (
      * This function checks if the click is outside of the provided refs.
      * @param event - click event
      */
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     function handleClickOutside(event): void {
       const isNotFocused = refs.every(
         (ref) => ref.current && !ref.current.contains(event.target as Node),
diff --git a/apps/spruce/src/hooks/usePagination/usePagination.test.tsx b/apps/spruce/src/hooks/usePagination/usePagination.test.tsx
index d04fd25bb..6ed9e14c5 100644
--- a/apps/spruce/src/hooks/usePagination/usePagination.test.tsx
+++ b/apps/spruce/src/hooks/usePagination/usePagination.test.tsx
@@ -5,6 +5,7 @@ import { getDefaultPageSize } from "utils/url";
 import usePagination from "./index";
 
 describe("usePagination", () => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const wrapper = ({ children }) => <MemoryRouter>{children}</MemoryRouter>;
 
   beforeEach(() => {
diff --git a/apps/spruce/src/hooks/useParentTask/index.ts b/apps/spruce/src/hooks/useParentTask/index.ts
index dc36b7ee8..30c8bb846 100644
--- a/apps/spruce/src/hooks/useParentTask/index.ts
+++ b/apps/spruce/src/hooks/useParentTask/index.ts
@@ -27,7 +27,9 @@ export const useParentTask = (taskId: string) => {
   const { order: skipOrderNumber } = versionMetadata?.baseVersion ?? {};
 
   const bvOptionsBase = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     tasks: [string.applyStrictRegex(displayName)],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variants: [string.applyStrictRegex(buildVariant)],
   };
 
@@ -37,13 +39,16 @@ export const useParentTask = (taskId: string) => {
   >(LAST_MAINLINE_COMMIT, {
     skip: !versionMetadata || versionMetadata.isPatch,
     variables: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       projectIdentifier,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       skipOrderNumber,
       buildVariantOptions: {
         ...bvOptionsBase,
       },
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const task = getTaskFromMainlineCommitsQuery(parentTaskData);
 
   return {
diff --git a/apps/spruce/src/hooks/useProjectRedirect/index.ts b/apps/spruce/src/hooks/useProjectRedirect/index.ts
index fc4f6660a..6916b7f35 100644
--- a/apps/spruce/src/hooks/useProjectRedirect/index.ts
+++ b/apps/spruce/src/hooks/useProjectRedirect/index.ts
@@ -30,6 +30,7 @@ export const useProjectRedirect = ({
   const { [slugs.projectIdentifier]: projectIdentifier } = useParams();
   const navigate = useNavigate();
   const location = useLocation();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const needsRedirect = validateObjectId(projectIdentifier) && shouldRedirect;
 
   const [attemptedRedirect, setAttemptedRedirect] = useState(false);
@@ -37,15 +38,18 @@ export const useProjectRedirect = ({
   const { loading } = useQuery<ProjectQuery, ProjectQueryVariables>(PROJECT, {
     skip: !needsRedirect,
     variables: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       idOrIdentifier: projectIdentifier,
     },
     onCompleted: (projectData) => {
       const { identifier } = projectData.project;
       const currentUrl = location.pathname.concat(location.search);
       const redirectPathname = currentUrl.replace(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectIdentifier,
         identifier,
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       sendAnalyticsEvent(projectIdentifier, identifier);
       navigate(redirectPathname, { replace: true });
       setAttemptedRedirect(true);
diff --git a/apps/spruce/src/hooks/useRunningTime/index.ts b/apps/spruce/src/hooks/useRunningTime/index.ts
index 1987b64e2..492fdd2a6 100644
--- a/apps/spruce/src/hooks/useRunningTime/index.ts
+++ b/apps/spruce/src/hooks/useRunningTime/index.ts
@@ -16,15 +16,18 @@ export const useRunningTime = (startTime: Date) => {
   const timerRef = useRef(null);
 
   useEffect(() => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     timerRef.current = setInterval(() => {
       const newRunningTime = differenceInMilliseconds(Date.now(), startTime);
       setRunningTime(newRunningTime > 0 ? newRunningTime : 0);
     }, 1000);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     return () => clearInterval(timerRef.current);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [startTime]);
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const endTimer = () => clearInterval(timerRef.current);
 
   return { runningTime, endTimer };
diff --git a/apps/spruce/src/hooks/useScrollToAnchor/index.ts b/apps/spruce/src/hooks/useScrollToAnchor/index.ts
index 972ff3f7b..07a9023f8 100644
--- a/apps/spruce/src/hooks/useScrollToAnchor/index.ts
+++ b/apps/spruce/src/hooks/useScrollToAnchor/index.ts
@@ -12,6 +12,7 @@ const useScrollToAnchor = () => {
   const timeout = useRef<NodeJS.Timeout>(null);
   useEffect(() => {
     if (anchor === "") return;
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     timeout.current = setTimeout(() => {
       const element = document.getElementById(anchor);
       if (element) {
@@ -22,6 +23,7 @@ const useScrollToAnchor = () => {
 
   useEffect(
     () => () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       clearTimeout(timeout.current);
     },
     [],
diff --git a/apps/spruce/src/hooks/useScrollToAnchor/useScrollToAnchor.test.tsx b/apps/spruce/src/hooks/useScrollToAnchor/useScrollToAnchor.test.tsx
index 0f8b75961..bbed1aeef 100644
--- a/apps/spruce/src/hooks/useScrollToAnchor/useScrollToAnchor.test.tsx
+++ b/apps/spruce/src/hooks/useScrollToAnchor/useScrollToAnchor.test.tsx
@@ -19,6 +19,7 @@ describe("useScrollToAnchor", () => {
   });
 
   it("should scroll to element when hash is present", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const wrapper = ({ children }) => (
       <MemoryRouter initialEntries={["/#test-anchor"]}>{children}</MemoryRouter>
     );
@@ -33,6 +34,7 @@ describe("useScrollToAnchor", () => {
   });
 
   it("should not scroll when hash is not present", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const wrapper = ({ children }) => (
       <MemoryRouter initialEntries={["/"]}>{children}</MemoryRouter>
     );
@@ -44,6 +46,7 @@ describe("useScrollToAnchor", () => {
   });
 
   it("should clear timeout on unmount", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const wrapper = ({ children }) => (
       <MemoryRouter initialEntries={["/#test-anchor"]}>{children}</MemoryRouter>
     );
diff --git a/apps/spruce/src/hooks/useStatusesFilter.ts b/apps/spruce/src/hooks/useStatusesFilter.ts
index 0a8a90f11..682e0fee7 100644
--- a/apps/spruce/src/hooks/useStatusesFilter.ts
+++ b/apps/spruce/src/hooks/useStatusesFilter.ts
@@ -1,4 +1,5 @@
 import { useEffect, useState, useMemo } from "react";
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 import isEqual from "lodash.isequal";
 import { useLocation } from "react-router-dom";
 import { useUpdateURLQueryParams } from "hooks/useUpdateURLQueryParams";
diff --git a/apps/spruce/src/hooks/useTableSort.ts b/apps/spruce/src/hooks/useTableSort.ts
index dec5f4dad..9188bf5ff 100644
--- a/apps/spruce/src/hooks/useTableSort.ts
+++ b/apps/spruce/src/hooks/useTableSort.ts
@@ -34,9 +34,11 @@ export const useTableSort = (props?: Props): CallbackType => {
 
     if (sorter.length === 1) {
       const { desc, id } = sorter[0];
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       nextQueryParams[TableQueryParams.SortDir] = desc
         ? SortDirection.Desc
         : SortDirection.Asc;
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       nextQueryParams[TableQueryParams.SortBy] = id;
     } else if (sorter.length) {
       const sortString = sorter
@@ -46,6 +48,7 @@ export const useTableSort = (props?: Props): CallbackType => {
         .filter(Boolean)
         .join(";");
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       nextQueryParams[TableQueryParams.Sorts] = sortString;
     }
     setQueryParams(nextQueryParams);
diff --git a/apps/spruce/src/hooks/useTaskStatuses.ts b/apps/spruce/src/hooks/useTaskStatuses.ts
index 0f1860590..ceb4f8a6c 100644
--- a/apps/spruce/src/hooks/useTaskStatuses.ts
+++ b/apps/spruce/src/hooks/useTaskStatuses.ts
@@ -31,6 +31,7 @@ export const useTaskStatuses = ({
     pollInterval: DEFAULT_POLL_INTERVAL,
   });
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const { version } = data || {};
diff --git a/apps/spruce/src/hooks/useVersionTaskStatusSelect.ts b/apps/spruce/src/hooks/useVersionTaskStatusSelect.ts
index ae938e2c4..43bd2e416 100644
--- a/apps/spruce/src/hooks/useVersionTaskStatusSelect.ts
+++ b/apps/spruce/src/hooks/useVersionTaskStatusSelect.ts
@@ -103,18 +103,23 @@ export const useVersionTaskStatusSelect = (
     const selected = taskIds[taskVersion];
 
     if (typeof selected === "string") {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       if (newState[taskVersion][selected]) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         newState[taskVersion][selected] = false;
       } else {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         newState[taskVersion][selected] = true;
       }
     } else {
       // Enter this condition when a parent checkbox is clicked.
       // If every task is already checked, uncheck them. Otherwise, check them.
       const nextCheckedState = !selected.every(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         (selectedId) => selectedTasks[taskVersion][selectedId],
       );
       selected.forEach((selectedId) => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         newState[taskVersion][selectedId] = nextCheckedState;
       });
     }
@@ -147,6 +152,7 @@ export const useVersionTaskStatusSelect = (
           reduceBuildVariants({
             parentTasksChanged:
               versionBuildVariants !== prevVersionBuildVariants,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             buildVariants: cv.buildVariants,
             versionStatusFilterTerm: versionStatusFilterTerm[childId],
             baseStatusFilterTerm: baseStatusFilterTerm[childId],
@@ -155,6 +161,7 @@ export const useVersionTaskStatusSelect = (
         newTaskSelect[childId] = childNextState;
       });
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       dispatch({ type: "setSelectedTasks", data: newTaskSelect });
     }
   }, [
@@ -222,9 +229,11 @@ const reduceBuildVariants = (filterDetails: reduceInput) => {
     baseStatusFilterTerm?.length ? baseStatuses.has(status) : true;
 
   const isSelected = (task: task) =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     hasFilter && hasStatus(task.status) && hasBaseStatus(task.baseStatus);
 
   if (versionStatusFilterTerm || baseStatusFilterTerm || parentTasksChanged) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const taskReducer = (acc, task: task) => ({
       ...acc,
       [task.id]: isSelected(task),
@@ -237,6 +246,7 @@ const reduceBuildVariants = (filterDetails: reduceInput) => {
 
     // Iterate through VersionBuildVariants and determine if a task should be
     // selected or not based on if the task status correlates with the 2 filters.
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const reducedVariants = buildVariants?.reduce(bvReducer, {
       ...selectedTasks,
     });
diff --git a/apps/spruce/src/pages/CommitQueue.tsx b/apps/spruce/src/pages/CommitQueue.tsx
index 53d761245..26d6281c6 100644
--- a/apps/spruce/src/pages/CommitQueue.tsx
+++ b/apps/spruce/src/pages/CommitQueue.tsx
@@ -27,6 +27,7 @@ export const CommitQueue: React.FC = () => {
     CommitQueueQuery,
     CommitQueueQueryVariables
   >(COMMIT_QUEUE, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { projectIdentifier },
     fetchPolicy: "cache-and-network",
     onError: (err) => {
@@ -57,6 +58,7 @@ export const CommitQueue: React.FC = () => {
         </Column>
         <ProjectSelectWrapper>
           <ProjectSelect
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             selectedProjectIdentifier={projectIdentifier}
             data-cy="commit-queue-project-select"
             getRoute={getCommitQueueRoute}
@@ -72,17 +74,28 @@ export const CommitQueue: React.FC = () => {
         queue.map(({ enqueueTime, issue, patch }, i) => (
           <CommitQueueCard
             key={issue}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             issue={issue}
             index={formatZeroIndexForDisplay(i)}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             title={patch?.description}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             author={patch?.author}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             patchId={patch?.id}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             versionId={patch?.versionFull?.id}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             repo={commitQueue?.repo}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             owner={commitQueue?.owner}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             commitTime={enqueueTime}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             moduleCodeChanges={patch?.moduleCodeChanges}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             commitQueueId={commitQueue.projectId}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             activated={patch?.activated}
           />
         ))
diff --git a/apps/spruce/src/pages/ProjectPatches.tsx b/apps/spruce/src/pages/ProjectPatches.tsx
index 2284fcb5d..64952cddc 100644
--- a/apps/spruce/src/pages/ProjectPatches.tsx
+++ b/apps/spruce/src/pages/ProjectPatches.tsx
@@ -36,6 +36,7 @@ export const ProjectPatches = () => {
     ProjectPatchesQueryVariables
   >(PROJECT_PATCHES, {
     variables: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       projectIdentifier,
       patchesInput: {
         ...patchesInput,
@@ -49,10 +50,12 @@ export const ProjectPatches = () => {
       );
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
   const { displayName, patches } = data?.project ?? {};
   return (
     <>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ProjectBanner projectIdentifier={projectIdentifier} />
       <PatchesPage
         analyticsObject={analyticsObject}
@@ -62,6 +65,7 @@ export const ProjectPatches = () => {
         filterComp={
           <ProjectSelect
             getRoute={getProjectPatchesRoute}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             selectedProjectIdentifier={projectIdentifier}
             showLabel={false}
             onSubmit={() => {
diff --git a/apps/spruce/src/pages/Task.tsx b/apps/spruce/src/pages/Task.tsx
index addad4158..32799cd1e 100644
--- a/apps/spruce/src/pages/Task.tsx
+++ b/apps/spruce/src/pages/Task.tsx
@@ -43,6 +43,7 @@ export const Task = () => {
     TaskQuery,
     TaskQueryVariables
   >(TASK, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { taskId, execution: selectedExecution },
     pollInterval: DEFAULT_POLL_INTERVAL,
     fetchPolicy: "network-only",
@@ -51,6 +52,7 @@ export const Task = () => {
         `There was an error loading the task: ${err.message}`,
       ),
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const { task } = data ?? {};
@@ -65,6 +67,7 @@ export const Task = () => {
     status,
     versionMetadata,
   } = task ?? {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const attributed = annotation?.issues?.length > 0;
   const isDisplayTask = executionTasksFull != null;
 
@@ -74,11 +77,15 @@ export const Task = () => {
 
   return (
     <PageWrapper>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ProjectBanner projectIdentifier={versionMetadata?.projectIdentifier} />
       {task && (
         <TaskPageBreadcrumbs
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           displayTask={displayTask}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           patchNumber={patchNumber}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           taskName={displayName}
           versionMetadata={versionMetadata}
         />
@@ -86,15 +93,18 @@ export const Task = () => {
       <PageTitle
         pageTitle={`Task${displayName ? ` - ${displayName}` : ""}`}
         loading={loading}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         title={displayName}
         badge={
           <StyledBadgeWrapper>
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             <TaskStatusBadge status={status} />
             {attributed && <TaskStatusBadge status={TaskStatus.KnownIssue} />}
           </StyledBadgeWrapper>
         }
         buttons={
           <ActionButtons
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             initialPriority={priority}
             isDisplayTask={isDisplayTask}
             isExecutionTask={!!displayTask}
@@ -104,10 +114,13 @@ export const Task = () => {
       />
       <PageLayout hasSider>
         <PageSider>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           {latestExecution > 0 && (
             <ExecutionSelect
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               id={taskId}
               currentExecution={selectedExecution}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               latestExecution={latestExecution}
               updateExecution={(n: number) => {
                 taskAnalytics.sendEvent({ name: "Change Execution" });
@@ -118,9 +131,11 @@ export const Task = () => {
             />
           )}
           <Metadata
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             taskId={taskId}
             task={task}
             loading={loading}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             error={error}
           />
         </PageSider>
diff --git a/apps/spruce/src/pages/UserPatches.tsx b/apps/spruce/src/pages/UserPatches.tsx
index c291a4f27..2c51ec3a0 100644
--- a/apps/spruce/src/pages/UserPatches.tsx
+++ b/apps/spruce/src/pages/UserPatches.tsx
@@ -3,6 +3,7 @@ import Cookies from "js-cookie";
 import { useParams } from "react-router-dom";
 import { useUserPatchesAnalytics } from "analytics";
 import { PatchesPage } from "components/PatchesPage";
+import { RequesterSelector } from "components/PatchesPage/RequesterSelector";
 import { usePatchesQueryParams } from "components/PatchesPage/usePatchesQueryParams";
 import { INCLUDE_COMMIT_QUEUE_USER_PATCHES } from "constants/cookies";
 import { DEFAULT_POLL_INTERVAL } from "constants/index";
@@ -34,6 +35,7 @@ export const UserPatches = () => {
     UserPatchesQueryVariables
   >(USER_PATCHES, {
     variables: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       userId,
       patchesInput: {
         ...patchesInput,
@@ -46,12 +48,16 @@ export const UserPatches = () => {
       dispatchToast.error(`Error while fetching user patches: ${err.message}`);
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { title: pageTitle } = useGetUserPatchesPageTitleAndLink(userId) || {};
 
   return (
     <PatchesPage
       analyticsObject={analyticsObject}
+      filterComp={<RequesterSelector />}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       pageTitle={pageTitle}
       loading={loading && !data?.user.patches}
       pageType="user"
diff --git a/apps/spruce/src/pages/Version.tsx b/apps/spruce/src/pages/Version.tsx
index a20e50018..76db47951 100644
--- a/apps/spruce/src/pages/Version.tsx
+++ b/apps/spruce/src/pages/Version.tsx
@@ -49,6 +49,7 @@ export const VersionPage: React.FC = () => {
     VersionQuery,
     VersionQueryVariables
   >(VERSION, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: versionId },
     fetchPolicy: "cache-and-network",
     onError: (error) => {
@@ -64,6 +65,7 @@ export const VersionPage: React.FC = () => {
     IsPatchConfiguredQuery,
     IsPatchConfiguredQueryVariables
   >(IS_PATCH_CONFIGURED, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: versionId },
     onError: (error) => {
       dispatchToast.error(
@@ -78,12 +80,15 @@ export const VersionPage: React.FC = () => {
     HasVersionQuery,
     HasVersionQueryVariables
   >(HAS_VERSION, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: versionId },
     onCompleted: ({ hasVersion }) => {
       setIsLoadingData(true);
       if (hasVersion) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         getVersion({ variables: { id: versionId } });
       } else {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         getPatch({ variables: { id: versionId } });
       }
     },
@@ -99,13 +104,17 @@ export const VersionPage: React.FC = () => {
     if (patchData) {
       const { patch } = patchData;
       const { activated, alias, projectID } = patch;
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       if (isPatchUnconfigured({ alias, activated })) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         setRedirectURL(getPatchRoute(versionId, { configure: true }));
         setIsLoadingData(false);
       } else if (!activated && alias === commitQueueAlias) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         setRedirectURL(getCommitQueueRoute(projectID));
         setIsLoadingData(false);
       } else {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         getVersion({ variables: { id: versionId } });
       }
     }
@@ -157,18 +166,22 @@ export const VersionPage: React.FC = () => {
   } = patch || {};
   const isPatchOnCommitQueue = commitQueuePosition !== null;
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const versionText = shortenGithash(revision || versionId);
   const pageTitle = isPatch
     ? `Patch - ${patchNumber}`
     : `Version - ${versionText}`;
 
   const linkifiedMessage = jiraLinkify(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     githubPRLinkify(message),
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     spruceConfig?.jira?.host,
   );
 
   return (
     <PageWrapper data-cy="version-page">
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ProjectBanner projectIdentifier={projectIdentifier} />
       {errors && errors.length > 0 && <ErrorBanner errors={errors} />}
       {warnings && warnings.length > 0 && <WarningBanner warnings={warnings} />}
@@ -180,14 +193,20 @@ export const VersionPage: React.FC = () => {
         />
       )}
       <PageTitle
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         badge={<PatchStatusBadge status={status} />}
         buttons={
           <ActionButtons
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             canEnqueueToCommitQueue={canEnqueueToCommitQueue}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             canReconfigure={!isPatchOnCommitQueue && isPatch}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             isPatch={isPatch}
             isPatchOnCommitQueue={isPatchOnCommitQueue}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             patchDescription={message}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             versionId={versionId}
           />
         }
@@ -196,19 +215,24 @@ export const VersionPage: React.FC = () => {
         title={linkifiedMessage || `Version ${order}`}
       >
         {isPatch && (
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           <NameChangeModal patchId={versionId} originalPatchName={message} />
         )}
       </PageTitle>
       <PageLayout hasSider>
         <PageSider>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <Metadata loading={false} version={version} />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <BuildVariantCard versionId={versionId} />
         </PageSider>
         <PageLayout>
           <PageContent>
             <VersionTabs
               childPatches={childPatches}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               isPatch={version?.isPatch}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               taskCount={version?.taskCount}
             />
           </PageContent>
diff --git a/apps/spruce/src/pages/commitqueue/CommitQueueCard.test.tsx b/apps/spruce/src/pages/commitqueue/CommitQueueCard.test.tsx
index 64f10bf37..673bef1c5 100644
--- a/apps/spruce/src/pages/commitqueue/CommitQueueCard.test.tsx
+++ b/apps/spruce/src/pages/commitqueue/CommitQueueCard.test.tsx
@@ -113,6 +113,7 @@ describe("commit queue entry title", () => {
           activated
           issue="1000"
           title={titleWithPullRequestURL}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           versionId={undefined}
         />,
       );
@@ -141,6 +142,7 @@ describe("commit queue entry title", () => {
           activated
           issue="1000"
           title={titleWithoutPullRequestURL}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           versionId={undefined}
         />,
       );
@@ -169,7 +171,9 @@ describe("commit queue entry title", () => {
           activated
           issue="1000"
           title={titleWithoutPullRequestURL}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           versionId={undefined}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           patchId={undefined}
         />,
       );
diff --git a/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/BuildVariantCard.test.tsx b/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/BuildVariantCard.test.tsx
index 129e2e611..2fa953e30 100644
--- a/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/BuildVariantCard.test.tsx
+++ b/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/BuildVariantCard.test.tsx
@@ -47,8 +47,10 @@ describe("buildVariantCard", () => {
       </MockedProvider>,
     );
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("build-variant-icon-container"));
     expect(injectGlobalDimStyle).toHaveBeenCalledTimes(1);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.unhover(screen.queryByDataCy("build-variant-icon-container"));
     expect(removeGlobalDimStyle).toHaveBeenCalledTimes(1);
   });
diff --git a/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/WaterfallTaskStatusIcon.test.tsx b/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/WaterfallTaskStatusIcon.test.tsx
index d7d06dce8..7d8999593 100644
--- a/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/WaterfallTaskStatusIcon.test.tsx
+++ b/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/WaterfallTaskStatusIcon.test.tsx
@@ -49,6 +49,7 @@ describe("waterfallTaskStatusIcon", () => {
   it("tooltip should contain task name, duration, list of failing test names and additonal test count", async () => {
     const user = userEvent.setup();
     render(<Content status="failed" hasCedarResults />);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("waterfall-task-status-icon"));
     await waitFor(() => {
       expect(
@@ -94,12 +95,14 @@ describe("waterfallTaskStatusIcon", () => {
     vi.mocked(removeGlobalHighlightStyle).mockImplementationOnce(() => {});
 
     render(<Content status="failed" hasCedarResults />);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("waterfall-task-status-icon"));
     await waitFor(() => {
       expect(injectGlobalHighlightStyle).toHaveBeenCalledTimes(1);
     });
     expect(injectGlobalHighlightStyle).toHaveBeenCalledWith(props.identifier);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.unhover(screen.queryByDataCy("waterfall-task-status-icon"));
     expect(removeGlobalHighlightStyle).toHaveBeenCalledTimes(1);
   });
diff --git a/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/index.tsx b/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/index.tsx
index 7a37d7c24..3ce84fb84 100644
--- a/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/index.tsx
+++ b/apps/spruce/src/pages/commits/ActiveCommits/BuildVariantCard/WaterfallTaskStatusIcon/index.tsx
@@ -31,6 +31,7 @@ interface WaterfallTaskStatusIconProps {
   hasCedarResults: boolean;
 }
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 let timeout;
 export const WaterfallTaskStatusIcon: React.FC<
   WaterfallTaskStatusIconProps
@@ -50,9 +51,11 @@ export const WaterfallTaskStatusIcon: React.FC<
   >(FAILED_TASK_STATUS_ICON_TOOLTIP, { variables: { taskId } });
 
   const { filteredTestCount, testResults } = data?.task?.tests ?? {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const failedTestDifference = filteredTestCount - (testResults ?? []).length;
 
   useEffect(() => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     if (timeout) {
       clearTimeout(timeout);
     }
@@ -71,6 +74,7 @@ export const WaterfallTaskStatusIcon: React.FC<
 
   useEffect(
     () => () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       if (timeout) {
         clearTimeout(timeout);
       }
diff --git a/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitBarChart.stories.tsx b/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitBarChart.stories.tsx
index 845e71852..d77724dcf 100644
--- a/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitBarChart.stories.tsx
+++ b/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitBarChart.stories.tsx
@@ -15,6 +15,7 @@ export default {
 export const Default: StoryObj<typeof CommitBarChart> = {
   render: ({ chartType }) => (
     <FlexRowContainer>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {versions.map((item) => (
         <CommitBarChart
           key={item.version.id}
diff --git a/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitBarChart.test.tsx b/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitBarChart.test.tsx
index d096fdb33..d714a994b 100644
--- a/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitBarChart.test.tsx
+++ b/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitBarChart.test.tsx
@@ -38,6 +38,7 @@ describe("commitChart", () => {
     );
 
     expect(screen.queryByDataCy("commit-chart-tooltip")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("commit-chart-container"));
     await waitFor(() => {
       expect(screen.getByDataCy("commit-chart-tooltip")).toBeInTheDocument();
@@ -57,6 +58,7 @@ describe("commitChart", () => {
     );
 
     expect(screen.queryByDataCy("commit-chart-tooltip")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("commit-chart-container"));
     await waitFor(() => {
       expect(screen.getByDataCy("commit-chart-tooltip")).toBeInTheDocument();
diff --git a/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitChartTooltip.tsx b/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitChartTooltip.tsx
index fe3387e9b..4be8af044 100644
--- a/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitChartTooltip.tsx
+++ b/apps/spruce/src/pages/commits/ActiveCommits/CommitBarChart/CommitChartTooltip.tsx
@@ -38,6 +38,7 @@ export const CommitChartTooltip: React.FC<Props> = ({
           <FlexColumnContainer key={color} data-cy="current-status-count">
             <TotalCount
               status={umbrellaStatus}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               eta={
                 umbrellaStatus === TaskStatus.RunningUmbrella && eta
                   ? eta
@@ -58,6 +59,7 @@ export const CommitChartTooltip: React.FC<Props> = ({
           <TotalCount
             key={umbrellaStatus}
             status={umbrellaStatus}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             color={mapTaskToBarchartColor[umbrellaStatus]}
             count={0}
             active={false}
@@ -85,6 +87,7 @@ export const TotalCount: React.FC<TotalCountProps> = ({
   <TotalCountContainer active={active}>
     <Circle color={color} />
     <StatusText css={sharedCss}>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <div>{`Total ${taskStatusToCopy[status]}`}</div>
       {eta &&
         `(${msToDuration(new Date(eta).valueOf() - Date.now())} remaining)`}
diff --git a/apps/spruce/src/pages/commits/ActiveCommits/index.tsx b/apps/spruce/src/pages/commits/ActiveCommits/index.tsx
index 24938a123..5ba48cfd6 100644
--- a/apps/spruce/src/pages/commits/ActiveCommits/index.tsx
+++ b/apps/spruce/src/pages/commits/ActiveCommits/index.tsx
@@ -83,6 +83,7 @@ export const BuildVariantContainer: React.FC<BuildVariantContainerProps> = ({
 
       const buildVariant = groupedBuildVariants[v];
       const variantStats = groupedBuildVariantStats[v];
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       const { displayName, variant } = buildVariant ?? variantStats;
 
       return (
@@ -91,9 +92,11 @@ export const BuildVariantContainer: React.FC<BuildVariantContainerProps> = ({
           height={height}
           variant={variant}
           buildVariantDisplayName={displayName}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           groupedVariantStats={variantStats}
           versionId={id}
           projectIdentifier={projectIdentifier}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           tasks={buildVariant?.tasks}
           order={order}
         />
diff --git a/apps/spruce/src/pages/commits/CommitChart/index.tsx b/apps/spruce/src/pages/commits/CommitChart/index.tsx
index 1e59d3199..b2aee8ee5 100644
--- a/apps/spruce/src/pages/commits/CommitChart/index.tsx
+++ b/apps/spruce/src/pages/commits/CommitChart/index.tsx
@@ -62,6 +62,7 @@ export const CommitChart: React.FC<Props> = ({ hasTaskFilter, versions }) => {
   const defaultOpenAccordion =
     Cookies.get(COMMIT_CHART_TYPE_VIEW_OPTIONS_ACCORDION) === "true" ||
     Cookies.get(COMMIT_CHART_TYPE_VIEW_OPTIONS_ACCORDION) === undefined;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const onToggleAccordion = ({ isVisible }) =>
     Cookies.set(COMMIT_CHART_TYPE_VIEW_OPTIONS_ACCORDION, isVisible.toString());
 
@@ -79,21 +80,26 @@ export const CommitChart: React.FC<Props> = ({ hasTaskFilter, versions }) => {
       >
         <ChartWrapper>
           <FlexRowContainer>
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             {versions.map((commit) => (
               <CommitWrapper
                 key={getCommitKey(commit)}
                 width={getCommitWidth(commit)}
               >
                 <RenderCommitsChart
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   hasTaskFilter={hasTaskFilter}
                   commit={commit}
                   chartType={chartType}
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   max={max}
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   groupedResult={versionToGroupedTaskStatsMap}
                 />
               </CommitWrapper>
             ))}
           </FlexRowContainer>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <GridLabel chartType={chartType} max={max} numDashedLine={5} />
           <Grid numDashedLine={5} />
           <AbsoluteContainer>
diff --git a/apps/spruce/src/pages/commits/CommitTypeSelector/index.tsx b/apps/spruce/src/pages/commits/CommitTypeSelector/index.tsx
index 7e4bdfb9f..ebb033a37 100644
--- a/apps/spruce/src/pages/commits/CommitTypeSelector/index.tsx
+++ b/apps/spruce/src/pages/commits/CommitTypeSelector/index.tsx
@@ -44,6 +44,7 @@ const CommitTypeSelector = () => {
   );
 
   const onChange = (value: string[]) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     setRequesters(value);
     sendEvent({ name: "Filter by requester", requesters: value });
   };
diff --git a/apps/spruce/src/pages/commits/CommitsWrapper.tsx b/apps/spruce/src/pages/commits/CommitsWrapper.tsx
index 02bad5e40..fa9a15345 100644
--- a/apps/spruce/src/pages/commits/CommitsWrapper.tsx
+++ b/apps/spruce/src/pages/commits/CommitsWrapper.tsx
@@ -50,11 +50,14 @@ export const CommitsWrapper: React.FC<CommitsWrapperProps> = ({
         <CommitChart versions={versions} hasTaskFilter={hasTaskFilter} />
         <StickyContainer>
           <FlexRowContainer>
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             {versions.map((commit) => (
               <CommitWrapper
                 key={getCommitKey(commit)}
                 width={getCommitWidth(commit)}
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 selected={isCommitSelected(commit, revision)}
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 data-selected={isCommitSelected(commit, revision)}
               >
                 <RenderCommitsLabel commit={commit} hasFilters={hasFilters} />
@@ -63,14 +66,17 @@ export const CommitsWrapper: React.FC<CommitsWrapperProps> = ({
           </FlexRowContainer>
         </StickyContainer>
         <FlexRowContainer>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           {versions.map((commit) => (
             <CommitWrapper
               key={getCommitKey(commit)}
               width={getCommitWidth(commit)}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               selected={isCommitSelected(commit, revision)}
             >
               <RenderCommitsBuildVariants
                 commit={commit}
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 buildVariantDict={buildVariantDict}
               />
             </CommitWrapper>
diff --git a/apps/spruce/src/pages/commits/InactiveCommits/InactiveCommits.stories.tsx b/apps/spruce/src/pages/commits/InactiveCommits/InactiveCommits.stories.tsx
index 61673b1da..cc4e64331 100644
--- a/apps/spruce/src/pages/commits/InactiveCommits/InactiveCommits.stories.tsx
+++ b/apps/spruce/src/pages/commits/InactiveCommits/InactiveCommits.stories.tsx
@@ -7,6 +7,7 @@ export default {
 } satisfies CustomMeta<typeof InactiveCommits>;
 
 export const Default: CustomStoryObj<typeof InactiveCommits> = {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   render: (args) => <InactiveCommits rolledUpVersions={versions} {...args} />,
   args: {
     hasFilters: false,
diff --git a/apps/spruce/src/pages/commits/InactiveCommits/InactiveCommits.test.tsx b/apps/spruce/src/pages/commits/InactiveCommits/InactiveCommits.test.tsx
index a73ce5269..b3d040752 100644
--- a/apps/spruce/src/pages/commits/InactiveCommits/InactiveCommits.test.tsx
+++ b/apps/spruce/src/pages/commits/InactiveCommits/InactiveCommits.test.tsx
@@ -16,6 +16,7 @@ const RenderInactiveCommitButton = ({
   hasFilters?: boolean;
 }) => (
   <MockedProvider>
+    {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
     <InactiveCommitButton hasFilters={hasFilters} rolledUpVersions={versions} />
   </MockedProvider>
 );
@@ -39,6 +40,7 @@ describe("inactiveCommitButton", () => {
     render(<RenderInactiveCommitButton versions={versions} />);
 
     expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("inactive-commits-button"));
     await waitFor(() => {
       expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeVisible();
@@ -54,6 +56,7 @@ describe("inactiveCommitButton", () => {
     );
 
     expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("inactive-commits-button"));
     await waitFor(() => {
       expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeVisible();
@@ -69,6 +72,7 @@ describe("inactiveCommitButton", () => {
     render(<RenderInactiveCommitButton versions={versions} />);
 
     expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("inactive-commits-button"));
     await waitFor(() => {
       expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeVisible();
@@ -84,6 +88,7 @@ describe("inactiveCommitButton", () => {
     render(<RenderInactiveCommitButton versions={versions} />);
 
     expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("inactive-commits-button"));
     await waitFor(() => {
       expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeVisible();
@@ -92,6 +97,7 @@ describe("inactiveCommitButton", () => {
       MAX_COMMIT_COUNT,
     );
     expect(screen.queryByDataCy("inactive-commits-modal")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("hidden-commits"));
     await waitFor(() => {
       expect(screen.queryByDataCy("inactive-commits-modal")).toBeVisible();
@@ -109,6 +115,7 @@ describe("inactiveCommitButton", () => {
     const user = userEvent.setup();
     render(<RenderInactiveCommitButton versions={versions.slice(0, 1)} />);
     expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeNull();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("inactive-commits-button"));
     await waitFor(() => {
       expect(screen.queryByDataCy("inactive-commits-tooltip")).toBeVisible();
diff --git a/apps/spruce/src/pages/commits/InactiveCommits/index.tsx b/apps/spruce/src/pages/commits/InactiveCommits/index.tsx
index 02e184b61..fc1b03d13 100644
--- a/apps/spruce/src/pages/commits/InactiveCommits/index.tsx
+++ b/apps/spruce/src/pages/commits/InactiveCommits/index.tsx
@@ -46,6 +46,7 @@ export const InactiveCommitButton: React.FC<InactiveCommitsProps> = ({
     returnedCommits = [
       ...rolledUpVersions
         .slice(0, 1)
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         .map((v) => <CommitCopy v={v} isTooltip key={v.id} />),
       <HiddenCommitsWrapper
         key="hidden_commits"
@@ -62,9 +63,11 @@ export const InactiveCommitButton: React.FC<InactiveCommitsProps> = ({
       </HiddenCommitsWrapper>,
       ...rolledUpVersions
         .slice(-2)
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         .map((v) => <CommitCopy v={v} isTooltip key={v.id} />),
     ];
   } else {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     returnedCommits = rolledUpVersions.map((v) => (
       <CommitCopy v={v} isTooltip key={v.id} />
     ));
@@ -78,6 +81,7 @@ export const InactiveCommitButton: React.FC<InactiveCommitsProps> = ({
         setOpen={setShowModal}
         title={`${versionCount} ${tooltipType} Commits`}
       >
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         {rolledUpVersions?.map((v) => (
           <CommitCopy v={v} isTooltip={false} key={v.id} />
         ))}
@@ -155,6 +159,7 @@ const CommitCopy: React.FC<CommitCopyProps> = ({ isTooltip, v }) => {
       <CommitBodyText>
         {v.ignored && <StyledIcon data-cy="ignored-icon" glyph="Ignored" />}
         {v.author} -{" "}
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         {jiraLinkify(message, jiraHost, () => {
           sendEvent({
             name: "Click commit label",
diff --git a/apps/spruce/src/pages/commits/PaginationButtons.tsx b/apps/spruce/src/pages/commits/PaginationButtons.tsx
index b1d6dbd96..feb9370c8 100644
--- a/apps/spruce/src/pages/commits/PaginationButtons.tsx
+++ b/apps/spruce/src/pages/commits/PaginationButtons.tsx
@@ -21,6 +21,7 @@ export const PaginationButtons: React.FC<PaginationButtonsProps> = ({
     sendEvent({ name: "Paginate", direction: "next" });
     updateQueryParams({
       [MainlineCommitQueryParams.SkipOrderNumber]:
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         nextPageOrderNumber.toString(),
     });
   };
@@ -31,6 +32,7 @@ export const PaginationButtons: React.FC<PaginationButtonsProps> = ({
     });
     updateQueryParams({
       [MainlineCommitQueryParams.SkipOrderNumber]:
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         prevPageOrderNumber.toString(),
     });
   };
diff --git a/apps/spruce/src/pages/commits/ProjectHealth.stories.tsx b/apps/spruce/src/pages/commits/ProjectHealth.stories.tsx
index b46239f47..31d025eeb 100644
--- a/apps/spruce/src/pages/commits/ProjectHealth.stories.tsx
+++ b/apps/spruce/src/pages/commits/ProjectHealth.stories.tsx
@@ -46,12 +46,18 @@ export const Default: CustomStoryObj<
 };
 
 const RenderCommitsWrapper = ({
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   buildVariantCount,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   hasFilters,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   hasTaskFilter,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   isLoading,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   taskCount,
 }) => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const updatedVersions = versions.map((version) =>
     populateVersion(version, buildVariantCount, taskCount, hasTaskFilter),
   );
diff --git a/apps/spruce/src/pages/commits/RenderCommit.tsx b/apps/spruce/src/pages/commits/RenderCommit.tsx
index 1ab7ce060..ebc217c1e 100644
--- a/apps/spruce/src/pages/commits/RenderCommit.tsx
+++ b/apps/spruce/src/pages/commits/RenderCommit.tsx
@@ -119,6 +119,7 @@ const isCommitSelected = (commit: Commit, revision: string) => {
 
   if (
     rolledUpVersions &&
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     rolledUpVersions.some((v) => v.revision.startsWith(revision))
   ) {
     return true;
diff --git a/apps/spruce/src/pages/commits/StatusSelect.tsx b/apps/spruce/src/pages/commits/StatusSelect.tsx
index 4653efbd0..9a1e38a29 100644
--- a/apps/spruce/src/pages/commits/StatusSelect.tsx
+++ b/apps/spruce/src/pages/commits/StatusSelect.tsx
@@ -12,6 +12,7 @@ export const StatusSelect = () => {
   const { sendEvent } = useProjectHealthAnalytics({ page: "Commit chart" });
   const { inputValue, setAndSubmitInputValue } = useStatusesFilter({
     urlParam: PatchTasksQueryParams.Statuses,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     sendAnalyticsEvent: (_, filterValue: string[]) => {
       sendEvent({
         name: "Filter by task status",
diff --git a/apps/spruce/src/pages/commits/ViewToggle.tsx b/apps/spruce/src/pages/commits/ViewToggle.tsx
index 9471ccb9f..b7cac2107 100644
--- a/apps/spruce/src/pages/commits/ViewToggle.tsx
+++ b/apps/spruce/src/pages/commits/ViewToggle.tsx
@@ -42,6 +42,7 @@ export const ViewToggle: React.FC<Props> = ({ identifier }) => {
 
   useEffect(() => {
     if (!view) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setView(data?.project?.projectHealthView);
     }
   }, [data, setView, view]);
@@ -78,6 +79,7 @@ export const ViewToggle: React.FC<Props> = ({ identifier }) => {
       <SegmentedControl
         aria-controls="[data-cy='waterfall-task-status-icon']"
         name="Icon Tooltip"
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         onChange={onChange}
         value={view || ProjectHealthView.Failed}
       >
diff --git a/apps/spruce/src/pages/commits/WaterfallMenu/AddNotification.tsx b/apps/spruce/src/pages/commits/WaterfallMenu/AddNotification.tsx
index 40591fa12..d9af3fdf5 100644
--- a/apps/spruce/src/pages/commits/WaterfallMenu/AddNotification.tsx
+++ b/apps/spruce/src/pages/commits/WaterfallMenu/AddNotification.tsx
@@ -34,6 +34,7 @@ export const AddNotification: React.FC<AddNotificationProps> = ({
           setIsModalVisible(false);
           setMenuOpen(false);
         }}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         resourceId={projectIdentifier}
         sendAnalyticsEvent={(subscription) =>
           sendEvent({ name: "Add Notification", subscription })
diff --git a/apps/spruce/src/pages/commits/__snapshots__/ProjectHealth_Default.storyshot b/apps/spruce/src/pages/commits/__snapshots__/ProjectHealth_Default.storyshot
index 3d709d7f7..ad4e42a9c 100644
--- a/apps/spruce/src/pages/commits/__snapshots__/ProjectHealth_Default.storyshot
+++ b/apps/spruce/src/pages/commits/__snapshots__/ProjectHealth_Default.storyshot
@@ -253,7 +253,7 @@
                             >
                               <input
                                 aria-checked="true"
-                                aria-describedby="lg-232"
+                                aria-describedby="lg-292"
                                 aria-disabled="false"
                                 checked=""
                                 class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
@@ -281,7 +281,7 @@
                               for="chart-radio-percent"
                             >
                               <input
-                                aria-describedby="lg-233"
+                                aria-describedby="lg-293"
                                 aria-disabled="false"
                                 class="lg-ui-radio-group-0002 leafygreen-ui-1iwed1m"
                                 data-cy="cy-chart-percent-radio"
diff --git a/apps/spruce/src/pages/commits/hooks/useCommitLimit.ts b/apps/spruce/src/pages/commits/hooks/useCommitLimit.ts
index 629c82cd3..0c76b949e 100644
--- a/apps/spruce/src/pages/commits/hooks/useCommitLimit.ts
+++ b/apps/spruce/src/pages/commits/hooks/useCommitLimit.ts
@@ -18,6 +18,7 @@ export const useCommitLimit = <T extends HTMLElement>(): [
   );
   const commitsContainerRef = useRef<T>();
   const isResizing = useResize();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { width } = useDimensions(commitsContainerRef);
   const previousWidth = usePrevious(width);
   const nextLimit = Math.max(Math.round(width / COL_WIDTH), MIN_LIMIT);
@@ -25,10 +26,12 @@ export const useCommitLimit = <T extends HTMLElement>(): [
   useEffect(() => {
     // Checking that a previous width existed ensures that skipOrderNumber is not reset on initial page loads
     if (previousWidth) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setSkipOrderNumber(undefined);
     }
   }, [nextLimit]); // eslint-disable-line react-hooks/exhaustive-deps
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return [commitsContainerRef, nextLimit, isResizing];
 };
 
diff --git a/apps/spruce/src/pages/commits/index.tsx b/apps/spruce/src/pages/commits/index.tsx
index dce6045fb..89687ee11 100644
--- a/apps/spruce/src/pages/commits/index.tsx
+++ b/apps/spruce/src/pages/commits/index.tsx
@@ -97,6 +97,7 @@ const Commits = () => {
       if (recentlySelectedProject) {
         navigate(getCommitsRoute(recentlySelectedProject), { replace: true });
       } else if (spruceData) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         navigate(getCommitsRoute(spruceData?.spruceConfig.ui.defaultProject), {
           replace: true,
         });
@@ -136,9 +137,12 @@ const Commits = () => {
 
   const variables = getMainlineCommitsQueryVariables({
     mainlineCommitOptions: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       projectIdentifier,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       skipOrderNumber,
       limit,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       revision,
     },
     filterState,
@@ -158,6 +162,7 @@ const Commits = () => {
     onError: (e) =>
       dispatchToast.error(`There was an error loading the page: ${e.message}`),
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const { mainlineCommits } = data || {};
@@ -173,6 +178,7 @@ const Commits = () => {
     useFilterBadgeQueryParams(queryParamsToDisplay);
   const onSubmit = useUpsertQueryParams();
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const onSubmitTupleSelect = ({ category, value }) => {
     onSubmit({ category, value });
     switch (category) {
@@ -188,7 +194,9 @@ const Commits = () => {
 
   return (
     <PageWrapper>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ProjectBanner projectIdentifier={projectIdentifier} />
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <RepotrackerBanner projectIdentifier={projectIdentifier} />
       <PageContainer>
         <HeaderWrapper>
@@ -208,6 +216,7 @@ const Commits = () => {
           </ElementWrapper>
           <ElementWrapper width="25">
             <ProjectSelect
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               selectedProjectIdentifier={projectIdentifier}
               getRoute={getCommitsRoute}
               onSubmit={() => {
@@ -233,9 +242,12 @@ const Commits = () => {
           />
         </BadgeWrapper>
         <PaginationWrapper>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ViewToggle identifier={projectIdentifier} />
           <PaginationButtons
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             prevPageOrderNumber={prevPageOrderNumber}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             nextPageOrderNumber={nextPageOrderNumber}
           />
         </PaginationWrapper>
diff --git a/apps/spruce/src/pages/commits/utils.ts b/apps/spruce/src/pages/commits/utils.ts
index adb8b3a59..637c33b81 100644
--- a/apps/spruce/src/pages/commits/utils.ts
+++ b/apps/spruce/src/pages/commits/utils.ts
@@ -94,6 +94,7 @@ const generateBuildVariantOptionsForTaskIconsFromState = (
   const { hasStatuses, hasTasks } = getFilterStatus(filterState);
 
   let shouldShowTaskIcons = true;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let statusesToShow = [];
 
   if (hasTasks || filterState.view === ProjectHealthView.All) {
@@ -113,6 +114,7 @@ const generateBuildVariantOptionsForTaskIconsFromState = (
   const buildVariantOptions = {
     tasks: shouldShowTaskIcons ? filterState.tasks : [impossibleMatch],
     variants: filterState.variants,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     statuses: statusesToShow,
     includeBaseTasks: false,
   };
@@ -134,6 +136,7 @@ const generateBuildVariantOptionsForGroupedTasksFromState = (
     };
   }
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let statusesToShow = [];
   let shouldShowGroupedTaskIcons = true;
   if (hasTasks) {
@@ -160,6 +163,7 @@ const generateBuildVariantOptionsForGroupedTasksFromState = (
   const groupedBuildVariantOptions = {
     tasks: shouldShowGroupedTaskIcons ? filterState.tasks : [impossibleMatch],
     variants: filterState.variants,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     statuses: statusesToShow,
   };
 
@@ -203,6 +207,7 @@ const findMaxGroupedTaskStats = (groupedTaskStats: {
 
 const getAllTaskStatsGroupedByColor = (versions: Commits) => {
   const idToGroupedTaskStats: { [id: string]: GroupedResult } = {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   versions.forEach(({ version }) => {
     if (version != null) {
       idToGroupedTaskStats[version.id] = groupStatusesByUmbrellaStatus(
@@ -234,6 +239,7 @@ const constructBuildVariantDict = (versions: Commits): BuildVariantDict => {
 
       // Construct build variant dict which will contain information needed for rendering.
       Object.values(allBuildVariants).reduce(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         (acc, { statusCounts, tasks, variant }) => {
           // Determine height to allocate for icons.
           let iconHeight = 0;
@@ -255,15 +261,22 @@ const constructBuildVariantDict = (versions: Commits): BuildVariantDict => {
             badgeHeight = badgeContainerHeight + badgeContainerPadding;
           }
 
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           if (acc[variant]) {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             if (iconHeight > acc[variant].iconHeight) {
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               acc[variant].iconHeight = iconHeight;
             }
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             if (badgeHeight > acc[variant].badgeHeight) {
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               acc[variant].badgeHeight = badgeHeight;
             }
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             acc[variant].priority += 1;
           } else {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             acc[variant] = { priority: 1, iconHeight, badgeHeight };
           }
           return acc;
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureBuildVariants/BuildVariantCard.tsx b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureBuildVariants/BuildVariantCard.tsx
index bfce14947..6a5b214cc 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureBuildVariants/BuildVariantCard.tsx
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureBuildVariants/BuildVariantCard.tsx
@@ -12,6 +12,7 @@ const { green } = palette;
 
 interface BuildVariantCardProps {
   "data-cy": string;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   onClick: (variantName: string) => (e) => void;
   menuItems: MenuItemProps[];
   selectedMenuItems: string[];
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureBuildVariants/index.tsx b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureBuildVariants/index.tsx
index 605cac3ef..07590347a 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureBuildVariants/index.tsx
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureBuildVariants/index.tsx
@@ -46,6 +46,7 @@ export const ConfigureBuildVariants: React.FC<Props> = ({
     window.addEventListener("keydown", keyDownCb);
     window.addEventListener("keyup", keyUpCb);
     return () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       window.removeEventListener("keyDown", keyDownCb);
       window.removeEventListener("keyup", keyUpCb);
     };
@@ -96,9 +97,11 @@ export const ConfigureBuildVariants: React.FC<Props> = ({
           selectedMenuItems={selectedBuildVariants}
           data-cy="build-variant-list-item"
         />
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         {aliases?.length > 0 && (
           <BuildVariantCard
             onClick={getClickVariantHandler}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             menuItems={aliases}
             title="Select Downstream Tasks"
             selectedMenuItems={selectedBuildVariants}
@@ -118,6 +121,7 @@ interface UserSelectWrapperProps {
 
 const UserSelectWrapper = styled.span<UserSelectWrapperProps>`
   ${(props: UserSelectWrapperProps): string =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     props.isHotKeyPressed && "user-select: none;"}
 `;
 
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/index.tsx b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/index.tsx
index 1ee686a1b..210fad3f1 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/index.tsx
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/index.tsx
@@ -90,6 +90,7 @@ const ConfigureTasks: React.FC<Props> = ({
     );
     return deduplicateTasks(
       tasks,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       previouslySelectedVariants,
       new RegExp(search),
     );
@@ -294,6 +295,7 @@ const ConfigureTasks: React.FC<Props> = ({
         <DisabledVariantTasksList
           data-cy="child-patch-task-checkbox"
           status={CheckboxState.Checked}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           variantTasks={currentChildPatches[0].variantsTasks}
         />
       )}
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/utils.test.ts b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/utils.test.ts
index 314e1f7b7..4ad921653 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/utils.test.ts
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/utils.test.ts
@@ -25,6 +25,7 @@ describe("deduplicateTasks", () => {
       { task1: false, task2: false },
       { task3: false, task4: true },
     ];
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(deduplicateTasks(tasks, [], /(?:)/)).toStrictEqual({
       task1: {
         checkboxState: CheckboxState.Unchecked,
@@ -49,6 +50,7 @@ describe("deduplicateTasks", () => {
       { task1: false, task2: false },
       { task2: false, task3: false },
     ];
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(deduplicateTasks(tasks, [], /(?:)/)).toStrictEqual({
       task1: {
         checkboxState: CheckboxState.Unchecked,
@@ -69,6 +71,7 @@ describe("deduplicateTasks", () => {
       { task1: false, task2: false },
       { task2: true, task3: false },
     ];
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(deduplicateTasks(tasks, [], /(?:)/)).toStrictEqual({
       task1: {
         checkboxState: CheckboxState.Unchecked,
@@ -94,6 +97,7 @@ describe("deduplicateTasks", () => {
       { tasks: ["task3"], name: "variant2" },
     ];
     expect(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       deduplicateTasks(tasks, previouslyActivatedBuildvariants, /(?:)/),
     ).toStrictEqual({
       task1: {
@@ -115,6 +119,7 @@ describe("deduplicateTasks", () => {
       { task1: false, task2: false },
       { task2: false, task3: false },
     ];
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(deduplicateTasks(tasks, [], /task1/)).toStrictEqual({
       task1: {
         checkboxState: CheckboxState.Unchecked,
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/utils.ts b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/utils.ts
index 451e38a29..f82a86fdb 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/utils.ts
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/ConfigureTasks/utils.ts
@@ -132,6 +132,7 @@ const getVisibleAliases = (
   const visiblePatches = {};
   Object.entries(selectedAliases).forEach(([alias]) => {
     if (selectedBuildVariants.includes(alias)) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       visiblePatches[alias] = selectedAliases[alias]
         ? CheckboxState.Checked
         : CheckboxState.Unchecked;
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/__snapshots__/ConfigurePatchCore_ConfigureTasksDefault.storyshot b/apps/spruce/src/pages/configurePatch/configurePatchCore/__snapshots__/ConfigurePatchCore_ConfigureTasksDefault.storyshot
index 60f041a57..3f5d1bf21 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/__snapshots__/ConfigurePatchCore_ConfigureTasksDefault.storyshot
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/__snapshots__/ConfigurePatchCore_ConfigureTasksDefault.storyshot
@@ -3,34 +3,42 @@
     class="css-d31jx9-FlexRow ek3m3u40"
   >
     <div
-      class="css-pjeyga-StyledInput ek3m3u42 leafygreen-ui-90q1a7"
+      class="leafygreen-ui-1br9h7w css-pjeyga-StyledInput ek3m3u42"
+      data-lgid="lg-text_input"
     >
       <div
-        class="leafygreen-ui-e3fvh5"
+        class="leafygreen-ui-au9iil"
       >
         <label
-          class="leafygreen-ui-t01kw4"
-          for="textinput-8"
+          class="leafygreen-ui-1qjbbjd"
+          data-lgid="lg-label"
+          data-testid="lg-form_field-label"
+          for="lg-form-field-input-320"
+          id="lg-form-field-label-317"
         >
           Patch Name
         </label>
       </div>
       <div
-        class="leafygreen-ui-lzja97"
+        class="leafygreen-ui-95c1iv"
       >
-        <input
-          aria-invalid="false"
-          autocomplete="on"
-          class="leafygreen-ui-1kmfbzh"
-          data-cy="patch-name-input"
-          id="textinput-8"
-          required=""
-          type="text"
-          value="test"
-        />
         <div
-          class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-        />
+          class="leafygreen-ui-1ago99h"
+        >
+          <input
+            aria-describedby=""
+            aria-disabled="false"
+            aria-invalid="false"
+            aria-labelledby="lg-form-field-label-317"
+            autocomplete="on"
+            class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+            data-cy="patch-name-input"
+            id="lg-form-field-input-320"
+            required=""
+            type="text"
+            value="test"
+          />
+        </div>
       </div>
     </div>
     <div
@@ -302,26 +310,34 @@
                     class="eoqkpw13 css-1pn85ix-TextInputWrapper-StyledTextInput e13gwrw81"
                   >
                     <div
-                      class="leafygreen-ui-90q1a7"
+                      aria-labelledby="search-tasks"
+                      class="leafygreen-ui-1br9h7w"
+                      data-lgid="lg-text_input"
                     >
                       <div
-                        class="leafygreen-ui-lzja97"
+                        class="leafygreen-ui-1iyoj2o"
+                      />
+                      <div
+                        class="leafygreen-ui-95c1iv"
                       >
-                        <input
-                          aria-invalid="false"
-                          aria-labelledby="search-tasks"
-                          autocomplete="on"
-                          class="leafygreen-ui-1kmfbzh"
-                          data-cy="task-filter-input"
-                          id="textinput-10"
-                          placeholder="Search tasks regex"
-                          required=""
-                          type="text"
-                          value=""
-                        />
                         <div
-                          class="lg-ui-icon-selector-0000 leafygreen-ui-11c7q5r"
-                        />
+                          class="leafygreen-ui-1ago99h"
+                        >
+                          <input
+                            aria-describedby=""
+                            aria-disabled="false"
+                            aria-invalid="false"
+                            aria-labelledby="search-tasks"
+                            autocomplete="on"
+                            class="lg-ui-form-field-input-0000 leafygreen-ui-1ago99h"
+                            data-cy="task-filter-input"
+                            id="lg-form-field-input-329"
+                            placeholder="Search tasks regex"
+                            required=""
+                            type="text"
+                            value=""
+                          />
+                        </div>
                       </div>
                     </div>
                     <div
@@ -362,17 +378,17 @@
                   >
                     <label
                       class="leafygreen-ui-75mjfl"
-                      for="checkbox-258"
-                      id="checkbox-258-label"
+                      for="checkbox-330"
+                      id="checkbox-330-label"
                     >
                       <input
                         aria-checked="false"
                         aria-disabled="false"
                         aria-label="checkbox"
-                        aria-labelledby="checkbox-258-label"
+                        aria-labelledby="checkbox-330-label"
                         class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
                         data-cy="select-all-checkbox"
-                        id="checkbox-258"
+                        id="checkbox-330"
                         type="checkbox"
                       />
                       <div
@@ -426,17 +442,17 @@
                   >
                     <label
                       class="leafygreen-ui-75mjfl"
-                      for="checkbox-259"
-                      id="checkbox-259-label"
+                      for="checkbox-331"
+                      id="checkbox-331-label"
                     >
                       <input
                         aria-checked="false"
                         aria-disabled="false"
                         aria-label="checkbox"
-                        aria-labelledby="checkbox-259-label"
+                        aria-labelledby="checkbox-331-label"
                         class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
                         data-cy="task-checkbox"
-                        id="checkbox-259"
+                        id="checkbox-331"
                         type="checkbox"
                       />
                       <div
@@ -475,17 +491,17 @@
                   >
                     <label
                       class="leafygreen-ui-75mjfl"
-                      for="checkbox-260"
-                      id="checkbox-260-label"
+                      for="checkbox-332"
+                      id="checkbox-332-label"
                     >
                       <input
                         aria-checked="false"
                         aria-disabled="false"
                         aria-label="checkbox"
-                        aria-labelledby="checkbox-260-label"
+                        aria-labelledby="checkbox-332-label"
                         class="lg-ui-input-0000 leafygreen-ui-1a1e5kp"
                         data-cy="task-checkbox"
-                        id="checkbox-260"
+                        id="checkbox-332"
                         type="checkbox"
                       />
                       <div
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/index.tsx b/apps/spruce/src/pages/configurePatch/configurePatchCore/index.tsx
index 7f3f6c30a..c29b07dbb 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/index.tsx
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/index.tsx
@@ -62,11 +62,13 @@ const ConfigurePatchCore: React.FC<ConfigurePatchCoreProps> = ({ patch }) => {
     time,
     variantsTasks,
   } = patch;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { variants } = project;
 
   const childPatchesWithAliases: ChildPatchAliased[] =
     childPatches?.map((cp) => {
       const { alias = id } =
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         childPatchAliases.find(({ patchId }) => cp.id === patchId) || {};
       return { ...cp, alias };
     }) ?? [];
@@ -116,6 +118,7 @@ const ConfigurePatchCore: React.FC<ConfigurePatchCoreProps> = ({ patch }) => {
     onCompleted(data) {
       const { schedulePatch: scheduledPatch } = data;
       dispatchToast.success("Successfully scheduled the patch");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       navigate(getVersionRoute(scheduledPatch.versionFull.id));
     },
     onError(err) {
@@ -185,9 +188,11 @@ const ConfigurePatchCore: React.FC<ConfigurePatchCoreProps> = ({ patch }) => {
       </FlexRow>
       <PageLayout hasSider>
         <PageSider>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <MetadataCard error={null}>
             <MetadataTitle>Patch Metadata</MetadataTitle>
             <MetadataItem>Submitted by: {author}</MetadataItem>
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             <MetadataItem>Submitted at: {time.submittedAt}</MetadataItem>
             <MetadataItem>
               Project:{" "}
@@ -284,9 +289,11 @@ const getChildPatchEntries = (childPatches: ChildPatchAliased[]) => {
   if (!childPatches) {
     return [];
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return childPatches.map(({ alias, projectIdentifier, variantsTasks }) => ({
     displayName: `${alias} (${projectIdentifier})`,
     name: alias,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     taskCount: variantsTasks.reduce((c, v) => c + v.tasks.length, 0),
   }));
 };
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/index.ts b/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/index.ts
index eb0adaadc..dc1d9d128 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/index.ts
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/index.ts
@@ -47,6 +47,7 @@ const initialState = ({ selectedTab = 0 }: { selectedTab: number }) => ({
   selectedBuildVariantTasks: {},
   patchParams: null,
   selectedTab,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   disableBuildVariantSelect: tabToIndexMap[selectedTab] === PatchTab.Tasks,
 });
 
@@ -128,11 +129,13 @@ const useConfigurePatch = (patch: ConfigurePatchQuery["patch"]): HookResult => {
   const { [slugs.tab]: tab } = useParams<{ [slugs.tab]: PatchTab }>();
 
   const { id, project } = patch;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { variants } = project;
 
   const [state, dispatch] = useReducer(
     reducer,
     initialState({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       selectedTab: tabToIndexMap[tab || PatchTab.Configure],
     }),
   );
@@ -180,6 +183,7 @@ const useConfigurePatch = (patch: ConfigurePatchQuery["patch"]): HookResult => {
     });
   const setSelectedTab = (i: number) =>
     dispatch({ type: "setSelectedTab", tabIndex: i });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const setPatchParams = (params) =>
     dispatch({ type: "setPatchParams", params });
 
@@ -196,6 +200,7 @@ const useConfigurePatch = (patch: ConfigurePatchQuery["patch"]): HookResult => {
     setSelectedAliases,
     setSelectedBuildVariants,
     setSelectedBuildVariantTasks,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     setSelectedTab,
   };
 };
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/types.ts b/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/types.ts
index fc9686b60..45ea44c42 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/types.ts
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/types.ts
@@ -3,6 +3,7 @@ import { Unpacked } from "types/utils";
 
 // Extract the type of a child patch and append alias field
 export interface ChildPatchAliased
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   extends Unpacked<ConfigurePatchQuery["patch"]["childPatches"]> {
   alias: string;
 }
diff --git a/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/utils.test.ts b/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/utils.test.ts
index 5ab36a109..ede15b058 100644
--- a/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/utils.test.ts
+++ b/apps/spruce/src/pages/configurePatch/configurePatchCore/useConfigurePatch/utils.test.ts
@@ -95,7 +95,9 @@ describe("initializeTaskState", () => {
 
 describe("initializeAliasState", () => {
   it("should not return an object with aliases if there are no aliases", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const patchTriggerAliases = [];
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(initializeAliasState(patchTriggerAliases)).toStrictEqual({});
   });
   it("should return an object with aliases", () => {
diff --git a/apps/spruce/src/pages/configurePatch/index.tsx b/apps/spruce/src/pages/configurePatch/index.tsx
index 808965d8e..3a5b9b374 100644
--- a/apps/spruce/src/pages/configurePatch/index.tsx
+++ b/apps/spruce/src/pages/configurePatch/index.tsx
@@ -23,6 +23,7 @@ const ConfigurePatch: React.FC = () => {
     ConfigurePatchQuery,
     ConfigurePatchQueryVariables
   >(PATCH_CONFIGURE, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: patchId },
     onError(err) {
       dispatchToast.error(err.message);
@@ -33,7 +34,9 @@ const ConfigurePatch: React.FC = () => {
   usePageTitle(`Configure Patch`);
 
   // Can't configure a mainline version so should redirect to the version page
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!validateObjectId(patchId)) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     return <Navigate to={getVersionRoute(patchId)} />;
   }
 
@@ -44,13 +47,17 @@ const ConfigurePatch: React.FC = () => {
     return <PageDoesNotExist />;
   }
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (patch.alias === commitQueueAlias) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     return <Navigate to={getVersionRoute(patchId)} />;
   }
 
   return (
     <PageWrapper>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ProjectBanner projectIdentifier={patch?.projectIdentifier} />
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ConfigurePatchCore patch={patch} />
     </PageWrapper>
   );
diff --git a/apps/spruce/src/pages/container/EventsTable/EventCopy.tsx b/apps/spruce/src/pages/container/EventsTable/EventCopy.tsx
index 8fbca0279..10b9bf4d4 100644
--- a/apps/spruce/src/pages/container/EventsTable/EventCopy.tsx
+++ b/apps/spruce/src/pages/container/EventsTable/EventCopy.tsx
@@ -17,6 +17,7 @@ export const EventCopy: React.FC<EventCopyProps> = ({
   const taskLink = (
     <ShortenedRouterLink
       title={data.taskID}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       to={getTaskRoute(data.taskID, { execution: data.taskExecution })}
     >
       {data.taskID}
diff --git a/apps/spruce/src/pages/container/EventsTable/index.tsx b/apps/spruce/src/pages/container/EventsTable/index.tsx
index 520f21f76..1052da07b 100644
--- a/apps/spruce/src/pages/container/EventsTable/index.tsx
+++ b/apps/spruce/src/pages/container/EventsTable/index.tsx
@@ -33,6 +33,7 @@ const EventsTable: React.FC<{}> = () => {
     PodEventsQuery,
     PodEventsQueryVariables
   >(POD_EVENTS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: podId, page, limit },
     onError: (err) => {
       dispatchToast.error(
diff --git a/apps/spruce/src/pages/container/Metadata/index.tsx b/apps/spruce/src/pages/container/Metadata/index.tsx
index 8f97bedf3..1b95451b0 100644
--- a/apps/spruce/src/pages/container/Metadata/index.tsx
+++ b/apps/spruce/src/pages/container/Metadata/index.tsx
@@ -23,6 +23,7 @@ const Metadata: React.FC<{
     id: runningTaskId,
   } = task ?? {};
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const taskLink = getTaskRoute(runningTaskId, {
     execution: runningTaskExecution,
   });
diff --git a/apps/spruce/src/pages/container/index.tsx b/apps/spruce/src/pages/container/index.tsx
index 29066dd14..cd09f6c3d 100644
--- a/apps/spruce/src/pages/container/index.tsx
+++ b/apps/spruce/src/pages/container/index.tsx
@@ -20,6 +20,7 @@ const Container = () => {
   const dispatchToast = useToastContext();
   const { [slugs.podId]: podId } = useParams();
   const { data, error, loading } = useQuery<PodQuery, PodQueryVariables>(POD, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { podId },
     onError: (err) => {
       dispatchToast.error(
@@ -40,6 +41,7 @@ const Container = () => {
       />
       <PageLayout hasSider>
         <PageSider width={350}>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <Metadata loading={loading} pod={pod} error={error} />
         </PageSider>
         <PageLayout>
diff --git a/apps/spruce/src/pages/distroSettings/Context.tsx b/apps/spruce/src/pages/distroSettings/Context.tsx
index f72c31e7e..6c8d6197f 100644
--- a/apps/spruce/src/pages/distroSettings/Context.tsx
+++ b/apps/spruce/src/pages/distroSettings/Context.tsx
@@ -53,10 +53,13 @@ const useDistroSettingsContext = (): SettingsState<
       "useDistroSettingsContext must be used within a DistroSettingsProvider",
     );
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return context;
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const useHasUnsavedTab = getUseHasUnsavedTab(DistroSettingsContext);
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const usePopulateForm = getUsePopulateForm(DistroSettingsContext);
 
 export {
diff --git a/apps/spruce/src/pages/distroSettings/DeleteDistro/index.tsx b/apps/spruce/src/pages/distroSettings/DeleteDistro/index.tsx
index 28a2f6c79..6d73f66ad 100644
--- a/apps/spruce/src/pages/distroSettings/DeleteDistro/index.tsx
+++ b/apps/spruce/src/pages/distroSettings/DeleteDistro/index.tsx
@@ -75,6 +75,7 @@ export const DeleteDistro: React.FC = () => {
     UserDistroSettingsPermissionsQuery,
     UserDistroSettingsPermissionsQueryVariables
   >(USER_DISTRO_SETTINGS_PERMISSIONS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { distroId },
   });
   const isAdmin = data?.user?.permissions?.distroPermissions?.admin;
@@ -83,6 +84,7 @@ export const DeleteDistro: React.FC = () => {
     <>
       <Modal
         closeModal={() => setOpen(false)}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         distroId={distroId}
         open={open}
       />
diff --git a/apps/spruce/src/pages/distroSettings/DistroSelect/DistroSelect.test.tsx b/apps/spruce/src/pages/distroSettings/DistroSelect/DistroSelect.test.tsx
index 05f5d1578..0429392f3 100644
--- a/apps/spruce/src/pages/distroSettings/DistroSelect/DistroSelect.test.tsx
+++ b/apps/spruce/src/pages/distroSettings/DistroSelect/DistroSelect.test.tsx
@@ -10,6 +10,7 @@ import {
 import { ApolloMock } from "types/gql";
 import { DistroSelect } from ".";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const wrapper = ({ children }) => (
   <MockedProvider mocks={[distrosMock]}>{children}</MockedProvider>
 );
diff --git a/apps/spruce/src/pages/distroSettings/DistroSelect/index.tsx b/apps/spruce/src/pages/distroSettings/DistroSelect/index.tsx
index 25ed544fd..edb45f34e 100644
--- a/apps/spruce/src/pages/distroSettings/DistroSelect/index.tsx
+++ b/apps/spruce/src/pages/distroSettings/DistroSelect/index.tsx
@@ -39,6 +39,7 @@ export const DistroSelect: React.FC<DistroSelectProps> = ({
       clearable={false}
       data-cy="distro-select"
       label="Distro"
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       onChange={(distroId: string) => {
         navigate(getDistroSettingsRoute(distroId));
       }}
@@ -70,6 +71,7 @@ const filterAdminOnlyDistros = (distros: DistrosQuery["distros"]) =>
   distros.reduce(
     (accum, distro) => {
       const [adminOnly, nonAdminOnly] = accum;
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       (distro.adminOnly ? adminOnly : nonAdminOnly).push(distro);
       return accum;
     },
diff --git a/apps/spruce/src/pages/distroSettings/NavigationModal.tsx b/apps/spruce/src/pages/distroSettings/NavigationModal.tsx
index 58d6ac30e..b40fd5dc3 100644
--- a/apps/spruce/src/pages/distroSettings/NavigationModal.tsx
+++ b/apps/spruce/src/pages/distroSettings/NavigationModal.tsx
@@ -8,6 +8,7 @@ export const NavigationModal: React.FC = () => {
   const { hasUnsaved, unsavedTabs } = useHasUnsavedTab();
   const { distroId } = useParams();
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const shouldConfirmNavigation = ({ nextLocation }): boolean => {
     const isDistroSettingsRoute =
       nextLocation &&
@@ -17,6 +18,7 @@ export const NavigationModal: React.FC = () => {
     }
 
     /* Identify if the user is navigating to a new distro's settings via distro select dropdown */
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const currentDistroRoute = getDistroSettingsRoute(distroId);
     const isNewDistroSettingsRoute = !matchPath(
       `${currentDistroRoute}/*`,
diff --git a/apps/spruce/src/pages/distroSettings/NewDistro/CopyModal.test.tsx b/apps/spruce/src/pages/distroSettings/NewDistro/CopyModal.test.tsx
index c19b1a496..f9f265d7b 100644
--- a/apps/spruce/src/pages/distroSettings/NewDistro/CopyModal.test.tsx
+++ b/apps/spruce/src/pages/distroSettings/NewDistro/CopyModal.test.tsx
@@ -70,6 +70,7 @@ describe("copy distro modal", () => {
       route: `/distro/${distroIdToCopy}/settings/general`,
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("distro-id-input"), newDistroId);
     await user.click(screen.getByRole("button", { name: "Duplicate" }));
     await waitFor(() => expect(dispatchToast.success).toHaveBeenCalledTimes(1));
@@ -89,6 +90,7 @@ describe("copy distro modal", () => {
     });
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("distro-id-input"),
       "string with spaces",
     );
@@ -126,6 +128,7 @@ describe("copy distro modal", () => {
       route: `/distro/${distroIdToCopy}/settings/general`,
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("distro-id-input"), newDistroId);
 
     const confirmButton = screen.getByRole("button", {
diff --git a/apps/spruce/src/pages/distroSettings/NewDistro/CopyModal.tsx b/apps/spruce/src/pages/distroSettings/NewDistro/CopyModal.tsx
index 9fe7597cb..9208817b1 100644
--- a/apps/spruce/src/pages/distroSettings/NewDistro/CopyModal.tsx
+++ b/apps/spruce/src/pages/distroSettings/NewDistro/CopyModal.tsx
@@ -46,6 +46,7 @@ export const CopyModal: React.FC<Props> = ({ handleClose, open }) => {
     copyDistro({
       variables: {
         opts: {
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           distroIdToCopy: distroId,
           newDistroId: formState.newDistroId,
         },
diff --git a/apps/spruce/src/pages/distroSettings/NewDistro/CreateModal.test.tsx b/apps/spruce/src/pages/distroSettings/NewDistro/CreateModal.test.tsx
index 1cb1e4e2e..3abe8d1a2 100644
--- a/apps/spruce/src/pages/distroSettings/NewDistro/CreateModal.test.tsx
+++ b/apps/spruce/src/pages/distroSettings/NewDistro/CreateModal.test.tsx
@@ -60,6 +60,7 @@ describe("create distro modal", () => {
     const { Component, dispatchToast } = RenderFakeToastContext(<Modal />);
     const { router } = render(<Component />);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("distro-id-input"), newDistroId);
     await user.click(screen.getByRole("button", { name: "Create" }));
     await waitFor(() => expect(dispatchToast.success).toHaveBeenCalledTimes(1));
@@ -76,6 +77,7 @@ describe("create distro modal", () => {
     render(<Component />);
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("distro-id-input"),
       "string with spaces",
     );
@@ -109,6 +111,7 @@ describe("create distro modal", () => {
     );
     const { router } = render(<Component />);
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("distro-id-input"), newDistroId);
 
     const confirmButton = screen.getByRole("button", {
diff --git a/apps/spruce/src/pages/distroSettings/NewDistro/NewDistroButton.test.tsx b/apps/spruce/src/pages/distroSettings/NewDistro/NewDistroButton.test.tsx
index d055deb7e..44426b5c8 100644
--- a/apps/spruce/src/pages/distroSettings/NewDistro/NewDistroButton.test.tsx
+++ b/apps/spruce/src/pages/distroSettings/NewDistro/NewDistroButton.test.tsx
@@ -69,6 +69,7 @@ describe("new distro button", () => {
       });
 
       await screen.findByText("New distro");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("new-distro-button"));
       expect(screen.queryByDataCy("new-distro-menu")).toBeVisible();
     });
@@ -82,8 +83,10 @@ describe("new distro button", () => {
       });
 
       await screen.findByText("New distro");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("new-distro-button"));
       expect(screen.queryByDataCy("new-distro-menu")).toBeVisible();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("create-distro-button"));
       await waitFor(() => {
         expect(screen.queryByDataCy("create-distro-modal")).toBeVisible();
@@ -100,8 +103,10 @@ describe("new distro button", () => {
       });
 
       await screen.findByText("New distro");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("new-distro-button"));
       expect(screen.queryByDataCy("new-distro-menu")).toBeVisible();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("copy-distro-button"));
       await waitFor(() => {
         expect(screen.queryByDataCy("copy-distro-modal")).toBeVisible();
diff --git a/apps/spruce/src/pages/distroSettings/NewDistro/NewDistroButton.tsx b/apps/spruce/src/pages/distroSettings/NewDistro/NewDistroButton.tsx
index 850b61b6b..86b8b4593 100644
--- a/apps/spruce/src/pages/distroSettings/NewDistro/NewDistroButton.tsx
+++ b/apps/spruce/src/pages/distroSettings/NewDistro/NewDistroButton.tsx
@@ -25,6 +25,7 @@ export const NewDistroButton: React.FC = () => {
     UserDistroSettingsPermissionsQuery,
     UserDistroSettingsPermissionsQueryVariables
   >(USER_DISTRO_SETTINGS_PERMISSIONS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { distroId },
   });
   const {
diff --git a/apps/spruce/src/pages/distroSettings/SaveModal.tsx b/apps/spruce/src/pages/distroSettings/SaveModal.tsx
index be9511058..8e358ad52 100644
--- a/apps/spruce/src/pages/distroSettings/SaveModal.tsx
+++ b/apps/spruce/src/pages/distroSettings/SaveModal.tsx
@@ -72,6 +72,7 @@ export const SaveModal: React.FC<SaveModalProps> = ({
     // Only perform the save operation if the tab is valid.
     // eslint-disable-next-line no-prototype-builtins
     if (formToGqlMap.hasOwnProperty(tab)) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       const formToGql: FormToGqlFunction<typeof tab> = formToGqlMap[tab];
       const changes = formToGql(formData, distro);
       saveDistro({
diff --git a/apps/spruce/src/pages/distroSettings/Tabs.tsx b/apps/spruce/src/pages/distroSettings/Tabs.tsx
index 899f34113..ee466a850 100644
--- a/apps/spruce/src/pages/distroSettings/Tabs.tsx
+++ b/apps/spruce/src/pages/distroSettings/Tabs.tsx
@@ -38,6 +38,7 @@ export const DistroSettingsTabs: React.FC<Props> = ({ distro }) => {
   return (
     <Container>
       <NavigationModal />
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <Header tab={tab} distro={distro} />
       <Routes>
         <Route
@@ -49,6 +50,7 @@ export const DistroSettingsTabs: React.FC<Props> = ({ distro }) => {
           element={
             <GeneralTab
               distroData={tabData[DistroSettingsTabRoutes.General]}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               minimumHosts={distro.hostAllocatorSettings.minimumHosts}
             />
           }
@@ -67,6 +69,7 @@ export const DistroSettingsTabs: React.FC<Props> = ({ distro }) => {
           element={
             <TaskTab
               distroData={tabData[DistroSettingsTabRoutes.Task]}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               provider={distro.provider}
             />
           }
@@ -76,6 +79,7 @@ export const DistroSettingsTabs: React.FC<Props> = ({ distro }) => {
           element={
             <HostTab
               distroData={tabData[DistroSettingsTabRoutes.Host]}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               provider={distro.provider}
             />
           }
@@ -99,6 +103,7 @@ const getTabData = (data: Props["distro"]): FormStateMap =>
   Object.keys(gqlToFormMap).reduce(
     (obj, tab) => ({
       ...obj,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [tab]: gqlToFormMap[tab](data),
     }),
     {} as FormStateMap,
diff --git a/apps/spruce/src/pages/distroSettings/index.tsx b/apps/spruce/src/pages/distroSettings/index.tsx
index 30965833d..5f2b4f438 100644
--- a/apps/spruce/src/pages/distroSettings/index.tsx
+++ b/apps/spruce/src/pages/distroSettings/index.tsx
@@ -38,6 +38,7 @@ const DistroSettings: React.FC = () => {
   const { data, loading } = useQuery<DistroQuery, DistroQueryVariables>(
     DISTRO,
     {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       variables: { distroId },
       onError: (e) => {
         dispatchToast.error(
@@ -47,10 +48,12 @@ const DistroSettings: React.FC = () => {
     },
   );
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!Object.values(DistroSettingsTabRoutes).includes(currentTab)) {
     return (
       <Navigate
         replace
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         to={getDistroSettingsRoute(distroId, DistroSettingsTabRoutes.General)}
       />
     );
@@ -60,6 +63,7 @@ const DistroSettings: React.FC = () => {
     <DistroSettingsProvider>
       <SideNav aria-label="Distro Settings" widthOverride={250}>
         <ButtonsContainer>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <DistroSelect selectedDistro={distroId} />
           <NewDistroButton />
         </ButtonsContainer>
@@ -69,6 +73,7 @@ const DistroSettings: React.FC = () => {
               active={tab === currentTab}
               as={Link}
               key={tab}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               to={getDistroSettingsRoute(distroId, tab)}
               data-cy={`navitem-${tab}`}
             >
@@ -78,6 +83,7 @@ const DistroSettings: React.FC = () => {
         </SideNavGroup>
         <SideNavGroup glyph={<Icon glyph="Link" />} header="Links">
           <SideNavItemLink
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             to={getTaskQueueRoute(distroId)}
             data-cy="navitem-task-queue-link"
           >
diff --git a/apps/spruce/src/pages/distroSettings/tabs/BaseTab.tsx b/apps/spruce/src/pages/distroSettings/tabs/BaseTab.tsx
index c304a8ad7..1f6dbdfa6 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/BaseTab.tsx
+++ b/apps/spruce/src/pages/distroSettings/tabs/BaseTab.tsx
@@ -27,12 +27,14 @@ export const BaseTab = <T extends WritableDistroSettingsType>({
     [slugs.distroId]: string;
   }>();
   const state = useDistroSettingsContext();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePopulateForm(initialFormState, tab);
 
   const { data } = useQuery<
     UserDistroSettingsPermissionsQuery,
     UserDistroSettingsPermissionsQueryVariables
   >(USER_DISTRO_SETTINGS_PERMISSIONS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { distroId },
   });
   const canEditDistro =
@@ -43,6 +45,7 @@ export const BaseTab = <T extends WritableDistroSettingsType>({
       disabled={!canEditDistro}
       {...rest}
       state={state}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       tab={tab}
     />
   );
diff --git a/apps/spruce/src/pages/distroSettings/tabs/EventLogTab/EventLogTab.test.tsx b/apps/spruce/src/pages/distroSettings/tabs/EventLogTab/EventLogTab.test.tsx
index 1fa583f6a..05ea2cd6d 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/EventLogTab/EventLogTab.test.tsx
+++ b/apps/spruce/src/pages/distroSettings/tabs/EventLogTab/EventLogTab.test.tsx
@@ -9,6 +9,7 @@ import { renderWithRouterMatch as render, screen, waitFor } from "test_utils";
 import { ApolloMock } from "types/gql";
 import { EventLogTab } from "./EventLogTab";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Wrapper = ({ children, mocks = [query()] }) => (
   <MockedProvider mocks={mocks}>{children}</MockedProvider>
 );
diff --git a/apps/spruce/src/pages/distroSettings/tabs/EventLogTab/EventLogTab.tsx b/apps/spruce/src/pages/distroSettings/tabs/EventLogTab/EventLogTab.tsx
index 7fce25d70..73a776f7f 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/EventLogTab/EventLogTab.tsx
+++ b/apps/spruce/src/pages/distroSettings/tabs/EventLogTab/EventLogTab.tsx
@@ -12,6 +12,7 @@ export const EventLogTab: React.FC<TabProps> = ({ limit }) => {
   const { [slugs.distroId]: distroId } = useParams();
 
   const { allEventsFetched, events, fetchMore, loading } = useDistroEvents(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     distroId,
     limit,
   );
diff --git a/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/GeneralTab.tsx b/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/GeneralTab.tsx
index 800015dd2..da42e9aec 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/GeneralTab.tsx
+++ b/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/GeneralTab.tsx
@@ -16,6 +16,7 @@ export const GeneralTab: React.FC<TabProps> = ({
   const containerPoolDistros =
     spruceConfig?.containerPools?.pools?.map(({ distro }) => distro) ?? [];
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const isContainerDistro = containerPoolDistros.includes(distroId);
 
   const formSchema = useMemo(
diff --git a/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/getFormSchema.ts b/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/getFormSchema.ts
index 126fd1859..8323268b4 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/getFormSchema.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/getFormSchema.ts
@@ -135,8 +135,7 @@ export const getFormSchema = (
       },
       warningNote: {
         "ui:rows": 2,
-        // TODO: https://jira.mongodb.org/browse/DEVPROD-6656 - Swap this to textarea when the backend supports it
-        "ui:widget": "hidden",
+        "ui:widget": "textarea",
         "ui:description":
           "This will be displayed to users when selecting this distro as part of evergreen yml validation.",
       },
diff --git a/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/transformers.test.ts b/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/transformers.test.ts
index 48da16727..3a7c0aa18 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/transformers.test.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/transformers.test.ts
@@ -33,6 +33,7 @@ const generalForm: GeneralFormState = {
   },
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const generalGql: DistroInput = {
   ...distroData,
   name: "rhel71-power8-large",
diff --git a/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/transformers.ts b/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/transformers.ts
index 33f4ab717..31c109db9 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/transformers.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/GeneralTab/transformers.ts
@@ -37,11 +37,13 @@ export const gqlToForm = ((data) => {
       warningNote,
     },
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
   { distroAliases, distroImage, distroName, distroOptions },
   distro,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 ) => ({
   ...distro,
   name: distroName.name,
diff --git a/apps/spruce/src/pages/distroSettings/tabs/HostTab/HostTab.tsx b/apps/spruce/src/pages/distroSettings/tabs/HostTab/HostTab.tsx
index cfb0931d9..7726c08b4 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/HostTab/HostTab.tsx
+++ b/apps/spruce/src/pages/distroSettings/tabs/HostTab/HostTab.tsx
@@ -24,6 +24,7 @@ export const HostTab: React.FC<TabProps> = ({ distroData, provider }) => {
     <BaseTab
       formSchema={formSchema}
       initialFormState={distroData}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       validate={validate}
     />
   );
diff --git a/apps/spruce/src/pages/distroSettings/tabs/HostTab/transformers.test.ts b/apps/spruce/src/pages/distroSettings/tabs/HostTab/transformers.test.ts
index 5797716f4..98b4824aa 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/HostTab/transformers.test.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/HostTab/transformers.test.ts
@@ -22,6 +22,7 @@ describe("host tab", () => {
   });
 
   it("correctly converts from GQL to a form when mountpoints is null", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(gqlToForm({ ...distroData, mountpoints: null })).toStrictEqual({
       ...form,
       setup: { ...form.setup, mountpoints: [] },
@@ -83,4 +84,5 @@ const form: HostFormState = {
   },
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const gql: DistroInput = distroData;
diff --git a/apps/spruce/src/pages/distroSettings/tabs/HostTab/transformers.ts b/apps/spruce/src/pages/distroSettings/tabs/HostTab/transformers.ts
index c4da63b1c..92871388d 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/HostTab/transformers.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/HostTab/transformers.ts
@@ -68,11 +68,13 @@ export const gqlToForm = ((data) => {
     },
     allocation: hostAllocatorSettings,
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
   { allocation, bootstrapSettings, setup, sshConfig },
   distro,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 ) => ({
   ...distro,
   arch: setup.arch,
diff --git a/apps/spruce/src/pages/distroSettings/tabs/ProjectTab/transformers.test.ts b/apps/spruce/src/pages/distroSettings/tabs/ProjectTab/transformers.test.ts
index 8e31add89..49502d409 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/ProjectTab/transformers.test.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/ProjectTab/transformers.test.ts
@@ -31,6 +31,7 @@ const form: ProjectFormState = {
   validProjects: [],
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const gql: DistroInput = {
   ...distroData,
   expansions: [
diff --git a/apps/spruce/src/pages/distroSettings/tabs/ProjectTab/transformers.ts b/apps/spruce/src/pages/distroSettings/tabs/ProjectTab/transformers.ts
index cd680a662..8c9049102 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/ProjectTab/transformers.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/ProjectTab/transformers.ts
@@ -12,8 +12,10 @@ export const gqlToForm = ((data) => {
     expansions,
     validProjects,
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const formToGql = (({ expansions, validProjects }, distro) => ({
   ...distro,
   expansions,
diff --git a/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/UnsavedModal.tsx b/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/UnsavedModal.tsx
index 911693982..c21ceb4d1 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/UnsavedModal.tsx
+++ b/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/UnsavedModal.tsx
@@ -14,6 +14,7 @@ type UnsavedModalProps = {
   shouldBlock: boolean | BlockerFunction;
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const UnsavedModal: React.FC<UnsavedModalProps> = ({
   distro,
   shouldBlock,
diff --git a/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/getFormSchema.ts b/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/getFormSchema.ts
index 5b89aadee..c5e3a59f7 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/getFormSchema.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/getFormSchema.ts
@@ -60,6 +60,7 @@ export const getFormSchema = ({
       },
     },
     dependencies: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       provider: {
         oneOf: [
           {
diff --git a/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/transformers.test.ts b/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/transformers.test.ts
index 8858b194a..116a4d407 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/transformers.test.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/transformers.test.ts
@@ -81,6 +81,7 @@ describe("provider tab", () => {
       ],
     };
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const staticForm: ProviderFormState = {
       ...defaultFormState,
       provider: {
@@ -94,6 +95,7 @@ describe("provider tab", () => {
       },
     };
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const staticGql: DistroInput = {
       ...distroData,
       provider: Provider.Static,
@@ -109,10 +111,12 @@ describe("provider tab", () => {
     };
 
     it("correctly converts from GQL to a form", () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(gqlToForm(staticDistroData)).toStrictEqual(staticForm);
     });
 
     it("correctly converts from a form to GQL", () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(formToGql(staticForm, staticDistroData)).toStrictEqual(staticGql);
     });
   });
@@ -135,6 +139,7 @@ describe("provider tab", () => {
       ],
     };
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const dockerForm: ProviderFormState = {
       ...defaultFormState,
       provider: {
@@ -153,6 +158,7 @@ describe("provider tab", () => {
       },
     };
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const dockerGql: DistroInput = {
       ...distroData,
       provider: Provider.Docker,
@@ -171,10 +177,12 @@ describe("provider tab", () => {
     };
 
     it("correctly converts from GQL to a form", () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(gqlToForm(dockerDistroData)).toStrictEqual(dockerForm);
     });
 
     it("correctly converts from a form to GQL", () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(formToGql(dockerForm, dockerDistroData)).toStrictEqual(dockerGql);
     });
   });
@@ -232,9 +240,13 @@ describe("provider tab", () => {
           mountPoints: [
             {
               deviceName: "device-east",
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               virtualName: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               volumeType: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               iops: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               throughput: undefined,
               size: 200,
             },
@@ -260,9 +272,13 @@ describe("provider tab", () => {
           mountPoints: [
             {
               deviceName: "device-east",
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               virtualName: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               volumeType: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               iops: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               throughput: undefined,
               size: 200,
             },
@@ -279,6 +295,7 @@ describe("provider tab", () => {
       ],
     };
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const ec2Gql: DistroInput = {
       ...distroData,
       provider: Provider.Ec2Fleet,
@@ -316,10 +333,12 @@ describe("provider tab", () => {
     };
 
     it("correctly converts from GQL to a form", () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(gqlToForm(ec2FleetDistroData)).toStrictEqual(ec2Form);
     });
 
     it("correctly converts from a form to GQL", () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(formToGql(ec2Form, ec2FleetDistroData)).toStrictEqual(ec2Gql);
     });
   });
@@ -372,9 +391,13 @@ describe("provider tab", () => {
           mountPoints: [
             {
               deviceName: "device-east",
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               virtualName: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               volumeType: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               iops: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               throughput: undefined,
               size: 200,
             },
@@ -400,9 +423,13 @@ describe("provider tab", () => {
           mountPoints: [
             {
               deviceName: "device-east",
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               virtualName: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               volumeType: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               iops: undefined,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               throughput: undefined,
               size: 200,
             },
@@ -419,6 +446,7 @@ describe("provider tab", () => {
       ],
     };
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const ec2Gql: DistroInput = {
       ...distroData,
       provider: Provider.Ec2OnDemand,
@@ -451,10 +479,12 @@ describe("provider tab", () => {
     };
 
     it("correctly converts from GQL to a form", () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(gqlToForm(ec2OnDemandDistroData)).toStrictEqual(ec2Form);
     });
 
     it("correctly converts from a form to GQL", () => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(formToGql(ec2Form, ec2OnDemandDistroData)).toStrictEqual(ec2Gql);
     });
   });
diff --git a/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/transformers.ts b/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/transformers.ts
index 193a59895..a4f0da602 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/transformers.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/ProviderTab/transformers.ts
@@ -31,6 +31,7 @@ export const gqlToForm = ((data) => {
       displayTitle: p.region,
     })),
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((data, distro) => {
@@ -84,4 +85,5 @@ export const formToGql = ((data, distro) => {
     default:
       return distro;
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/distroSettings/tabs/TaskTab/transformers.test.ts b/apps/spruce/src/pages/distroSettings/tabs/TaskTab/transformers.test.ts
index 9b222ccec..2f6a4569f 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/TaskTab/transformers.test.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/TaskTab/transformers.test.ts
@@ -40,6 +40,7 @@ const form: TaskFormState = {
   },
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const gql: DistroInput = {
   ...distroData,
   finderSettings: {
diff --git a/apps/spruce/src/pages/distroSettings/tabs/TaskTab/transformers.ts b/apps/spruce/src/pages/distroSettings/tabs/TaskTab/transformers.ts
index b1fe26e3e..4037b1468 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/TaskTab/transformers.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/TaskTab/transformers.ts
@@ -17,6 +17,7 @@ export const gqlToForm = ((data) => {
     },
     dispatcherSettings,
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
@@ -34,4 +35,5 @@ export const formToGql = ((
     },
     dispatcherSettings,
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/distroSettings/tabs/transformers.ts b/apps/spruce/src/pages/distroSettings/tabs/transformers.ts
index 8025abac3..e1a001c7e 100644
--- a/apps/spruce/src/pages/distroSettings/tabs/transformers.ts
+++ b/apps/spruce/src/pages/distroSettings/tabs/transformers.ts
@@ -13,19 +13,29 @@ import {
 export const formToGqlMap: {
   [T in WritableDistroSettingsType]: FormToGqlFunction<T>;
 } = {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.General]: general.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.Host]: host.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.Project]: project.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.Provider]: provider.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.Task]: task.formToGql,
 };
 
 export const gqlToFormMap: {
   [T in WritableDistroSettingsType]?: GqlToFormFunction<T>;
 } = {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.General]: general.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.Host]: host.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.Project]: project.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.Provider]: provider.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [DistroSettingsTabRoutes.Task]: task.gqlToForm,
 };
diff --git a/apps/spruce/src/pages/host/Metadata.tsx b/apps/spruce/src/pages/host/Metadata.tsx
index 84bfcd7f7..23fd943ef 100644
--- a/apps/spruce/src/pages/host/Metadata.tsx
+++ b/apps/spruce/src/pages/host/Metadata.tsx
@@ -34,7 +34,9 @@ export const Metadata: React.FC<{
 
   const { id: runningTaskId, name: runningTaskName } = runningTask ?? {};
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const taskLink = getTaskRoute(runningTaskId);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const distroLink = getDistroSettingsRoute(distroId);
 
   return (
@@ -52,6 +54,7 @@ export const Metadata: React.FC<{
         </MetadataItem>
       )}
       <MetadataItem>
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         Uptime: {formatDistanceToNow(new Date(uptime))}
       </MetadataItem>
       <MetadataItem>Started By: {startedBy}</MetadataItem>
diff --git a/apps/spruce/src/pages/host/index.tsx b/apps/spruce/src/pages/host/index.tsx
index 3567a8b09..f5b6e253d 100644
--- a/apps/spruce/src/pages/host/index.tsx
+++ b/apps/spruce/src/pages/host/index.tsx
@@ -39,6 +39,7 @@ const Host: React.FC = () => {
     error,
     loading: hostMetaDataLoading,
   } = useQuery<HostQuery, HostQueryVariables>(HOST, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: hostId },
     onError: (err) => {
       dispatchToast.error(
@@ -62,6 +63,7 @@ const Host: React.FC = () => {
     HostEventsQuery,
     HostEventsQueryVariables
   >(HOST_EVENTS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: hostId, tag, page, limit },
   });
 
@@ -97,6 +99,7 @@ const Host: React.FC = () => {
                   </ButtonSpacer>
                   <ButtonSpacer>
                     <RestartJasper
+                      // @ts-expect-error: FIXME. This comment was added by an automated script.
                       selectedHostIds={[hostId]}
                       hostUrl={hostUrl}
                       isSingleHost
@@ -106,6 +109,7 @@ const Host: React.FC = () => {
                   </ButtonSpacer>
                   <ButtonSpacer>
                     <Reprovision
+                      // @ts-expect-error: FIXME. This comment was added by an automated script.
                       selectedHostIds={[hostId]}
                       hostUrl={hostUrl}
                       isSingleHost
@@ -123,6 +127,7 @@ const Host: React.FC = () => {
               <Metadata
                 loading={hostMetaDataLoading}
                 host={host}
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 error={error}
               />
               {sshAddress && (
@@ -135,10 +140,13 @@ const Host: React.FC = () => {
               <PageContent>
                 <HostTable
                   loading={hostEventLoading}
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   eventData={hostEventData}
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   error={error}
                   page={page}
                   limit={limit}
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   eventsCount={eventsCount}
                 />
               </PageContent>
@@ -148,6 +156,7 @@ const Host: React.FC = () => {
       )}
       <UpdateStatusModal
         data-cy="update-host-status-modal"
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         hostIds={[hostId]}
         visible={isUpdateStatusModalVisible}
         closeModal={() => setIsUpdateStatusModalVisible(false)}
diff --git a/apps/spruce/src/pages/hosts/HostsTable.tsx b/apps/spruce/src/pages/hosts/HostsTable.tsx
index 1387d76eb..fc1e437ad 100644
--- a/apps/spruce/src/pages/hosts/HostsTable.tsx
+++ b/apps/spruce/src/pages/hosts/HostsTable.tsx
@@ -56,13 +56,16 @@ export const HostsTable: React.FC<Props> = ({
   };
 
   const setSorting = (s: SortingState) =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     getDefaultSorting(table).onSortingChange(s);
 
   const tableSortHandler = useTableSort({
     sendAnalyticsEvents: () => sendEvent({ name: "Sort Hosts" }),
   });
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const setFilters = (f: ColumnFiltersState) =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     getDefaultFiltering(table).onColumnFiltersChange(f);
 
   const updateFilters = (filterState: ColumnFiltersState) => {
@@ -73,7 +76,9 @@ export const HostsTable: React.FC<Props> = ({
     };
 
     filterState.forEach(({ id, value }) => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       const key = mapIdToFilterParam[id];
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       updatedParams[key] = value;
     });
 
@@ -82,6 +87,7 @@ export const HostsTable: React.FC<Props> = ({
   };
 
   const tableContainerRef = useRef<HTMLDivElement>(null);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const table = useLeafyGreenTable<Host>({
     columns,
     containerRef: tableContainerRef,
@@ -105,6 +111,7 @@ export const HostsTable: React.FC<Props> = ({
     manualPagination: true,
     manualSorting: true,
     onColumnFiltersChange: onChangeHandler<ColumnFiltersState>(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setFilters,
       (updatedState) => {
         updateFilters(updatedState);
@@ -116,6 +123,7 @@ export const HostsTable: React.FC<Props> = ({
       updateRowSelection,
     ),
     onSortingChange: onChangeHandler<SortingState>(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setSorting,
       (updatedState) => {
         tableSortHandler(updatedState);
@@ -146,6 +154,7 @@ const columns = [
     header: "ID",
     accessorKey: "id",
     id: HostSortBy.Id,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }): JSX.Element => {
       const id = getValue();
       return (
@@ -196,6 +205,7 @@ const columns = [
     header: "Current Task",
     accessorKey: "runningTask",
     id: HostSortBy.CurrentTask,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => {
       const task = getValue();
       return task?.id !== null ? (
@@ -223,6 +233,7 @@ const columns = [
     header: "Elapsed",
     accessorKey: "elapsed",
     id: HostSortBy.Elapsed,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => {
       const elapsed = getValue();
       return elapsed ? formatDistanceToNow(new Date(elapsed)) : "N/A";
@@ -236,6 +247,7 @@ const columns = [
     header: "Uptime",
     accessorKey: "uptime",
     id: HostSortBy.Uptime,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => {
       const uptime = getValue();
       return uptime ? formatDistanceToNow(new Date(uptime)) : "N/A";
@@ -249,6 +261,7 @@ const columns = [
     header: "Idle Time",
     accessorKey: "totalIdleTime",
     id: HostSortBy.IdleTime,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => {
       const totalIdleTime = getValue();
       return totalIdleTime
@@ -264,6 +277,7 @@ const columns = [
     header: "Owner",
     accessorKey: "startedBy",
     id: HostSortBy.Owner,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => <WordBreak>{getValue()}</WordBreak>,
     enableColumnFilter: true,
     enableSorting: true,
diff --git a/apps/spruce/src/pages/hosts/index.tsx b/apps/spruce/src/pages/hosts/index.tsx
index e24610152..c94af6a1e 100644
--- a/apps/spruce/src/pages/hosts/index.tsx
+++ b/apps/spruce/src/pages/hosts/index.tsx
@@ -37,6 +37,7 @@ const Hosts: React.FC = () => {
   const initialSorting = useMemo(() => getSorting(queryVariables), []);
 
   const hasFilters =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     hostId || currentTaskId || distroId || statuses.length || startedBy;
 
   const [selectedHosts, setSelectedHosts] = useState([]);
@@ -54,21 +55,27 @@ const Hosts: React.FC = () => {
     let restartJasperErrorMessage = "Jasper cannot be restarted for:";
     let reprovisionErrorMessage =
       "The following hosts cannot be reprovisioned:";
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const errorHosts = [];
     selectedHosts.forEach((host) => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       const bootstrapMethod = host?.distro?.bootstrapMethod;
       if (
         !(
-          host?.status === "running" &&
-          (bootstrapMethod === "ssh" || bootstrapMethod === "user-data")
+          (bootstrapMethod === "ssh" || bootstrapMethod === "user-data") &&
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
+          host?.status === "running"
         )
       ) {
         canRestart = false;
         canRepro = false;
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         errorHosts.push(` ${host?.id}`);
       }
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     restartJasperErrorMessage += ` ${errorHosts}`;
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     reprovisionErrorMessage += ` ${errorHosts}`;
 
     const hostIds = selectedHosts.map(({ id }) => id);
@@ -165,6 +172,7 @@ const Hosts: React.FC = () => {
         hosts={hostItems}
         loading={loading && hostItems.length === 0}
         limit={limit}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         setSelectedHosts={setSelectedHosts}
       />
       <UpdateStatusModal
diff --git a/apps/spruce/src/pages/hosts/utils.ts b/apps/spruce/src/pages/hosts/utils.ts
index d26d71ad2..e29b094f0 100644
--- a/apps/spruce/src/pages/hosts/utils.ts
+++ b/apps/spruce/src/pages/hosts/utils.ts
@@ -60,8 +60,11 @@ const useQueryVariables = (): HostsQueryVariables => {
  * @returns - react-table's filtering state
  */
 const getFilters = (queryParams: HostsQueryVariables): ColumnFiltersState =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   Object.entries(mapQueryParamToId).reduce((accum, [param, id]) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     if (queryParams[param]?.length) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       return [...accum, { id, value: queryParams[param] }];
     }
     return accum;
@@ -75,6 +78,7 @@ const getFilters = (queryParams: HostsQueryVariables): ColumnFiltersState =>
  * @returns - react-table's sorting state
  */
 const getSorting = ({ sortBy, sortDir }: HostsQueryVariables): SortingState => [
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   { id: sortBy, desc: sortDir === SortDirection.Desc },
 ];
 
diff --git a/apps/spruce/src/pages/jobLogs/JobLogsTable.tsx b/apps/spruce/src/pages/jobLogs/JobLogsTable.tsx
index dcdc0efce..a4298becf 100644
--- a/apps/spruce/src/pages/jobLogs/JobLogsTable.tsx
+++ b/apps/spruce/src/pages/jobLogs/JobLogsTable.tsx
@@ -36,6 +36,7 @@ export const JobLogsTable: React.FC<JobLogsTableProps> = ({
         accessorKey: "name",
         cell: ({ getValue, row }) => (
           <Link
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             href={getParsleyLogkeeperTestLogURL(buildId, row.original.id)}
             onClick={() => {
               sendEvent({
diff --git a/apps/spruce/src/pages/jobLogs/index.tsx b/apps/spruce/src/pages/jobLogs/index.tsx
index 86f9d0011..4e5a9240c 100644
--- a/apps/spruce/src/pages/jobLogs/index.tsx
+++ b/apps/spruce/src/pages/jobLogs/index.tsx
@@ -48,10 +48,12 @@ const JobLogs: React.FC<JobLogsProps> = ({ isLogkeeper }) => {
         title="Job Logs"
         loading={loading}
         size="large"
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         badge={null}
         subtitle={
           <SubtitleContainer>
-            <H3>{metadata.displayName}</H3>{" "}
+            <H3>{metadata.displayName}</H3>
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             <TaskStatusBadge status={metadata.taskStatus} />
           </SubtitleContainer>
         }
diff --git a/apps/spruce/src/pages/jobLogs/useJobLogs.ts b/apps/spruce/src/pages/jobLogs/useJobLogs.ts
index c6687fdb8..7a1152e5a 100644
--- a/apps/spruce/src/pages/jobLogs/useJobLogs.ts
+++ b/apps/spruce/src/pages/jobLogs/useJobLogs.ts
@@ -33,11 +33,13 @@ const useJobLogsPageData = ({
   onError,
   taskId,
 }: UseJobLogsPageParams): JobLogsPageData => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const executionAsInt = parseInt(execution, 10);
   const { data: logkeeperData, loading: loadingLogkeeper } = useQuery<
     LogkeeperBuildMetadataQuery,
     LogkeeperBuildMetadataQueryVariables
   >(LOGKEEPER_BUILD_METADATA, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { buildId },
     skip: !isLogkeeper,
     onError: (err) => {
@@ -73,6 +75,7 @@ const useJobLogsPageData = ({
 
   const resultsToRender = getFormattedTestResults(
     logkeeperBuildMetadata?.tests,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     evergreenTask?.tests?.testResults,
     groupId,
   );
@@ -87,6 +90,7 @@ const useJobLogsPageData = ({
   return {
     resultsToRender,
     title,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     status: evergreenTask?.status,
     loading: loadingEvergreen || loadingLogkeeper,
     metadata,
diff --git a/apps/spruce/src/pages/jobLogs/utils.ts b/apps/spruce/src/pages/jobLogs/utils.ts
index e275c2ae7..61bfce738 100644
--- a/apps/spruce/src/pages/jobLogs/utils.ts
+++ b/apps/spruce/src/pages/jobLogs/utils.ts
@@ -30,23 +30,29 @@ const getMetadata = (
   if (isLogkeeper) {
     const { buildNum, builder } = options.logkeeperBuildMetadata || {};
     return {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       completeLogsURL: getParsleyBuildLogURL(options.buildId),
       builder,
       buildId: options.buildId,
       buildNum,
       displayName,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       execution,
       isLogkeeper,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       taskId: id,
       taskStatus: status as TaskStatus,
     };
   }
   return {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     completeLogsURL: getParsleyCompleteLogsURL(id, execution, options.groupId),
     displayName,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     execution,
     groupID: options.groupId,
     isLogkeeper,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     taskId: id,
     taskStatus: status as TaskStatus,
   };
diff --git a/apps/spruce/src/pages/preferences/PreferencesTabs.tsx b/apps/spruce/src/pages/preferences/PreferencesTabs.tsx
index 1e8825fdf..3e9d0a709 100644
--- a/apps/spruce/src/pages/preferences/PreferencesTabs.tsx
+++ b/apps/spruce/src/pages/preferences/PreferencesTabs.tsx
@@ -14,10 +14,12 @@ import { ProfileTab } from "./preferencesTabs/ProfileTab";
 import { PublicKeysTab } from "./preferencesTabs/PublicKeysTab";
 
 export const PreferencesTabs: React.FC = () => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { [slugs.tab]: tab } = useParams<{
     [slugs.tab]: PreferencesTabRoutes | null;
   }>();
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { subtitle, title } = getTitle(tab);
   return (
     <>
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/NewUITab.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/NewUITab.tsx
index 34a7e7e1d..90274031b 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/NewUITab.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/NewUITab.tsx
@@ -67,6 +67,7 @@ export const NewUITab: React.FC = () => {
     <SettingsCard>
       <PreferenceItem>
         <Toggle
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           checked={spruceV1}
           disabled={updateLoading}
           onChange={handleOnChangeNewUI}
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/NotificationsTab.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/NotificationsTab.tsx
index c373fb557..788bd5b88 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/NotificationsTab.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/NotificationsTab.tsx
@@ -4,6 +4,7 @@ import styled from "@emotion/styled";
 import Button, { Variant } from "@leafygreen-ui/button";
 import TextInput from "@leafygreen-ui/text-input";
 import { Skeleton } from "antd";
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 import isEqual from "lodash.isequal";
 import { usePreferencesAnalytics } from "analytics";
 import { SettingsCard } from "components/SettingsCard";
@@ -56,6 +57,7 @@ export const NotificationsTab: React.FC = () => {
     return null;
   }
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const handleSave = async (e): Promise<void> => {
     e.preventDefault();
 
@@ -90,12 +92,14 @@ export const NotificationsTab: React.FC = () => {
         <StyledTextInput
           label="Slack Username"
           onChange={handleFieldUpdate(setSlackUsernameField)}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           value={slackUsernameField}
           data-cy="slack-username-field"
         />
         <StyledTextInput
           label="Slack Member ID"
           onChange={handleFieldUpdate(setSlackMemberIdField)}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           value={slackMemberIdField}
           description="Click on the three dots next to 'set a status' in your Slack profile, and then 'Copy member ID'."
           data-cy="slack-member-id-field"
@@ -119,6 +123,7 @@ export const NotificationsTab: React.FC = () => {
   );
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const handleFieldUpdate = (stateUpdate) => (e) => {
   if (typeof e === "string") {
     stateUpdate(e); // Antd select just passes in the value string instead of an event
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/ProfileTab.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/ProfileTab.tsx
index f9eb529aa..3f65051db 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/ProfileTab.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/ProfileTab.tsx
@@ -70,9 +70,12 @@ export const ProfileTab: React.FC = () => {
     dateFormat: string;
     timeFormat: string;
   }>({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     timezone,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     region,
     githubUser: { lastKnownAs },
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     dateFormat,
     timeFormat,
   });
@@ -80,8 +83,11 @@ export const ProfileTab: React.FC = () => {
   useEffect(() => {
     setFormState({
       githubUser: omitTypename(githubUser || {}),
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       timezone,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       region,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       dateFormat,
       timeFormat,
     });
@@ -140,6 +146,7 @@ export const ProfileTab: React.FC = () => {
           schema={{
             properties: {
               githubUser: {
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 title: null,
                 properties: {
                   lastKnownAs: {
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/PublicKeysTab.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/PublicKeysTab.tsx
index 26e0c2a5a..129b9e251 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/PublicKeysTab.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/PublicKeysTab.tsx
@@ -7,10 +7,12 @@ import { PublicKeysTable } from "./publicKeysTab/PublicKeysTable";
 
 export const PublicKeysTab: React.FC = () => {
   const [editModalProps, setEditModalProps] = useState<EditModalPropsState>(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     defaultEditModalProps,
   );
 
   const onCancel = () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     setEditModalProps(defaultEditModalProps);
   };
 
@@ -22,6 +24,7 @@ export const PublicKeysTab: React.FC = () => {
         onClick={() => {
           setEditModalProps({
             visible: true,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             initialPublicKey: null,
           });
         }}
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/cliTab/AuthenticationCard.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/cliTab/AuthenticationCard.tsx
index 30a783f66..1d295b6f5 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/cliTab/AuthenticationCard.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/cliTab/AuthenticationCard.tsx
@@ -24,17 +24,20 @@ export const AuthenticationCard = () => {
     return <Skeleton active paragraph={{ rows: 6 }} />;
   }
   const config = get(data, "userConfig");
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const authCode = `user: "${config.user}"
-api_key: "${config.api_key}"
-api_server_host: "${config.api_server_host}"
-ui_server_host: "${config.ui_server_host}"
+api_key: "${config?.api_key}"
+api_server_host: "${config?.api_server_host}"
+ui_server_host: "${config?.ui_server_host}"
 `;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const resetKey = async (e) => {
     e.preventDefault();
     sendEvent({ name: "Reset Key" });
     await post(`/settings/newkey`, {});
     refetch();
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const downloadFile = (e) => {
     sendEvent({ name: "Download Auth File" });
     // This creates a text blob with the contents of `authCode`
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/cliTab/DownloadCard.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/cliTab/DownloadCard.tsx
index 452d8d39c..56204f135 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/cliTab/DownloadCard.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/cliTab/DownloadCard.tsx
@@ -33,10 +33,12 @@ export const DownloadCard = () => {
   if (loading) {
     return <Skeleton active paragraph={{ rows: 6 }} />;
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { clientConfig } = data;
   const { clientBinaries } = clientConfig || {};
   const topBinaries = clientBinaries.filter(filterBinaries);
   const otherBinaries = clientBinaries.filter(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     (binary) => !filterBinaries(binary),
   );
 
@@ -53,13 +55,16 @@ export const DownloadCard = () => {
         </Body>
       </CardDescription>
       <CardGroup>
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         {topBinaries.map((binary) => (
           <CliDownloadBox
             key={`downloadBox_${binary.url}`}
             title={
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               prettyDisplayNameTop[binary.displayName] || binary.displayName
             }
             link={binary.url}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             description={descriptions[binary.displayName]}
           />
         ))}
@@ -93,6 +98,7 @@ const CliDownloadBox: React.FC<CliDownloadBoxProps> = ({
             downloadName: title,
           });
         }}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         href={link}
         disabled={!link}
         as="a"
@@ -118,6 +124,7 @@ const ExpandableLinkContents: React.FC<ExpandableLinkContentsProps> = ({
           onClick={() => {
             sendEvent({
               name: "CLI Download Link",
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               downloadName: binary.displayName,
             });
           }}
@@ -142,6 +149,7 @@ const prettyDisplayNameTop = {
 };
 
 const filterBinaries = (binary: ClientBinary) =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   /darwin_arm64\/|linux_amd64\/|windows_amd64\//.test(binary.url);
 
 const CardGroup = styled.div`
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/NotificationField.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/NotificationField.tsx
index 0171cd64c..7b113f22f 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/NotificationField.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/NotificationField.tsx
@@ -25,16 +25,19 @@ export const NotificationField: React.FC<NotificationFieldProps> = ({
     {Object.keys(notifications).map((notification, index) => (
       <Fragment key={notification}>
         <NotificationEvent row={index}>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           {notificationFields[notification]}
         </NotificationEvent>
         <StyledRadioGroup
           row={index}
           onChange={(e) => {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             setNotificationStatus({
               ...notificationStatus,
               [notification]: e.target.value,
             });
           }}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           value={notificationStatus[notification]}
         >
           <Radio value="email" />
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/UserSubscriptions.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/UserSubscriptions.tsx
index 3ff29f997..0d77faefd 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/UserSubscriptions.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/UserSubscriptions.tsx
@@ -78,8 +78,10 @@ export const UserSubscriptions: React.FC<{}> = () => {
       {
         accessorKey: "resourceType",
         id: "resourceType",
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         cell: ({ getValue }) => {
           const resourceType = getValue();
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           return resourceTypeToCopy[resourceType] ?? resourceType;
         },
         enableColumnFilter: true,
@@ -97,8 +99,10 @@ export const UserSubscriptions: React.FC<{}> = () => {
         header: "ID",
         accessorKey: "selectors",
         cell: ({
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           getValue,
           row: {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             original: { resourceType },
           },
         }) => {
@@ -128,27 +132,33 @@ export const UserSubscriptions: React.FC<{}> = () => {
             options: triggerTreeData,
           },
         },
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         cell: ({ getValue }) => {
           const trigger = getValue();
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           return triggerToCopy[trigger] ?? trigger;
         },
       },
       {
         header: "Notify by",
         accessorKey: "subscriber.type",
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         cell: ({ getValue }) => {
           const subscriberType = getValue();
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           return notificationMethodToCopy[subscriberType] ?? subscriberType;
         },
       },
       {
         header: "Target",
         accessorKey: "subscriber",
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         cell: ({ getValue }) => {
           const subscriber = getValue();
           const text = getSubscriberText(subscriber);
           return subscriber.type === NotificationMethods.JIRA_COMMENT
-            ? jiraLinkify(text, jiraHost)
+            ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+              jiraLinkify(text, jiraHost)
             : text;
         },
       },
@@ -166,6 +176,7 @@ export const UserSubscriptions: React.FC<{}> = () => {
     getFacetedUniqueValues: getFacetedUniqueValues(),
     getFilteredRowModel: getFilteredRowModel(),
     hasSelectableRows: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     onColumnFiltersChange: setColumnFilters,
     onRowSelectionChange: setRowSelection,
     state: {
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/useSubscriptionData.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/useSubscriptionData.tsx
index 29faff350..5a845cbfe 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/useSubscriptionData.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/notificationTab/useSubscriptionData.tsx
@@ -39,6 +39,7 @@ export const useSubscriptionData = () => {
 
   const subscriptions = useMemo(
     () =>
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       processSubscriptionData(data?.user?.subscriptions, globalSubscriptionIds),
     [data?.user?.subscriptions, globalSubscriptionIds],
   );
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/publicKeysTab/EditModal.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/publicKeysTab/EditModal.tsx
index 21084598c..13e464ba1 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/publicKeysTab/EditModal.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/publicKeysTab/EditModal.tsx
@@ -91,6 +91,7 @@ export const EditModal: React.FC<EditModalProps> = ({
     ) {
       inputErrors.push(DUPLICATE_KEY_NAME);
     }
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     if (!validateSSHPublicKey(keyValue)) {
       inputErrors.push(INVALID_SSH_KEY);
     }
@@ -104,14 +105,17 @@ export const EditModal: React.FC<EditModalProps> = ({
   };
 
   const onClickSave = () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const nextKeyInfo = { name: keyName, key: stripNewLines(keyValue) };
     if (replaceKeyName) {
       sendEvent({ name: "Update public key" });
       updatePublicKey({
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         variables: { targetKeyName: replaceKeyName, updateInfo: nextKeyInfo },
       });
     } else {
       sendEvent({ name: "Create new public key" });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       createPublicKey({ variables: { publicKeyInput: nextKeyInfo } });
     }
     closeModal();
diff --git a/apps/spruce/src/pages/preferences/preferencesTabs/publicKeysTab/PublicKeysTable.tsx b/apps/spruce/src/pages/preferences/preferencesTabs/publicKeysTab/PublicKeysTable.tsx
index 95e9bd54d..ac14b375a 100644
--- a/apps/spruce/src/pages/preferences/preferencesTabs/publicKeysTab/PublicKeysTable.tsx
+++ b/apps/spruce/src/pages/preferences/preferencesTabs/publicKeysTab/PublicKeysTable.tsx
@@ -60,12 +60,14 @@ export const PublicKeysTable: React.FC<PublicKeysTableProps> = ({
       {
         header: "Name",
         accessorKey: "name",
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         cell: ({ getValue }) => (
           <WordBreak data-cy="table-key-name">{getValue()}</WordBreak>
         ),
       },
       {
         header: "Actions",
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         cell: ({ row }) => {
           const { key, name } = row.original;
           return (
diff --git a/apps/spruce/src/pages/projectSettings/Context.tsx b/apps/spruce/src/pages/projectSettings/Context.tsx
index fe3986533..4a4ca14b1 100644
--- a/apps/spruce/src/pages/projectSettings/Context.tsx
+++ b/apps/spruce/src/pages/projectSettings/Context.tsx
@@ -53,10 +53,13 @@ const useProjectSettingsContext = (): SettingsState<
       "useProjectSettingsContext must be used within a ProjectSettingsProvider",
     );
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return context;
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const useHasUnsavedTab = getUseHasUnsavedTab(ProjectSettingsContext);
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const usePopulateForm = getUsePopulateForm(ProjectSettingsContext);
 
 export {
diff --git a/apps/spruce/src/pages/projectSettings/CopyProjectModal.test.tsx b/apps/spruce/src/pages/projectSettings/CopyProjectModal.test.tsx
index c7f4ab335..168f82411 100644
--- a/apps/spruce/src/pages/projectSettings/CopyProjectModal.test.tsx
+++ b/apps/spruce/src/pages/projectSettings/CopyProjectModal.test.tsx
@@ -80,6 +80,7 @@ describe("copyProjectField", () => {
     render(<Component />);
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("project-name-input"),
       newProjectIdentifier,
     );
@@ -137,6 +138,7 @@ describe("copyProjectField", () => {
     render(<Component />);
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("project-name-input"),
       newProjectIdentifier,
     );
@@ -196,6 +198,7 @@ describe("copyProjectField", () => {
     render(<Component />);
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("project-name-input"),
       newProjectIdentifier,
     );
@@ -237,6 +240,7 @@ describe("copyProjectField", () => {
     render(<Component />);
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("project-name-input"),
       newProjectIdentifier,
     );
diff --git a/apps/spruce/src/pages/projectSettings/CreateDuplicateProjectButton.test.tsx b/apps/spruce/src/pages/projectSettings/CreateDuplicateProjectButton.test.tsx
index 1f3483534..4da97c5ca 100644
--- a/apps/spruce/src/pages/projectSettings/CreateDuplicateProjectButton.test.tsx
+++ b/apps/spruce/src/pages/projectSettings/CreateDuplicateProjectButton.test.tsx
@@ -82,6 +82,7 @@ describe("createDuplicateProjectField", () => {
       render(<Component />);
 
       await screen.findByText("New Project");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("new-project-button"));
       await waitFor(() => {
         expect(screen.queryByDataCy("create-project-modal")).toBeVisible();
@@ -97,6 +98,7 @@ describe("createDuplicateProjectField", () => {
       render(<Component />);
 
       await screen.findByText("New Project");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("new-project-button"));
       expect(screen.queryByDataCy("new-project-menu")).toBeVisible();
     });
@@ -107,8 +109,10 @@ describe("createDuplicateProjectField", () => {
       render(<Component />);
 
       await screen.findByText("New Project");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("new-project-button"));
       expect(screen.queryByDataCy("new-project-menu")).toBeVisible();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("create-project-button"));
       await waitFor(() => {
         expect(screen.queryByDataCy("create-project-modal")).toBeVisible();
@@ -122,8 +126,10 @@ describe("createDuplicateProjectField", () => {
       render(<Component />);
 
       await screen.findByText("New Project");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("new-project-button"));
       expect(screen.queryByDataCy("new-project-menu")).toBeVisible();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("copy-project-button"));
       await waitFor(() => {
         expect(screen.queryByDataCy("copy-project-modal")).toBeVisible();
diff --git a/apps/spruce/src/pages/projectSettings/CreateProjectModal.test.tsx b/apps/spruce/src/pages/projectSettings/CreateProjectModal.test.tsx
index 02f6e47c8..39ff9817a 100644
--- a/apps/spruce/src/pages/projectSettings/CreateProjectModal.test.tsx
+++ b/apps/spruce/src/pages/projectSettings/CreateProjectModal.test.tsx
@@ -112,9 +112,11 @@ describe("createProjectField", () => {
     await waitForModalLoad();
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("project-name-input"),
       "new-project-name-input",
     );
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(screen.queryByDataCy("new-repo-input"));
     expect(
       screen.getByRole("button", {
@@ -142,6 +144,7 @@ describe("createProjectField", () => {
     render(<Component />);
     await waitForModalLoad();
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("project-name-input"), "my test");
     expect(
       screen.getByRole("button", {
@@ -185,11 +188,14 @@ describe("createProjectField", () => {
     await waitForModalLoad();
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("project-name-input"),
       "new-project-id",
     );
     await selectLGOption("new-owner-select", "10gen");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(screen.queryByDataCy("new-repo-input"));
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("new-repo-input"), "new-repo-name");
 
     const confirmButton = screen.getByText("Create project");
@@ -255,11 +261,14 @@ describe("createProjectField", () => {
     await waitForModalLoad();
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("project-name-input"),
       "new-project-name",
     );
     await selectLGOption("new-owner-select", "10gen");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(screen.queryByDataCy("new-repo-input"));
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("new-repo-input"), "new-repo-name");
 
     const confirmButton = screen.getByText("Create project");
diff --git a/apps/spruce/src/pages/projectSettings/CreateProjectModal.tsx b/apps/spruce/src/pages/projectSettings/CreateProjectModal.tsx
index dd3134c99..e76f4b41f 100644
--- a/apps/spruce/src/pages/projectSettings/CreateProjectModal.tsx
+++ b/apps/spruce/src/pages/projectSettings/CreateProjectModal.tsx
@@ -49,6 +49,7 @@ export const CreateProjectModal: React.FC<Props> = ({
   const { data: gitOrgs } = useQuery<GithubOrgsQuery>(GITHUB_ORGS, {
     skip: !open,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { spruceConfig: { githubOrgs = [] } = {} } = gitOrgs ?? {};
 
   const form = modalFormDefinition(githubOrgs);
diff --git a/apps/spruce/src/pages/projectSettings/Header.tsx b/apps/spruce/src/pages/projectSettings/Header.tsx
index e9ac2d32e..2f11c378a 100644
--- a/apps/spruce/src/pages/projectSettings/Header.tsx
+++ b/apps/spruce/src/pages/projectSettings/Header.tsx
@@ -38,6 +38,7 @@ export const Header: React.FC<Props> = ({
         <H2 data-cy="project-settings-tab-title">{title}</H2>
         {projectType === ProjectType.AttachedProject && (
           <StyledRouterLink
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             to={getProjectSettingsRoute(attachedRepoId, tab)}
             data-cy="attached-repo-link"
           >
diff --git a/apps/spruce/src/pages/projectSettings/HeaderButtons.tsx b/apps/spruce/src/pages/projectSettings/HeaderButtons.tsx
index 85fc2d7aa..383a0ff29 100644
--- a/apps/spruce/src/pages/projectSettings/HeaderButtons.tsx
+++ b/apps/spruce/src/pages/projectSettings/HeaderButtons.tsx
@@ -58,6 +58,7 @@ export const HeaderButtons: React.FC<Props> = ({ id, projectType, tab }) => {
   >(SAVE_PROJECT_SETTINGS_FOR_SECTION, {
     onCompleted({
       saveProjectSettingsForSection: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectRef: { identifier: newIdentifier },
       },
     }) {
@@ -79,6 +80,7 @@ export const HeaderButtons: React.FC<Props> = ({ id, projectType, tab }) => {
     },
     refetchQueries: ({
       data: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         saveProjectSettingsForSection: {
           projectRef: { identifier: newIdentifier },
         },
@@ -104,8 +106,10 @@ export const HeaderButtons: React.FC<Props> = ({ id, projectType, tab }) => {
   });
 
   const onClick = () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const formToGql: FormToGqlFunction<typeof tab> = formToGqlMap[tab];
     const newData = formToGql(formData, isRepo, id);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const save = (update, section) =>
       isRepo
         ? saveRepoSection({
diff --git a/apps/spruce/src/pages/projectSettings/NavigationModal.tsx b/apps/spruce/src/pages/projectSettings/NavigationModal.tsx
index f4c0f5865..29e7f0f4a 100644
--- a/apps/spruce/src/pages/projectSettings/NavigationModal.tsx
+++ b/apps/spruce/src/pages/projectSettings/NavigationModal.tsx
@@ -8,6 +8,7 @@ export const NavigationModal: React.FC = () => {
   const { hasUnsaved, unsavedTabs } = useHasUnsavedTab();
   const { projectIdentifier } = useParams();
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const shouldConfirmNavigation = ({ nextLocation }): boolean => {
     const isProjectSettingsRoute =
       nextLocation &&
@@ -17,6 +18,7 @@ export const NavigationModal: React.FC = () => {
     }
 
     /* Identify if the user is navigating to a new project's settings via project select dropdown */
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const currentProjectRoute = getProjectSettingsRoute(projectIdentifier);
     const isNewProjectSettingsRoute = !matchPath(
       `${currentProjectRoute}/*`,
diff --git a/apps/spruce/src/pages/projectSettings/Tabs.tsx b/apps/spruce/src/pages/projectSettings/Tabs.tsx
index 3ab7d91e0..9466b02e8 100644
--- a/apps/spruce/src/pages/projectSettings/Tabs.tsx
+++ b/apps/spruce/src/pages/projectSettings/Tabs.tsx
@@ -54,6 +54,7 @@ export const ProjectSettingsTabs: React.FC<Props> = ({
   const identifier = projectData?.projectRef?.identifier;
 
   const tabData: TabDataProps = useMemo(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     () => getTabData(projectData, projectType, repoData),
     [projectData, projectType, repoData],
   );
@@ -78,8 +79,10 @@ export const ProjectSettingsTabs: React.FC<Props> = ({
       <NavigationModal />
       <Header
         attachedRepoId={projectData?.projectRef?.repoRefId}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         id={projectId || repoId}
         projectType={projectType}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         tab={tab}
       />
       <Routes>
@@ -110,6 +113,7 @@ export const ProjectSettingsTabs: React.FC<Props> = ({
           path={ProjectSettingsTabRoutes.Variables}
           element={
             <VariablesTab
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               identifier={identifier || repoId}
               projectData={
                 tabData[ProjectSettingsTabRoutes.Variables].projectData
@@ -123,19 +127,23 @@ export const ProjectSettingsTabs: React.FC<Props> = ({
           path={ProjectSettingsTabRoutes.GithubCommitQueue}
           element={
             <GithubCommitQueueTab
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               githubWebhooksEnabled={
                 projectData?.githubWebhooksEnabled ||
                 repoData?.githubWebhooksEnabled
               }
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               identifier={identifier || repoId}
               projectData={
                 tabData[ProjectSettingsTabRoutes.GithubCommitQueue].projectData
               }
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               projectId={projectId}
               projectType={projectType}
               repoData={
                 tabData[ProjectSettingsTabRoutes.GithubCommitQueue].repoData
               }
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               versionControlEnabled={
                 projectData?.projectRef?.versionControlEnabled ??
                 repoData?.projectRef?.versionControlEnabled
@@ -186,6 +194,7 @@ export const ProjectSettingsTabs: React.FC<Props> = ({
           path={ProjectSettingsTabRoutes.VirtualWorkstation}
           element={
             <VirtualWorkstationTab
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               identifier={identifier || repoId}
               projectData={
                 tabData[ProjectSettingsTabRoutes.VirtualWorkstation].projectData
@@ -201,6 +210,7 @@ export const ProjectSettingsTabs: React.FC<Props> = ({
           path={ProjectSettingsTabRoutes.Containers}
           element={
             <ContainersTab
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               identifier={identifier || repoId}
               projectData={
                 tabData[ProjectSettingsTabRoutes.Containers].projectData
@@ -214,6 +224,7 @@ export const ProjectSettingsTabs: React.FC<Props> = ({
           path={ProjectSettingsTabRoutes.ViewsAndFilters}
           element={
             <ViewsAndFiltersTab
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               identifier={identifier}
               projectData={
                 tabData[ProjectSettingsTabRoutes.ViewsAndFilters].projectData
@@ -282,7 +293,9 @@ const getTabData = (
     (obj, tab) => ({
       ...obj,
       [tab]: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectData: gqlToFormMap[tab](projectData, { projectType }),
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         repoData: gqlToFormMap[tab](repoData, { projectType }),
       },
     }),
diff --git a/apps/spruce/src/pages/projectSettings/index.tsx b/apps/spruce/src/pages/projectSettings/index.tsx
index 65a87f6a6..a946ba326 100644
--- a/apps/spruce/src/pages/projectSettings/index.tsx
+++ b/apps/spruce/src/pages/projectSettings/index.tsx
@@ -41,11 +41,13 @@ const ProjectSettings: React.FC = () => {
   usePageTitle(`Project Settings`);
   const dispatchToast = useToastContext();
   const { [slugs.projectIdentifier]: projectIdentifier, [slugs.tab]: tab } =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     useParams<{
       [slugs.projectIdentifier]: string | null;
       [slugs.tab]: ProjectSettingsTabRoutes;
     }>();
   // If the path includes an Object ID, this page could either be a project or a repo if it is a project we should redirect the user so that they use the identifier.
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const identifierIsObjectId = validateObjectId(projectIdentifier);
   const [isRepo, setIsRepo] = useState<boolean>(false);
 
@@ -70,6 +72,7 @@ const ProjectSettings: React.FC = () => {
     ProjectSettingsQueryVariables
   >(PROJECT_SETTINGS, {
     skip: identifierIsObjectId,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { projectIdentifier },
     onError: (e) => {
       dispatchToast.error(
@@ -96,17 +99,20 @@ const ProjectSettings: React.FC = () => {
     RepoSettingsQueryVariables
   >(REPO_SETTINGS, {
     skip: projectLoading || projectType === ProjectType.Project,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { repoId },
     onError: (e) => {
       dispatchToast.error(`There was an error loading ${repoId}: ${e.message}`);
     },
   });
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!tabRouteValues.includes(tab)) {
     return (
       <Navigate
         replace
         to={getProjectSettingsRoute(
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           projectIdentifier,
           ProjectSettingsTabRoutes.General,
         )}
@@ -137,72 +143,91 @@ const ProjectSettings: React.FC = () => {
 
   return (
     <ProjectSettingsProvider>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ProjectBanner projectIdentifier={projectIdentifier} />
       <SideNav aria-label="Project Settings" widthOverride={250}>
         <ButtonsContainer>
           <ProjectSelect
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             selectedProjectIdentifier={projectLabel}
             getRoute={getProjectSettingsRoute}
             isProjectSettingsPage
           />
           <CreateDuplicateProjectButton
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             id={project?.projectRef?.id}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             label={projectLabel}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             owner={owner}
             projectType={projectType}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             repo={repo}
           />
         </ButtonsContainer>
 
         <SideNavGroup>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.General}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.Access}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.Variables}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.GithubCommitQueue}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.Notifications}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.PatchAliases}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.VirtualWorkstation}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.Containers}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.ViewsAndFilters}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.ProjectTriggers}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.PeriodicBuilds}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.Plugins}
           />
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <ProjectSettingsNavItem
             {...sharedProps}
             tab={ProjectSettingsTabRoutes.EventLog}
diff --git a/apps/spruce/src/pages/projectSettings/tabs/AccessTab/AccessTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/AccessTab/AccessTab.tsx
index f8a9c0d11..f095fee28 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/AccessTab/AccessTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/AccessTab/AccessTab.tsx
@@ -26,6 +26,7 @@ export const AccessTab: React.FC<TabProps> = ({
   return (
     <BaseTab
       formSchema={formSchema}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       initialFormState={initialFormState}
       tab={tab}
     />
diff --git a/apps/spruce/src/pages/projectSettings/tabs/AccessTab/getFormSchema.ts b/apps/spruce/src/pages/projectSettings/tabs/AccessTab/getFormSchema.ts
index 6a69b3c4d..16abf8199 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/AccessTab/getFormSchema.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/AccessTab/getFormSchema.ts
@@ -76,6 +76,7 @@ const getAdminsDescription = (projectType: ProjectType): string => {
       "Admins for this branch will be able to edit branch settings and view repo settings.",
     default: "Admins for this branch will be able to edit branch settings.",
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const description = descriptions[projectType] || descriptions.default;
   return `${description} All admins will have access to create new projects on Evergreen.`;
 };
diff --git a/apps/spruce/src/pages/projectSettings/tabs/AccessTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/AccessTab/transformers.ts
index 63841e0a6..12210ac6a 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/AccessTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/AccessTab/transformers.ts
@@ -10,20 +10,25 @@ export const gqlToForm = ((data) => {
   const { projectRef } = data;
   return {
     accessSettings: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       restricted: projectRef.restricted,
     },
     admin: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       admins: projectRef.admins ?? [],
     },
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = (({ accessSettings, admin }, isRepo, id) => {
   const projectRef: ProjectInput = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     restricted: accessSettings.restricted,
     admins: admin.admins,
   };
 
   return { ...(isRepo ? { repoId: id } : { projectId: id }), projectRef };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/BaseTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/BaseTab.tsx
index 1e95644bc..12946e5e9 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/BaseTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/BaseTab.tsx
@@ -20,6 +20,7 @@ export const BaseTab = <T extends WritableProjectSettingsType>({
   usePopulateForm(initialFormState, tab);
 
   return (
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     <Form<WritableProjectSettingsType, FormStateMap>
       {...rest}
       state={state}
diff --git a/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/ContainersTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/ContainersTab.tsx
index edf94e2e3..f2b513c76 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/ContainersTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/ContainersTab.tsx
@@ -38,6 +38,7 @@ export const ContainersTab: React.FC<TabProps> = ({
       </Banner>
       <BaseTab
         formSchema={formSchema}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         initialFormState={initialFormState}
         tab={tab}
       />
diff --git a/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/getFormSchema.ts b/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/getFormSchema.ts
index dd85d8f74..f45f86c4f 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/getFormSchema.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/getFormSchema.ts
@@ -6,6 +6,7 @@ import {
 import { SpruceConfig } from "gql/generated/types";
 
 export const getFormSchema = (
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   ecsConfig: SpruceConfig["providers"]["aws"]["pod"]["ecs"],
 ): ReturnType<GetFormSchema> => ({
   fields: {},
diff --git a/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/transformers.ts
index a9e8216c6..50fe7299b 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/ContainersTab/transformers.ts
@@ -6,6 +6,7 @@ type Tab = ProjectSettingsTabRoutes.Containers;
 export const gqlToForm = ((data) => {
   if (!data) return null;
   const { projectRef } = data;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { containerSizeDefinitions } = projectRef;
 
   return {
@@ -13,6 +14,7 @@ export const gqlToForm = ((data) => {
       variables: containerSizeDefinitions,
     },
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((formState, isRepo, id) => {
@@ -24,4 +26,5 @@ export const formToGql = ((formState, isRepo, id) => {
       containerSizeDefinitions: containerSizeDefinitions.variables,
     },
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx b/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx
index 25862df62..9f6b33a04 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.test.tsx
@@ -12,6 +12,7 @@ import { ApolloMock } from "types/gql";
 import { ProjectType } from "../utils";
 import { EventLogTab } from "./EventLogTab";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Wrapper = ({ children, mocks = [] }) => (
   <MockedProvider mocks={mocks}>{children}</MockedProvider>
 );
@@ -19,6 +20,7 @@ const Wrapper = ({ children, mocks = [] }) => (
 describe("loading events", () => {
   it("does not show a load more button when the event count is less than the limit", async () => {
     const { Component } = RenderFakeToastContext(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       <Wrapper mocks={[mock()]}>
         <EventLogTab projectType={ProjectType.AttachedProject} />
       </Wrapper>,
@@ -39,6 +41,7 @@ describe("loading events", () => {
   it("shows a 'Load more' button when the number of events loaded meets the limit", async () => {
     const limit = 1;
     const { Component } = RenderFakeToastContext(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       <Wrapper mocks={[mock(limit)]}>
         <EventLogTab projectType={ProjectType.AttachedProject} limit={limit} />
       </Wrapper>,
diff --git a/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.tsx
index fad9966e4..a973f6fa5 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/EventLogTab/EventLogTab.tsx
@@ -14,6 +14,7 @@ export const EventLogTab: React.FC<TabProps> = ({ limit, projectType }) => {
 
   const isRepo = projectType === ProjectType.Repo;
   const { allEventsFetched, events, fetchMore } = useProjectSettingsEvents(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     projectIdentifier,
     isRepo,
     limit,
@@ -24,6 +25,7 @@ export const EventLogTab: React.FC<TabProps> = ({ limit, projectType }) => {
   return (
     <EventLog
       allEventsFetched={allEventsFetched}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       events={events}
       handleFetchMore={() => {
         fetchMore({
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.test.tsx b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.test.tsx
index a832d9365..555e575ad 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.test.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.test.tsx
@@ -128,6 +128,7 @@ describe("repoConfigField", () => {
     expect(
       screen.queryByDataCy("attach-repo-disabled-tooltip"),
     ).not.toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("attach-repo-button"));
     await waitFor(() => {
       expect(
@@ -153,6 +154,7 @@ describe("repoConfigField", () => {
     expect(
       screen.queryByDataCy("attach-repo-disabled-tooltip"),
     ).not.toBeInTheDocument();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("attach-repo-button"));
     await waitFor(() => {
       expect(
@@ -184,6 +186,7 @@ describe("repoConfigField", () => {
     expect(screen.queryByDataCy("move-repo-modal")).not.toBeInTheDocument();
 
     await screen.findByDataCy("move-repo-button");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("move-repo-button"));
     await waitFor(() => {
       expect(screen.queryByDataCy("move-repo-modal")).toBeVisible();
@@ -237,6 +240,7 @@ describe("repoConfigField", () => {
         "evergreen-ci",
       );
       await selectLGOption("new-owner-select", "10gen");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.type(screen.queryByDataCy("new-repo-input"), "new-repo-name");
       expect(
         screen.getByRole("button", {
@@ -253,6 +257,7 @@ describe("repoConfigField", () => {
       render(<Component />);
 
       expect(screen.queryByDataCy("attach-repo-modal")).not.toBeInTheDocument();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByDataCy("attach-repo-button"));
       await waitFor(() => {
         expect(screen.queryByDataCy("attach-repo-modal")).toBeVisible();
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.tsx b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.tsx
index 692e06858..cbc654fac 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/Fields/RepoConfigField.tsx
@@ -37,6 +37,7 @@ export const RepoConfigField: Field = ({
     formData.owner !== initialOwner || formData.repo !== initialRepo;
 
   const { data } = useQuery<GithubOrgsQuery>(GITHUB_ORGS);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { spruceConfig: { githubOrgs = [] } = {} } = data ?? {};
 
   return (
@@ -117,5 +118,5 @@ const ButtonRow = styled.div`
 `;
 
 const Container = styled.div<{ hasButtons: boolean }>`
-  ${({ hasButtons }): string => hasButtons && `margin-bottom: ${size.m};`}
+  ${({ hasButtons }) => hasButtons && `margin-bottom: ${size.m};`}
 `;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/GeneralTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/GeneralTab.tsx
index a99d73607..ede740239 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/GeneralTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/GeneralTab.tsx
@@ -40,6 +40,7 @@ export const GeneralTab: React.FC<TabProps> = ({
   const formSchema = useMemo(
     () =>
       getFormSchema(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectId,
         projectType,
         identifierHasChanges,
@@ -59,6 +60,7 @@ export const GeneralTab: React.FC<TabProps> = ({
 
   return (
     <BaseTab
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       initialFormState={initialFormState}
       formSchema={formSchema}
       tab={tab}
@@ -79,6 +81,7 @@ const validate = (projectType: ProjectType) =>
 
     // Ensure that both attached and unattached projects have a branch specified if they are enabled.
     if (enabled && !branch) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       errors.generalConfiguration.branch.addError(
         "A branch is required for enabled projects.",
       );
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/getFormSchema.tsx b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/getFormSchema.tsx
index 8e4c4cc69..e28761e7b 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/getFormSchema.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/getFormSchema.tsx
@@ -50,6 +50,7 @@ export const getFormSchema = (
                 type: "string" as "string",
                 title: "Owner",
                 format: "noSpaces",
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 minLength: getMinLength(projectType, repoData, "owner"),
                 default: "",
               },
@@ -57,6 +58,7 @@ export const getFormSchema = (
                 type: "string" as "string",
                 title: "Repository",
                 format: "noSpaces",
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 minLength: getMinLength(projectType, repoData, "repo"),
                 default: "",
               },
@@ -110,6 +112,7 @@ export const getFormSchema = (
                 title: "Version Control",
                 oneOf: radioBoxOptions(
                   ["Enabled", "Disabled"],
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   repoData?.generalConfiguration?.other?.versionControlEnabled,
                 ),
               },
@@ -126,6 +129,7 @@ export const getFormSchema = (
             title: "Dispatching",
             oneOf: radioBoxOptions(
               ["Enabled", "Disabled"],
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               repoData?.projectFlags?.dispatchingDisabled,
               true,
             ),
@@ -139,6 +143,7 @@ export const getFormSchema = (
                 title: "Repotracker",
                 oneOf: radioBoxOptions(
                   ["Enabled", "Disabled"],
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   repoData?.projectFlags?.repotracker?.repotrackerDisabled,
                   true,
                 ),
@@ -157,6 +162,7 @@ export const getFormSchema = (
                 title: "Old Task on Success",
                 oneOf: radioBoxOptions(
                   ["Unschedule", "Don't Unschedule"],
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   repoData?.projectFlags?.scheduling?.deactivatePrevious,
                 ),
               },
@@ -165,6 +171,7 @@ export const getFormSchema = (
                 title: "Stepback",
                 oneOf: radioBoxOptions(
                   ["Enabled", "Disabled"],
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   repoData?.projectFlags?.scheduling?.stepbackDisabled,
                   true,
                 ),
@@ -174,6 +181,7 @@ export const getFormSchema = (
                 title: "Stepback Bisection",
                 oneOf: radioBoxOptions(
                   ["Enabled", "Disabled"],
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   repoData?.projectFlags?.scheduling?.stepbackBisection,
                 ),
               },
@@ -193,6 +201,7 @@ export const getFormSchema = (
                 title: "Patching",
                 oneOf: radioBoxOptions(
                   ["Enabled", "Disabled"],
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   repoData?.projectFlags?.patch?.patchingDisabled,
                   true,
                 ),
@@ -208,6 +217,7 @@ export const getFormSchema = (
                 title: "Project Config Commands",
                 oneOf: radioBoxOptions(
                   ["Enabled", "Disabled"],
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   repoData?.projectFlags?.taskSync.configEnabled,
                 ),
               },
@@ -216,6 +226,7 @@ export const getFormSchema = (
                 title: "Task in Patches",
                 oneOf: radioBoxOptions(
                   ["Enabled", "Disabled"],
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   repoData?.projectFlags?.taskSync.patchEnabled,
                 ),
               },
@@ -232,6 +243,7 @@ export const getFormSchema = (
             title: "Cache Daily Task Statistics",
             oneOf: radioBoxOptions(
               ["Enabled", "Disabled"],
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               repoData?.historicalTaskDataCaching?.disabledStatsCache,
               true,
             ),
@@ -273,17 +285,20 @@ export const getFormSchema = (
         },
         owner: {
           ...placeholderIf(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             repoData?.generalConfiguration?.repositoryInfo?.owner,
           ),
         },
         repo: {
           "ui:data-cy": "repo-input",
           ...placeholderIf(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             repoData?.generalConfiguration?.repositoryInfo?.repo,
           ),
         },
       },
       branch: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         ...placeholderIf(repoData?.generalConfiguration?.branch),
       },
       other: {
@@ -302,11 +317,13 @@ export const getFormSchema = (
           "ui:description":
             "The interval of time (in minutes) that Evergreen should wait in between activating the latest version.",
           "ui:data-cy": "batch-time-input",
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           ...placeholderIf(repoData?.generalConfiguration?.other?.batchTime),
         },
         remotePath: {
           "ui:description":
             "Path to yaml file where project tasks, variants, and other settings are defined.",
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           ...placeholderIf(repoData?.generalConfiguration?.other?.remotePath),
         },
         spawnHostScriptPath: {
@@ -315,6 +332,7 @@ export const getFormSchema = (
           "ui:data-cy": "spawn-host-input",
           "ui:optional": true,
           ...placeholderIf(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             repoData?.generalConfiguration?.other?.spawnHostScriptPath,
           ),
         },
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/transformers.test.ts b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/transformers.test.ts
index 6b0e01e8b..22c72a9dc 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/transformers.test.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/transformers.test.ts
@@ -101,12 +101,17 @@ const projectForm: GeneralFormState = {
       owner: "evergreen-ci",
       repo: "evergreen",
     },
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     branch: null,
     other: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       displayName: null,
       identifier: "project",
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       batchTime: null,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       remotePath: null,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       spawnHostScriptPath: null,
       versionControlEnabled: true,
     },
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/transformers.ts
index 59be18c6d..96b7a89f5 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/GeneralTab/transformers.ts
@@ -13,53 +13,73 @@ export const gqlToForm = ((data, options = {}) => {
   return {
     generalConfiguration: {
       ...(projectType !== ProjectType.Repo &&
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         "enabled" in projectRef && {
           enabled: projectRef.enabled,
         }),
       repositoryInfo: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         owner: projectRef.owner,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         repo: projectRef.repo,
       },
       ...(projectType !== ProjectType.Repo &&
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         "branch" in projectRef && {
           branch: projectRef.branch,
         }),
       other: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         displayName: projectRef.displayName,
         ...(projectType !== ProjectType.Repo &&
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           "identifier" in projectRef && {
             identifier: projectRef.identifier,
           }),
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         batchTime: projectRef.batchTime || null,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         remotePath: projectRef.remotePath,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         spawnHostScriptPath: projectRef.spawnHostScriptPath,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         versionControlEnabled: projectRef.versionControlEnabled,
       },
     },
     projectFlags: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       dispatchingDisabled: projectRef.dispatchingDisabled,
       scheduling: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         deactivatePrevious: projectRef.deactivatePrevious,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         stepbackDisabled: projectRef.stepbackDisabled,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         stepbackBisection: projectRef.stepbackBisect,
         deactivateStepback: null,
       },
       repotracker: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         repotrackerDisabled: projectRef.repotrackerDisabled,
         forceRun: null,
       },
       patch: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         patchingDisabled: projectRef.patchingDisabled,
       },
       taskSync: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         configEnabled: projectRef.taskSync.configEnabled,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         patchEnabled: projectRef.taskSync.patchEnabled,
       },
     },
     historicalTaskDataCaching: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       disabledStatsCache: projectRef.disabledStatsCache,
     },
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
@@ -72,6 +92,7 @@ export const formToGql = ((
   id,
 ) => {
   const projectRef: ProjectInput = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     ...("enabled" in generalConfiguration && {
       enabled: generalConfiguration.enabled,
@@ -103,4 +124,5 @@ export const formToGql = ((
   };
 
   return { ...(isRepo ? { repoId: id } : { projectId: id }), projectRef };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/GithubCommitQueueTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/GithubCommitQueueTab.tsx
index b77da2e5d..952ad7e4c 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/GithubCommitQueueTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/GithubCommitQueueTab.tsx
@@ -51,6 +51,7 @@ export const GithubCommitQueueTab: React.FC<TabProps> = ({
   });
 
   const initialFormState = useMemo(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     () => getInitialFormState(projectData, repoData),
     [projectData, repoData],
   );
@@ -62,6 +63,7 @@ export const GithubCommitQueueTab: React.FC<TabProps> = ({
         projectType,
         githubWebhooksEnabled,
         formData,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         data?.githubProjectConflicts,
         versionControlEnabled,
         projectType === ProjectType.AttachedProject ? repoData : null,
@@ -79,6 +81,7 @@ export const GithubCommitQueueTab: React.FC<TabProps> = ({
 
   const validateConflicts = validate(
     projectType,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     repoData,
     versionControlEnabled,
   );
@@ -129,6 +132,7 @@ const validate = (
 
     if (
       getAliasError(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         prTestingEnabled,
         prTesting?.githubPrAliasesOverride,
         prTesting?.githubPrAliases,
@@ -151,6 +155,7 @@ const validate = (
 
     if (
       getAliasError(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         gitTagVersionsEnabled,
         gitTags?.gitTagAliasesOverride,
         gitTags?.gitTagAliases,
@@ -162,6 +167,7 @@ const validate = (
 
     if (
       getAliasError(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         enabled,
         patchDefinitions?.commitQueueAliasesOverride,
         patchDefinitions?.commitQueueAliases,
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/GithubTriggerAliasField.tsx b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/GithubTriggerAliasField.tsx
index e1341e88f..236a282f6 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/GithubTriggerAliasField.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/GithubTriggerAliasField.tsx
@@ -26,6 +26,7 @@ export const GithubTriggerAliasField: Field = ({ formData }) => {
       )}
       {status && (
         <Body>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <strong>Wait On:</strong> {PatchTriggerAliasStatus[status]}
         </Body>
       )}
@@ -36,6 +37,7 @@ export const GithubTriggerAliasField: Field = ({ formData }) => {
           </Body>
           <Ul>
             {taskSpecifiers.map(
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               ({ patchAlias, taskRegex, variantRegex }, i) => (
                 // eslint-disable-next-line react/no-array-index-key
                 <li key={i}>
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getErrors.test.ts b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getErrors.test.ts
index 9bd8c9ebc..748fd6d31 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getErrors.test.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getErrors.test.ts
@@ -2,11 +2,17 @@ import { AliasFormType, ProjectType } from "../utils";
 import { sectionHasError } from "./getErrors";
 
 const callSectionHasError = ({
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   aliases,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   enabled,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   override,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   projectType,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   repoAliases,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   versionControlEnabled,
 }) =>
   sectionHasError(versionControlEnabled, projectType)(
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getFormSchema.tsx b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getFormSchema.tsx
index ae97604d6..afa717a5a 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getFormSchema.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/getFormSchema.tsx
@@ -74,6 +74,7 @@ export const getFormSchema = (
               title: "Automated Testing",
               oneOf: radioBoxOptions(
                 ["Enabled", "Disabled"],
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 repoData?.github?.prTestingEnabled,
               ),
             },
@@ -82,6 +83,7 @@ export const getFormSchema = (
               title: "Manual Testing",
               oneOf: radioBoxOptions(
                 ["Enabled", "Disabled"],
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 repoData?.github?.manualPrTestingEnabled,
               ),
             },
@@ -98,6 +100,7 @@ export const getFormSchema = (
                   "Override Repo Patch Definition",
                   "Default to Repo Patch Definition",
                 ],
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 aliasArray.schema,
               ),
             },
@@ -124,6 +127,7 @@ export const getFormSchema = (
               ...overrideRadioBox(
                 "githubCheckAliases",
                 ["Override Repo Definition", "Default to Repo Definition"],
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 aliasArray.schema,
               ),
             },
@@ -137,6 +141,7 @@ export const getFormSchema = (
               type: ["boolean", "null"],
               oneOf: radioBoxOptions(
                 ["Enabled", "Disabled"],
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 repoData?.github?.gitTagVersionsEnabled,
               ),
             },
@@ -183,6 +188,7 @@ export const getFormSchema = (
               ...overrideRadioBox(
                 "gitTagAliases",
                 ["Override Repo Git Tags", "Default to Repo Git Tags"],
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 gitTagArray.schema,
               ),
             },
@@ -196,6 +202,7 @@ export const getFormSchema = (
               type: ["boolean", "null"],
               oneOf: radioBoxOptions(
                 ["Enabled", "Disabled"],
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 repoData?.commitQueue?.enabled,
               ),
             },
@@ -306,6 +313,7 @@ export const getFormSchema = (
                           "Override Repo Patch Definition",
                           "Default to Repo Patch Definition",
                         ],
+                        // @ts-expect-error: FIXME. This comment was added by an automated script.
                         aliasArray.schema,
                       ),
                     },
@@ -328,6 +336,7 @@ export const getFormSchema = (
           "ui:widget": widgets.RadioBoxWidget,
 
           ...githubConflictErrorStyling(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             githubProjectConflicts?.prTestingIdentifiers,
             formData?.github?.prTestingEnabled,
             repoData?.github?.prTestingEnabled,
@@ -340,6 +349,7 @@ export const getFormSchema = (
           "ui:description":
             "Patches can be run manually by commenting ‘evergreen patch’ on the PR even if automated testing isn't enabled.",
           ...githubConflictErrorStyling(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             githubProjectConflicts?.prTestingIdentifiers,
             formData?.github?.manualPrTestingEnabled,
             repoData?.github?.manualPrTestingEnabled,
@@ -350,14 +360,17 @@ export const getFormSchema = (
           "ui:description":
             "Specify the oldest commit SHA on your project branch that is allowed to be a merge base for a PR",
           "ui:optional": true,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           ...placeholderIf(repoData?.github?.oldestAllowedMergeBase),
           ...hideIf(
             fieldDisabled(
               formData?.github?.prTestingEnabled,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               repoData?.github?.prTestingEnabled,
             ) &&
               fieldDisabled(
                 formData?.github?.manualPrTestingEnabled,
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 repoData?.github?.manualPrTestingEnabled,
               ),
           ),
@@ -366,14 +379,17 @@ export const getFormSchema = (
           ...hideIf(
             fieldDisabled(
               formData?.github?.prTestingEnabled,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               repoData?.github?.prTestingEnabled,
             ) &&
               fieldDisabled(
                 formData?.github?.manualPrTestingEnabled,
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 repoData?.github?.manualPrTestingEnabled,
               ),
           ),
           ...errorStyling(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             formData?.github?.prTestingEnabled,
             formData?.github?.prTesting?.githubPrAliasesOverride,
             formData?.github?.prTesting?.githubPrAliases,
@@ -424,6 +440,7 @@ export const getFormSchema = (
           "ui:widget": widgets.RadioBoxWidget,
 
           ...githubConflictErrorStyling(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             githubProjectConflicts?.commitCheckIdentifiers,
             formData?.github?.githubChecksEnabled,
             repoData?.github?.githubChecksEnabled,
@@ -434,6 +451,7 @@ export const getFormSchema = (
           ...hideIf(
             fieldDisabled(
               formData?.github?.githubChecksEnabled,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               repoData?.github?.githubChecksEnabled,
             ),
           ),
@@ -441,6 +459,7 @@ export const getFormSchema = (
             formData?.github?.githubChecksEnabled,
             formData?.github?.githubChecks?.githubCheckAliasesOverride,
             formData?.github?.githubChecks?.githubCheckAliases,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             repoData?.github?.githubChecks?.githubCheckAliases,
             "Commit Check Definition",
           ),
@@ -469,6 +488,7 @@ export const getFormSchema = (
           "Add User",
           repoData?.github?.users?.gitTagAuthorizedUsers === undefined,
           formData?.github?.gitTagVersionsEnabled,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           repoData?.github?.gitTagVersionsEnabled,
         ),
         teams: userTeamStyling(
@@ -476,16 +496,19 @@ export const getFormSchema = (
           "Add Team",
           repoData?.github?.teams?.gitTagAuthorizedTeams === undefined,
           formData?.github?.gitTagVersionsEnabled,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           repoData?.github?.gitTagVersionsEnabled,
         ),
         gitTags: {
           ...hideIf(
             fieldDisabled(
               formData?.github?.gitTagVersionsEnabled,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               repoData?.github?.gitTagVersionsEnabled,
             ),
           ),
           ...errorStyling(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             formData?.github?.gitTagVersionsEnabled,
             formData?.github?.gitTags?.gitTagAliasesOverride,
             formData?.github?.gitTags?.gitTagAliases,
@@ -515,6 +538,7 @@ export const getFormSchema = (
           "ui:widget": widgets.RadioBoxWidget,
           "ui:data-cy": "cq-enabled-radio-box",
           ...githubConflictErrorStyling(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             githubProjectConflicts?.commitQueueIdentifiers,
             formData?.commitQueue?.enabled,
             repoData?.commitQueue?.enabled,
@@ -524,6 +548,7 @@ export const getFormSchema = (
         message: {
           "ui:description": "Shown in commit queue CLI commands & web UI",
           "ui:data-cy": "cq-message-input",
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           ...placeholderIf(repoData?.commitQueue?.message),
         },
         mergeSettings: {
@@ -538,6 +563,7 @@ export const getFormSchema = (
         },
         patchDefinitions: {
           ...errorStyling(
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             formData?.commitQueue?.enabled,
             formData?.commitQueue?.patchDefinitions?.commitQueueAliasesOverride,
             formData?.commitQueue?.patchDefinitions?.commitQueueAliases,
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.test.ts b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.test.ts
index c4fc5f30c..26d85df4b 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.test.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.test.ts
@@ -70,6 +70,7 @@ const projectForm: GCQFormState = {
       ],
     },
     githubTriggerAliases: [],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     githubChecksEnabled: null,
     githubChecks: {
       githubCheckAliasesOverride: false,
@@ -352,6 +353,7 @@ const mergedForm: GCQFormState = {
       },
     },
     githubTriggerAliases: [],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     githubChecksEnabled: null,
     githubChecks: {
       githubCheckAliasesOverride: false,
diff --git a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.ts
index 6ecaf46ce..682c7d185 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/GithubCommitQueueTab/transformers.ts
@@ -31,16 +31,25 @@ export const gqlToForm = ((data, options) => {
   if (!data) return null;
 
   const { aliases, projectRef } = data;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { projectType } = options;
 
   const {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     commitQueue,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     gitTagAuthorizedTeams,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     gitTagAuthorizedUsers,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     gitTagVersionsEnabled,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     githubChecksEnabled,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     manualPrTestingEnabled,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     oldestAllowedMergeBase,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     prTestingEnabled,
   } = projectRef;
 
@@ -49,14 +58,17 @@ export const gqlToForm = ((data, options) => {
     gitTagAliases,
     githubCheckAliases,
     githubPrAliases,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
   } = sortAliases(aliases);
 
   const override = (field: Array<any>) =>
     projectType !== ProjectType.AttachedProject || !!field?.length;
 
   const githubTriggerAliases =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     projectRef.githubTriggerAliases
       ?.map((aliasName) =>
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectRef.patchTriggerAliases.find(({ alias }) => alias === aliasName),
       )
       ?.filter((a) => a) ?? [];
@@ -107,6 +119,7 @@ export const gqlToForm = ((data, options) => {
       },
     },
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
@@ -134,6 +147,7 @@ export const formToGql = ((
   id,
 ) => {
   const projectRef: ProjectInput = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     prTestingEnabled,
     manualPrTestingEnabled,
@@ -190,4 +204,5 @@ export const formToGql = ((
     projectRef,
     aliases,
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/NotificationsTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/NotificationsTab.tsx
index 3467ee554..39377643d 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/NotificationsTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/NotificationsTab.tsx
@@ -19,6 +19,7 @@ export const NotificationsTab: React.FC<TabProps> = ({
   const formSchema = useMemo(
     () =>
       getFormSchema(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectType === ProjectType.AttachedProject ? repoData : null,
         projectType,
       ),
@@ -28,6 +29,7 @@ export const NotificationsTab: React.FC<TabProps> = ({
   return (
     <BaseTab
       formSchema={formSchema}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       initialFormState={initialFormState}
       tab={tab}
       validate={validate}
@@ -38,6 +40,7 @@ export const NotificationsTab: React.FC<TabProps> = ({
 const validate = ((formData, errors) => {
   const { subscriptions } = formData;
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   subscriptions.forEach((subscription, i) => {
     const { subscriptionData } = subscription || {};
     const { event, notification } = subscriptionData || {};
@@ -49,6 +52,7 @@ const validate = ((formData, errors) => {
         if (notificationSelect === notificationType) {
           const hasMatchingEvent = eventType.some((e) => e === eventSelect);
           if (hasMatchingEvent) {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             errors.subscriptions[
               i
             ].subscriptionData?.notification?.notificationSelect?.addError(
diff --git a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getFormSchema.tsx b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getFormSchema.tsx
index a63b7fe0d..84c21b3f5 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getFormSchema.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getFormSchema.tsx
@@ -39,6 +39,7 @@ export const getFormSchema = (
               title: "Build Break Notifications",
               oneOf: radioBoxOptions(
                 ["Enabled", "Disabled"],
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 repoData?.buildBreakSettings?.notifyOnBuildFailure,
               ),
             },
diff --git a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getGqlPayload.test.ts b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getGqlPayload.test.ts
index cd453a21d..70dd4838b 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getGqlPayload.test.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getGqlPayload.test.ts
@@ -45,6 +45,7 @@ describe("getGqlPayload", () => {
   });
 
   it("should correctly format webhook subscription", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const payload = getGqlPayload("project_id")(webhookSubscriptionWithSecret);
     expect(payload).toStrictEqual({
       id: "webhook_subscription",
@@ -79,6 +80,7 @@ describe("getGqlPayload", () => {
     );
 
     const payload = getGqlPayload("project_id")(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       webhookSubscriptionWithoutSecret,
     );
     expect(payload).toStrictEqual({
diff --git a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getGqlPayload.ts b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getGqlPayload.ts
index 798f7b9d4..862dace64 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getGqlPayload.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/getGqlPayload.ts
@@ -77,6 +77,7 @@ export const getGqlPayload =
     subscription: Unpacked<NotificationsFormState["subscriptions"]>,
   ): SubscriptionInput => {
     const { subscriptionData } = subscription || {};
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const event = projectTriggers[subscriptionData?.event?.eventSelect];
     const {
       extraFields,
@@ -87,16 +88,19 @@ export const getGqlPayload =
 
     const triggerData = extraFieldsFormToGql(
       extraFields,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       subscriptionData?.event?.extraFields,
     );
 
     const regexData = regexFormToGql(
       !!regexSelectors,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       subscriptionData?.event?.regexSelector,
     );
 
     const method = subscriptionData?.notification?.notificationSelect;
     const subscriber = getTargetForMethod(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       method,
       subscriptionData?.notification,
     );
@@ -111,11 +115,14 @@ export const getGqlPayload =
     return {
       id: subscriptionData?.id,
       owner_type: "project",
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       regex_selectors: regexData,
       resource_type: resourceType,
       selectors: [{ type: "project", data: projectId }, ...selectors],
       subscriber: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         type: method,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         target: subscriber,
         webhookSubscriber:
           method === NotificationMethods.WEBHOOK
diff --git a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/transformers.ts
index ba2ec5eab..6ed048fda 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/transformers.ts
@@ -40,9 +40,11 @@ const getExtraFields = (
   if (!triggerData) return {};
 
   const extraFields = {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   projectTriggers[triggerEnum]?.extraFields.forEach((e) => {
     // Extra fields that are numbers must be converted in order to fulfill the form schema.
     const isNumber = e.format === "number";
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     extraFields[e.key] = isNumber
       ? parseInt(triggerData[e.key], 10)
       : triggerData[e.key];
@@ -58,11 +60,13 @@ const getHttpHeaders = (headers: { key: string; value: string }[]) =>
       }))
     : [];
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const gqlToForm = ((data, { projectType }) => {
   if (!data) return null;
   const { projectRef, subscriptions } = data;
   return {
     ...(projectType !== ProjectType.Repo &&
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       "banner" in projectRef && {
         banner: {
           bannerData: {
@@ -72,6 +76,7 @@ export const gqlToForm = ((data, { projectType }) => {
         },
       }),
     buildBreakSettings: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       notifyOnBuildFailure: projectRef.notifyOnBuildFailure,
     },
     subscriptions: subscriptions
@@ -89,6 +94,7 @@ export const gqlToForm = ((data, { projectType }) => {
             const triggerText = getTriggerText(trigger, resourceType);
 
             // Find and process information about subscriber.
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             const { subscriber: subscribers, type: subscriberType } =
               subscriber;
             const {
@@ -98,6 +104,7 @@ export const gqlToForm = ((data, { projectType }) => {
               slackSubscriber,
               webhookSubscriber,
             } = subscribers;
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             const subscriberText = getSubscriberText(subscriber);
 
             return {
@@ -106,6 +113,7 @@ export const gqlToForm = ((data, { projectType }) => {
                 id,
                 event: {
                   eventSelect: triggerEnum,
+                  // @ts-expect-error: FIXME. This comment was added by an automated script.
                   extraFields: getExtraFields(triggerEnum, triggerData),
                   regexSelector: regexSelectors.map((r) => ({
                     regexSelect: r.type,
@@ -136,16 +144,20 @@ export const gqlToForm = ((data, { projectType }) => {
         )
       : [],
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((formState, isRepo, id) => {
   const { banner, buildBreakSettings, subscriptions } = formState;
   const projectRef: ProjectInput = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     notifyOnBuildFailure: buildBreakSettings.notifyOnBuildFailure,
     ...(banner && { banner: banner.bannerData }),
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const transformedSubscriptions: SubscriptionInput[] = subscriptions.map(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     getGqlPayload(id),
   );
   return {
@@ -153,4 +165,5 @@ export const formToGql = ((formState, isRepo, id) => {
     projectRef,
     subscriptions: transformedSubscriptions,
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/types.ts b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/types.ts
index 3e5acdc52..688dae51c 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/types.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/types.ts
@@ -47,6 +47,7 @@ export interface NotificationsFormState {
 // This utils file contains functions used to process the form state.
 export type SubscriptionData = Unpacked<
   NotificationsFormState["subscriptions"]
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 >["subscriptionData"];
 
 export type TabProps = {
diff --git a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/utils.ts b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/utils.ts
index 479c77a0c..2ed7f8ac6 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/utils.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/NotificationsTab/utils.ts
@@ -30,6 +30,7 @@ export const hasInitialError = (
   const { eventSelect } = event || {};
   const { notificationSelect } = notification || {};
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const target = getTargetForMethod(notificationSelect, notification);
   return !eventSelect || !notificationSelect || !target;
 };
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/PatchAliasesTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/PatchAliasesTab.tsx
index 20f05cbe7..f05c8750a 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/PatchAliasesTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/PatchAliasesTab.tsx
@@ -10,6 +10,7 @@ const getInitialFormState = (
   projectData: TabProps["projectData"],
   repoData: TabProps["repoData"],
 ): PatchAliasesFormState => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!projectData) return repoData;
   if (repoData) {
     return {
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/getFormSchema.tsx b/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/getFormSchema.tsx
index 24438dc0a..7c9aa78aa 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/getFormSchema.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/getFormSchema.tsx
@@ -25,6 +25,7 @@ export const getFormSchema = (
         ...overrideRadioBox(
           "aliases",
           ["Override Repo Patch Aliases", "Default to Repo Patch Aliases"],
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           patchAliasArray.schema,
         ),
       },
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/transformers.ts
index ed901f86b..3f9519942 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/PatchAliasesTab/transformers.ts
@@ -17,16 +17,20 @@ const migrateSuccessStatus = (status: string) => {
   return status ?? "";
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const gqlToForm: GqlToFormFunction<Tab> = ((data, options) => {
   if (!data) return null;
 
   const {
     aliases,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     projectRef: { githubTriggerAliases, patchTriggerAliases },
   } = data;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { projectType } = options;
   const isAttachedProject = projectType === ProjectType.AttachedProject;
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { patchAliases } = sortAliases(aliases);
 
   return {
@@ -40,9 +44,11 @@ export const gqlToForm: GqlToFormFunction<Tab> = ((data, options) => {
     patchTriggerAliases: {
       aliasesOverride: !isAttachedProject || !!patchTriggerAliases,
       aliases:
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         patchTriggerAliases?.map((p) => ({
           ...p,
           taskSpecifiers:
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             p.taskSpecifiers?.map((t) => ({
               ...t,
               specifier: t.patchAlias
@@ -56,6 +62,7 @@ export const gqlToForm: GqlToFormFunction<Tab> = ((data, options) => {
         })) ?? [],
     },
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
@@ -68,6 +75,7 @@ export const formToGql = ((
     patchAliases.aliasesOverride,
   );
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const githubTriggerAliases = [];
   const patchTriggerAliases = ptaData.aliasesOverride
     ? ptaData.aliases.map((a) => {
@@ -100,7 +108,9 @@ export const formToGql = ((
 
   return {
     ...(isRepo ? { repoId: id } : { projectId: id }),
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     projectRef: { id, patchTriggerAliases, githubTriggerAliases },
     aliases,
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/PeriodicBuildsTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/PeriodicBuildsTab.tsx
index c3e172125..9311dfad1 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/PeriodicBuildsTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/PeriodicBuildsTab.tsx
@@ -11,6 +11,7 @@ const getInitialFormState = (
   projectData: TabProps["projectData"],
   repoData: TabProps["repoData"],
 ): PeriodicBuildsFormState => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!projectData) return repoData;
   if (repoData) return { ...projectData, repoData };
   return projectData;
@@ -29,6 +30,7 @@ export const PeriodicBuildsTab: React.FC<TabProps> = ({
   );
 
   const formSchema = useMemo(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     () => getFormSchema(projectType, timezone),
     [projectType, timezone],
   );
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.test.ts b/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.test.ts
index e854bf70f..bf4a2d116 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.test.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.test.ts
@@ -68,6 +68,7 @@ const repoForm: PeriodicBuildsFormState = {
       id: "456",
       interval: {
         specifier: IntervalSpecifier.Cron,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         intervalHours: null,
         cron: "*/5 * * * *",
       },
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.ts
index 7c35e1fda..ba1d711d2 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/PeriodicBuildsTab/transformers.ts
@@ -19,10 +19,12 @@ const getTitle = (
   return intervalHours ? `Every ${intervalHours} hours` : cron;
 };
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const gqlToForm = ((data, { projectType }) => {
   if (!data) return null;
 
   const {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     projectRef: { periodicBuilds },
   } = data;
 
@@ -32,12 +34,19 @@ export const gqlToForm = ((data, { projectType }) => {
     periodicBuilds:
       periodicBuilds?.map(
         ({
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           alias,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           configFile,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           cron,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           id,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           intervalHours,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           message,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           nextRunTime,
         }) => ({
           alias,
@@ -61,6 +70,7 @@ export const gqlToForm = ((data, { projectType }) => {
         }),
       ) ?? [],
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
@@ -70,6 +80,7 @@ export const formToGql = ((
 ) => ({
   ...(isRepo ? { repoId: id } : { projectId: id }),
   projectRef: {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     periodicBuilds: periodicBuildsOverride
       ? periodicBuilds.map(
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/PluginsTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/PluginsTab.tsx
index 39ad41e05..263165395 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/PluginsTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/PluginsTab.tsx
@@ -22,6 +22,7 @@ export const PluginsTab: React.FC<TabProps> = ({
     () =>
       getFormSchema(
         projectType === ProjectType.Repo,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         jiraEmail,
         projectType === ProjectType.AttachedProject ? repoData : null,
       ),
@@ -31,6 +32,7 @@ export const PluginsTab: React.FC<TabProps> = ({
   return (
     <BaseTab
       formSchema={formSchema}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       initialFormState={initialFormState}
       tab={tab}
       validate={validate}
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/getFormSchema.tsx b/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/getFormSchema.tsx
index 51ad686d1..b19bb00b3 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/getFormSchema.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/getFormSchema.tsx
@@ -49,6 +49,7 @@ export const getFormSchema = (
             title: "",
             oneOf: radioBoxOptions(
               ["Enabled", "Disabled"],
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               repoData?.performanceSettings?.perfEnabled,
             ),
           },
@@ -248,9 +249,11 @@ export const getFormSchema = (
         "ui:description":
           "Specify the endpoint and secret for a custom webhook to be called when the File Ticket button is clicked on a failing task.",
         endpoint: placeholderIf(
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           repoData?.buildBaronSettings?.fileTicketWebhook?.endpoint,
         ),
         secret: placeholderIf(
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           repoData?.buildBaronSettings?.fileTicketWebhook?.secret,
         ),
       },
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/transformers.test.ts b/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/transformers.test.ts
index c94187589..80e1c9255 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/transformers.test.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/transformers.test.ts
@@ -34,6 +34,7 @@ const projectForm: PluginsFormState = {
   },
   buildBaronSettings: {
     ticketCreateProject: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       createProject: null,
     },
     ticketCreateIssueType: {
@@ -42,7 +43,9 @@ const projectForm: PluginsFormState = {
     ticketSearchProjects: [],
     useBuildBaron: false,
     fileTicketWebhook: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       endpoint: null,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       secret: null,
     },
   },
@@ -69,7 +72,9 @@ const projectResult: Pick<ProjectSettingsInput, "projectId" | "projectRef"> = {
     perfEnabled: true,
     taskAnnotationSettings: {
       fileTicketWebhook: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         endpoint: null,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         secret: null,
       },
     },
diff --git a/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/transformers.ts
index 0891ec231..0d66188b3 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/PluginsTab/transformers.ts
@@ -41,6 +41,7 @@ export const gqlToForm = ((data) => {
         displayTitle: e.displayName,
       })) ?? [],
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
@@ -49,11 +50,14 @@ export const formToGql = ((
   id,
 ) => {
   const projectRef: ProjectInput = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     perfEnabled: performanceSettings.perfEnabled,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     ...buildBaronIf(buildBaronSettings.useBuildBaron, buildBaronSettings),
     taskAnnotationSettings: {
       ...fileTicketWebhookIf(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         buildBaronSettings.useBuildBaron,
         buildBaronSettings.fileTicketWebhook,
       ),
@@ -68,6 +72,7 @@ export const formToGql = ((
         : null,
   };
   return { ...(isRepo ? { repoId: id } : { projectId: id }), projectRef };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
 
 // conditionally include the buildBaronSettings field based on the useBuildBaron boolean
@@ -78,7 +83,9 @@ export const buildBaronIf = (useBuildBaron: boolean, buildBaronSettings: any) =>
       ticketCreateProject:
         buildBaronSettings.ticketCreateProject?.createProject,
       ticketSearchProjects: buildBaronSettings.ticketSearchProjects
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         .map(({ searchProject }) => searchProject)
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         .filter((str) => !!str),
       ticketCreateIssueType:
         buildBaronSettings.ticketCreateIssueType?.issueType ||
diff --git a/apps/spruce/src/pages/projectSettings/tabs/ProjectTriggersTab/ProjectTriggersTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/ProjectTriggersTab/ProjectTriggersTab.tsx
index 4d6b80889..15ab93f9e 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/ProjectTriggersTab/ProjectTriggersTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/ProjectTriggersTab/ProjectTriggersTab.tsx
@@ -10,6 +10,7 @@ const getInitialFormState = (
   projectData: TabProps["projectData"],
   repoData: TabProps["repoData"],
 ): ProjectTriggersFormState => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!projectData) return repoData;
   if (repoData) return { ...projectData, repoData };
   return projectData;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/ProjectTriggersTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/ProjectTriggersTab/transformers.ts
index 7f6ff7a8e..56ebc5dd9 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/ProjectTriggersTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/ProjectTriggersTab/transformers.ts
@@ -11,22 +11,28 @@ const { omitTypename } = string;
 type Tab = ProjectSettingsTabRoutes.ProjectTriggers;
 
 const getTitle = ({
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   level,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   project,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   status,
 }: Unpacked<ProjectTriggersSettingsFragment["triggers"]>) =>
   `${project}: On ${level}${status === "all" ? "" : ` ${status}`}`;
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const gqlToForm = ((data, { projectType }) => {
   if (!data) return null;
 
   const {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     projectRef: { triggers },
   } = data;
 
   return {
     triggersOverride: projectType !== ProjectType.AttachedProject || !!triggers,
     triggers:
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       triggers?.map((trigger) =>
         omitTypename({
           ...trigger,
@@ -35,11 +41,13 @@ export const gqlToForm = ((data, { projectType }) => {
         }),
       ) ?? [],
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = (({ triggers, triggersOverride }, isRepo, id) => ({
   ...(isRepo ? { repoId: id } : { projectId: id }),
   projectRef: {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     triggers: triggersOverride
       ? triggers.map((trigger) => ({
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/PromoteVariablesModal.tsx b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/PromoteVariablesModal.tsx
index 73bf7b211..daec5deb6 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/PromoteVariablesModal.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/PromoteVariablesModal.tsx
@@ -65,6 +65,7 @@ export const PromoteVariablesModal: React.FC<Props> = ({
 
   const [selected, setSelected] = useReducer(reducer, new Set<string>());
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const handleClickCheckbox = (name) => (e) => {
     setSelected({
       type: e.target.checked ? "checkCheckbox" : "uncheckCheckbox",
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariableRow.test.tsx b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariableRow.test.tsx
index d330c4c0b..3f0170f22 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariableRow.test.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariableRow.test.tsx
@@ -29,6 +29,7 @@ describe("variable row field template", () => {
     render(
       <VariableRow
         formData={{ varName: "test" }}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         properties={mockProperties}
         uiSchema={mockUiSchema}
       />,
@@ -40,6 +41,7 @@ describe("variable row field template", () => {
     render(
       <VariableRow
         formData={{ varName: "" }}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         properties={mockProperties}
         uiSchema={mockUiSchema}
       />,
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariableRow.tsx b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariableRow.tsx
index 773def02d..1d4e5eb6e 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariableRow.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariableRow.tsx
@@ -16,7 +16,8 @@ export const VariableRow: React.FC<
   );
   const repoData = uiSchema?.options?.repoData;
   const inRepo = repoData
-    ? repoData.vars.some(({ varName }) => varName === formData.varName)
+    ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+      repoData.vars.some(({ varName }) => varName === formData.varName)
     : false;
 
   return (
@@ -53,6 +54,7 @@ const LeftColumn = styled.div`
   padding-right: ${size.s};
 
   ${(props: { showWarning?: boolean }): string =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     props.showWarning &&
     `input {
     border-color: ${yellow.dark2};
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariablesTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariablesTab.tsx
index 74506fd53..22f358610 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariablesTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/VariablesTab.tsx
@@ -15,6 +15,7 @@ const getInitialFormState = (
   projectData: TabProps["projectData"],
   repoData: TabProps["repoData"],
 ): VariablesFormState => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!projectData) return repoData;
   if (repoData) return { ...projectData, repoData };
   return projectData;
@@ -52,6 +53,7 @@ export const VariablesTab: React.FC<TabProps> = ({
     () =>
       getFormSchema(
         projectType,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectType === ProjectType.AttachedProject ? repoData : null,
         projectType === ProjectType.AttachedProject ? <ModalButton /> : null,
       ),
@@ -88,6 +90,7 @@ export const VariablesTab: React.FC<TabProps> = ({
 const validate = ((formData, errors) => {
   const duplicateIndices = findDuplicateIndices(formData.vars, "varName");
   duplicateIndices.forEach((i) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     errors.vars?.[i]?.varName?.addError(
       "Value already appears in project variables.",
     );
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/getFormSchema.ts b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/getFormSchema.ts
index fb4d89a82..f1dc88cfd 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/getFormSchema.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/getFormSchema.ts
@@ -113,6 +113,7 @@ export const getFormSchema = (
   },
 });
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const getDescription = (projectType: ProjectType): string => {
   if (projectType === ProjectType.Repo) {
     return "Variables defined here will be used by all branches attached to this project, unless a variable is specifically overridden in the branch.";
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/transformers.ts
index 65e83656d..c0dfa5ec8 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/VariablesTab/transformers.ts
@@ -7,6 +7,7 @@ export const gqlToForm = ((data) => {
   if (!data) return null;
 
   const {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     vars: { adminOnlyVars, privateVars, vars },
   } = data;
 
@@ -19,6 +20,7 @@ export const gqlToForm = ((data) => {
       isDisabled: privateVars.includes(varName),
     })),
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = (({ vars: varsData }, isRepo, id) => {
@@ -28,13 +30,16 @@ export const formToGql = (({ vars: varsData }, isRepo, id) => {
 
       let val = varValue;
       if (isPrivate) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         acc.privateVarsList.push(varName);
         // Overwrite {REDACTED} for variables that have been previously saved as private variables
         if (isDisabled) val = "";
       }
       if (isAdminOnly) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         acc.adminOnlyVarsList.push(varName);
       }
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       acc.vars[varName] = val;
       return acc;
     },
@@ -49,4 +54,5 @@ export const formToGql = (({ vars: varsData }, isRepo, id) => {
     projectRef: { id },
     vars,
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies FormToGqlFunction<Tab>;
diff --git a/apps/spruce/src/pages/projectSettings/tabs/ViewsAndFiltersTab/ViewsAndFiltersTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/ViewsAndFiltersTab/ViewsAndFiltersTab.tsx
index 099a0f18a..343653849 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/ViewsAndFiltersTab/ViewsAndFiltersTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/ViewsAndFiltersTab/ViewsAndFiltersTab.tsx
@@ -12,6 +12,7 @@ const getInitialFormState = (
   projectData: TabProps["projectData"],
   repoData: TabProps["repoData"],
 ): ViewsFormState => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!projectData) return repoData;
   if (repoData) return { ...projectData, repoData };
   return projectData;
@@ -47,6 +48,7 @@ const validate = ((formData, errors) => {
   ];
   const duplicateIndices = findDuplicateIndices(combinedFilters, "expression");
   duplicateIndices.forEach((i) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     errors.parsleyFilters?.[i]?.expression?.addError(
       "Filter expression already appears in this project.",
     );
diff --git a/apps/spruce/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.ts
index af92888c8..58e8a94ba 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/ViewsAndFiltersTab/transformers.ts
@@ -4,6 +4,7 @@ import { ProjectType } from "../utils";
 
 type Tab = ProjectSettingsTabRoutes.ViewsAndFilters;
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const gqlToForm = ((data, { projectType }) => {
   if (!data) return null;
 
@@ -11,6 +12,7 @@ export const gqlToForm = ((data, { projectType }) => {
 
   return {
     parsleyFilters:
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       projectRef.parsleyFilters?.map(
         ({ caseSensitive, exactMatch, expression }) => ({
           displayTitle: expression,
@@ -20,17 +22,20 @@ export const gqlToForm = ((data, { projectType }) => {
         }),
       ) ?? [],
     ...(projectType !== ProjectType.Repo &&
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       "projectHealthView" in projectRef && {
         view: {
           projectHealthView: projectRef.projectHealthView,
         },
       }),
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = (({ parsleyFilters, view }, isRepo, id) => ({
   ...(isRepo ? { repoId: id } : { projectId: id }),
   projectRef: {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     parsleyFilters: parsleyFilters.map(
       ({ caseSensitive, exactMatch, expression }) => ({
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/VirtualWorkstationTab.tsx b/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/VirtualWorkstationTab.tsx
index dfa963924..d19b182bd 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/VirtualWorkstationTab.tsx
+++ b/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/VirtualWorkstationTab.tsx
@@ -11,6 +11,7 @@ const getInitialFormState = (
   projectData: TabProps["projectData"],
   repoData: TabProps["repoData"],
 ): VWFormState => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!projectData) return repoData;
   if (repoData) {
     return {
@@ -40,6 +41,7 @@ export const VirtualWorkstationTab: React.FC<TabProps> = ({
       getFormSchema(
         identifier,
         projectType,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectType === ProjectType.AttachedProject ? repoData : null,
       ),
     [identifier, projectType, repoData],
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/getFormSchema.ts b/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/getFormSchema.ts
index c9e9c44fc..15fbb1d12 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/getFormSchema.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/getFormSchema.ts
@@ -19,6 +19,7 @@ export const getFormSchema = (
       gitClone: {
         type: ["boolean", "null"],
         title: "Git Clone",
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         oneOf: radioBoxOptions(["Enabled", "Disabled"], repoData?.gitClone),
       },
       commands: {
diff --git a/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/transformers.ts
index 202389bdf..b93813c90 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/VirtualWorkstationTab/transformers.ts
@@ -12,9 +12,11 @@ export const gqlToForm = ((data, options) => {
 
   const {
     projectRef: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       workstationConfig: { gitClone, setupCommands },
     },
   } = data;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { projectType } = options;
 
   return {
@@ -25,6 +27,7 @@ export const gqlToForm = ((data, options) => {
       setupCommands: setupCommands?.map(omitTypename) ?? [],
     },
   };
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
 }) satisfies GqlToFormFunction<Tab>;
 
 export const formToGql = ((
@@ -34,6 +37,7 @@ export const formToGql = ((
 ) => ({
   ...(isRepo ? { repoId: id } : { projectId: id }),
   projectRef: {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     id,
     workstationConfig: {
       gitClone,
diff --git a/apps/spruce/src/pages/projectSettings/tabs/testData.ts b/apps/spruce/src/pages/projectSettings/tabs/testData.ts
index caa99a715..45f785e66 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/testData.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/testData.ts
@@ -32,6 +32,7 @@ const projectBase: ProjectSettingsQuery["projectSettings"] = {
     enabled: false,
     owner: "evergreen-ci",
     repo: "evergreen",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     branch: null,
     containerSizeDefinitions: [
       {
@@ -40,11 +41,14 @@ const projectBase: ProjectSettingsQuery["projectSettings"] = {
         memoryMb: 1024,
       },
     ],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     displayName: null,
     notifyOnBuildFailure: null,
     batchTime: 0,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     remotePath: null,
     oldestAllowedMergeBase: "abc",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     spawnHostScriptPath: null,
     dispatchingDisabled: null,
     versionControlEnabled: true,
@@ -75,13 +79,16 @@ const projectBase: ProjectSettingsQuery["projectSettings"] = {
     },
     perfEnabled: true,
     buildBaronSettings: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       ticketCreateProject: null,
       ticketSearchProjects: [],
       ticketCreateIssueType: JiraTicketType.Epic,
     },
     taskAnnotationSettings: {
       fileTicketWebhook: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         endpoint: null,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         secret: null,
       },
     },
diff --git a/apps/spruce/src/pages/projectSettings/tabs/transformers.ts b/apps/spruce/src/pages/projectSettings/tabs/transformers.ts
index aa121fa96..9212956e3 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/transformers.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/transformers.ts
@@ -20,33 +20,56 @@ import * as virtualWorkstation from "./VirtualWorkstationTab/transformers";
 export const gqlToFormMap: {
   [T in WritableProjectSettingsType]: GqlToFormFunction<T>;
 } = {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.General]: general.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Access]: access.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Plugins]: plugins.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Variables]: variables.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.GithubCommitQueue]: githubCommitQueue.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Notifications]: notifications.gqlToForm,
   [ProjectSettingsTabRoutes.PatchAliases]: patchAliases.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.VirtualWorkstation]: virtualWorkstation.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.ProjectTriggers]: projectTriggers.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.PeriodicBuilds]: periodicBuilds.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Containers]: containers.gqlToForm,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.ViewsAndFilters]: viewsAndFilters.gqlToForm,
 };
 
 export const formToGqlMap: {
   [T in WritableProjectSettingsType]: FormToGqlFunction<T>;
 } = {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.General]: general.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Access]: access.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Plugins]: plugins.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Variables]: variables.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.GithubCommitQueue]: githubCommitQueue.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Notifications]: notifications.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.PatchAliases]: patchAliases.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.VirtualWorkstation]: virtualWorkstation.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.ProjectTriggers]: projectTriggers.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.PeriodicBuilds]: periodicBuilds.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.Containers]: containers.formToGql,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   [ProjectSettingsTabRoutes.ViewsAndFilters]: viewsAndFilters.formToGql,
 };
diff --git a/apps/spruce/src/pages/projectSettings/tabs/utils/alias.test.ts b/apps/spruce/src/pages/projectSettings/tabs/utils/alias.test.ts
index e7ba49c6f..ec793e03e 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/utils/alias.test.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/utils/alias.test.ts
@@ -62,6 +62,7 @@ describe("transformAliases", () => {
     expect(
       transformAliases(
         [
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           {
             id: "456",
             variants: {
diff --git a/apps/spruce/src/pages/projectSettings/tabs/utils/alias.ts b/apps/spruce/src/pages/projectSettings/tabs/utils/alias.ts
index 97259d8c2..74eec70ad 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/utils/alias.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/utils/alias.ts
@@ -67,6 +67,7 @@ const aliasToForm = ({
 }: ProjectAlias): AliasFormType => ({
   id,
   alias,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   description,
   gitTag,
   remotePath,
@@ -99,14 +100,19 @@ export const sortAliases = (
     (o, a) => {
       const transformedAlias = aliasToForm(a);
       if (a.alias === AliasNames.GithubPr) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         o.githubPrAliases.push(transformedAlias);
       } else if (a.alias === AliasNames.GithubCheck) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         o.githubCheckAliases.push(transformedAlias);
       } else if (a.alias === AliasNames.GitTag) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         o.gitTagAliases.push(transformedAlias);
       } else if (a.alias === AliasNames.CommitQueue) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         o.commitQueueAliases.push(transformedAlias);
       } else {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         o.patchAliases.push(transformedAlias);
       }
       return o;
@@ -121,8 +127,11 @@ export const sortAliases = (
   );
 
 const transformVariants = ({
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   specifier,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   variant,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   variantTags,
 }): {
   variant: string;
@@ -135,12 +144,16 @@ const transformVariants = ({
       }
     : {
         variant: "",
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         variantTags: variantTags?.filter((tag) => tag) ?? [],
       };
 
 const transformTasks = ({
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   specifier,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   task,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   taskTags,
 }): {
   task: string;
@@ -153,6 +166,7 @@ const transformTasks = ({
       }
     : {
         task: "",
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         taskTags: taskTags?.filter((tag) => tag) ?? [],
       };
 
@@ -168,6 +182,7 @@ export const transformAliases = (
   override: boolean,
   aliasName?: AliasNames,
 ): ProjectAliasInput[] =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   override
     ? aliases.map((a) => {
         const {
diff --git a/apps/spruce/src/pages/projectSettings/tabs/utils/errors.ts b/apps/spruce/src/pages/projectSettings/tabs/utils/errors.ts
index 2d6dd4649..af20feb9d 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/utils/errors.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/utils/errors.ts
@@ -14,6 +14,7 @@ export const findDuplicateIndices = <T = { [key: string]: any }>(
       (val, index, arr) =>
         val !== "" && arr.lastIndexOf(val) !== index && index,
     )
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     .filter((index) => array[index]);
   return duplicateIndices;
 };
diff --git a/apps/spruce/src/pages/projectSettings/tabs/utils/form.ts b/apps/spruce/src/pages/projectSettings/tabs/utils/form.ts
index e0961a8f9..2634e8509 100644
--- a/apps/spruce/src/pages/projectSettings/tabs/utils/form.ts
+++ b/apps/spruce/src/pages/projectSettings/tabs/utils/form.ts
@@ -1,5 +1,6 @@
 import { SpruceFormProps } from "components/SpruceForm/types";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const insertIf = (condition, ...elements) => (condition ? elements : []);
 
 const radioBoxOption = (title: string, value: boolean) => ({
@@ -17,6 +18,7 @@ const radioBoxOption = (title: string, value: boolean) => ({
  */
 export const radioBoxOptions = (
   options: [string, string],
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   field: boolean = undefined,
   invert: boolean = false,
 ): Array<SpruceFormProps["schema"]> => [
@@ -29,6 +31,7 @@ export const radioBoxOptions = (
         ? options[+invert]
         : options[+!invert]
       ).toLowerCase()})`,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       null,
     ),
   ),
diff --git a/apps/spruce/src/pages/spawn/SpawnHost.tsx b/apps/spruce/src/pages/spawn/SpawnHost.tsx
index 029e305eb..1443a8ca5 100644
--- a/apps/spruce/src/pages/spawn/SpawnHost.tsx
+++ b/apps/spruce/src/pages/spawn/SpawnHost.tsx
@@ -29,6 +29,7 @@ export const SpawnHost = () => {
     ({ volumes }) => !!volumes.find(({ migrating }) => migrating),
   );
   usePolling({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     startPolling,
     stopPolling,
     refetch,
diff --git a/apps/spruce/src/pages/spawn/SpawnVolume.tsx b/apps/spruce/src/pages/spawn/SpawnVolume.tsx
index 2541d66a5..26f04dab1 100644
--- a/apps/spruce/src/pages/spawn/SpawnVolume.tsx
+++ b/apps/spruce/src/pages/spawn/SpawnVolume.tsx
@@ -34,6 +34,7 @@ export const SpawnVolume = () => {
     ({ migrating }) => migrating,
   );
   usePolling({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     startPolling,
     stopPolling,
     refetch,
@@ -48,6 +49,7 @@ export const SpawnVolume = () => {
   const volumeLimit = spruceConfig?.providers?.aws?.maxVolumeSizePerUser;
   const totalVolumeSize = volumes.reduce((acc, volume) => acc + volume.size, 0);
   const maxSpawnableLimit =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     volumeLimit - totalVolumeSize >= 0 ? volumeLimit - totalVolumeSize : 0;
   const mountedCount = volumes.filter((v) => v.hostID).length ?? 0;
   const unmountedCount = volumes.filter((v) => !v.hostID).length ?? 0;
@@ -68,6 +70,7 @@ export const SpawnVolume = () => {
         </BadgeWrapper>
       </TitleContainer>
       <SpawnVolumeButton
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         volumeLimit={volumeLimit}
         maxSpawnableLimit={maxSpawnableLimit}
       />
diff --git a/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostButton.tsx b/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostButton.tsx
index c73ff0d28..da22a7244 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostButton.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostButton.tsx
@@ -33,6 +33,7 @@ export const EditSpawnHostButton: React.FC<EditSpawnHostButtonProps> = ({
           trigger={
             <Button
               size={Size.XSmall}
+              data-cy="edit-host-button"
               disabled={!canEditSpawnHost}
               onClick={(e) => {
                 e.stopPropagation();
diff --git a/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostModal.test.tsx b/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostModal.test.tsx
index 59cc973a3..6b5a012c2 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostModal.test.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostModal.test.tsx
@@ -88,6 +88,7 @@ describe("editSpawnHostModal", () => {
         </MockedProvider>,
       );
       expect(screen.queryByDataCy("edit-spawn-host-modal")).toBeVisible();
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       within(screen.queryByDataCy("daypicker"))
         .getAllByRole("checkbox")
         .forEach((day) => {
@@ -159,15 +160,18 @@ describe("editSpawnHostModal", () => {
       );
       expect(screen.queryByDataCy("edit-spawn-host-modal")).toBeVisible();
       await user.click(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByText("Use default host uptime schedule", {
           exact: false,
         }),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       within(screen.queryByDataCy("daypicker"))
         .getAllByRole("checkbox")
         .forEach((day) => {
           expect(day).not.toBeDisabled();
         });
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByLabelText("Start Time"));
       await user.click(screen.getAllByText("07")[0]);
       await user.click(screen.getByText("OK", { selector: "span" }));
@@ -189,11 +193,14 @@ describe("editSpawnHostModal", () => {
       );
       expect(screen.queryByDataCy("edit-spawn-host-modal")).toBeVisible();
       await user.click(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByText("Use default host uptime schedule", {
           exact: false,
         }),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByTitle("Sunday"));
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByText("Run continuously for enabled days"));
       expect(screen.queryByDataCy("host-uptime-details")).toHaveTextContent(
         "144",
@@ -215,12 +222,16 @@ describe("editSpawnHostModal", () => {
       );
       expect(screen.queryByDataCy("edit-spawn-host-modal")).toBeVisible();
       await user.click(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         screen.queryByText("Use default host uptime schedule", {
           exact: false,
         }),
       );
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByTitle("Sunday"));
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByTitle("Saturday"));
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       await user.click(screen.queryByText("Run continuously for enabled days"));
       expect(screen.queryByDataCy("host-uptime-details")).toHaveTextContent(
         "168",
diff --git a/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostModal.tsx b/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostModal.tsx
index 9cca551e3..809d1f46e 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostModal.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/EditSpawnHostModal.tsx
@@ -4,8 +4,10 @@ import { useSpawnAnalytics } from "analytics";
 import { ConfirmationModal } from "components/ConfirmationModal";
 import {
   defaultSleepSchedule,
+  getEnabledHoursCount,
   getHostUptimeFromGql,
-  validateUptimeSchedule,
+  getHostUptimeWarnings,
+  isNullSleepSchedule,
   validator,
 } from "components/Spawn";
 import {
@@ -52,7 +54,9 @@ export const EditSpawnHostModal: React.FC<EditSpawnHostModalProps> = ({
 
   let instanceTypes = instanceTypesData?.instanceTypes ?? [];
   // The list of instance types provided by Evergreen can be out-of-date, so make sure the instance type in use is considered valid by RJSF
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (!instanceTypes.includes(host.instanceType)) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     instanceTypes = [...instanceTypes, host.instanceType];
   }
 
@@ -75,39 +79,47 @@ export const EditSpawnHostModal: React.FC<EditSpawnHostModalProps> = ({
     expirationDetails: {
       expiration: host.expiration ? host.expiration.toString() : null,
       noExpiration: host.noExpiration,
-      hostUptime: host.noExpiration
-        ? getHostUptimeFromGql(host.sleepSchedule)
-        : getHostUptimeFromGql({ ...defaultSleepSchedule, timeZone }),
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      hostUptime: isNullSleepSchedule(host?.sleepSchedule)
+        ? getHostUptimeFromGql(defaultSleepSchedule)
+        : // @ts-expect-error: FIXME. This comment was added by an automated script.
+          getHostUptimeFromGql(host.sleepSchedule),
     },
     publicKeySection: { useExisting: true, publicKeyNameDropdown: "" },
   };
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const [formState, setFormState] = useState<FormState>(initialFormState);
   const [hasError, setHasError] = useState(false);
 
-  const hostUptimeValidation = useMemo(
-    () =>
-      validateUptimeSchedule({
-        enabledWeekdays:
-          formState?.expirationDetails?.hostUptime?.sleepSchedule
-            ?.enabledWeekdays,
-        ...formState?.expirationDetails?.hostUptime?.sleepSchedule
-          ?.timeSelection,
-        useDefaultUptimeSchedule:
-          formState?.expirationDetails?.hostUptime?.useDefaultUptimeSchedule,
-      }),
-    [formState?.expirationDetails?.hostUptime],
-  );
+  const hostUptimeWarnings = useMemo(() => {
+    const { enabledHoursCount, enabledWeekdaysCount } = getEnabledHoursCount(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      formState?.expirationDetails?.hostUptime,
+    );
+    const warnings = getHostUptimeWarnings({
+      enabledHoursCount,
+      enabledWeekdaysCount,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      runContinuously:
+        formState?.expirationDetails?.hostUptime?.sleepSchedule?.timeSelection
+          ?.runContinuously,
+    });
+    return { enabledHoursCount, warnings };
+  }, [formState?.expirationDetails?.hostUptime]);
 
   const { schema, uiSchema } = getFormSchema({
     canEditInstanceType: host.status === HostStatus.Stopped,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     canEditRdpPassword:
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       host.distro.isWindows && host.status === HostStatus.Running,
     canEditSshKeys: host.status === HostStatus.Running,
     disableExpirationCheckbox,
-    hostUptimeValidation,
+    hostUptimeWarnings,
     instanceTypes: instanceTypes ?? [],
     myPublicKeys: publicKeys ?? [],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     noExpirationCheckboxTooltip,
     timeZone,
     volumes,
@@ -129,10 +141,11 @@ export const EditSpawnHostModal: React.FC<EditSpawnHostModalProps> = ({
       );
       onCancel();
     },
-    refetchQueries: ["MyVolumes"],
+    refetchQueries: ["MyHosts", "MyVolumes"],
   });
 
   const initialEditState = formToGql({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     formData: initialFormState,
     hostId: host.id,
     myPublicKeys: publicKeys,
@@ -157,12 +170,14 @@ export const EditSpawnHostModal: React.FC<EditSpawnHostModalProps> = ({
     sendEvent({
       name: "Edited a Spawn Host",
       params: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         hostId: host.id,
         ...omit(mutationParams, ["publicKey"]),
       },
     });
     editSpawnHostMutation({
       variables: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         hostId: host.id,
         ...mutationParams,
       },
@@ -177,6 +192,7 @@ export const EditSpawnHostModal: React.FC<EditSpawnHostModalProps> = ({
       submitDisabled={!hasChanges || hasError || loadingSpawnHost}
       onCancel={() => {
         onCancel();
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         setFormState(initialFormState);
       }}
       onConfirm={onSubmit}
diff --git a/apps/spruce/src/pages/spawn/spawnHost/PauseSleepScheduleModal.tsx b/apps/spruce/src/pages/spawn/spawnHost/PauseSleepScheduleModal.tsx
new file mode 100644
index 000000000..05b9e3f9c
--- /dev/null
+++ b/apps/spruce/src/pages/spawn/spawnHost/PauseSleepScheduleModal.tsx
@@ -0,0 +1,62 @@
+import { useState } from "react";
+import styled from "@emotion/styled";
+import { Radio, RadioGroup } from "@leafygreen-ui/radio-group";
+import { ConfirmationModal } from "components/ConfirmationModal";
+import { getNextHostStart } from "components/Spawn/utils";
+import { size } from "constants/tokens";
+import { SleepSchedule } from "gql/generated/types";
+
+const todayDate = new Date();
+
+export const PauseSleepScheduleModal: React.FC<{
+  handleConfirm: (shouldKeepOff?: boolean) => void;
+  open: boolean;
+  setOpen: (open: boolean) => void;
+  sleepSchedule: SleepSchedule;
+}> = ({ handleConfirm, open, setOpen, sleepSchedule }) => {
+  const [shouldKeepOff, setShouldKeepOff] = useState(false);
+
+  const { nextStartDay, nextStartTime } = getNextHostStart(
+    sleepSchedule,
+    todayDate,
+  );
+  return (
+    <ConfirmationModal
+      buttonText={`Pause host ${shouldKeepOff ? "indefinitely" : `until ${nextStartDay}`}`}
+      data-cy="pause-sleep-schedule-modal"
+      open={open}
+      onCancel={() => setOpen(false)}
+      onConfirm={() => {
+        handleConfirm(shouldKeepOff);
+        setOpen(false);
+      }}
+      setOpen={setOpen}
+      title="Configure Host Pause"
+    >
+      <P>
+        Since this host has a sleep schedule configured, by default it will wake
+        up at the next scheduled start time. If you won&rsquo;t need it then,
+        you can pause indefinitely and manually restart it at a later date.
+      </P>
+
+      {/* LG's radio group does not support boolean values, so cast the state to a string for use by the component */}
+      <RadioGroup
+        onChange={(e) => setShouldKeepOff(e.target.value === "true")}
+        value={`${shouldKeepOff}`}
+      >
+        <Radio value="false">
+          Start host at its next scheduled time&nbsp;
+          <span data-cy="next-start">
+            ({nextStartDay}
+            {nextStartTime && ` at ${nextStartTime}`})
+          </span>
+        </Radio>
+        <Radio value="true">Pause host indefinitely</Radio>
+      </RadioGroup>
+    </ConfirmationModal>
+  );
+};
+
+const P = styled.p`
+  margin-bottom: ${size.s};
+`;
diff --git a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostActionButton.tsx b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostActionButton.tsx
index c7260efd8..980dd3607 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostActionButton.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostActionButton.tsx
@@ -5,6 +5,7 @@ import Checkbox from "@leafygreen-ui/checkbox";
 import { useSpawnAnalytics } from "analytics";
 import Icon from "components/Icon";
 import Popconfirm from "components/Popconfirm";
+import { isNullSleepSchedule } from "components/Spawn";
 import { useToastContext } from "context/toast";
 import {
   UpdateSpawnHostStatusMutation,
@@ -18,11 +19,14 @@ import { MY_HOSTS } from "gql/queries";
 import { usePolling } from "hooks";
 import { HostStatus } from "types/host";
 import { MyHost } from "types/spawn";
+import { PauseSleepScheduleModal } from "./PauseSleepScheduleModal";
 
 export const SpawnHostActionButton: React.FC<{ host: MyHost }> = ({ host }) => {
   const dispatchToast = useToastContext();
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const glyph = mapStatusToGlyph[host.status];
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const action = mapStatusToAction[host.status];
   const canTerminate = host.status !== HostStatus.Terminated;
 
@@ -42,6 +46,7 @@ export const SpawnHostActionButton: React.FC<{ host: MyHost }> = ({ host }) => {
     },
   });
   usePolling({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     startPolling,
     stopPolling,
     refetch,
@@ -72,15 +77,15 @@ export const SpawnHostActionButton: React.FC<{ host: MyHost }> = ({ host }) => {
     refetchQueries: ["MyVolumes"],
   });
 
-  const onClick = (a) => (e: React.MouseEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-
+  const handleClick = (a: SpawnHostStatusActions, shouldKeepOff?: boolean) => {
     spawnAnalytics.sendEvent({ name: "Change Host Status", status: a });
     updateSpawnHostStatus({
       variables: {
-        hostId: host.id,
-        action: a,
+        updateSpawnHostStatusInput: {
+          hostId: host.id,
+          action: a,
+          shouldKeepOff,
+        },
       },
     });
   };
@@ -97,19 +102,45 @@ export const SpawnHostActionButton: React.FC<{ host: MyHost }> = ({ host }) => {
   const [checkboxAcknowledged, setCheckboxAcknowledged] =
     useState(!checkboxLabel);
 
+  const [sleepModalOpen, setSleepModalOpen] = useState(false);
+
   return (
     <>
-      {action ? (
-        <Button
-          disabled={loading}
-          leftGlyph={<Icon glyph={glyph} />}
-          size={Size.XSmall}
-          onClick={onClick(action)}
-        />
-      ) : null}
+      {/* TODO: Replace with noExpiration check when sleep schedules are deployed */}
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
+      {!isNullSleepSchedule(host?.sleepSchedule) &&
+      action === SpawnHostStatusActions.Stop ? (
+        <>
+          <Button
+            data-cy="pause-unexpirable-host-button"
+            disabled={loading || host.status === HostStatus.Stopping}
+            leftGlyph={<Icon glyph={glyph} />}
+            size={Size.XSmall}
+            onClick={() => setSleepModalOpen((o) => !o)}
+          />
+          <PauseSleepScheduleModal
+            handleConfirm={(shouldKeepOff) =>
+              handleClick(action, shouldKeepOff)
+            }
+            open={sleepModalOpen}
+            setOpen={setSleepModalOpen}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
+            sleepSchedule={host.sleepSchedule}
+          />
+        </>
+      ) : (
+        action && (
+          <Button
+            disabled={loading || host.status === HostStatus.Stopping}
+            leftGlyph={<Icon glyph={glyph} />}
+            size={Size.XSmall}
+            onClick={() => handleClick(action)}
+          />
+        )
+      )}
       <Popconfirm
         confirmDisabled={!checkboxAcknowledged}
-        onConfirm={onClick(SpawnHostStatusActions.Terminate)}
+        onConfirm={() => handleClick(SpawnHostStatusActions.Terminate)}
         trigger={
           <Button
             size={Size.XSmall}
diff --git a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostButton.tsx b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostButton.tsx
index b5d29afb2..ff141c352 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostButton.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostButton.tsx
@@ -63,6 +63,7 @@ export const SpawnHostButton: React.FC = () => {
         <SpawnHostModal
           open={openModal}
           setOpen={(open) => {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             setOpenModal(open);
             setSpawnHostParam(undefined);
           }}
diff --git a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostCard.tsx b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostCard.tsx
index a1b15e5f7..41e53f1f9 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostCard.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostCard.tsx
@@ -27,6 +27,7 @@ const SpawnHostCard: React.FC<SpawnHostCardProps> = ({ host }) => {
   return (
     <DetailsCard
       data-cy="spawn-host-card"
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       fieldMaps={spawnHostCardFieldMaps(sendEvent)}
       type={host}
     />
@@ -35,11 +36,13 @@ const SpawnHostCard: React.FC<SpawnHostCardProps> = ({ host }) => {
 
 const HostUptime: React.FC<MyHost> = ({ uptime }) => {
   const getDateCopy = useDateFormat();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return <span>{getDateCopy(uptime)}</span>;
 };
 
 const HostExpiration: React.FC<MyHost> = ({ expiration, noExpiration }) => {
   const getDateCopy = useDateFormat();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return <span>{noExpiration ? DoesNotExpire : getDateCopy(expiration)}</span>;
 };
 const spawnHostCardFieldMaps = (sendEvent: SendEvent) => ({
@@ -86,6 +89,7 @@ const spawnHostCardFieldMaps = (sendEvent: SendEvent) => ({
   ),
   "Home Volume": (host: MyHost) => (
     <span>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <StyledRouterLink to={getSpawnVolumeRoute(host?.homeVolumeID)}>
         {host?.homeVolume?.displayName || host?.homeVolumeID}
       </StyledRouterLink>
@@ -94,6 +98,7 @@ const spawnHostCardFieldMaps = (sendEvent: SendEvent) => ({
   IDE: (host: MyHost) =>
     host?.distro?.isVirtualWorkStation &&
     host?.status === HostStatus.Running &&
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     workstationSupportedDistros.includes(host?.distro?.id) ? (
       <IDEContainer>
         <StyledLink
diff --git a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTable.tsx b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTable.tsx
index 291987149..f8577cb96 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTable.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTable.tsx
@@ -60,6 +60,7 @@ const columns = [
     header: "Host",
     accessorKey: "id",
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue, row }) => {
       const id = getValue();
       return row.original.distro?.isVirtualWorkStation ? (
@@ -74,20 +75,25 @@ const columns = [
   },
   {
     header: "Distro",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     accessorFn: ({ distro: { id } }) => id,
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => <WordBreak>{getValue()}</WordBreak>,
   },
   {
     header: "Status",
     accessorKey: "status",
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => <HostStatusBadge status={getValue()} />,
   },
   {
     header: "Expires In",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     accessorFn: ({ expiration }) => new Date(expiration),
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue, row }) =>
       row.original.noExpiration
         ? DoesNotExpire
@@ -95,12 +101,15 @@ const columns = [
   },
   {
     header: "Uptime",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     accessorFn: ({ uptime }) => new Date(uptime),
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => formatDistanceToNow(getValue()),
   },
   {
     header: "Actions",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ row }) => <SpawnHostTableActions host={row.original} />,
   },
 ];
diff --git a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTableActions.test.tsx b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTableActions.test.tsx
index 7df5ccdbc..5d9e738da 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTableActions.test.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTableActions.test.tsx
@@ -1,8 +1,33 @@
 import { MockedProvider } from "@apollo/client/testing";
+import { defaultSleepSchedule } from "components/Spawn/utils";
 import { SECOND } from "constants/index";
+import { RenderFakeToastContext } from "context/toast/__mocks__";
+import {
+  InstanceTypesQuery,
+  InstanceTypesQueryVariables,
+  MyHostsQuery,
+  MyHostsQueryVariables,
+  MyPublicKeysQuery,
+  MyPublicKeysQueryVariables,
+} from "gql/generated/types";
+import {
+  getSpruceConfigMock,
+  getUserSettingsMock,
+} from "gql/mocks/getSpruceConfig";
 import { getUserMock } from "gql/mocks/getUser";
-import { act, render, screen, userEvent, waitFor } from "test_utils";
+import { myVolumesQueryMock } from "gql/mocks/myVolumesQuery";
+import { INSTANCE_TYPES, MY_HOSTS, MY_PUBLIC_KEYS } from "gql/queries";
+import {
+  act,
+  renderWithRouterMatch as render,
+  screen,
+  userEvent,
+  waitFor,
+} from "test_utils";
+import { ApolloMock } from "types/gql";
 import { HostStatus } from "types/host";
+import { MyHost } from "types/spawn";
+import { SpawnHostTable } from "./SpawnHostTable";
 import { CopySSHCommandButton } from "./SpawnHostTableActions";
 
 const testUser = "bynn.lee";
@@ -32,6 +57,7 @@ describe("copySSHCommandButton", () => {
     const copySSHButton = screen.queryByDataCy("copy-ssh-button");
 
     // Hover over button to trigger tooltip.
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(copySSHButton);
     await waitFor(() => {
       expect(screen.getByDataCy("copy-ssh-tooltip")).toBeInTheDocument();
@@ -41,6 +67,7 @@ describe("copySSHCommandButton", () => {
     ).toBeInTheDocument();
 
     // Click on button to copy the SSH command and change tooltip message.
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(copySSHButton);
     await waitFor(async () => {
       const clipboardText = await navigator.clipboard.readText();
@@ -64,6 +91,7 @@ describe("copySSHCommandButton", () => {
       <MockedProvider mocks={[getUserMock]}>
         <CopySSHCommandButton
           user={testUser}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           hostUrl={undefined}
           hostStatus={HostStatus.Starting}
         />
@@ -73,6 +101,7 @@ describe("copySSHCommandButton", () => {
     expect(copySSHButton).toBeInTheDocument();
     expect(copySSHButton).toHaveAttribute("aria-disabled", "true");
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(copySSHButton);
     await waitFor(() => {
       expect(screen.getByDataCy("copy-ssh-tooltip")).toBeInTheDocument();
@@ -97,6 +126,7 @@ describe("copySSHCommandButton", () => {
     expect(copySSHButton).toBeInTheDocument();
     expect(copySSHButton).toHaveAttribute("aria-disabled", "true");
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(copySSHButton);
     await waitFor(() => {
       expect(screen.getByDataCy("copy-ssh-tooltip")).toBeInTheDocument();
@@ -106,3 +136,155 @@ describe("copySSHCommandButton", () => {
     ).toBeInTheDocument();
   });
 });
+
+describe("spawn host table", () => {
+  it("prompts user to permanently pause host when a sleep schedule is configured", async () => {
+    const user = userEvent.setup();
+    const { Component } = RenderFakeToastContext(
+      <SpawnHostTable hosts={[baseSpawnHost]} />,
+    );
+    render(
+      <MockedProvider
+        mocks={[
+          getSpruceConfigMock,
+          getUserSettingsMock,
+          instanceTypesMock,
+          myHostsMock,
+          myPublicKeysMock,
+          myVolumesQueryMock,
+        ]}
+      >
+        <Component />
+      </MockedProvider>,
+    );
+    await user.click(screen.getByDataCy("pause-unexpirable-host-button"));
+    await waitFor(() => {
+      expect(screen.queryByDataCy("pause-sleep-schedule-modal")).toBeVisible();
+    });
+    expect(screen.getByDataCy("next-start")).toHaveTextContent(
+      "(tomorrow at 8:00)",
+    );
+    expect(
+      screen.getByRole("button", { name: "Pause host until tomorrow" }),
+    ).toBeVisible();
+    await user.click(screen.getByLabelText("Pause host indefinitely"));
+    await waitFor(() => {
+      expect(
+        screen.getByRole("button", { name: "Pause host indefinitely" }),
+      ).toBeVisible();
+    });
+  });
+
+  it("does not prompt user when pausing expirable host", async () => {
+    const { Component } = RenderFakeToastContext(
+      <SpawnHostTable
+        hosts={[{ ...baseSpawnHost, noExpiration: false, sleepSchedule: null }]}
+      />,
+    );
+    render(
+      <MockedProvider
+        mocks={[
+          getSpruceConfigMock,
+          getUserSettingsMock,
+          instanceTypesMock,
+          myHostsMock,
+          myPublicKeysMock,
+          myVolumesQueryMock,
+        ]}
+      >
+        <Component />
+      </MockedProvider>,
+    );
+    expect(
+      screen.queryByDataCy("pause-unexpirable-host-button"),
+    ).not.toBeInTheDocument();
+  });
+});
+
+const baseSpawnHost: MyHost = {
+  id: "i-0e2424677dfab890e",
+  distro: {
+    isVirtualWorkStation: true,
+    id: "ubuntu1804-workstation",
+    user: "ubuntu",
+    workDir: "/home/ubuntu",
+    isWindows: false,
+    __typename: "DistroInfo",
+  },
+  expiration: new Date("2024-05-06T20:27:43.024Z"),
+  hostUrl: "ec2-34-201-138-106.compute-1.amazonaws.com",
+  homeVolumeID: "vol-07fa9f6b5c2067e34",
+  homeVolume: {
+    id: "home-volume-id",
+    displayName: "",
+  },
+  instanceType: "m5.xlarge",
+  instanceTags: [],
+  volumes: [
+    {
+      displayName: "",
+      id: "vol-0cf616375140c067e",
+      migrating: false,
+      __typename: "Volume",
+    },
+  ],
+  noExpiration: true,
+  persistentDnsName: "",
+  provider: "ec2-ondemand",
+  startedBy: "stssss.arst",
+  status: "running",
+  tag: "evg-ubuntu1804-workstation-20201014223740-6478743249380995507",
+  user: "ubuntu",
+  uptime: new Date("2020-10-14T22:37:40Z"),
+  displayName: "",
+  availabilityZone: "us-east-1c",
+  sleepSchedule: {
+    ...defaultSleepSchedule,
+    timeZone: "America/New_York",
+  },
+  __typename: "Host",
+};
+
+const myHostsMock: ApolloMock<MyHostsQuery, MyHostsQueryVariables> = {
+  request: { query: MY_HOSTS, variables: {} },
+  result: {
+    data: {
+      myHosts: [baseSpawnHost],
+    },
+  },
+};
+
+const myPublicKeysMock: ApolloMock<
+  MyPublicKeysQuery,
+  MyPublicKeysQueryVariables
+> = {
+  request: { query: MY_PUBLIC_KEYS, variables: {} },
+  result: {
+    data: {
+      myPublicKeys: [{ key: "abc", name: "MBP", __typename: "PublicKey" }],
+    },
+  },
+};
+const instanceTypesMock: ApolloMock<
+  InstanceTypesQuery,
+  InstanceTypesQueryVariables
+> = {
+  request: { query: INSTANCE_TYPES, variables: {} },
+  result: {
+    data: {
+      instanceTypes: [
+        "c5.xlarge",
+        "c5.2xlarge",
+        "c5.4xlarge",
+        "m5.4xlarge",
+        "m6i.xlarge",
+        "m6i.2xlarge",
+        "m6i.4xlarge",
+        "m6g.2xlarge",
+        "m6g.4xlarge",
+        "m7g.2xlarge",
+        "m7g.4xlarge",
+      ],
+    },
+  },
+};
diff --git a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTableActions.tsx b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTableActions.tsx
index 6e1aafbcc..9b9ab6b4d 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTableActions.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/SpawnHostTableActions.tsx
@@ -18,6 +18,7 @@ export const SpawnHostTableActions: React.FC<{ host: MyHost }> = ({ host }) => (
   <FlexContainer>
     <SpawnHostActionButton host={host} />
     <CopySSHCommandButton
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       user={host.user}
       hostUrl={host.persistentDnsName || host.hostUrl}
       hostStatus={host.status}
diff --git a/apps/spruce/src/pages/spawn/spawnHost/spawnHostButton/SpawnHostModal.tsx b/apps/spruce/src/pages/spawn/spawnHost/spawnHostButton/SpawnHostModal.tsx
index 4e925dd14..51786d78d 100644
--- a/apps/spruce/src/pages/spawn/spawnHost/spawnHostButton/SpawnHostModal.tsx
+++ b/apps/spruce/src/pages/spawn/spawnHost/spawnHostButton/SpawnHostModal.tsx
@@ -3,7 +3,11 @@ import { useQuery, useMutation } from "@apollo/client";
 import { useLocation } from "react-router-dom";
 import { useSpawnAnalytics } from "analytics";
 import { ConfirmationModal } from "components/ConfirmationModal";
-import { validateUptimeSchedule, validator } from "components/Spawn";
+import {
+  getEnabledHoursCount,
+  getHostUptimeWarnings,
+  validator,
+} from "components/Spawn";
 import {
   formToGql,
   getFormSchema,
@@ -83,30 +87,34 @@ export const SpawnHostModal: React.FC<SpawnHostModalProps> = ({
   );
 
   useVirtualWorkstationDefaultExpiration({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     isVirtualWorkstation: selectedDistro?.isVirtualWorkStation,
     setFormState,
     formState,
     disableExpirationCheckbox: formSchemaInput.disableExpirationCheckbox,
   });
 
-  const hostUptimeValidation = useMemo(
-    () =>
-      validateUptimeSchedule({
-        enabledWeekdays:
-          formState?.expirationDetails?.hostUptime?.sleepSchedule
-            ?.enabledWeekdays,
-        ...formState?.expirationDetails?.hostUptime?.sleepSchedule
-          ?.timeSelection,
-        useDefaultUptimeSchedule:
-          formState?.expirationDetails?.hostUptime?.useDefaultUptimeSchedule,
-      }),
-    [formState?.expirationDetails?.hostUptime],
-  );
+  const hostUptimeWarnings = useMemo(() => {
+    const { enabledHoursCount, enabledWeekdaysCount } = getEnabledHoursCount(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      formState?.expirationDetails?.hostUptime,
+    );
+    const warnings = getHostUptimeWarnings({
+      enabledHoursCount,
+      enabledWeekdaysCount,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
+      runContinuously:
+        formState?.expirationDetails?.hostUptime?.sleepSchedule?.timeSelection
+          ?.runContinuously,
+    });
+    return { enabledHoursCount, warnings };
+  }, [formState?.expirationDetails?.hostUptime]);
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { schema, uiSchema } = getFormSchema({
     ...formSchemaInput,
     distroIdQueryParam,
-    hostUptimeValidation,
+    hostUptimeWarnings,
     isMigration: false,
     isVirtualWorkstation: !!selectedDistro?.isVirtualWorkStation,
     spawnTaskData: spawnTaskData?.task,
@@ -121,8 +129,10 @@ export const SpawnHostModal: React.FC<SpawnHostModalProps> = ({
 
   const spawnHost = () => {
     const mutationInput = formToGql({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       isVirtualWorkStation: selectedDistro?.isVirtualWorkStation,
       formData: formState,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       myPublicKeys: formSchemaInput.myPublicKeys,
       spawnTaskData: spawnTaskData?.task,
       timeZone,
@@ -130,6 +140,7 @@ export const SpawnHostModal: React.FC<SpawnHostModalProps> = ({
     spawnAnalytics.sendEvent({
       name: "Spawned a host",
       isMigration: false,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       params: omit(mutationInput, [
         "publicKey",
         "userDataScript",
diff --git a/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeCard.tsx b/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeCard.tsx
index 21a5f0f82..66cf2f1b4 100644
--- a/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeCard.tsx
+++ b/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeCard.tsx
@@ -9,6 +9,7 @@ interface Props {
 export const SpawnVolumeCard: React.FC<Props> = ({ volume }) => (
   <DetailsCard
     data-cy={`spawn-volume-card-${volume.displayName || volume.id}`}
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     fieldMaps={spawnVolumeCardFields}
     type={volume}
   />
@@ -16,6 +17,7 @@ export const SpawnVolumeCard: React.FC<Props> = ({ volume }) => (
 
 const VolumeCreationTime: React.FC<TableVolume> = ({ creationTime }) => {
   const getDateCopy = useDateFormat();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return <>{getDateCopy(creationTime)}</>;
 };
 
diff --git a/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeModal.test.tsx b/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeModal.test.tsx
index 9dcae8844..bfa288bc9 100644
--- a/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeModal.test.tsx
+++ b/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeModal.test.tsx
@@ -147,7 +147,9 @@ describe("spawnVolumeModal", () => {
     });
 
     // Modify form values
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(screen.queryByDataCy("volume-size-input"));
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("volume-size-input"), "24");
     expect(screen.queryByDataCy("volume-size-input")).toHaveValue("24");
     await selectLGOption("availability-zone-select", "us-east-1c");
diff --git a/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeModal.tsx b/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeModal.tsx
index 567a90b6e..a42915bde 100644
--- a/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeModal.tsx
+++ b/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeModal.tsx
@@ -79,14 +79,17 @@ export const SpawnVolumeModal: React.FC<SpawnVolumeModalProps> = ({
         (status === HostStatus.Running || status === HostStatus.Stopped),
     )
     .map(({ displayName, id }) => ({ id, displayName }))
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     .sort((a, b) => a.displayName.localeCompare(b.displayName));
 
   const { schema, uiSchema } = getFormSchema({
     maxSpawnableLimit,
     availabilityZones,
     types,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     hosts: availableHosts,
     disableExpirationCheckbox,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     noExpirationCheckboxTooltip,
   });
 
diff --git a/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeTable.tsx b/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeTable.tsx
index 6715d4e14..c6e16a537 100644
--- a/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeTable.tsx
+++ b/apps/spruce/src/pages/spawn/spawnVolume/SpawnVolumeTable.tsx
@@ -65,16 +65,20 @@ const sortByHost = (a: TableVolume, b: TableVolume) =>
 const columns = [
   {
     header: "Volume",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     accessorFn: ({ displayName, id }) => displayName || id,
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => (
       <WordBreak data-cy="vol-name">{getValue()}</WordBreak>
     ),
   },
   {
     header: "Mounted On",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     accessorFn: ({ host, hostID }) => host?.displayName || hostID,
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue, row }) => {
       const hostId = row.original.hostID;
       return (
@@ -93,6 +97,7 @@ const columns = [
     header: "Status",
     accessorKey: "hostID",
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue, row }) => {
       const hostId = getValue();
       const { migrating } = row.original;
@@ -101,8 +106,10 @@ const columns = [
   },
   {
     header: "Expires In",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     accessorFn: ({ expiration }) => new Date(expiration),
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue, row }) => {
       const expiration = getValue();
       const { noExpiration } = row.original;
@@ -113,6 +120,7 @@ const columns = [
   },
   {
     header: "Actions",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ row }) => <SpawnVolumeTableActions volume={row.original} />,
   },
 ];
diff --git a/apps/spruce/src/pages/spawn/spawnVolume/spawnVolumeTableActions/EditVolumeModal.tsx b/apps/spruce/src/pages/spawn/spawnVolume/spawnVolumeTableActions/EditVolumeModal.tsx
index 7313965a2..086fb9138 100644
--- a/apps/spruce/src/pages/spawn/spawnVolume/spawnVolumeTableActions/EditVolumeModal.tsx
+++ b/apps/spruce/src/pages/spawn/spawnVolume/spawnVolumeTableActions/EditVolumeModal.tsx
@@ -52,6 +52,7 @@ export const EditVolumeModal: React.FC<Props> = ({
   const initialState = useMemo(
     () => ({
       expirationDetails: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         expiration: new Date(volume?.expiration).toString(),
         noExpiration: volume.noExpiration,
       },
@@ -78,6 +79,7 @@ export const EditVolumeModal: React.FC<Props> = ({
 
   const { schema, uiSchema } = getFormSchema({
     disableExpirationCheckbox,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     noExpirationCheckboxTooltip,
     hasName: !!initialState?.name?.length,
   });
@@ -103,6 +105,7 @@ export const EditVolumeModal: React.FC<Props> = ({
         formData={formState}
         onChange={({ errors, formData }) => {
           setFormState(formData);
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           setFormErrors(errors);
         }}
       />
diff --git a/apps/spruce/src/pages/spawn/spawnVolume/spawnVolumeTableActions/MigrateVolumeModal.tsx b/apps/spruce/src/pages/spawn/spawnVolume/spawnVolumeTableActions/MigrateVolumeModal.tsx
index ae5766840..4095afd68 100644
--- a/apps/spruce/src/pages/spawn/spawnVolume/spawnVolumeTableActions/MigrateVolumeModal.tsx
+++ b/apps/spruce/src/pages/spawn/spawnVolume/spawnVolumeTableActions/MigrateVolumeModal.tsx
@@ -42,6 +42,7 @@ export const MigrateVolumeModal: React.FC<MigrateVolumeModalProps> = ({
   const { sendEvent } = useSpawnAnalytics();
 
   const { formSchemaInput, loading: loadingFormData } = useLoadFormSchemaData({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     host: volume.host,
   });
   const [migrateVolumeMutation, { loading: loadingMigration }] = useMutation<
@@ -75,12 +76,14 @@ export const MigrateVolumeModal: React.FC<MigrateVolumeModalProps> = ({
 
   const { schema, uiSchema } = getFormSchema({
     ...formSchemaInput,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     distros,
     isMigration: true,
     isVirtualWorkstation: !!selectedDistro?.isVirtualWorkStation,
     userAwsRegion: AZToRegion(volume.availabilityZone),
   });
   useVirtualWorkstationDefaultExpiration({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     isVirtualWorkstation: selectedDistro?.isVirtualWorkStation,
     disableExpirationCheckbox: formSchemaInput.disableExpirationCheckbox,
     formState: form,
@@ -98,12 +101,14 @@ export const MigrateVolumeModal: React.FC<MigrateVolumeModalProps> = ({
     const mutationInput = formToGql({
       isVirtualWorkStation: !!selectedDistro?.isVirtualWorkStation,
       formData: form,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       myPublicKeys: formSchemaInput.myPublicKeys,
       migrateVolumeId: volume.id,
     });
     sendEvent({
       name: "Spawned a host",
       isMigration: true,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       params: omit(mutationInput, [
         "publicKey",
         "userDataScript",
@@ -112,6 +117,7 @@ export const MigrateVolumeModal: React.FC<MigrateVolumeModalProps> = ({
     });
     migrateVolumeMutation({
       variables: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         spawnHostInput: mutationInput,
         volumeId: volume.id,
       },
diff --git a/apps/spruce/src/pages/task/ActionButtons.tsx b/apps/spruce/src/pages/task/ActionButtons.tsx
index 4c7ae99c0..94eab279b 100644
--- a/apps/spruce/src/pages/task/ActionButtons.tsx
+++ b/apps/spruce/src/pages/task/ActionButtons.tsx
@@ -88,6 +88,7 @@ export const ActionButtons: React.FC<Props> = ({
     ScheduleTasksMutation,
     ScheduleTasksMutationVariables
   >(SCHEDULE_TASKS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { taskIds: [taskId], versionId },
     onCompleted: () => {
       dispatchToast.success("Task marked as scheduled");
@@ -101,6 +102,7 @@ export const ActionButtons: React.FC<Props> = ({
     UnscheduleTaskMutation,
     UnscheduleTaskMutationVariables
   >(UNSCHEDULE_TASK, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { taskId },
     onCompleted: () => {
       dispatchToast.success("Task marked as unscheduled");
@@ -115,6 +117,7 @@ export const ActionButtons: React.FC<Props> = ({
     AbortTaskMutationVariables
   >(ABORT_TASK, {
     variables: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       taskId,
     },
     onCompleted: () => {
@@ -131,6 +134,7 @@ export const ActionButtons: React.FC<Props> = ({
   >(RESTART_TASK, {
     onCompleted: (data) => {
       const { latestExecution, priority } = data.restartTask;
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       if (priority < 0) {
         dispatchToast.warning(
           "Task scheduled to restart, but is disabled. Enable the task to run.",
@@ -151,6 +155,7 @@ export const ActionButtons: React.FC<Props> = ({
   >(SET_TASK_PRIORITY, {
     onCompleted: (data) => {
       dispatchToast.success(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         data.setTaskPriority.priority >= 0
           ? `Priority for task updated to ${data.setTaskPriority.priority}`
           : `Task was successfully disabled`,
@@ -177,6 +182,7 @@ export const ActionButtons: React.FC<Props> = ({
   });
 
   const HistoryLink = useLGButtonRouterLink(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     getTaskHistoryRoute(projectIdentifier, displayName, {
       selectedCommit: !isPatch && order,
       visibleColumns: [buildVariant],
@@ -220,6 +226,7 @@ export const ActionButtons: React.FC<Props> = ({
       disabled={disabled || !canDisable}
       onClick={() => {
         setTaskPriority({
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           variables: { taskId, priority: initialPriority < 0 ? 0 : -1 },
         });
       }}
@@ -231,6 +238,7 @@ export const ActionButtons: React.FC<Props> = ({
     >
       {initialPriority < 0 ? "Enable" : "Disable"}
     </DropdownItem>,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     <SetPriority
       key="set-task-priority"
       taskId={taskId}
@@ -242,6 +250,7 @@ export const ActionButtons: React.FC<Props> = ({
       data-cy="override-dependencies"
       disabled={disabled || !canOverrideDependencies}
       onClick={() => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         overrideTaskDependencies({ variables: { taskId } });
       }}
     >
@@ -297,6 +306,7 @@ export const ActionButtons: React.FC<Props> = ({
           >
             <MenuItem
               onClick={() => {
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 restartTask({ variables: { taskId, failedOnly: false } });
                 taskAnalytics.sendEvent({ name: "Restart" });
               }}
@@ -305,6 +315,7 @@ export const ActionButtons: React.FC<Props> = ({
             </MenuItem>
             <MenuItem
               onClick={() => {
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 restartTask({ variables: { taskId, failedOnly: true } });
                 taskAnalytics.sendEvent({ name: "Restart" });
               }}
@@ -320,6 +331,7 @@ export const ActionButtons: React.FC<Props> = ({
             disabled={disabled || !canRestart || isPatchOnCommitQueue}
             loading={loadingRestartTask}
             onClick={() => {
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               restartTask({ variables: { taskId, failedOnly: false } });
               taskAnalytics.sendEvent({ name: "Restart" });
             }}
diff --git a/apps/spruce/src/pages/task/Breadcrumbs/index.tsx b/apps/spruce/src/pages/task/Breadcrumbs/index.tsx
index 2688b88bf..c3ef05af3 100644
--- a/apps/spruce/src/pages/task/Breadcrumbs/index.tsx
+++ b/apps/spruce/src/pages/task/Breadcrumbs/index.tsx
@@ -30,14 +30,17 @@ const TaskPageBreadcrumbs: React.FC<TaskPageBreadcrumbsProps> = ({
 }) => {
   const { author, id, isPatch, message, projectIdentifier, revision } =
     versionMetadata ?? {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const breadcrumbRoot = useBreadcrumbRoot(isPatch, author, projectIdentifier);
   const breadcrumbAnalytics = useBreadcrumbAnalytics();
 
   const messagePrefix = isPatch
     ? `Patch ${patchNumber}`
-    : shortenGithash(revision);
+    : // @ts-expect-error: FIXME. This comment was added by an automated script.
+      shortenGithash(revision);
 
   const messageBreadcrumb = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     to: getVersionRoute(id),
     text: `${messagePrefix} - ${message}`,
     onClick: () => {
@@ -73,6 +76,7 @@ const TaskPageBreadcrumbs: React.FC<TaskPageBreadcrumbsProps> = ({
   };
 
   const breadcrumbs: Breadcrumb[] = [
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     breadcrumbRoot,
     messageBreadcrumb,
     ...displayTaskBreadcrumb,
diff --git a/apps/spruce/src/pages/task/TaskTabs.tsx b/apps/spruce/src/pages/task/TaskTabs.tsx
index c201403e8..b72ed5fdd 100644
--- a/apps/spruce/src/pages/task/TaskTabs.tsx
+++ b/apps/spruce/src/pages/task/TaskTabs.tsx
@@ -47,9 +47,13 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
 
   const { showBuildBaron } = useBuildBaronVariables({
     task: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       id,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       execution,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       status,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       canModifyAnnotation,
       hasAnnotation: !!annotation,
     },
@@ -58,6 +62,7 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
   const tabMap = {
     [TaskTab.Logs]: (
       <Tab name="Logs" data-cy="task-logs-tab" key="task-logs-tab">
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         <Logs taskId={id} execution={execution} logLinks={logLinks} />
       </Tab>
     ),
@@ -90,8 +95,10 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
         key="execution-tasks-tab"
       >
         <ExecutionTasksTable
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           execution={execution}
           executionTasksFull={executionTasksFull}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           isPatch={versionMetadata?.isPatch}
         />
       </Tab>
@@ -115,6 +122,7 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
         data-cy="task-files-tab"
         key="task-files-tab"
       >
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         <FileTable taskId={id} execution={execution} />
       </Tab>
     ),
@@ -125,9 +133,13 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
         key="task-build-baron-tab"
       >
         <BuildBaron
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           annotation={annotation}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           taskId={id}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           execution={execution}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           userCanModify={canModifyAnnotation}
         />
       </Tab>
@@ -138,6 +150,7 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
         data-cy="trend-charts-tab"
         key="trend-charts-tab"
       >
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         <TrendChartsPlugin taskId={id} />
       </Tab>
     ),
@@ -153,6 +166,7 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
   };
 
   const activeTabs = Object.keys(tabMap).filter(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     (tab) => tabIsActive[tab],
   ) as TaskTab[];
 
@@ -161,6 +175,7 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
     defaultTab = activeTabs.indexOf(urlTab);
   } else if (isDisplayTask) {
     defaultTab = activeTabs.indexOf(TaskTab.ExecutionTasks);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
   } else if (totalTestCount > 0) {
     defaultTab = activeTabs.indexOf(TaskTab.Tests);
   }
@@ -186,11 +201,14 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
       if (
         id === task?.id &&
         query.execution === undefined &&
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         task.latestExecution !== undefined
       ) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         params.execution = task.latestExecution;
       }
 
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       const newRoute = getTaskRoute(id, params);
       navigate(newRoute, { replace: true });
 
@@ -209,6 +227,7 @@ export const TaskTabs: React.FC<TaskTabProps> = ({ isDisplayTask, task }) => {
       setSelected={setSelectedTab}
       aria-label="Task Page Tabs"
     >
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {activeTabs.map((tab: string) => tabMap[tab])}
     </StyledTabs>
   );
diff --git a/apps/spruce/src/pages/task/actionButtons/RelevantCommits/RelevantCommits.test.tsx b/apps/spruce/src/pages/task/actionButtons/RelevantCommits/RelevantCommits.test.tsx
index 1bc9ae64f..68fe21faa 100644
--- a/apps/spruce/src/pages/task/actionButtons/RelevantCommits/RelevantCommits.test.tsx
+++ b/apps/spruce/src/pages/task/actionButtons/RelevantCommits/RelevantCommits.test.tsx
@@ -20,6 +20,7 @@ describe("relevant commits", () => {
     it("the button is disabled when there is no base task", async () => {
       const { Component } = RenderFakeToastContext(
         <MockedProvider mocks={[getPatchTaskWithNoBaseTask]}>
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <RelevantCommits task={patchTaskWithNoBaseTask} />
         </MockedProvider>,
       );
@@ -38,6 +39,7 @@ describe("relevant commits", () => {
         <MockedProvider
           mocks={[getMainlineTaskWithBaseVersion, getNullParentTask]}
         >
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <RelevantCommits task={mainlineTaskWithBaseVersion} />
         </MockedProvider>,
       );
@@ -55,6 +57,7 @@ describe("relevant commits", () => {
         <MockedProvider
           mocks={[getMainlineTaskWithBaseVersion, getParentTaskWithError]}
         >
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           <RelevantCommits task={mainlineTaskWithBaseVersion} />
         </MockedProvider>,
       );
@@ -71,6 +74,7 @@ describe("relevant commits", () => {
   it("the button is disabled when no base version exists", async () => {
     const { Component } = RenderFakeToastContext(
       <MockedProvider mocks={[getPatchTaskWithNoBaseVersion]}>
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         <RelevantCommits task={patchTaskWithNoBaseVersion} />
       </MockedProvider>,
     );
@@ -93,6 +97,7 @@ describe("relevant commits", () => {
           getLastExecutedVersion,
         ]}
       >
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         <RelevantCommits task={patchTaskWithSuccessfulBaseTask} />
       </MockedProvider>,
     );
@@ -131,6 +136,7 @@ describe("relevant commits", () => {
           getBreakingCommit,
         ]}
       >
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         <RelevantCommits task={patchTaskWithFailingBaseTask} />
       </MockedProvider>,
     );
@@ -170,6 +176,7 @@ describe("relevant commits", () => {
           getBreakingCommit,
         ]}
       >
+        {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
         <RelevantCommits task={patchTaskWithRunningBaseTask} />
       </MockedProvider>,
     );
@@ -576,6 +583,7 @@ const getPatchTaskWithNoBaseTask: ApolloMock<
   },
   result: {
     data: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       task: patchTaskWithNoBaseTask,
     },
   },
@@ -591,6 +599,7 @@ const mainlineTaskWithBaseVersion = {
   status: "success",
   versionMetadata: {
     baseVersion: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       ...taskQuery.task.versionMetadata,
       id: "baseVersion",
       order: 3676,
diff --git a/apps/spruce/src/pages/task/actionButtons/RelevantCommits/index.tsx b/apps/spruce/src/pages/task/actionButtons/RelevantCommits/index.tsx
index de249e078..3911ac452 100644
--- a/apps/spruce/src/pages/task/actionButtons/RelevantCommits/index.tsx
+++ b/apps/spruce/src/pages/task/actionButtons/RelevantCommits/index.tsx
@@ -22,17 +22,21 @@ export const RelevantCommits: React.FC<RelevantCommitsProps> = ({ task }) => {
 
   const { baseTask, versionMetadata } = task ?? {};
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { loading: parentLoading, task: parentTask } = useParentTask(task.id);
 
   const { loading: passingLoading, task: lastPassingTask } = useLastPassingTask(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     task.id,
   );
 
   const { loading: breakingLoading, task: breakingTask } = useBreakingTask(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     task.id,
   );
 
   const { loading: executedLoading, task: lastExecutedTask } =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     useLastExecutedTask(task.id);
 
   const linkObject = useMemo(
diff --git a/apps/spruce/src/pages/task/actionButtons/RelevantCommits/types.ts b/apps/spruce/src/pages/task/actionButtons/RelevantCommits/types.ts
index 15e5cce2a..1626ee6c3 100644
--- a/apps/spruce/src/pages/task/actionButtons/RelevantCommits/types.ts
+++ b/apps/spruce/src/pages/task/actionButtons/RelevantCommits/types.ts
@@ -10,7 +10,9 @@ export enum CommitType {
   LastExecuted = "lastExecuted",
 }
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export type BaseTask = BaseVersionAndTaskQuery["task"]["baseTask"];
 
 export type CommitTask =
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   LastMainlineCommitQuery["mainlineCommits"]["versions"][number]["version"]["buildVariants"][number]["tasks"][number];
diff --git a/apps/spruce/src/pages/task/actionButtons/RelevantCommits/utils.ts b/apps/spruce/src/pages/task/actionButtons/RelevantCommits/utils.ts
index a18f0770c..6ea1f581a 100644
--- a/apps/spruce/src/pages/task/actionButtons/RelevantCommits/utils.ts
+++ b/apps/spruce/src/pages/task/actionButtons/RelevantCommits/utils.ts
@@ -46,6 +46,7 @@ export const getTaskFromMainlineCommitsQuery = (
   data: LastMainlineCommitQuery,
 ): CommitTask => {
   const buildVariants =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     data?.mainlineCommits.versions.find(({ version }) => version)?.version
       .buildVariants ?? [];
   if (buildVariants.length > 1) {
@@ -53,10 +54,12 @@ export const getTaskFromMainlineCommitsQuery = (
       new Error("Multiple build variants matched previous commit search."),
     ).warning();
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (buildVariants[0]?.tasks.length > 1) {
     reportError(
       new Error("Multiple tasks matched previous commit search."),
     ).warning();
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return buildVariants[0]?.tasks[0];
 };
diff --git a/apps/spruce/src/pages/task/actionButtons/TaskNotificationModal.tsx b/apps/spruce/src/pages/task/actionButtons/TaskNotificationModal.tsx
index 8c723cdae..0ada039f4 100644
--- a/apps/spruce/src/pages/task/actionButtons/TaskNotificationModal.tsx
+++ b/apps/spruce/src/pages/task/actionButtons/TaskNotificationModal.tsx
@@ -21,6 +21,7 @@ export const TaskNotificationModal: React.FC<ModalProps> = ({
     <NotificationModal
       data-cy="task-notification-modal"
       onCancel={onCancel}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       resourceId={taskId}
       sendAnalyticsEvent={(subscription) =>
         taskAnalytics.sendEvent({ name: "Add Notification", subscription })
diff --git a/apps/spruce/src/pages/task/executionDropdown/ExecutionSelector.tsx b/apps/spruce/src/pages/task/executionDropdown/ExecutionSelector.tsx
index 9c4343c65..f4b8798b7 100644
--- a/apps/spruce/src/pages/task/executionDropdown/ExecutionSelector.tsx
+++ b/apps/spruce/src/pages/task/executionDropdown/ExecutionSelector.tsx
@@ -41,7 +41,9 @@ export const ExecutionSelect: React.FC<ExecutionSelectProps> = ({
       data-cy="execution-select"
       disabled={executionsLoading}
       key={currentExecution}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       onChange={(selected: number | null) => {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         updateExecution(selected);
       }}
       placeholder="Choose an execution"
@@ -53,6 +55,7 @@ export const ExecutionSelect: React.FC<ExecutionSelectProps> = ({
         const optionText = `Execution ${formatZeroIndexForDisplay(
           singleExecution.execution,
         )} - ${getDateCopy(
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           singleExecution.activatedTime ?? singleExecution.ingestTime,
           { omitTimezone: true },
         )}`;
diff --git a/apps/spruce/src/pages/task/metadata/Metadata.stories.tsx b/apps/spruce/src/pages/task/metadata/Metadata.stories.tsx
index 455cd36ff..5490d4165 100644
--- a/apps/spruce/src/pages/task/metadata/Metadata.stories.tsx
+++ b/apps/spruce/src/pages/task/metadata/Metadata.stories.tsx
@@ -14,7 +14,9 @@ export const Default: CustomStoryObj<typeof Metadata> = {
       <Metadata
         {...args}
         task={taskQuery.task}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         taskId={taskQuery.task.id}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         error={null}
       />
     </Container>
@@ -26,6 +28,7 @@ export const WithDependencies: CustomStoryObj<typeof Metadata> = {
     <Container>
       <Metadata
         {...args}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         task={{
           ...taskQuery.task,
           dependsOn: [
@@ -59,7 +62,9 @@ export const WithDependencies: CustomStoryObj<typeof Metadata> = {
             },
           ],
         }}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         taskId={taskQuery.task.id}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         error={null}
       />
     </Container>
@@ -73,12 +78,16 @@ export const WithAbortMessage: CustomStoryObj<
     <Container>
       <Metadata
         {...args}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         task={{
           ...taskQuery.task,
           aborted: true,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           abortInfo: abortInfoMap[abortInfoSelection],
         }}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         taskId={taskQuery.task.id}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         error={null}
       />
     </Container>
@@ -108,13 +117,16 @@ export const ContainerizedTask: CustomStoryObj<typeof Metadata> = {
           ...taskQuery.task,
           hostId: null,
           ami: null,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           distroId: null,
           pod: {
             id: "pod_id",
           },
           spawnHostLink: null,
         }}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         taskId={taskQuery.task.id}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         error={null}
       />
     </Container>
diff --git a/apps/spruce/src/pages/task/metadata/Metadata.test.tsx b/apps/spruce/src/pages/task/metadata/Metadata.test.tsx
index e20497b10..9e2267dd4 100644
--- a/apps/spruce/src/pages/task/metadata/Metadata.test.tsx
+++ b/apps/spruce/src/pages/task/metadata/Metadata.test.tsx
@@ -10,6 +10,7 @@ import {
 } from "test_utils";
 import { Metadata } from ".";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const wrapper = ({ children }) => (
   <MockedProvider mocks={[getUserMock]}>{children}</MockedProvider>
 );
@@ -23,7 +24,9 @@ describe("metadata", () => {
       <Metadata
         taskId={taskId}
         loading={false}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         task={taskAboutToStart.task}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         error={undefined}
       />,
       {
@@ -44,7 +47,9 @@ describe("metadata", () => {
       <Metadata
         taskId={taskId}
         loading={false}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         task={taskStarted.task}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         error={undefined}
       />,
       {
@@ -66,7 +71,9 @@ describe("metadata", () => {
       <Metadata
         taskId={taskId}
         loading={false}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         task={taskSucceeded.task}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         error={undefined}
       />,
       {
diff --git a/apps/spruce/src/pages/task/metadata/Stepback.tsx b/apps/spruce/src/pages/task/metadata/Stepback.tsx
index 3732da653..c6b59ed11 100644
--- a/apps/spruce/src/pages/task/metadata/Stepback.tsx
+++ b/apps/spruce/src/pages/task/metadata/Stepback.tsx
@@ -21,12 +21,14 @@ type Props = {
 export function isInStepback(task: TaskQuery["task"]) {
   // The 'lastFailingStepbackTaskId' is set for all stepback tasks except the first one.
   const hasLastStepback =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     task?.stepbackInfo?.lastFailingStepbackTaskId?.length > 0;
 
   // The 'nextStepbackTaskId' is only set when the next task in stepback is running/finished.
   // This happens in the beginning of stepback or them middle of stepback. This condition is
   // covering for the beginning of stepback.
   const isBeginningStepback =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     task?.stepbackInfo?.nextStepbackTaskId?.length > 0;
 
   // If the task is in stepback or beginning stepback, it is counted as in stepback.
diff --git a/apps/spruce/src/pages/task/metadata/index.tsx b/apps/spruce/src/pages/task/metadata/index.tsx
index ead30127d..20621a890 100644
--- a/apps/spruce/src/pages/task/metadata/index.tsx
+++ b/apps/spruce/src/pages/task/metadata/index.tsx
@@ -90,6 +90,7 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
     timeTaken: baseTaskDuration,
     versionMetadata: baseTaskVersionMetadata,
   } = baseTask ?? {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const baseCommit = shortenGithash(baseTaskVersionMetadata?.revision);
   const projectIdentifier = project?.identifier;
   const { author, id: versionID } = versionMetadata ?? {};
@@ -116,8 +117,10 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
         Build Variant:{" "}
         <StyledRouterLink
           data-cy="build-variant-link"
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           to={getVersionRoute(versionID, {
             page: 0,
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             variant: applyStrictRegex(buildVariant),
           })}
           onClick={() =>
@@ -131,6 +134,7 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
         Project:{" "}
         <StyledRouterLink
           data-cy="project-link"
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           to={getProjectPatchesRoute(projectIdentifier)}
           onClick={() =>
             taskAnalytics.sendEvent({ name: "Click Project Link" })
@@ -140,7 +144,6 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
         </StyledRouterLink>
       </MetadataItem>
       <MetadataItem>Submitted by: {author}</MetadataItem>
-
       {submittedTime && (
         <MetadataItem data-cy="task-metadata-submitted-at">
           Submitted at:{" "}
@@ -157,15 +160,19 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
           </StyledRouterLink>
         </MetadataItem>
       )}
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {estimatedStart > 0 && (
         <MetadataItem>
           Estimated time to start:{" "}
           <span data-cy="task-metadata-estimated_start">
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             {msToDuration(estimatedStart)}
           </span>
         </MetadataItem>
       )}
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {status === TaskStatus.Started && expectedDuration > 0 && (
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         <ETATimer startTime={startTime} expectedDuration={expectedDuration} />
       )}
       {status === TaskStatus.Started && startTime && (
@@ -190,13 +197,16 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
           </span>
         </MetadataItem>
       )}
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {timeTaken > 0 && finishTime && (
         <MetadataItem data-cy="task-metadata-duration">
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           Duration: {msToDuration(timeTaken)}{" "}
         </MetadataItem>
       )}
       {baseTaskDuration !== undefined && (
         <MetadataItem data-cy="task-metadata-base-commit-duration">
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           Base commit duration: {msToDuration(baseTaskDuration)}
         </MetadataItem>
       )}
@@ -285,6 +295,7 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
       )}
       {priority !== 0 && (
         <MetadataItem data-cy="task-metadata-priority">
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           Priority: {priority} {priority < 0 && `(Disabled)`}
         </MetadataItem>
       )}
@@ -322,11 +333,13 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
             </StyledLink>
           </MetadataItem>
         ))}
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {taskQueuePosition > 0 && (
         <MetadataItem>
           Position in queue:{" "}
           <StyledRouterLink
             data-cy="task-queue-position"
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             to={getTaskQueueRoute(distroId, taskId)}
           >
             {taskQueuePosition}
@@ -392,6 +405,7 @@ export const Metadata: React.FC<Props> = ({ error, loading, task, taskId }) => {
               data-cy="task-metrics-link"
               href={getHoneycombSystemMetricsUrl(
                 taskId,
+                // @ts-expect-error: FIXME. This comment was added by an automated script.
                 diskDevices,
                 startTime,
                 finishTime,
diff --git a/apps/spruce/src/pages/task/taskTabs/ExecutionTasksTable.tsx b/apps/spruce/src/pages/task/taskTabs/ExecutionTasksTable.tsx
index 1fe2a4ff2..79499608d 100644
--- a/apps/spruce/src/pages/task/taskTabs/ExecutionTasksTable.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/ExecutionTasksTable.tsx
@@ -26,6 +26,7 @@ const { getDefaultOptions: getDefaultSorting } = RowSorting;
 
 interface Props {
   execution: number;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   executionTasksFull: TaskQuery["task"]["executionTasksFull"];
   isPatch: boolean;
 }
@@ -55,6 +56,7 @@ export const ExecutionTasksTable: React.FC<Props> = ({
 
   const uniqueExecutions = new Set([
     execution,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     ...executionTasksFull.map((t) => t.execution),
   ]);
 
@@ -74,6 +76,7 @@ export const ExecutionTasksTable: React.FC<Props> = ({
   );
 
   const tableSortHandler = useTableSort({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     sendAnalyticsEvents: (sorter: SortingState) =>
       sendEvent({
         name: "Sort Execution Tasks Table",
@@ -97,6 +100,7 @@ export const ExecutionTasksTable: React.FC<Props> = ({
       isMultiSortEvent: () => true, // Override default requirement for shift-click to multisort.
       maxMultiSortColCount: 2,
       onSortingChange: onChangeHandler<SortingState>(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         (s) => getDefaultSorting(table).onSortingChange(s),
         tableSortHandler,
       ),
diff --git a/apps/spruce/src/pages/task/taskTabs/FileTable/index.tsx b/apps/spruce/src/pages/task/taskTabs/FileTable/index.tsx
index 8a9f0c4ba..ca92646a4 100644
--- a/apps/spruce/src/pages/task/taskTabs/FileTable/index.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/FileTable/index.tsx
@@ -54,6 +54,7 @@ const FileTable: React.FC<FileTableProps> = ({ execution, taskId }) => {
         validatorErrorMessage="Invalid regex"
       />
       {filteredGroupedFiles.length === 0 && <Body>No files found</Body>}
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {filteredGroupedFiles.map((groupedFile) => (
         <GroupedFileTable
           key={groupedFile?.taskName}
diff --git a/apps/spruce/src/pages/task/taskTabs/FileTable/types.ts b/apps/spruce/src/pages/task/taskTabs/FileTable/types.ts
index 8ce4b5d6a..40d27bc80 100644
--- a/apps/spruce/src/pages/task/taskTabs/FileTable/types.ts
+++ b/apps/spruce/src/pages/task/taskTabs/FileTable/types.ts
@@ -2,5 +2,6 @@ import { TaskFilesQuery } from "gql/generated/types";
 import { Unpacked } from "types/utils";
 
 export type GroupedFiles = Unpacked<
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   TaskFilesQuery["task"]["files"]["groupedFiles"]
 >;
diff --git a/apps/spruce/src/pages/task/taskTabs/FileTable/utils.test.ts b/apps/spruce/src/pages/task/taskTabs/FileTable/utils.test.ts
index 5cf43b8e4..a50619369 100644
--- a/apps/spruce/src/pages/task/taskTabs/FileTable/utils.test.ts
+++ b/apps/spruce/src/pages/task/taskTabs/FileTable/utils.test.ts
@@ -2,7 +2,9 @@ import { filterGroupedFiles } from "./utils";
 
 describe("filterGroupedFiles", () => {
   it("should return an empty array if groupedFiles is empty", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const groupedFiles = [];
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const result = filterGroupedFiles(groupedFiles, /(?:)/);
     expect(result).toStrictEqual([]);
   });
diff --git a/apps/spruce/src/pages/task/taskTabs/FileTable/utils.ts b/apps/spruce/src/pages/task/taskTabs/FileTable/utils.ts
index 41305bb9d..bfdc283c5 100644
--- a/apps/spruce/src/pages/task/taskTabs/FileTable/utils.ts
+++ b/apps/spruce/src/pages/task/taskTabs/FileTable/utils.ts
@@ -8,6 +8,7 @@ import type { GroupedFiles } from "./types";
  */
 const filterGroupedFiles = (groupedFiles: GroupedFiles[], search: RegExp) =>
   groupedFiles.reduce((acc, groupedFile) => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const filteredFiles = groupedFile?.files?.filter((file) =>
       search.test(file.name),
     );
diff --git a/apps/spruce/src/pages/task/taskTabs/Logs.tsx b/apps/spruce/src/pages/task/taskTabs/Logs.tsx
index f5b8a46d2..30013bef0 100644
--- a/apps/spruce/src/pages/task/taskTabs/Logs.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/Logs.tsx
@@ -188,6 +188,7 @@ const getLinks = (
     return {};
   }
   if (logType === LogTypes.Event) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     return { htmlLink: logLinks.eventLogLink };
   }
   const htmlLink = `${
diff --git a/apps/spruce/src/pages/task/taskTabs/TestsTable.tsx b/apps/spruce/src/pages/task/taskTabs/TestsTable.tsx
index 046c678b4..a8fed438d 100644
--- a/apps/spruce/src/pages/task/taskTabs/TestsTable.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/TestsTable.tsx
@@ -50,6 +50,7 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
   const { sendEvent } = useTaskAnalytics();
 
   const [queryParams, setQueryParams] = useQueryParams();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const queryVariables = getQueryVariables(queryParams, task.id);
   const { execution, limitNum, pageNum, sort } = queryVariables;
   const sortBy = sort?.[0]?.sortBy;
@@ -66,6 +67,7 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
       updateQueryParams &&
       appliedDefaultSort.current !== pathname
     ) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       appliedDefaultSort.current = pathname;
       updateQueryParams({
         [TableQueryParams.SortBy]: TestSortCategory.Status,
@@ -82,6 +84,7 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
     skip: queryVariables.execution === null,
     pollInterval: DEFAULT_POLL_INTERVAL,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const clearQueryParams = () => {
@@ -96,7 +99,9 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
     };
 
     filterState.forEach(({ id, value }) => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       const key = mapIdToFilterParam[id];
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       updatedParams[key] = value;
     });
 
@@ -105,6 +110,7 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
   };
 
   const tableSortHandler = useTableSort({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     sendAnalyticsEvents: (sorter: SortingState) =>
       sendEvent({
         name: "Sort Tests Table",
@@ -122,14 +128,18 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
   );
 
   const setSorting = (s: SortingState) =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     getDefaultSorting(table).onSortingChange(s);
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const setFilters = (f: ColumnFiltersState) =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     getDefaultFiltering(table).onColumnFiltersChange(f);
 
   const columns = useMemo(() => getColumnsTemplate({ task }), [task]);
 
   const tableContainerRef = useRef<HTMLDivElement>(null);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const table = useLeafyGreenTable<TestResult>({
     columns,
     containerRef: tableContainerRef,
@@ -154,10 +164,12 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
     manualPagination: true,
     maxMultiSortColCount: 2,
     onColumnFiltersChange: onChangeHandler<ColumnFiltersState>(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setFilters,
       updateFilters,
     ),
     onSortingChange: onChangeHandler<SortingState>(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setSorting,
       tableSortHandler,
     ),
@@ -167,9 +179,13 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
     <TableWrapper
       controls={
         <TableControl
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           filteredCount={filteredTestCount}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           totalCount={totalTestCount}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           limit={limitNum}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           page={pageNum}
           label="tests"
           onClear={clearQueryParams}
@@ -178,12 +194,14 @@ export const TestsTable: React.FC<TestsTableProps> = ({ task }) => {
           }}
         />
       }
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       shouldShowBottomTableControl={filteredTestCount > 10}
     >
       <BaseTable
         data-cy="tests-table"
         data-loading={loading}
         loading={loading}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         loadingRows={limitNum}
         shouldAlternateRowColor
         table={table}
@@ -213,7 +231,9 @@ const getInitialState = (queryParams: {
       sortBy && sortDir
         ? [{ id: sortBy, desc: sortDir === SortDirection.Desc }]
         : [{ id: TestSortCategory.Status, desc: false }],
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     initialFilters: Object.entries(mapFilterParamToId).reduce(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       (accum, [param, id]) => {
         if (queryParams[param]?.length) {
           return [...accum, { id, value: queryParams[param] }];
@@ -244,6 +264,7 @@ const getQueryVariables = (
       ? SortDirection.Desc
       : SortDirection.Asc;
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   let sort = [];
   if (sortBy && direction) {
     sort = [{ sortBy, direction }];
@@ -263,6 +284,7 @@ const getQueryVariables = (
   return {
     id: taskId,
     execution: queryParamAsNumber(execution),
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     sort,
     limitNum: getLimit(queryParams[PaginationQueryParams.Limit]),
     statusList,
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AddIssueModal/AddIssueModal.test.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AddIssueModal/AddIssueModal.test.tsx
index 3d8814073..cda9ece9d 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AddIssueModal/AddIssueModal.test.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AddIssueModal/AddIssueModal.test.tsx
@@ -76,6 +76,7 @@ describe("addIssueModal", () => {
 
     expect(screen.queryByDataCy("issue-url")).toHaveValue("");
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("issue-url"),
       "https://jira.mongodb.org/browse/EVG-123",
     );
@@ -103,6 +104,7 @@ describe("addIssueModal", () => {
 
     expect(screen.queryByDataCy("issue-url")).toHaveValue("");
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("issue-url"),
       "https://jira.mongodb.org/browse/EVG-123",
     );
@@ -111,14 +113,19 @@ describe("addIssueModal", () => {
       name: "Add issue",
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("confidence-level"), "not a number");
     expect(confirmButton).toHaveAttribute("aria-disabled", "true");
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(screen.queryByDataCy("confidence-level"));
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("confidence-level"), "110");
     expect(confirmButton).toHaveAttribute("aria-disabled", "true");
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.clear(screen.queryByDataCy("confidence-level"));
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("confidence-level"), "80");
     expect(confirmButton).not.toHaveAttribute("aria-disabled", "true");
   }, 15000);
@@ -140,9 +147,11 @@ describe("addIssueModal", () => {
     });
 
     await user.type(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       screen.queryByDataCy("issue-url"),
       "https://jira.mongodb.org/browse/EVG-123",
     );
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.type(screen.queryByDataCy("confidence-level"), "12");
 
     const confirmButton = screen.getByRole("button", {
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AddIssueModal/index.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AddIssueModal/index.tsx
index 4bfc68677..f3ceb1bf4 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AddIssueModal/index.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AddIssueModal/index.tsx
@@ -59,6 +59,7 @@ export const AddIssueModal: React.FC<Props> = ({
   >(ADD_ANNOTATION, {
     onCompleted: () => {
       dispatchToast.success(`Successfully added ${issueString}`);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setSelectedRowKey(issueKey);
       closeModal();
       annotationAnalytics.sendEvent({ name: analyticsType });
@@ -78,6 +79,7 @@ export const AddIssueModal: React.FC<Props> = ({
   const handleSubmit = () => {
     const apiIssue: IssueLinkInput = {
       url: formState.url,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       issueKey,
       confidenceScore: toDecimal(formState.advancedOptions.confidenceScore),
     };
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/AnnotationTicketRow/index.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/AnnotationTicketRow/index.tsx
index 0846c5148..697a5bcb1 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/AnnotationTicketRow/index.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/AnnotationTicketRow/index.tsx
@@ -65,6 +65,7 @@ const AnnotationTicketRow: React.FC<AnnotationTicketRowProps> = ({
           {jiraLink}
           {jiraTicket && (
             <StyledBadge data-cy={`${issueKey}-badge`} variant="lightgray">
+              {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
               {status.name}
             </StyledBadge>
           )}
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/AnnotationTicketRowWithActions/index.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/AnnotationTicketRowWithActions/index.tsx
index 1e8ce1279..1d57fd23c 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/AnnotationTicketRowWithActions/index.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/AnnotationTicketRowWithActions/index.tsx
@@ -57,6 +57,7 @@ const AnnotationTicketRowWithActions = forwardRef<
                 <Popconfirm
                   align="right"
                   onConfirm={() => {
+                    // @ts-expect-error: FIXME. This comment was added by an automated script.
                     onMove({ url, issueKey, confidenceScore });
                   }}
                   trigger={children}
@@ -87,6 +88,7 @@ const AnnotationTicketRowWithActions = forwardRef<
                 <Popconfirm
                   align="right"
                   onConfirm={() => {
+                    // @ts-expect-error: FIXME. This comment was added by an automated script.
                     onRemove(url, issueKey);
                   }}
                   trigger={children}
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/index.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/index.tsx
index fe75b2046..7574c03bd 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/index.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/index.tsx
@@ -114,6 +114,7 @@ const AnnotationTicketsList: React.FC<AnnotationTicketsListProps> = ({
 
   return (
     <div data-cy={isIssue ? "issues-list" : "suspected-issues-list"}>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {jiraIssues.map((issue) => (
         <AnnotationTicketRowWithActions
           isIssue={isIssue}
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/types.ts b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/types.ts
index e80bfe74f..426840292 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/types.ts
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/AnnotationTicketsList/types.ts
@@ -1,6 +1,7 @@
 import { IssuesQuery } from "gql/generated/types";
 import { Unpacked } from "types/utils";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 type AnnotationTickets = IssuesQuery["task"]["annotation"]["issues"];
 type AnnotationTicket = Unpacked<AnnotationTickets>;
 
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaron.test.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaron.test.tsx
index a2d2637d8..d49c031d9 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaron.test.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaron.test.tsx
@@ -45,6 +45,7 @@ describe("buildBaronContent", () => {
     const { Component } = RenderFakeToastContext(
       <MockedProvider mocks={buildBaronMocks} addTypename={false}>
         <BuildBaronContent
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           annotation={null}
           taskId={taskId}
           execution={execution}
@@ -68,6 +69,7 @@ describe("buildBaronContent", () => {
     const { Component, dispatchToast } = RenderFakeToastContext(
       <MockedProvider mocks={buildBaronMocks} addTypename={false}>
         <BuildBaronContent
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           annotation={null}
           taskId={taskId}
           execution={execution}
@@ -81,6 +83,7 @@ describe("buildBaronContent", () => {
       route: `/task/${taskId}`,
       path: "/task/:id",
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(screen.queryByDataCy("file-ticket-button"));
     expect(screen.getByDataCy("file-ticket-popconfirm")).toBeVisible();
     await user.click(screen.getByRole("button", { name: "Yes" }));
@@ -93,6 +96,7 @@ describe("buildBaronContent", () => {
     const { Component } = RenderFakeToastContext(
       <MockedProvider mocks={buildBaronMocks} addTypename={false}>
         <BuildBaronContent
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           annotation={null}
           taskId={taskId}
           execution={execution}
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaron.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaron.tsx
index 3a1014c66..3b52b27a6 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaron.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaron.tsx
@@ -32,6 +32,7 @@ const BuildBaron: React.FC<Props> = ({
       {loading && <Skeleton active title={false} paragraph={{ rows: 4 }} />}
       {(data || annotation) && (
         <BuildBaronContent
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           bbData={data?.buildBaron}
           taskId={taskId}
           execution={execution}
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaronContent.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaronContent.tsx
index fde263a6d..1cb45016d 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaronContent.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/BuildBaronContent.tsx
@@ -72,6 +72,7 @@ const BuildBaronContent: React.FC<BuildBaronCoreProps> = ({
         <CustomCreatedTickets
           taskId={taskId}
           execution={execution}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           tickets={customTickets}
         />
       ) : (
@@ -79,11 +80,12 @@ const BuildBaronContent: React.FC<BuildBaronCoreProps> = ({
           taskId={taskId}
           execution={execution}
           buildBaronConfigured={bbData?.buildBaronConfigured}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           tickets={bbTickets}
         />
       )}
-
       <AnnotationNote
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         note={annotation?.note}
         taskId={taskId}
         execution={execution}
@@ -105,6 +107,7 @@ const BuildBaronContent: React.FC<BuildBaronCoreProps> = ({
         setSelectedRowKey={setSelectedRowKey}
         annotation={annotation}
       />
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {bbData?.searchReturnInfo?.issues.length > 0 && (
         <JiraIssueTable bbData={bbData} />
       )}
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/CustomCreatedTickets.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/CustomCreatedTickets.tsx
index 0596b3aa2..73880c982 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/CustomCreatedTickets.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/CreatedTicketsTable/CustomCreatedTickets.tsx
@@ -25,10 +25,14 @@ const CustomCreatedTickets: React.FC<CustomCreatedTicketProps> = ({
         <TicketContainer>
           {tickets.map(({ confidenceScore, issueKey, jiraTicket, url }) => (
             <AnnotationTicketRow
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               confidenceScore={confidenceScore}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               issueKey={issueKey}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               jiraTicket={jiraTicket}
               key={issueKey}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               url={url}
             />
           ))}
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraIssueTable/index.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraIssueTable/index.tsx
index 98a882c09..77e7256e6 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraIssueTable/index.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraIssueTable/index.tsx
@@ -12,7 +12,9 @@ const JiraIssueTable: React.FC<JiraIssueTableProps> = ({ bbData }) => {
   const spruceConfig = useSpruceConfig();
   const jiraHost = spruceConfig?.jira?.host;
   const jiraSearchString = bbData?.searchReturnInfo?.search;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const jqlEscaped = encodeURIComponent(jiraSearchString);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const jiraSearchLink = getJiraSearchUrl(jiraHost, jqlEscaped);
 
   return (
@@ -25,6 +27,7 @@ const JiraIssueTable: React.FC<JiraIssueTableProps> = ({ bbData }) => {
         </StyledLink>
       </TicketsTitle>
       {/* build baron related jira tickets */}
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <JiraTicketList jiraIssues={bbData?.searchReturnInfo?.issues} />
     </>
   );
diff --git a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraTicketList/JiraTicketRow/index.tsx b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraTicketList/JiraTicketRow/index.tsx
index 3e484292d..8b3ed4e4a 100644
--- a/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraTicketList/JiraTicketRow/index.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/buildBaronAndAnnotations/JiraTicketList/JiraTicketRow/index.tsx
@@ -18,6 +18,7 @@ const JiraTicketRow: React.FC<JiraTicketRowProps> = ({ fields, jiraKey }) => {
   const getDateCopy = useDateFormat();
   const spruceConfig = useSpruceConfig();
   const jiraHost = spruceConfig?.jira?.host;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const url = getJiraTicketUrl(jiraHost, jiraKey);
   const { assigneeDisplayName, created, status, summary, updated } =
     fields ?? {};
diff --git a/apps/spruce/src/pages/task/taskTabs/logs/LogTypes.tsx b/apps/spruce/src/pages/task/taskTabs/logs/LogTypes.tsx
index 6c88df0cc..6a93b05e5 100644
--- a/apps/spruce/src/pages/task/taskTabs/logs/LogTypes.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/logs/LogTypes.tsx
@@ -58,9 +58,11 @@ export const AllLog: React.FC<Props> = (props) => {
     AllLogsQuery,
     AllLogsQueryVariables
   >(ALL_LOGS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: taskId, execution: selectedExecution },
     pollInterval: DEFAULT_POLL_INTERVAL,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const { task } = data || {};
@@ -71,6 +73,7 @@ export const AllLog: React.FC<Props> = (props) => {
   return useRenderBody({
     data: allLogs || [],
     loading,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     error,
     ...props,
   });
@@ -85,9 +88,11 @@ export const EventLog: React.FC<Props> = (props) => {
     TaskEventLogsQuery,
     TaskEventLogsQueryVariables
   >(TASK_EVENT_LOGS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: taskId, execution: selectedExecution },
     pollInterval: DEFAULT_POLL_INTERVAL,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const { task } = data || {};
@@ -95,11 +100,13 @@ export const EventLog: React.FC<Props> = (props) => {
   const { eventLogs } = taskLogs || {};
 
   return useRenderBody({
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     data: (eventLogs || []).map((v: TaskEventLogEntry) => ({
       ...v,
       kind: "taskEventLogEntry",
     })),
     loading,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     error,
     LogContainer: ({ children }) => <div>{children}</div>,
     ...props,
@@ -115,9 +122,11 @@ export const SystemLog: React.FC<Props> = (props) => {
     SystemLogsQuery,
     SystemLogsQueryVariables
   >(SYSTEM_LOGS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: taskId, execution: selectedExecution },
     pollInterval: DEFAULT_POLL_INTERVAL,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const { task } = data || {};
@@ -127,6 +136,7 @@ export const SystemLog: React.FC<Props> = (props) => {
   return useRenderBody({
     data: systemLogs || [],
     loading,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     error,
     ...props,
   });
@@ -141,9 +151,11 @@ export const AgentLog: React.FC<Props> = (props) => {
     AgentLogsQuery,
     AgentLogsQueryVariables
   >(AGENT_LOGS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: taskId, execution: selectedExecution },
     pollInterval: DEFAULT_POLL_INTERVAL,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const { task } = data || {};
@@ -153,6 +165,7 @@ export const AgentLog: React.FC<Props> = (props) => {
   return useRenderBody({
     data: agentLogs || [],
     loading,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     error,
     ...props,
   });
@@ -167,9 +180,11 @@ export const TaskLog: React.FC<Props> = (props) => {
     TaskLogsQuery,
     TaskLogsQueryVariables
   >(TASK_LOGS, {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { id: taskId, execution: selectedExecution },
     pollInterval: DEFAULT_POLL_INTERVAL,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const { task } = data || {};
@@ -178,6 +193,7 @@ export const TaskLog: React.FC<Props> = (props) => {
   return useRenderBody({
     data: taskLogs?.taskLogs || [],
     loading,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     error,
     ...props,
   });
@@ -217,7 +233,9 @@ const useRenderBody: React.FC<{
             {...d}
           />
         ) : (
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           <LogMessageLine
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             key={`${d.message}_${d.timestamp}_${index}`} // eslint-disable-line react/no-array-index-key
             {...d}
           />
diff --git a/apps/spruce/src/pages/task/taskTabs/logs/logTypes/LogMessageLine.tsx b/apps/spruce/src/pages/task/taskTabs/logs/logTypes/LogMessageLine.tsx
index c5730acff..5054b63fa 100644
--- a/apps/spruce/src/pages/task/taskTabs/logs/logTypes/LogMessageLine.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/logs/logTypes/LogMessageLine.tsx
@@ -17,12 +17,16 @@ export const LogMessageLine: React.FC<LogMessageFragment> = ({
 }) => {
   const tz = useUserTimeZone();
   const time = timestamp
-    ? `[${format(new Date(toZonedTime(timestamp, tz)), FORMAT_STR, {
+    ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+      `[${format(new Date(toZonedTime(timestamp, tz)), FORMAT_STR, {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         timeZone: tz,
       })}] `
     : "";
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const LogLineWrapper = getLogLineWrapper(severity);
   const memoizedLogLine = useMemo(() => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const render = linkifyHtml(ansiUp.ansi_to_html(message), {
       validate: {
         url: (value) => /^(http)s?:\/\//.test(value),
diff --git a/apps/spruce/src/pages/task/taskTabs/logs/logTypes/TaskEventLogLine.tsx b/apps/spruce/src/pages/task/taskTabs/logs/logTypes/TaskEventLogLine.tsx
index 33ee81630..eb578371d 100644
--- a/apps/spruce/src/pages/task/taskTabs/logs/logTypes/TaskEventLogLine.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/logs/logTypes/TaskEventLogLine.tsx
@@ -26,6 +26,7 @@ export const TaskEventLogLine: React.FC<TaskEventLogEntry> = ({
     status,
     userId,
   } = data;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const route = podId ? getPodRoute(podId) : getHostRoute(hostId);
   const containerOrHostCopy = podId ? "container" : "host";
   let message: JSX.Element;
@@ -36,6 +37,7 @@ export const TaskEventLogLine: React.FC<TaskEventLogEntry> = ({
           Task is blocked on{" "}
           <ShortenedRouterLink
             title={blockedOn}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             to={getTaskRoute(blockedOn)}
             width={500}
           >
@@ -99,6 +101,7 @@ export const TaskEventLogLine: React.FC<TaskEventLogEntry> = ({
     case TaskEventType.TaskScheduled:
       message = (
         <span className="cy-event-scheduled">
+          {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
           Scheduled at {getDateCopy(timestamp)}
         </span>
       );
@@ -120,11 +123,13 @@ export const TaskEventLogLine: React.FC<TaskEventLogEntry> = ({
       message = <>Container allocated for task.</>;
       break;
     default:
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       message = null;
   }
 
   return (
     <Row>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <Timestamp className="cy-event-ts">{getDateCopy(timestamp)}</Timestamp>
       {message}
     </Row>
diff --git a/apps/spruce/src/pages/task/taskTabs/testsTable/LogsColumn.tsx b/apps/spruce/src/pages/task/taskTabs/testsTable/LogsColumn.tsx
index e6ee0b4c8..34dd546c9 100644
--- a/apps/spruce/src/pages/task/taskTabs/testsTable/LogsColumn.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/testsTable/LogsColumn.tsx
@@ -88,6 +88,7 @@ export const LogsColumn: React.FC<Props> = ({ task, testResult }) => {
           onClick={() => {
             sendEvent({ name: "Click See History Button" });
           }}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           to={getTaskHistoryRoute(project?.identifier, displayName, {
             filters,
             selectedCommit: order,
diff --git a/apps/spruce/src/pages/task/taskTabs/testsTable/getColumnsTemplate.tsx b/apps/spruce/src/pages/task/taskTabs/testsTable/getColumnsTemplate.tsx
index efbbbea85..7a8b76865 100644
--- a/apps/spruce/src/pages/task/taskTabs/testsTable/getColumnsTemplate.tsx
+++ b/apps/spruce/src/pages/task/taskTabs/testsTable/getColumnsTemplate.tsx
@@ -16,6 +16,7 @@ export const getColumnsTemplate = ({ task }: GetColumnsTemplateParams) => [
     header: "Name",
     accessorKey: "testFile",
     id: TestSortCategory.TestName,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => <WordBreak>{getValue()}</WordBreak>,
     enableColumnFilter: true,
     enableSorting: true,
@@ -33,6 +34,7 @@ export const getColumnsTemplate = ({ task }: GetColumnsTemplateParams) => [
     id: TestSortCategory.Status,
     enableColumnFilter: true,
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => <TestStatusBadge status={getValue()} />,
     meta: {
       treeSelect: {
@@ -44,10 +46,12 @@ export const getColumnsTemplate = ({ task }: GetColumnsTemplateParams) => [
   },
   {
     header: () =>
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       `${task.versionMetadata.isPatch ? "Base" : "Previous"} Status`,
     accessorKey: "baseStatus",
     id: TestSortCategory.BaseStatus,
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }) => {
       const status = getValue();
       return status && <TestStatusBadge status={status} />;
@@ -61,6 +65,7 @@ export const getColumnsTemplate = ({ task }: GetColumnsTemplateParams) => [
     accessorKey: "duration",
     id: TestSortCategory.Duration,
     enableSorting: true,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ getValue }): string => {
       const ms = getValue() * 1000;
       return msToDuration(Math.trunc(ms));
@@ -72,6 +77,7 @@ export const getColumnsTemplate = ({ task }: GetColumnsTemplateParams) => [
   {
     header: "Logs",
     sorter: false,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     cell: ({ row }) => <LogsColumn testResult={row.original} task={task} />,
     meta: {
       width: "20%",
diff --git a/apps/spruce/src/pages/taskHistory/BuildVariantSelector.tsx b/apps/spruce/src/pages/taskHistory/BuildVariantSelector.tsx
index 6ec41d4b0..53e1b43be 100644
--- a/apps/spruce/src/pages/taskHistory/BuildVariantSelector.tsx
+++ b/apps/spruce/src/pages/taskHistory/BuildVariantSelector.tsx
@@ -45,6 +45,7 @@ const BuildVariantSelector: React.FC<BuildVariantSelectorProps> = ({
       name: "Filter by build variant",
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     setVisibleColumns(selectedBuildVariants);
   };
   const { buildVariantsForTaskName } = data || {};
diff --git a/apps/spruce/src/pages/taskHistory/ColumnHeaders/ColumnHeaders.test.tsx b/apps/spruce/src/pages/taskHistory/ColumnHeaders/ColumnHeaders.test.tsx
index d9ddbb7cc..2a5a4fe28 100644
--- a/apps/spruce/src/pages/taskHistory/ColumnHeaders/ColumnHeaders.test.tsx
+++ b/apps/spruce/src/pages/taskHistory/ColumnHeaders/ColumnHeaders.test.tsx
@@ -190,6 +190,7 @@ describe("columnHeaders (Task History)", () => {
       expect(screen.queryAllByDataCy("loading-header-cell")).toHaveLength(0);
     });
     expect(screen.queryByText(trimmedVariantName)).toBeVisible();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByText(trimmedVariantName));
     await waitFor(() => {
       expect(screen.queryByText(longVariantName)).toBeVisible();
@@ -212,6 +213,7 @@ const mock = (
   },
   result: {
     data: {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       buildVariantsForTaskName: buildVariants.map((bv) => ({
         __typename: "BuildVariantTuple",
         buildVariant: bv.buildVariant,
diff --git a/apps/spruce/src/pages/taskHistory/ColumnHeaders/index.tsx b/apps/spruce/src/pages/taskHistory/ColumnHeaders/index.tsx
index 734f69466..de73e5ab6 100644
--- a/apps/spruce/src/pages/taskHistory/ColumnHeaders/index.tsx
+++ b/apps/spruce/src/pages/taskHistory/ColumnHeaders/index.tsx
@@ -50,10 +50,12 @@ const ColumnHeaders: React.FC<ColumnHeadersProps> = ({
     },
   });
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { columnLimit, visibleColumns } = useHistoryTable();
   const { buildVariantsForTaskName } = columnData || {};
 
   const activeColumns = useColumns(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     buildVariantsForTaskName,
     ({ buildVariant }) => buildVariant,
   );
@@ -61,6 +63,7 @@ const ColumnHeaders: React.FC<ColumnHeadersProps> = ({
   return (
     <RowContainer>
       <LabelCellContainer />
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {visibleColumns.map((vc) => {
         const cell = columnMap[vc];
         if (!cell) {
diff --git a/apps/spruce/src/pages/taskHistory/TaskHistoryRow/TaskHistoryRow.test.tsx b/apps/spruce/src/pages/taskHistory/TaskHistoryRow/TaskHistoryRow.test.tsx
index 108841f99..c9fe0ee67 100644
--- a/apps/spruce/src/pages/taskHistory/TaskHistoryRow/TaskHistoryRow.test.tsx
+++ b/apps/spruce/src/pages/taskHistory/TaskHistoryRow/TaskHistoryRow.test.tsx
@@ -32,6 +32,7 @@ const initialState: HistoryTableReducerState = {
   columnLimit: 7,
   historyTableFilters: [],
   commitCount: 10,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   selectedCommit: null,
 };
 
@@ -149,6 +150,7 @@ describe("taskHistoryRow", () => {
       );
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("history-table-icon"));
     await waitFor(() => {
       expect(screen.queryByText("TestJiraIntegration")).toBeVisible();
@@ -195,6 +197,7 @@ describe("taskHistoryRow", () => {
     });
 
     expect(screen.queryByText("1 / 1 Failing Tests")).toBeVisible();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("history-table-icon"));
     await waitFor(() => {
       expect(screen.queryByText("TestJiraIntegration")).toBeVisible();
diff --git a/apps/spruce/src/pages/taskHistory/TaskHistoryRow/index.tsx b/apps/spruce/src/pages/taskHistory/TaskHistoryRow/index.tsx
index e7a9c168f..5b44c091a 100644
--- a/apps/spruce/src/pages/taskHistory/TaskHistoryRow/index.tsx
+++ b/apps/spruce/src/pages/taskHistory/TaskHistoryRow/index.tsx
@@ -16,6 +16,7 @@ interface Props {
 }
 const TaskHistoryRow: React.FC<Props> = ({ data, index }) => {
   const { sendEvent } = useProjectHealthAnalytics({ page: "Task history" });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { visibleColumns } = useHistoryTable();
 
   const { getTaskMetadata } = useTestResults(index);
@@ -62,6 +63,7 @@ const TaskHistoryRow: React.FC<Props> = ({ data, index }) => {
           commitType: "inactive",
         });
       },
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       onToggleFoldedCommit: ({ isVisible }) => {
         sendEvent({
           name: "Toggle folded commit",
@@ -79,6 +81,7 @@ const TaskHistoryRow: React.FC<Props> = ({ data, index }) => {
       index={index}
       columns={orderedColumns}
       numVisibleCols={visibleColumns.length}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       selected={data?.selected}
       eventHandlers={eventHandlers}
     />
@@ -97,6 +100,7 @@ const generateColumns = (
     if (buildVariants) {
       const foundVariant = buildVariantMap[c];
       if (foundVariant) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         const { tasks } = foundVariant;
         // the tasks array should in theory only have one item in it so we should always use it.
         const t = tasks[0];
diff --git a/apps/spruce/src/pages/taskHistory/index.tsx b/apps/spruce/src/pages/taskHistory/index.tsx
index a1ff361ef..958d69cae 100644
--- a/apps/spruce/src/pages/taskHistory/index.tsx
+++ b/apps/spruce/src/pages/taskHistory/index.tsx
@@ -42,6 +42,7 @@ const TaskHistoryContents: React.FC = () => {
     [slugs.projectIdentifier]: projectIdentifier,
     [slugs.taskName]: taskName,
   } = useParams();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { ingestNewCommits } = useHistoryTable();
   usePageTitle(`Task History | ${projectIdentifier} | ${taskName}`);
   useTestFilters();
@@ -58,11 +59,13 @@ const TaskHistoryContents: React.FC = () => {
   >(MAINLINE_COMMITS_FOR_HISTORY, {
     variables: {
       mainlineCommitsOptions: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectIdentifier,
         limit: 10,
         shouldCollapse: true,
       },
       buildVariantOptions: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         tasks: [applyStrictRegex(taskName)],
         includeBaseTasks: false,
       },
@@ -75,6 +78,7 @@ const TaskHistoryContents: React.FC = () => {
         {
           projectIdentifier,
           taskName,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           numCommits: mainlineCommits.versions.length,
         },
         SentryBreadcrumb.UI,
@@ -101,12 +105,14 @@ const TaskHistoryContents: React.FC = () => {
       );
       refetch({
         mainlineCommitsOptions: {
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           projectIdentifier,
           limit: 10,
           skipOrderNumber: data.mainlineCommits?.nextPageOrderNumber,
           shouldCollapse: true,
         },
         buildVariantOptions: {
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           tasks: [applyStrictRegex(taskName)],
           includeBaseTasks: false,
         },
@@ -116,6 +122,7 @@ const TaskHistoryContents: React.FC = () => {
 
   return (
     <PageWrapper>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ProjectBanner projectIdentifier={projectIdentifier} />
       <CenterPage>
         <PageHeader>
@@ -129,7 +136,9 @@ const TaskHistoryContents: React.FC = () => {
               }}
             />
             <BuildVariantSelector
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               projectIdentifier={projectIdentifier}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               taskName={taskName}
             />
           </PageHeaderContent>
@@ -159,7 +168,9 @@ const TaskHistoryContents: React.FC = () => {
         </PaginationFilterWrapper>
         <div>
           <ColumnHeaders
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             projectIdentifier={projectIdentifier}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             taskName={taskName}
           />
           <TableWrapper>
@@ -168,6 +179,7 @@ const TaskHistoryContents: React.FC = () => {
               loading={loading}
               finalRowCopy="End of task history"
             >
+              {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
               {TaskHistoryRow}
             </HistoryTable>
           </TableWrapper>
diff --git a/apps/spruce/src/pages/taskQueue/index.tsx b/apps/spruce/src/pages/taskQueue/index.tsx
index 59646d556..eed2cb1c4 100644
--- a/apps/spruce/src/pages/taskQueue/index.tsx
+++ b/apps/spruce/src/pages/taskQueue/index.tsx
@@ -63,6 +63,7 @@ const TaskQueue = () => {
     DistroTaskQueueQueryVariables
   >(DISTRO_TASK_QUEUE, {
     fetchPolicy: "cache-and-network",
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     variables: { distroId },
     skip: !distroId,
     onError: (err) => {
@@ -99,8 +100,11 @@ const TaskQueue = () => {
               onClick={onClick}
             />
           )}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           onChange={onChangeDistroSelection}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           value={selectedDistro}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           buttonRenderer={(option: TaskQueueDistro) => (
             <DistroLabel>
               <StyledBadge>{`${option?.taskCount || 0} ${
@@ -129,6 +133,7 @@ const TaskQueue = () => {
       }
       {!loadingTaskQueueItems && (
         <TaskQueueTable
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           taskQueue={taskQueueItemsData?.distroTaskQueue}
           taskId={taskId}
         />
diff --git a/apps/spruce/src/pages/variantHistory/ColumnHeaders.test.tsx b/apps/spruce/src/pages/variantHistory/ColumnHeaders.test.tsx
index f59fa421d..cdf73b236 100644
--- a/apps/spruce/src/pages/variantHistory/ColumnHeaders.test.tsx
+++ b/apps/spruce/src/pages/variantHistory/ColumnHeaders.test.tsx
@@ -156,6 +156,7 @@ describe("columnHeaders (Variant History)", () => {
     await waitFor(() => {
       expect(screen.queryAllByDataCy("loading-header-cell")).toHaveLength(0);
     });
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByText(trimmedTaskName));
     await waitFor(() => {
       expect(screen.queryByText(longTaskName)).toBeVisible();
diff --git a/apps/spruce/src/pages/variantHistory/ColumnHeaders.tsx b/apps/spruce/src/pages/variantHistory/ColumnHeaders.tsx
index ae9031185..5f1b4ec2b 100644
--- a/apps/spruce/src/pages/variantHistory/ColumnHeaders.tsx
+++ b/apps/spruce/src/pages/variantHistory/ColumnHeaders.tsx
@@ -53,9 +53,11 @@ const ColumnHeaders: React.FC<ColumnHeadersProps> = ({
   });
 
   const { taskNamesForBuildVariant } = columnData || {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { columnLimit, visibleColumns } = useHistoryTable();
 
   const columnMap = mapStringArrayToObject(visibleColumns, "name");
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const activeColumns = useColumns(taskNamesForBuildVariant, (c) => c);
   return (
     <RowContainer>
diff --git a/apps/spruce/src/pages/variantHistory/VariantHistoryRow.test.tsx b/apps/spruce/src/pages/variantHistory/VariantHistoryRow.test.tsx
index d418fc145..bd2cca1b7 100644
--- a/apps/spruce/src/pages/variantHistory/VariantHistoryRow.test.tsx
+++ b/apps/spruce/src/pages/variantHistory/VariantHistoryRow.test.tsx
@@ -33,6 +33,7 @@ const initialState: HistoryTableReducerState = {
   columnLimit: 7,
   historyTableFilters: [],
   commitCount: 10,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   selectedCommit: null,
 };
 
@@ -152,6 +153,7 @@ describe("variantHistoryRow", () => {
       );
     });
 
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("history-table-icon"));
     await waitFor(() => {
       expect(screen.queryByText("TestJiraIntegration")).toBeVisible();
@@ -198,6 +200,7 @@ describe("variantHistoryRow", () => {
     });
 
     expect(screen.queryByText("1 / 1 Failing Tests")).toBeVisible();
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.hover(screen.queryByDataCy("history-table-icon"));
     await waitFor(() => {
       expect(screen.queryByText("TestJiraIntegration")).toBeVisible();
diff --git a/apps/spruce/src/pages/variantHistory/VariantHistoryRow.tsx b/apps/spruce/src/pages/variantHistory/VariantHistoryRow.tsx
index f977c04e9..fcd29d4fa 100644
--- a/apps/spruce/src/pages/variantHistory/VariantHistoryRow.tsx
+++ b/apps/spruce/src/pages/variantHistory/VariantHistoryRow.tsx
@@ -16,6 +16,7 @@ interface Props {
 }
 const VariantHistoryRow: React.FC<Props> = ({ data, index }) => {
   const { sendEvent } = useProjectHealthAnalytics({ page: "Variant history" });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { visibleColumns } = useHistoryTable();
 
   const { getTaskMetadata } = useTestResults(index);
@@ -69,6 +70,7 @@ const VariantHistoryRow: React.FC<Props> = ({ data, index }) => {
           commitType: "inactive",
         });
       },
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       onToggleFoldedCommit: ({ isVisible }) => {
         sendEvent({
           name: "Toggle folded commit",
@@ -86,6 +88,7 @@ const VariantHistoryRow: React.FC<Props> = ({ data, index }) => {
       index={index}
       columns={orderedColumns}
       numVisibleCols={visibleColumns.length}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       selected={data?.selected}
       eventHandlers={eventHandlers}
     />
@@ -105,6 +108,7 @@ const generateColumns = (
       const taskMap = convertArrayToObject(tasks, "displayName");
       const t = taskMap[c];
       if (t) {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         const { failingTests, inactive, label } = getTaskMetadata(t.id);
         return (
           <TaskCell
@@ -116,6 +120,7 @@ const generateColumns = (
             }}
             inactive={inactive}
             key={c}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             task={t}
             failingTests={failingTests}
             label={label}
diff --git a/apps/spruce/src/pages/variantHistory/index.tsx b/apps/spruce/src/pages/variantHistory/index.tsx
index 176053bd1..40c915d34 100644
--- a/apps/spruce/src/pages/variantHistory/index.tsx
+++ b/apps/spruce/src/pages/variantHistory/index.tsx
@@ -42,6 +42,7 @@ const VariantHistoryContents: React.FC = () => {
     [slugs.variantName]: variantName,
   } = useParams();
   const { sendEvent } = useProjectHealthAnalytics({ page: "Variant history" });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { ingestNewCommits } = useHistoryTable();
   const dispatchToast = useToastContext();
   usePageTitle(`Variant History | ${projectIdentifier} | ${variantName}`);
@@ -56,11 +57,13 @@ const VariantHistoryContents: React.FC = () => {
   >(MAINLINE_COMMITS_FOR_HISTORY, {
     variables: {
       mainlineCommitsOptions: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectIdentifier,
         limit: 10,
         shouldCollapse: true,
       },
       buildVariantOptions: {
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         variants: [applyStrictRegex(variantName)],
         includeBaseTasks: false,
       },
@@ -73,6 +76,7 @@ const VariantHistoryContents: React.FC = () => {
         {
           projectIdentifier,
           variantName,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           numCommits: mainlineCommits.versions.length,
         },
         SentryBreadcrumb.UI,
@@ -99,12 +103,14 @@ const VariantHistoryContents: React.FC = () => {
       );
       refetch({
         mainlineCommitsOptions: {
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           projectIdentifier,
           limit: 10,
           skipOrderNumber: data.mainlineCommits?.nextPageOrderNumber,
           shouldCollapse: true,
         },
         buildVariantOptions: {
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           variants: [applyStrictRegex(variantName)],
           includeBaseTasks: false,
         },
@@ -114,6 +120,7 @@ const VariantHistoryContents: React.FC = () => {
 
   return (
     <PageWrapper>
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       <ProjectBanner projectIdentifier={projectIdentifier} />
       <CenterPage>
         <PageHeader>
@@ -127,7 +134,9 @@ const VariantHistoryContents: React.FC = () => {
               }}
             />
             <TaskSelector
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               projectIdentifier={projectIdentifier}
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               buildVariant={variantName}
             />
           </PageHeaderContent>
@@ -157,7 +166,9 @@ const VariantHistoryContents: React.FC = () => {
         </PaginationFilterWrapper>
         <div>
           <ColumnHeaders
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             projectIdentifier={projectIdentifier}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             variantName={variantName}
           />
           <TableWrapper>
@@ -166,6 +177,7 @@ const VariantHistoryContents: React.FC = () => {
               loading={loading}
               finalRowCopy="End of variant history"
             >
+              {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
               {VariantHistoryRow}
             </HistoryTable>
           </TableWrapper>
diff --git a/apps/spruce/src/pages/version/Breadcrumbs/index.tsx b/apps/spruce/src/pages/version/Breadcrumbs/index.tsx
index 781246a59..b7911ca6e 100644
--- a/apps/spruce/src/pages/version/Breadcrumbs/index.tsx
+++ b/apps/spruce/src/pages/version/Breadcrumbs/index.tsx
@@ -22,6 +22,7 @@ const VersionPageBreadcrumbs: React.FC<VersionPageBreadcrumbsProps> = ({
 }) => {
   const { author, isPatch, projectIdentifier, revision } =
     versionMetadata ?? {};
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const breadcrumbRoot = useBreadcrumbRoot(isPatch, author, projectIdentifier);
   const breadcrumbAnalytics = useBreadcrumbAnalytics();
 
@@ -37,6 +38,7 @@ const VersionPageBreadcrumbs: React.FC<VersionPageBreadcrumbsProps> = ({
   };
 
   const commitBreadcrumb = {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     text: shortenGithash(revision),
     onClick: () => {
       breadcrumbAnalytics.sendEvent({
@@ -48,6 +50,7 @@ const VersionPageBreadcrumbs: React.FC<VersionPageBreadcrumbsProps> = ({
   };
 
   const breadcrumbs: Breadcrumb[] = [
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     breadcrumbRoot,
     isPatch ? patchBreadcrumb : commitBreadcrumb,
   ];
diff --git a/apps/spruce/src/pages/version/BuildVariantCard/VariantTaskGroup/VariantTaskGroup.test.tsx b/apps/spruce/src/pages/version/BuildVariantCard/VariantTaskGroup/VariantTaskGroup.test.tsx
index 1939a6c62..ef560951d 100644
--- a/apps/spruce/src/pages/version/BuildVariantCard/VariantTaskGroup/VariantTaskGroup.test.tsx
+++ b/apps/spruce/src/pages/version/BuildVariantCard/VariantTaskGroup/VariantTaskGroup.test.tsx
@@ -6,6 +6,7 @@ import { TaskStatus } from "types/task";
 import { applyStrictRegex } from "utils/string";
 import VariantTaskGroup from ".";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const Wrapper = ({ children }) => <MockedProvider>{children}</MockedProvider>;
 const Component = () => (
   <VariantTaskGroup
diff --git a/apps/spruce/src/pages/version/BuildVariantCard/VariantTaskGroup/index.tsx b/apps/spruce/src/pages/version/BuildVariantCard/VariantTaskGroup/index.tsx
index dd29a7a8a..6a31098f7 100644
--- a/apps/spruce/src/pages/version/BuildVariantCard/VariantTaskGroup/index.tsx
+++ b/apps/spruce/src/pages/version/BuildVariantCard/VariantTaskGroup/index.tsx
@@ -30,6 +30,7 @@ const VariantTaskGroup: React.FC<VariantTaskGroupProps> = ({
 
   const [variantSearch] = useQueryParam<string | null>(
     PatchTasksQueryParams.Variant,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     undefined,
   );
   const [sorts] = useQueryParam(PatchTasksQueryParams.Sorts, undefined);
@@ -37,6 +38,7 @@ const VariantTaskGroup: React.FC<VariantTaskGroupProps> = ({
     PatchTasksQueryParams.Statuses,
     [],
   );
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const hasStatusFilter = statusSearch.length > 0;
   const hasVariantFilter = variantSearch !== undefined;
 
@@ -72,6 +74,7 @@ const VariantTaskGroup: React.FC<VariantTaskGroupProps> = ({
           ({ count, statusCounts: groupedStatusCounts, umbrellaStatus }) => {
             const hasStatusFilterForUmbrellaStatus = isUmbrellaStatusSet(
               umbrellaStatus,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               statusSearch,
             );
             // A badge is active if the variant is selected and the status is selected
diff --git a/apps/spruce/src/pages/version/BuildVariantCard/index.tsx b/apps/spruce/src/pages/version/BuildVariantCard/index.tsx
index f1773376b..31b2bcaf9 100644
--- a/apps/spruce/src/pages/version/BuildVariantCard/index.tsx
+++ b/apps/spruce/src/pages/version/BuildVariantCard/index.tsx
@@ -24,6 +24,7 @@ const BuildVariantCard: React.FC<BuildVariantCardProps> = ({ versionId }) => {
     variables: { id: versionId },
     pollInterval: DEFAULT_POLL_INTERVAL,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
   const { version } = data || {};
 
diff --git a/apps/spruce/src/pages/version/DownstreamTasks.tsx b/apps/spruce/src/pages/version/DownstreamTasks.tsx
index 187b24b5d..6ce4bbadd 100644
--- a/apps/spruce/src/pages/version/DownstreamTasks.tsx
+++ b/apps/spruce/src/pages/version/DownstreamTasks.tsx
@@ -2,6 +2,7 @@ import { VersionQuery } from "gql/generated/types";
 import { DownstreamProjectAccordion } from "./downstreamTasks/DownstreamProjectAccordion";
 
 interface DownstreamTasksProps {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   childPatches: VersionQuery["version"]["patch"]["childPatches"];
 }
 
@@ -11,12 +12,19 @@ export const DownstreamTasks: React.FC<DownstreamTasksProps> = ({
   <>
     {childPatches.map(
       ({
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         githash,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         id,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         parameters,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         projectIdentifier,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         status,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         taskCount,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         versionFull,
       }) => (
         <DownstreamProjectAccordion
diff --git a/apps/spruce/src/pages/version/Metadata.tsx b/apps/spruce/src/pages/version/Metadata.tsx
index abaaf51ce..788bfc870 100644
--- a/apps/spruce/src/pages/version/Metadata.tsx
+++ b/apps/spruce/src/pages/version/Metadata.tsx
@@ -76,6 +76,7 @@ export const Metadata: React.FC<Props> = ({ loading, version }) => {
   const isGithubMergePatch = requester === githubMergeRequester;
 
   return (
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     <MetadataCard loading={loading} error={null}>
       <MetadataTitle>
         {isPatch ? "Patch Metadata" : "Version Metadata"}
@@ -137,6 +138,7 @@ export const Metadata: React.FC<Props> = ({ loading, version }) => {
       </MetadataItem>
       {isPatch ? (
         <BaseCommitMetadata
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           baseVersionId={baseVersion?.id}
           isGithubMergePatch={isGithubMergePatch}
           onClick={() => sendEvent({ name: "Click Base Commit Link" })}
@@ -149,8 +151,10 @@ export const Metadata: React.FC<Props> = ({ loading, version }) => {
             as={Link}
             data-cy="version-previous-commit"
             onClick={() => sendEvent({ name: "Click Previous Version Link" })}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             to={getVersionRoute(previousVersion?.id)}
           >
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             {shortenGithash(previousVersion?.revision)}
           </InlineCode>
         </MetadataItem>
@@ -160,6 +164,7 @@ export const Metadata: React.FC<Props> = ({ loading, version }) => {
           <StyledLink
             data-cy="github-merge-queue-link"
             hideExternalIcon={false}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             href={getGithubMergeQueueUrl(owner, repo, branch)}
           >
             GitHub Merge Queue
@@ -171,6 +176,7 @@ export const Metadata: React.FC<Props> = ({ loading, version }) => {
           GitHub commit:{" "}
           <InlineCode
             data-cy="version-github-commit"
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             href={getGithubCommitUrl(owner, repo, revision)}
             onClick={() => sendEvent({ name: "Click Github Commit Link" })}
           >
@@ -185,6 +191,7 @@ export const Metadata: React.FC<Props> = ({ loading, version }) => {
             to={getCommitQueueRoute(project)}
           >
             Commit queue position:{" "}
+            {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
             {formatZeroIndexForDisplay(commitQueuePosition)}
           </StyledRouterLink>
         </MetadataItem>
@@ -195,11 +202,15 @@ export const Metadata: React.FC<Props> = ({ loading, version }) => {
           Triggered from:{" "}
           <StyledRouterLink
             to={getTriggerRoute({
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               triggerType,
               upstreamTask,
               upstreamVersion,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               upstreamRevision,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               upstreamOwner,
+              // @ts-expect-error: FIXME. This comment was added by an automated script.
               upstreamRepo,
             })}
           >
diff --git a/apps/spruce/src/pages/version/NameChangeModal/index.tsx b/apps/spruce/src/pages/version/NameChangeModal/index.tsx
index 6ae96ad32..ceb76dfbf 100644
--- a/apps/spruce/src/pages/version/NameChangeModal/index.tsx
+++ b/apps/spruce/src/pages/version/NameChangeModal/index.tsx
@@ -57,6 +57,7 @@ export const NameChangeModal: React.FC<NameChangeModalProps> = ({
         onCancel={() => setIsOpen(false)}
         onConfirm={() => {
           updateDescription({
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             variables: { patchId, description: newPatchName },
           });
         }}
diff --git a/apps/spruce/src/pages/version/TaskDuration.tsx b/apps/spruce/src/pages/version/TaskDuration.tsx
index d6c5b5b02..ce4584fea 100644
--- a/apps/spruce/src/pages/version/TaskDuration.tsx
+++ b/apps/spruce/src/pages/version/TaskDuration.tsx
@@ -33,7 +33,9 @@ const TaskDuration: React.FC<Props> = ({ taskCount }) => {
   const { search } = useLocation();
 
   const updateQueryParams = useUpdateURLQueryParams();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const versionAnalytics = useVersionAnalytics(versionId);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const queryVariables = useQueryVariables(search, versionId);
   const hasQueryVariables = Object.keys(parseQueryString(search)).length > 0;
   const { limit, page } = queryVariables.taskFilterOptions;
@@ -41,18 +43,25 @@ const TaskDuration: React.FC<Props> = ({ taskCount }) => {
   useEffect(() => {
     updateQueryParams({
       [PatchTasksQueryParams.Duration]: "DESC",
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.Sorts]: undefined,
     });
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   const clearQueryParams = () => {
     updateQueryParams({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.TaskName]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.Variant]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.Statuses]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.BaseStatuses]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PaginationQueryParams.Page]: undefined,
       [PatchTasksQueryParams.Duration]: "DESC",
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.Sorts]: undefined,
     });
   };
@@ -68,6 +77,7 @@ const TaskDuration: React.FC<Props> = ({ taskCount }) => {
       dispatchToast.error(`Error fetching patch tasks ${err}`);
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
   const { version } = data || {};
   const { tasks } = version || {};
@@ -79,7 +89,9 @@ const TaskDuration: React.FC<Props> = ({ taskCount }) => {
       <TableControl
         filteredCount={count}
         totalCount={taskCount}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         limit={limit}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         page={page}
         label="tasks"
         onClear={clearQueryParams}
@@ -92,6 +104,7 @@ const TaskDuration: React.FC<Props> = ({ taskCount }) => {
       <TaskDurationTable
         tasks={tasksData}
         loading={loading}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         numLoadingRows={limit}
       />
       {shouldShowBottomTableControl && (
@@ -99,8 +112,10 @@ const TaskDuration: React.FC<Props> = ({ taskCount }) => {
           <TableControl
             filteredCount={count}
             totalCount={taskCount}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             limit={limit}
             label="tasks"
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             page={page}
             onClear={clearQueryParams}
             onPageSizeChange={() => {
diff --git a/apps/spruce/src/pages/version/Tasks.tsx b/apps/spruce/src/pages/version/Tasks.tsx
index b69a56db5..8cc11e30c 100644
--- a/apps/spruce/src/pages/version/Tasks.tsx
+++ b/apps/spruce/src/pages/version/Tasks.tsx
@@ -32,13 +32,16 @@ export const Tasks: React.FC<Props> = ({ taskCount }) => {
   const { [slugs.versionId]: versionId } = useParams();
   const { search } = useLocation();
   const updateQueryParams = useUpdateURLQueryParams();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const versionAnalytics = useVersionAnalytics(versionId);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const queryVariables = useQueryVariables(search, versionId);
   const hasQueryVariables = Object.keys(parseQueryString(search)).length > 0;
   const { limit, page, sorts } = queryVariables.taskFilterOptions;
 
   useEffect(() => {
     updateQueryParams({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.Duration]: undefined,
       [PatchTasksQueryParams.Sorts]: defaultSortMethod,
     });
@@ -46,11 +49,17 @@ export const Tasks: React.FC<Props> = ({ taskCount }) => {
 
   const clearQueryParams = () => {
     updateQueryParams({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.TaskName]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.Variant]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.Statuses]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.BaseStatuses]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PaginationQueryParams.Page]: undefined,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       [PatchTasksQueryParams.Duration]: undefined,
       [PatchTasksQueryParams.Sorts]: defaultSortMethod,
     });
@@ -71,6 +80,7 @@ export const Tasks: React.FC<Props> = ({ taskCount }) => {
       dispatchToast.error(`Error fetching patch tasks ${err}`);
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
   const { version } = data || {};
   const { isPatch, tasks } = version || {};
@@ -82,7 +92,9 @@ export const Tasks: React.FC<Props> = ({ taskCount }) => {
         <TableControl
           filteredCount={count}
           totalCount={taskCount}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           limit={limit}
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           page={page}
           label="tasks"
           onClear={clearQueryParams}
@@ -96,7 +108,9 @@ export const Tasks: React.FC<Props> = ({ taskCount }) => {
       shouldShowBottomTableControl={tasksData.length > 10}
     >
       <PatchTasksTable
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         isPatch={isPatch}
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         sorts={sorts}
         tasks={tasksData}
         loading={tasksData.length === 0 && loading}
diff --git a/apps/spruce/src/pages/version/VersionTabs.tsx b/apps/spruce/src/pages/version/VersionTabs.tsx
index deefecd37..b1c5f94ae 100644
--- a/apps/spruce/src/pages/version/VersionTabs.tsx
+++ b/apps/spruce/src/pages/version/VersionTabs.tsx
@@ -20,6 +20,7 @@ const { parseQueryString } = queryString;
 interface Props {
   taskCount: number;
   isPatch: boolean;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   childPatches: VersionQuery["version"]["patch"]["childPatches"];
 }
 
@@ -30,6 +31,7 @@ const tabMap = ({
   versionId,
 }: {
   taskCount: number;
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   childPatches: VersionQuery["version"]["patch"]["childPatches"];
   numFailedChildPatches: number;
   versionId: string;
@@ -91,6 +93,7 @@ export const VersionTabs: React.FC<Props> = ({
     [slugs.tab]: PatchTab;
   }>();
   const { search } = useLocation();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { sendEvent } = useVersionAnalytics(versionId);
   const navigate = useNavigate();
 
@@ -106,31 +109,39 @@ export const VersionTabs: React.FC<Props> = ({
 
   const allTabs = useMemo(() => {
     const numFailedChildPatches = childPatches
-      ? childPatches.filter((c) => c.status === PatchStatus.Failed).length
+      ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+        childPatches.filter((c) => c.status === PatchStatus.Failed).length
       : 0;
     return tabMap({
       taskCount,
       childPatches,
       numFailedChildPatches,
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       versionId,
     });
   }, [taskCount, childPatches, versionId]);
 
   const activeTabs = useMemo(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     () => Object.keys(allTabs).filter((t) => tabIsActive[t] as PatchTab[]),
     [allTabs, tabIsActive],
   );
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const isValidTab = tabIsActive[tab];
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const [selectedTab, setSelectedTab] = useState(activeTabs.indexOf(tab));
   const previousTab = usePrevious(selectedTab);
 
   useEffect(() => {
     // If tab is not valid, set to task tab.
     if (!isValidTab) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       navigate(getVersionRoute(versionId), { replace: true });
     }
     // If tab updates in URL without having clicked a tab (e.g. clicked build variant), update state here.
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     else if (selectedTab !== activeTabs.indexOf(tab)) {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setSelectedTab(activeTabs.indexOf(tab));
     }
   }, [tab]); // eslint-disable-line react-hooks/exhaustive-deps
@@ -139,6 +150,7 @@ export const VersionTabs: React.FC<Props> = ({
   const selectNewTab = (newTabIndex: number) => {
     const queryParams = parseQueryString(search);
     const newTab = activeTabs[newTabIndex];
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     const newRoute = getVersionRoute(versionId, {
       tab: newTab as PatchTab,
       ...queryParams,
@@ -164,6 +176,7 @@ export const VersionTabs: React.FC<Props> = ({
       setSelected={selectNewTab}
       aria-label="Patch Tabs"
     >
+      {/* @ts-expect-error: FIXME. This comment was added by an automated script. */}
       {activeTabs.map((t: string) => allTabs[t])}
     </StyledTabs>
   );
diff --git a/apps/spruce/src/pages/version/downstreamTasks/DownstreamProjectAccordion.tsx b/apps/spruce/src/pages/version/downstreamTasks/DownstreamProjectAccordion.tsx
index 13cc2c3a9..5b4386574 100644
--- a/apps/spruce/src/pages/version/downstreamTasks/DownstreamProjectAccordion.tsx
+++ b/apps/spruce/src/pages/version/downstreamTasks/DownstreamProjectAccordion.tsx
@@ -94,6 +94,7 @@ export const DownstreamProjectAccordion: React.FC<
       dispatchToast.error(`Error fetching downstream tasks ${err}`);
     },
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   usePolling({ startPolling, stopPolling, refetch });
 
   const showSkeleton = !data;
@@ -127,11 +128,13 @@ export const DownstreamProjectAccordion: React.FC<
             childPatchId={childPatchId}
             count={count}
             dispatch={dispatch}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             isPatch={isPatch}
             limit={limit}
             loading={showSkeleton}
             page={page}
             taskCount={taskCount}
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             tasks={tasksData}
           />
         </AccordionContents>
diff --git a/apps/spruce/src/pages/version/downstreamTasks/DownstreamTasksTable.tsx b/apps/spruce/src/pages/version/downstreamTasks/DownstreamTasksTable.tsx
index 3a2538e40..e6db07e50 100644
--- a/apps/spruce/src/pages/version/downstreamTasks/DownstreamTasksTable.tsx
+++ b/apps/spruce/src/pages/version/downstreamTasks/DownstreamTasksTable.tsx
@@ -48,6 +48,7 @@ export const DownstreamTasksTable: React.FC<DownstreamTasksTableProps> = ({
 }) => {
   const { id: versionId } = useParams<{ id: string }>();
   const { sendEvent } = (isPatch ? usePatchAnalytics : useVersionAnalytics)(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     versionId,
   );
 
@@ -116,10 +117,12 @@ export const DownstreamTasksTable: React.FC<DownstreamTasksTableProps> = ({
       manualPagination: true,
       manualSorting: true,
       onColumnFiltersChange: onChangeHandler<ColumnFiltersState>(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         (f) => getDefaultFiltering(table).onColumnFiltersChange(f),
         onFilterChange,
       ),
       onSortingChange: onChangeHandler<SortingState>(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         (s) => getDefaultSorting(table).onSortingChange(s),
         onSortingChange,
       ),
diff --git a/apps/spruce/src/pages/version/taskDuration/TaskDurationCell.tsx b/apps/spruce/src/pages/version/taskDuration/TaskDurationCell.tsx
index 9de4da430..c44cef52f 100644
--- a/apps/spruce/src/pages/version/taskDuration/TaskDurationCell.tsx
+++ b/apps/spruce/src/pages/version/taskDuration/TaskDurationCell.tsx
@@ -22,6 +22,7 @@ export const TaskDurationCell: React.VFC<TaskDurationCellProps> = ({
 }) => {
   const barWidth = calculateBarWidth(timeTaken, maxTimeTaken);
   const barColor =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     mapTaskToBarchartColor[mapTaskStatusToUmbrellaStatus[status]];
   return (
     <Duration>
diff --git a/apps/spruce/src/pages/version/taskDuration/TaskDurationTable.test.tsx b/apps/spruce/src/pages/version/taskDuration/TaskDurationTable.test.tsx
index da753f61e..390d28088 100644
--- a/apps/spruce/src/pages/version/taskDuration/TaskDurationTable.test.tsx
+++ b/apps/spruce/src/pages/version/taskDuration/TaskDurationTable.test.tsx
@@ -31,6 +31,7 @@ describe("taskDurationTable", () => {
     const expandRowButton = within(
       screen.queryAllByDataCy("leafygreen-table-row")[0],
     ).queryByRole("button");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     await user.click(expandRowButton);
     expect(screen.queryByText("check_codegen_execution_task")).toBeVisible();
   });
diff --git a/apps/spruce/src/pages/version/taskDuration/TaskDurationTable.tsx b/apps/spruce/src/pages/version/taskDuration/TaskDurationTable.tsx
index 97b35beb0..613ac4213 100644
--- a/apps/spruce/src/pages/version/taskDuration/TaskDurationTable.tsx
+++ b/apps/spruce/src/pages/version/taskDuration/TaskDurationTable.tsx
@@ -36,7 +36,9 @@ export const TaskDurationTable: React.FC<Props> = ({
   tasks,
 }) => {
   const { [slugs.versionId]: versionId } = useParams();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { sendEvent } = useVersionAnalytics(versionId);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { currentStatuses: statusOptions } = useTaskStatuses({ versionId });
 
   const [queryParams, setQueryParams] = useQueryParams();
@@ -46,7 +48,9 @@ export const TaskDurationTable: React.FC<Props> = ({
     [], // eslint-disable-line react-hooks/exhaustive-deps
   );
 
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const setFilters = (f: ColumnFiltersState) =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     getDefaultFiltering(table).onColumnFiltersChange(f);
 
   const updateFilters = (filterState: ColumnFiltersState) => {
@@ -59,6 +63,7 @@ export const TaskDurationTable: React.FC<Props> = ({
     };
 
     filterState.forEach(({ id, value }) => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       updatedParams[id] = value;
     });
 
@@ -67,6 +72,7 @@ export const TaskDurationTable: React.FC<Props> = ({
   };
 
   const setSorting = (s: SortingState) =>
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     getDefaultSorting(table).onSortingChange(s);
 
   const updateSort = (sortState: SortingState) => {
@@ -77,6 +83,7 @@ export const TaskDurationTable: React.FC<Props> = ({
     };
 
     sortState.forEach(({ desc, id }) => {
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       updatedParams[id] = desc ? SortDirection.Desc : SortDirection.Asc;
     });
 
@@ -92,8 +99,10 @@ export const TaskDurationTable: React.FC<Props> = ({
         size: 250,
         enableColumnFilter: true,
         cell: ({
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           getValue,
           row: {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             original: { id },
           },
         }) => <TaskLink taskId={id} taskName={getValue()} />,
@@ -109,6 +118,7 @@ export const TaskDurationTable: React.FC<Props> = ({
         header: "Status",
         size: 120,
         enableColumnFilter: true,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         cell: ({ getValue }) => <TaskStatusBadge status={getValue()} />,
         meta: {
           treeSelect: {
@@ -137,9 +147,12 @@ export const TaskDurationTable: React.FC<Props> = ({
         enableSorting: true,
         size: 250,
         cell: ({
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           column,
+          // @ts-expect-error: FIXME. This comment was added by an automated script.
           getValue,
           row: {
+            // @ts-expect-error: FIXME. This comment was added by an automated script.
             original: { status },
           },
         }) => (
@@ -155,11 +168,13 @@ export const TaskDurationTable: React.FC<Props> = ({
   );
 
   const tableContainerRef = useRef<HTMLDivElement>(null);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const table = useLeafyGreenTable<
     VersionTaskDurationsQuery["version"]["tasks"]["data"][0]
   >({
     columns,
     containerRef: tableContainerRef,
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     data: tasks ?? [],
     defaultColumn: {
       // Handle bug in sorting order
@@ -175,6 +190,7 @@ export const TaskDurationTable: React.FC<Props> = ({
     manualPagination: true,
     manualSorting: true,
     onColumnFiltersChange: onChangeHandler<ColumnFiltersState>(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setFilters,
       (updatedState) => {
         updateFilters(updatedState);
@@ -182,6 +198,7 @@ export const TaskDurationTable: React.FC<Props> = ({
       },
     ),
     onSortingChange: onChangeHandler<SortingState>(
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       setSorting,
       (updatedState) => {
         updateSort(updatedState);
diff --git a/apps/spruce/src/pages/version/tasks/PatchTasksTable.tsx b/apps/spruce/src/pages/version/tasks/PatchTasksTable.tsx
index db551c969..31f4fb57c 100644
--- a/apps/spruce/src/pages/version/tasks/PatchTasksTable.tsx
+++ b/apps/spruce/src/pages/version/tasks/PatchTasksTable.tsx
@@ -31,6 +31,7 @@ export const PatchTasksTable: React.FC<Props> = ({
 }) => {
   const { [slugs.versionId]: versionId } = useParams();
   const updateQueryParams = useUpdateURLQueryParams();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { sendEvent } = useVersionAnalytics(versionId);
   const filterHookProps = {
     resetPage: true,
@@ -45,6 +46,7 @@ export const PatchTasksTable: React.FC<Props> = ({
     urlParam: PatchTasksQueryParams.BaseStatuses,
     ...filterHookProps,
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const { baseStatuses, currentStatuses } = useTaskStatuses({ versionId });
   const statusSelectorProps = {
     state: currentStatusesFilter.inputValue,
@@ -67,6 +69,7 @@ export const PatchTasksTable: React.FC<Props> = ({
 
   const tableChangeHandler: TableOnChange<Task> = (...[, , sorter]) => {
     updateQueryParams({
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       sorts: toSortString(sorter),
       [PaginationQueryParams.Page]: "0",
     });
@@ -92,7 +95,9 @@ export const PatchTasksTable: React.FC<Props> = ({
     <TasksTable
       isPatch={isPatch}
       sorts={sorts}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       tableChangeHandler={tableChangeHandler}
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       tasks={tasks}
       loading={loading}
       onExpand={(expanded) => {
diff --git a/apps/spruce/src/pages/version/useQueryVariables/index.ts b/apps/spruce/src/pages/version/useQueryVariables/index.ts
index 70839f67f..7f043d9f8 100644
--- a/apps/spruce/src/pages/version/useQueryVariables/index.ts
+++ b/apps/spruce/src/pages/version/useQueryVariables/index.ts
@@ -42,6 +42,7 @@ export const useQueryVariables = (
       taskName: getString(taskName),
       statuses: toArray(statuses),
       baseStatuses: toArray(baseStatuses),
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       sorts: sortsToApply,
       limit,
       page,
diff --git a/apps/spruce/src/pages/version/useQueryVariables/useQueryVariables.test.tsx b/apps/spruce/src/pages/version/useQueryVariables/useQueryVariables.test.tsx
index 0f6d599a3..c8ae2f28a 100644
--- a/apps/spruce/src/pages/version/useQueryVariables/useQueryVariables.test.tsx
+++ b/apps/spruce/src/pages/version/useQueryVariables/useQueryVariables.test.tsx
@@ -6,6 +6,7 @@ import { useQueryVariables } from ".";
 describe("useQueryVariables", () => {
   const search =
     "page=0&limit=20&sorts=NAME%3AASC%3BSTATUS%3AASC%3BBASE_STATUS%3ADESC%3BVARIANT%3AASC&statuses=success&taskName=generate";
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const wrapper = ({ children }) => (
     <MemoryRouter initialEntries={[`?${search}`]}>{children}</MemoryRouter>
   );
diff --git a/apps/spruce/src/test_utils/toast-decorator.tsx b/apps/spruce/src/test_utils/toast-decorator.tsx
index bc5d61f0e..f30a176a0 100644
--- a/apps/spruce/src/test_utils/toast-decorator.tsx
+++ b/apps/spruce/src/test_utils/toast-decorator.tsx
@@ -2,6 +2,7 @@ import { useMemo } from "react";
 import { action } from "@storybook/addon-actions";
 import { ToastContext } from "context/toast";
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 const WithToastContext = (Story) => (
   <MockToastProvider>
     <Story />
diff --git a/apps/spruce/src/test_utils/utils.ts b/apps/spruce/src/test_utils/utils.ts
index 56bf53e36..73dcae89a 100644
--- a/apps/spruce/src/test_utils/utils.ts
+++ b/apps/spruce/src/test_utils/utils.ts
@@ -1,6 +1,7 @@
 import { screen, userEvent } from ".";
 
 const mockEnvironmentVariables = () => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const restoreCalls = [];
   const mockEnv = (variable: string, value: string) => {
     const before = process.env[variable];
@@ -12,6 +13,7 @@ const mockEnvironmentVariables = () => {
     restoreCalls.push(restore);
   };
   const cleanup = () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     restoreCalls.forEach((restore) => {
       restore();
     });
@@ -23,8 +25,10 @@ const mockEnvironmentVariables = () => {
 const selectLGOption = async (dataCy: string, option: string) => {
   const user = userEvent.setup();
   expect(screen.queryByDataCy(dataCy)).not.toBeDisabled();
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   await user.click(screen.queryByDataCy(dataCy));
   await screen.findByText(option);
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   await user.click(screen.queryByText(option));
   expect(screen.queryByDataCy(dataCy)).toHaveTextContent(option);
 };
diff --git a/apps/spruce/src/types/commits.ts b/apps/spruce/src/types/commits.ts
index fd76f4942..64a37e914 100644
--- a/apps/spruce/src/types/commits.ts
+++ b/apps/spruce/src/types/commits.ts
@@ -32,6 +32,7 @@ export enum CommitRequesterTypes {
   AdHocRequester = "ad_hoc",
 }
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export type Commits = MainlineCommitsQuery["mainlineCommits"]["versions"];
 export type Commit = Unpacked<Commits>;
 export type CommitVersion = Commit["version"];
diff --git a/apps/spruce/src/types/patch.ts b/apps/spruce/src/types/patch.ts
index b7791275e..8aec3a15c 100644
--- a/apps/spruce/src/types/patch.ts
+++ b/apps/spruce/src/types/patch.ts
@@ -5,6 +5,7 @@ export enum PatchPageQueryParams {
   Page = "page",
   Limit = "limit",
   Hidden = "hidden",
+  Requesters = "requesters",
 }
 
 export enum PatchStatus {
diff --git a/apps/spruce/src/types/utils.ts b/apps/spruce/src/types/utils.ts
index 3b64b2cb5..2b93dd640 100644
--- a/apps/spruce/src/types/utils.ts
+++ b/apps/spruce/src/types/utils.ts
@@ -47,3 +47,6 @@ export type Subset<K> = {
 
 /** Helper function that takes in a complex typescript type and evaluates it for easy debugging */
 export type Evaluated<T> = {} & { [P in keyof T]: T[P] };
+
+/** Helper to identify field K in object T as optional */
+export type Optional<T, K extends keyof T> = Pick<Partial<T>, K> & Omit<T, K>;
diff --git a/apps/spruce/src/utils/array/array.test.ts b/apps/spruce/src/utils/array/array.test.ts
index c5689b68d..4dc456fd9 100644
--- a/apps/spruce/src/utils/array/array.test.ts
+++ b/apps/spruce/src/utils/array/array.test.ts
@@ -48,6 +48,7 @@ describe("deduplicatedAppend", () => {
 describe("convertObjectToArray", () => {
   it("should return an empty array for an empty object", () => {
     expect(convertObjectToArray({})).toStrictEqual([]);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(convertObjectToArray(undefined)).toStrictEqual([]);
   });
   it("should split out singular array values in objects into an array of their own objects", () => {
@@ -71,6 +72,7 @@ describe("convertObjectToArray", () => {
 describe("convertArrayToObject", () => {
   it("should return an empty object if provided with an empty array", () => {
     expect(convertArrayToObject([], "someKey")).toStrictEqual({});
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(convertArrayToObject(undefined, "someKey")).toStrictEqual({});
   });
   it("should take a singular array element and return an object with one element", () => {
@@ -144,6 +146,7 @@ describe("mapStringArrayToObject", () => {
   });
   it("should return an empty object if provided with an empty array", () => {
     expect(mapStringArrayToObject([], "someKey")).toStrictEqual({});
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(mapStringArrayToObject(undefined, "someKey")).toStrictEqual({});
   });
 });
diff --git a/apps/spruce/src/utils/array/index.ts b/apps/spruce/src/utils/array/index.ts
index 1c81665bd..3fe7f9457 100644
--- a/apps/spruce/src/utils/array/index.ts
+++ b/apps/spruce/src/utils/array/index.ts
@@ -92,7 +92,9 @@ export const convertArrayToObject = <T = { [key: string]: any }>(
 export const convertObjectToArray = <T extends object>(
   obj: T,
 ): KeyValue<T>[] => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const result = [];
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (obj === undefined) return result;
   const objectEntries = Object.entries(obj);
   return objectEntries.flatMap(([key, value]) => {
diff --git a/apps/spruce/src/utils/environmentVariables.ts b/apps/spruce/src/utils/environmentVariables.ts
index 4dbfb9145..50bc173ad 100644
--- a/apps/spruce/src/utils/environmentVariables.ts
+++ b/apps/spruce/src/utils/environmentVariables.ts
@@ -10,6 +10,7 @@ export const getApiUrl: () => string = () =>
  * @returns - The application's DSN
  */
 export const getSentryDSN: () => string = () =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   process.env.REACT_APP_SPRUCE_SENTRY_DSN;
 
 /**
@@ -30,6 +31,7 @@ export const getSignalProcessingUrl: () => string = () =>
  * @returns - Returns the Spruce URL
  */
 export const getSpruceURL: () => string = () =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   process.env.REACT_APP_SPRUCE_URL;
 
 /**
@@ -111,6 +113,7 @@ export const getHoneycombBaseURL = () =>
  * however in prod and staging and we want the login domain to be evergreen.com
  */
 export const getLoginDomain = (): string =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   isDevelopmentBuild() || getReleaseStage() === "local"
     ? process.env.REACT_APP_SPRUCE_URL
     : process.env.REACT_APP_UI_URL;
diff --git a/apps/spruce/src/utils/errorReporting.ts b/apps/spruce/src/utils/errorReporting.ts
index 5e20e345d..19ccbbdd6 100644
--- a/apps/spruce/src/utils/errorReporting.ts
+++ b/apps/spruce/src/utils/errorReporting.ts
@@ -99,11 +99,13 @@ const validateMetadata = (
   breadcrumbType: SentryBreadcrumb,
 ): Breadcrumb["data"] => {
   if (breadcrumbType === SentryBreadcrumb.Navigation) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     if (!metadata.from) {
       console.warn(
         "Navigation breadcrumbs should include a 'from' metadata field.",
       );
     }
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     if (!metadata.to) {
       console.warn(
         "Navigation breadcrumbs should include a 'to' metadata field.",
diff --git a/apps/spruce/src/utils/getTaskFromMainlineCommitsQuery.ts b/apps/spruce/src/utils/getTaskFromMainlineCommitsQuery.ts
index 9ba2e7fcd..de065c471 100644
--- a/apps/spruce/src/utils/getTaskFromMainlineCommitsQuery.ts
+++ b/apps/spruce/src/utils/getTaskFromMainlineCommitsQuery.ts
@@ -7,6 +7,7 @@ export const getTaskFromMainlineCommitsQuery = (
   data: LastMainlineCommitQuery,
 ): CommitTask => {
   const buildVariants =
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     data?.mainlineCommits.versions.find(({ version }) => version)?.version
       .buildVariants ?? [];
   if (buildVariants.length > 1) {
@@ -14,13 +15,16 @@ export const getTaskFromMainlineCommitsQuery = (
       new Error("Multiple build variants matched previous commit search."),
     ).warning();
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   if (buildVariants[0]?.tasks.length > 1) {
     reportError(
       new Error("Multiple tasks matched previous commit search."),
     ).warning();
   }
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return buildVariants[0]?.tasks[0];
 };
 
 export type CommitTask =
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   LastMainlineCommitQuery["mainlineCommits"]["versions"][number]["version"]["buildVariants"][number]["tasks"][number];
diff --git a/apps/spruce/src/utils/numbers/index.ts b/apps/spruce/src/utils/numbers/index.ts
index f156a754c..e4f471c20 100644
--- a/apps/spruce/src/utils/numbers/index.ts
+++ b/apps/spruce/src/utils/numbers/index.ts
@@ -7,8 +7,10 @@
  * toDecimal("100") // => 1.0
  */
 const toDecimal = (value: string | null): number => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const number = parseFloat(value);
   if (Number.isNaN(number)) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     return null;
   }
   return number / 100;
diff --git a/apps/spruce/src/utils/queryString/parseQueryString.ts b/apps/spruce/src/utils/queryString/parseQueryString.ts
index 70fb04cc4..943051cde 100644
--- a/apps/spruce/src/utils/queryString/parseQueryString.ts
+++ b/apps/spruce/src/utils/queryString/parseQueryString.ts
@@ -6,6 +6,7 @@ interface ParseQueryString {
   [key: string]: string | string[];
 }
 export const parseQueryString = (search: string): ParseQueryString =>
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   queryString.parse(search, { arrayFormat: "comma" });
 
 export const parseQueryStringAsValue = (search: string) =>
diff --git a/apps/spruce/src/utils/queryString/sortString.ts b/apps/spruce/src/utils/queryString/sortString.ts
index bfa9de443..80fc0facb 100644
--- a/apps/spruce/src/utils/queryString/sortString.ts
+++ b/apps/spruce/src/utils/queryString/sortString.ts
@@ -14,13 +14,17 @@ export const toSortString = (
 ) => {
   let sortStrings: string[] = [];
   if (Array.isArray(sorts)) {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     sortStrings = sorts.map(({ columnKey, order }) =>
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       order ? getSortString(columnKey, shortenSortOrder(order)) : undefined,
     );
   } else {
     sortStrings = [
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       sorts.order
-        ? getSortString(sorts.columnKey, shortenSortOrder(sorts.order))
+        ? // @ts-expect-error: FIXME. This comment was added by an automated script.
+          getSortString(sorts.columnKey, shortenSortOrder(sorts.order))
         : undefined,
     ];
   }
diff --git a/apps/spruce/src/utils/request.test.ts b/apps/spruce/src/utils/request.test.ts
index 10f0328de..4c29282f1 100644
--- a/apps/spruce/src/utils/request.test.ts
+++ b/apps/spruce/src/utils/request.test.ts
@@ -113,8 +113,10 @@ describe("request utils", () => {
         error = err;
       }
       expect(error).toBeInstanceOf(Error);
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(error.message).toBe("GET Error: 500 - Internal Server Error");
       expect(error).toHaveProperty("cause");
+      // @ts-expect-error: FIXME. This comment was added by an automated script.
       expect(error.cause).toStrictEqual({
         statusCode: 500,
         message: "Internal Server Error",
diff --git a/apps/spruce/src/utils/statuses/getCurrentStatuses.ts b/apps/spruce/src/utils/statuses/getCurrentStatuses.ts
index 004e34d38..a0d03b1fe 100644
--- a/apps/spruce/src/utils/statuses/getCurrentStatuses.ts
+++ b/apps/spruce/src/utils/statuses/getCurrentStatuses.ts
@@ -12,6 +12,7 @@ export const getCurrentStatuses = (
   statuses: string[],
   treeData: TreeDataEntry[],
 ): TreeDataEntry[] => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const currentStatuses = [];
   treeData.forEach((status) => {
     const { children, key } = status;
@@ -33,5 +34,6 @@ export const getCurrentStatuses = (
       currentStatuses.push(status);
     }
   });
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   return currentStatuses;
 };
diff --git a/apps/spruce/src/utils/statuses/getStatusBadgeCopy.test.ts b/apps/spruce/src/utils/statuses/getStatusBadgeCopy.test.ts
index 1919f6ffb..1d90dab03 100644
--- a/apps/spruce/src/utils/statuses/getStatusBadgeCopy.test.ts
+++ b/apps/spruce/src/utils/statuses/getStatusBadgeCopy.test.ts
@@ -13,7 +13,9 @@ describe("getStatusBadgeCopy", () => {
 
   it("returns an empty string when passed a falsy value", () => {
     expect(getStatusBadgeCopy("")).toBe("");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(getStatusBadgeCopy(undefined)).toBe("");
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(getStatusBadgeCopy(null)).toBe("");
   });
 });
diff --git a/apps/spruce/src/utils/statuses/groupStatusesByUmbrellaStatus.ts b/apps/spruce/src/utils/statuses/groupStatusesByUmbrellaStatus.ts
index 30b18ffdc..28a006cbb 100644
--- a/apps/spruce/src/utils/statuses/groupStatusesByUmbrellaStatus.ts
+++ b/apps/spruce/src/utils/statuses/groupStatusesByUmbrellaStatus.ts
@@ -28,13 +28,16 @@ export const groupStatusesByUmbrellaStatus = (
     if (counts[umbrellaStatus]) {
       counts[umbrellaStatus].count += stat.count;
       counts[umbrellaStatus].statuses = deduplicatedAppend(
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         taskStatusToCopy[stat.status],
         counts[umbrellaStatus].statuses,
       );
     } else {
       counts[umbrellaStatus] = {
         count: stat.count,
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         statuses: toArray(taskStatusToCopy[stat.status]),
+        // @ts-expect-error: FIXME. This comment was added by an automated script.
         color: mapTaskToBarchartColor[umbrellaStatus],
         umbrellaStatus: umbrellaStatus as TaskStatus,
         statusCounts: {},
diff --git a/apps/spruce/src/utils/statuses/sort.ts b/apps/spruce/src/utils/statuses/sort.ts
index 9e4cb313f..b5faa695f 100644
--- a/apps/spruce/src/utils/statuses/sort.ts
+++ b/apps/spruce/src/utils/statuses/sort.ts
@@ -24,7 +24,9 @@ const ordering = [
 
 const greyStatusIndex = 3.5;
 
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const sortTasks = (a, b): number => {
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   const findGroup = (status) => {
     const groupIndex = ordering.findIndex((statusGroup) =>
       statusGroup.has(status),
diff --git a/apps/spruce/src/utils/string/index.ts b/apps/spruce/src/utils/string/index.ts
index 43f9b212c..083cbad9d 100644
--- a/apps/spruce/src/utils/string/index.ts
+++ b/apps/spruce/src/utils/string/index.ts
@@ -90,6 +90,7 @@ export const stringifyNanoseconds = (
  * @example
  * omitTypename({ __typename: "Task", id: "123" }) // { id: "123" }
  */
+// @ts-expect-error: FIXME. This comment was added by an automated script.
 export const omitTypename = (object) =>
   JSON.parse(JSON.stringify(object), (key, value) =>
     key === "__typename" ? undefined : value,
diff --git a/apps/spruce/src/utils/string/jiraLinkify.tsx b/apps/spruce/src/utils/string/jiraLinkify.tsx
index 958e1953b..30fb32118 100644
--- a/apps/spruce/src/utils/string/jiraLinkify.tsx
+++ b/apps/spruce/src/utils/string/jiraLinkify.tsx
@@ -5,6 +5,7 @@ import { getJiraTicketUrl } from "constants/externalResources";
 export const jiraLinkify = (
   unlinkified: string | React.ReactNode[],
   jiraHost: string,
+  // @ts-expect-error: FIXME. This comment was added by an automated script.
   onClick?,
 ) =>
   reactStringReplace(unlinkified, /([A-Z]{1,10}-\d{1,6})/g, (match, i) => (
diff --git a/apps/spruce/src/utils/string/string.test.ts b/apps/spruce/src/utils/string/string.test.ts
index bc90a0898..45854bc23 100644
--- a/apps/spruce/src/utils/string/string.test.ts
+++ b/apps/spruce/src/utils/string/string.test.ts
@@ -332,6 +332,7 @@ describe("shortenGithash", () => {
     expect(shortenGithash("012")).toBe("012");
   });
   it("handles undefined input", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(shortenGithash(undefined)).toBeUndefined();
   });
 });
diff --git a/apps/spruce/src/utils/url/index.ts b/apps/spruce/src/utils/url/index.ts
index 561c826f9..315993619 100644
--- a/apps/spruce/src/utils/url/index.ts
+++ b/apps/spruce/src/utils/url/index.ts
@@ -30,6 +30,7 @@ export const removeQueryParam = (param: string | string[], value: string) => {
 
 export const getDefaultPageSize = () => {
   const pageSizeFromLocalStorage: number = parseInt(
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     localStorage.getItem(RECENT_PAGE_SIZE_KEY),
     10,
   );
diff --git a/apps/spruce/src/utils/url/url.test.ts b/apps/spruce/src/utils/url/url.test.ts
index 40570763a..da698bce7 100644
--- a/apps/spruce/src/utils/url/url.test.ts
+++ b/apps/spruce/src/utils/url/url.test.ts
@@ -2,7 +2,9 @@ import { upsertQueryParam } from ".";
 
 describe("upsertQueryParam", () => {
   it("should return the value when params aren't passed in", () => {
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(upsertQueryParam(undefined, "test")).toStrictEqual(["test"]);
+    // @ts-expect-error: FIXME. This comment was added by an automated script.
     expect(upsertQueryParam(undefined, "something")).toStrictEqual([
       "something",
     ]);
diff --git a/apps/spruce/tsconfig.json b/apps/spruce/tsconfig.json
index bac52dee0..1ec76355f 100644
--- a/apps/spruce/tsconfig.json
+++ b/apps/spruce/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
     "baseUrl": "src",
-    "strict": false,
     "types": [
       "vitest/globals",
       "vitest/jsdom"
diff --git a/package.json b/package.json
index bdb79b8cb..c99e1581c 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,6 @@
     ]
   },
   "scripts": {
-    "evg-db-ops": "./scripts/evg-db-ops.sh",
     "prepare": "husky",
     "test": "vitest --typecheck=false --exclude=./**/snapshot.test.ts"
   },
diff --git a/yarn.lock b/yarn.lock
index c7dca9a9b..03a214fc6 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -143,7 +143,7 @@
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.24.4.tgz#6f102372e9094f25d908ca0d34fc74c74606059a"
   integrity sha512-vg8Gih2MLK+kOkHJp4gBEIkyaIi00jgWot2D9QOmmfLC8jINSOzmCLta6Bvz/JSBCqnegV0L80jhxkol5GWNfQ==
 
-"@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.16.0", "@babel/core@^7.18.5", "@babel/core@^7.18.9", "@babel/core@^7.20.12", "@babel/core@^7.22.9", "@babel/core@^7.23.0", "@babel/core@^7.23.2":
+"@babel/core@^7.11.6", "@babel/core@^7.12.10", "@babel/core@^7.12.3", "@babel/core@^7.13.16", "@babel/core@^7.14.0", "@babel/core@^7.18.5", "@babel/core@^7.18.9", "@babel/core@^7.20.12", "@babel/core@^7.22.9", "@babel/core@^7.23.0", "@babel/core@^7.23.2":
   version "7.24.3"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.24.3.tgz#568864247ea10fbd4eff04dda1e05f9e2ea985c3"
   integrity sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==
@@ -205,7 +205,7 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
+"@babel/helper-annotate-as-pure@^7.22.5":
   version "7.22.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
   integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
@@ -230,7 +230,7 @@
     lru-cache "^5.1.1"
     semver "^6.3.1"
 
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.24.1":
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz#db58bf57137b623b916e24874ab7188d93d7f68f"
   integrity sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==
@@ -292,7 +292,7 @@
   dependencies:
     "@babel/types" "^7.23.0"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.1", "@babel/helper-module-imports@^7.24.3":
+"@babel/helper-module-imports@^7.16.7", "@babel/helper-module-imports@^7.22.15", "@babel/helper-module-imports@^7.24.1", "@babel/helper-module-imports@^7.24.3":
   version "7.24.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz#6ac476e6d168c7c23ff3ba3cf4f7841d46ac8128"
   integrity sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==
@@ -317,7 +317,7 @@
   dependencies:
     "@babel/types" "^7.22.5"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.24.0"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz#945681931a52f15ce879fd5b86ce2dae6d3d7f2a"
   integrity sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==
@@ -376,7 +376,7 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.5.tgz#918b1a7fa23056603506370089bd990d8720db62"
   integrity sha512-3q93SSKX2TWCG30M2G2kwaKeTYgEUp5Snjuj8qm729SObL6nbtUldAi37qbxkD5gg3xnBio+f9nqpSepGZMvxA==
 
-"@babel/helper-validator-option@^7.21.0", "@babel/helper-validator-option@^7.23.5":
+"@babel/helper-validator-option@^7.23.5":
   version "7.23.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz#907a3fbd4523426285365d1206c423c4c5520307"
   integrity sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==
@@ -443,7 +443,7 @@
     "@babel/helper-environment-visitor" "^7.22.20"
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.0":
+"@babel/plugin-proposal-class-properties@^7.0.0", "@babel/plugin-proposal-class-properties@^7.13.0":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz#b110f59741895f7ec21a6fff696ec46265c446a3"
   integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
@@ -451,16 +451,7 @@
     "@babel/helper-create-class-features-plugin" "^7.18.6"
     "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-decorators@^7.16.4":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.24.1.tgz#bab2b9e174a2680f0a80f341f3ec70f809f8bb4b"
-  integrity sha512-zPEvzFijn+hRvJuX2Vu3KbEBN39LN3f7tW3MQO2LsIs57B26KU+kUc82BdAktS1VCM6libzh45eKGI65lg0cpA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.24.1"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/plugin-syntax-decorators" "^7.24.1"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.0":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
   version "7.18.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
   integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
@@ -468,14 +459,6 @@
     "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
-  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.18.6"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
 "@babel/plugin-proposal-object-rest-spread@^7.0.0":
   version "7.20.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
@@ -487,7 +470,7 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.20.7"
 
-"@babel/plugin-proposal-optional-chaining@^7.13.12", "@babel/plugin-proposal-optional-chaining@^7.16.0":
+"@babel/plugin-proposal-optional-chaining@^7.13.12":
   version "7.21.0"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
   integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
@@ -496,29 +479,11 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.0":
-  version "7.18.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz#5209de7d213457548a98436fa2882f52f4be6bea"
-  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.18.6"
-    "@babel/helper-plugin-utils" "^7.18.6"
-
 "@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
   version "7.21.0-placeholder-for-preset-env.2"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
   integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
 
-"@babel/plugin-proposal-private-property-in-object@^7.17.12":
-  version "7.21.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
-  integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.18.6"
-    "@babel/helper-create-class-features-plugin" "^7.21.0"
-    "@babel/helper-plugin-utils" "^7.20.2"
-    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -540,13 +505,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-decorators@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.24.1.tgz#71d9ad06063a6ac5430db126b5df48c70ee885fa"
-  integrity sha512-05RJdO/cCrtVWuAaSn1tS3bH8jbsJa/Y1uD186u6J4C/1mnHFxseeuWpsqr9anvo7TUulev7tm7GDwRV+VuhDw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -596,7 +554,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.21.4", "@babel/plugin-syntax-jsx@^7.23.3", "@babel/plugin-syntax-jsx@^7.24.1":
+"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.23.3", "@babel/plugin-syntax-jsx@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz#3f6ca04b8c841811dbc3c5c5f837934e0d626c10"
   integrity sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==
@@ -799,7 +757,7 @@
     "@babel/helper-plugin-utils" "^7.24.0"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.16.0", "@babel/plugin-transform-flow-strip-types@^7.24.1":
+"@babel/plugin-transform-flow-strip-types@^7.0.0", "@babel/plugin-transform-flow-strip-types@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.1.tgz#fa8d0a146506ea195da1671d38eed459242b2dcc"
   integrity sha512-iIYPIWt3dUmUKKE10s3W+jsQ3icFkw0JyRVyY1B7G4yK/nngAOHLVx8xlhA6b/Jzl/Y0nis8gjqhqKtRDQqHWQ==
@@ -862,7 +820,7 @@
     "@babel/helper-module-transforms" "^7.23.3"
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.21.5", "@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.1":
+"@babel/plugin-transform-modules-commonjs@^7.0.0", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.23.0", "@babel/plugin-transform-modules-commonjs@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz#e71ba1d0d69e049a22bf90b3867e263823d3f1b9"
   integrity sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==
@@ -987,20 +945,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.16.0", "@babel/plugin-transform-react-display-name@^7.24.1":
+"@babel/plugin-transform-react-display-name@^7.0.0":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz#554e3e1a25d181f040cf698b93fd289a03bfdcdb"
   integrity sha512-mvoQg2f9p2qlpDQRBC7M3c3XTr0k7cp/0+kFKKO/7Gtu0LSw16eKB+Fabe2bDT/UpsyasTBBkAnbdsLrkD5XMw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-react-jsx-development@^7.22.5":
-  version "7.22.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.22.5.tgz#e716b6edbef972a92165cd69d92f1255f7e73e87"
-  integrity sha512-bDhuzwWMuInwCYeDeMzyi7TaBgRQei6DqxhbyniL7/VG4RSS7HtSL2QbY4eESy1KJqlWt8g3xeEBGPuo+XqC8A==
-  dependencies:
-    "@babel/plugin-transform-react-jsx" "^7.22.5"
-
 "@babel/plugin-transform-react-jsx-self@^7.18.6":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.1.tgz#a21d866d8167e752c6a7c4555dba8afcdfce6268"
@@ -1022,7 +973,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.22.5", "@babel/plugin-transform-react-jsx@^7.23.4":
+"@babel/plugin-transform-react-jsx@^7.0.0":
   version "7.23.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz#393f99185110cea87184ea47bcb4a7b0c2e39312"
   integrity sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==
@@ -1033,14 +984,6 @@
     "@babel/plugin-syntax-jsx" "^7.23.3"
     "@babel/types" "^7.23.4"
 
-"@babel/plugin-transform-react-pure-annotations@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.24.1.tgz#c86bce22a53956331210d268e49a0ff06e392470"
-  integrity sha512-+pWEAaDJvSm9aFvJNpLiM2+ktl2Sn2U5DdyiWdZBxmLc6+xGt88dvFqsHiAiDS+8WqUwbDfkKz9jRxK3M0k+kA==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/helper-plugin-utils" "^7.24.0"
-
 "@babel/plugin-transform-regenerator@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.24.1.tgz#625b7545bae52363bdc1fbbdc7252b5046409c8c"
@@ -1056,18 +999,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-runtime@^7.16.4":
-  version "7.24.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.24.3.tgz#dc58ad4a31810a890550365cc922e1ff5acb5d7f"
-  integrity sha512-J0BuRPNlNqlMTRJ72eVptpt9VcInbxO6iP3jaxr+1NPhC0UkKL+6oeX6VXMEYdADnuqmMmsBspt4d5w8Y/TCbQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.24.3"
-    "@babel/helper-plugin-utils" "^7.24.0"
-    babel-plugin-polyfill-corejs2 "^0.4.10"
-    babel-plugin-polyfill-corejs3 "^0.10.1"
-    babel-plugin-polyfill-regenerator "^0.6.1"
-    semver "^6.3.1"
-
 "@babel/plugin-transform-shorthand-properties@^7.0.0", "@babel/plugin-transform-shorthand-properties@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz#ba9a09144cf55d35ec6b93a32253becad8ee5b55"
@@ -1104,7 +1035,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/plugin-transform-typescript@^7.21.3", "@babel/plugin-transform-typescript@^7.24.1":
+"@babel/plugin-transform-typescript@^7.24.1":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.1.tgz#5c05e28bb76c7dfe7d6c5bed9951324fd2d3ab07"
   integrity sha512-liYSESjX2fZ7JyBFkYG78nfvHlMKE6IpNdTVnxmlYUR+j5ZLsitFbaAE+eJSK2zPPkNWNw4mXL51rQ8WrvdK0w==
@@ -1145,7 +1076,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.22.15"
     "@babel/helper-plugin-utils" "^7.24.0"
 
-"@babel/preset-env@^7.16.4", "@babel/preset-env@^7.22.9", "@babel/preset-env@^7.23.2":
+"@babel/preset-env@^7.22.9", "@babel/preset-env@^7.23.2":
   version "7.24.3"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.24.3.tgz#f3f138c844ffeeac372597b29c51b5259e8323a3"
   integrity sha512-fSk430k5c2ff8536JcPvPWK4tZDwehWLGlBp0wrsBUjZVdeQV6lePbwKWZaZfK2vnh/1kQX1PzAJWsnBmVgGJA==
@@ -1249,30 +1180,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.12.13", "@babel/preset-react@^7.16.0":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.24.1.tgz#2450c2ac5cc498ef6101a6ca5474de251e33aa95"
-  integrity sha512-eFa8up2/8cZXLIpkafhaADTXSnl7IsUFCYenRWrARBz0/qZwcT0RBXpys0LJU4+WfPoF2ZG6ew6s2V6izMCwRA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.24.0"
-    "@babel/helper-validator-option" "^7.23.5"
-    "@babel/plugin-transform-react-display-name" "^7.24.1"
-    "@babel/plugin-transform-react-jsx" "^7.23.4"
-    "@babel/plugin-transform-react-jsx-development" "^7.22.5"
-    "@babel/plugin-transform-react-pure-annotations" "^7.24.1"
-
-"@babel/preset-typescript@7.21.5":
-  version "7.21.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.5.tgz#68292c884b0e26070b4d66b202072d391358395f"
-  integrity sha512-iqe3sETat5EOrORXiQ6rWfoOg2y68Cs75B9wNxdPW4kixJxh7aXQE1KPdWLDniC24T/6dSnguF33W9j/ZZQcmA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.21.5"
-    "@babel/helper-validator-option" "^7.21.0"
-    "@babel/plugin-syntax-jsx" "^7.21.4"
-    "@babel/plugin-transform-modules-commonjs" "^7.21.5"
-    "@babel/plugin-transform-typescript" "^7.21.3"
-
-"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.16.0", "@babel/preset-typescript@^7.23.0":
+"@babel/preset-typescript@^7.13.0", "@babel/preset-typescript@^7.23.0":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.24.1.tgz#89bdf13a3149a17b3b2a2c9c62547f06db8845ec"
   integrity sha512-1DBaMmRDpuYQBPWD8Pf/WEwCrtgRHxsZnP4mIy9G/X+hFfbI47Q2G4t1Paakld84+qsk2fSsUPMKg71jkoOOaQ==
@@ -1299,7 +1207,7 @@
   resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
   integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.4", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.17.8", "@babel/runtime@^7.18.0", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.20.7", "@babel/runtime@^7.23.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
   version "7.24.1"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.24.1.tgz#431f9a794d173b53720e69a6464abc6f0e2a5c57"
   integrity sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==
@@ -3083,6 +2991,19 @@
     "@leafygreen-ui/tokens" "^2.7.0"
     "@leafygreen-ui/typography" "^19.1.1"
 
+"@leafygreen-ui/form-field@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@leafygreen-ui/form-field/-/form-field-1.1.1.tgz#085d588ea8b46d4076562e748dd75fd16fbfc853"
+  integrity sha512-E9M34lHll3oKlu5EPKB3WsmvmB3qWVl5O4H8/ukjWJd98FRk5GVPEOyWkwUp3Hkm2KGMZJNfSC10c+4Cbvv7CQ==
+  dependencies:
+    "@leafygreen-ui/emotion" "^4.0.8"
+    "@leafygreen-ui/hooks" "^8.1.3"
+    "@leafygreen-ui/icon" "^12.1.0"
+    "@leafygreen-ui/lib" "^13.4.0"
+    "@leafygreen-ui/palette" "^4.0.10"
+    "@leafygreen-ui/tokens" "^2.5.2"
+    "@leafygreen-ui/typography" "^19.0.0"
+
 "@leafygreen-ui/form-field@^1.2.0":
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/form-field/-/form-field-1.2.0.tgz#663c4f1dfe11fe02856fe6fed31bf7ece0e57557"
@@ -3136,7 +3057,7 @@
     focus-trap-react "9.0.2"
     polished "^4.2.2"
 
-"@leafygreen-ui/hooks@^7.3.3", "@leafygreen-ui/hooks@^7.5.0", "@leafygreen-ui/hooks@^7.7.1", "@leafygreen-ui/hooks@^7.7.3", "@leafygreen-ui/hooks@^7.7.5", "@leafygreen-ui/hooks@^7.7.8":
+"@leafygreen-ui/hooks@^7.3.3", "@leafygreen-ui/hooks@^7.5.0", "@leafygreen-ui/hooks@^7.7.1", "@leafygreen-ui/hooks@^7.7.5", "@leafygreen-ui/hooks@^7.7.8":
   version "7.7.8"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/hooks/-/hooks-7.7.8.tgz#63b884067711c42c152edc185b7a2e8be474c264"
   integrity sha512-8n0GjAxIxXN1e7XcZ2bobdI56XCqbtH3AZTbWTgQdILnTdxuA/9+yif1zIP4L8shoUbcosuMwU5HRu4UnX9n1g==
@@ -3180,7 +3101,7 @@
     "@leafygreen-ui/emotion" "^4.0.7"
     lodash "^4.17.21"
 
-"@leafygreen-ui/icon@^11.12.4", "@leafygreen-ui/icon@^11.12.5", "@leafygreen-ui/icon@^11.13.1", "@leafygreen-ui/icon@^11.15.0", "@leafygreen-ui/icon@^11.17.0", "@leafygreen-ui/icon@^11.22.1", "@leafygreen-ui/icon@^11.22.2", "@leafygreen-ui/icon@^11.23.0", "@leafygreen-ui/icon@^11.25.0", "@leafygreen-ui/icon@^11.25.1", "@leafygreen-ui/icon@^11.28.0", "@leafygreen-ui/icon@^11.29.1":
+"@leafygreen-ui/icon@^11.12.4", "@leafygreen-ui/icon@^11.12.5", "@leafygreen-ui/icon@^11.13.1", "@leafygreen-ui/icon@^11.17.0", "@leafygreen-ui/icon@^11.22.1", "@leafygreen-ui/icon@^11.22.2", "@leafygreen-ui/icon@^11.23.0", "@leafygreen-ui/icon@^11.25.0", "@leafygreen-ui/icon@^11.25.1", "@leafygreen-ui/icon@^11.28.0", "@leafygreen-ui/icon@^11.29.1":
   version "11.29.1"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/icon/-/icon-11.29.1.tgz#f61115a5b0b36310a5ffb008bf51dd9ae8982917"
   integrity sha512-bCfeJ3mndU5wHayMWfkVWo0NXhPpBpHIG53aox/eRterqLvWg6jWyiuF930MHbyWDNEXC9Qw1WD637kZ93mmog==
@@ -3726,18 +3647,18 @@
     "@leafygreen-ui/tokens" "^2.5.2"
     "@leafygreen-ui/typography" "^18.3.0"
 
-"@leafygreen-ui/text-input@12.1.12":
-  version "12.1.12"
-  resolved "https://registry.yarnpkg.com/@leafygreen-ui/text-input/-/text-input-12.1.12.tgz#552beaae38625adb85ee45ed657a563969e7292b"
-  integrity sha512-CXbAKTVjeYtathdF+mI19PeQWp3KRhS8CqlS5tRZkz2RBMtkqgCn3YFmmnmMJrfEOnKfxt7ln15oRj2sM6c/nQ==
+"@leafygreen-ui/text-input@13.0.2":
+  version "13.0.2"
+  resolved "https://registry.yarnpkg.com/@leafygreen-ui/text-input/-/text-input-13.0.2.tgz#e1fd177cdcd2f95568b21c81fe3f76fdf262e6f9"
+  integrity sha512-+ccRVd2aKklbYyy3p6QEpH9rtC+IeHiyLub1dXyoTfFzhSaExehkbWMMVFMvaIQtc665qjulr1oQn/nXBMNixw==
   dependencies:
-    "@leafygreen-ui/emotion" "^4.0.4"
-    "@leafygreen-ui/hooks" "^7.7.3"
-    "@leafygreen-ui/icon" "^11.15.0"
-    "@leafygreen-ui/lib" "^10.3.3"
-    "@leafygreen-ui/palette" "^4.0.4"
-    "@leafygreen-ui/tokens" "^2.1.0"
-    "@leafygreen-ui/typography" "^16.4.0"
+    "@leafygreen-ui/emotion" "^4.0.8"
+    "@leafygreen-ui/form-field" "^1.1.1"
+    "@leafygreen-ui/hooks" "^8.1.3"
+    "@leafygreen-ui/lib" "^13.4.0"
+    "@leafygreen-ui/tokens" "^2.5.2"
+    "@leafygreen-ui/typography" "^19.0.0"
+    "@lg-tools/test-harnesses" "^0.1.2"
 
 "@leafygreen-ui/text-input@^12.1.23":
   version "12.1.27"
@@ -3807,7 +3728,14 @@
   dependencies:
     "@leafygreen-ui/palette" "^3.4.5"
 
-"@leafygreen-ui/tokens@^2.0.0", "@leafygreen-ui/tokens@^2.0.1", "@leafygreen-ui/tokens@^2.0.3", "@leafygreen-ui/tokens@^2.1.0", "@leafygreen-ui/tokens@^2.1.1", "@leafygreen-ui/tokens@^2.1.4", "@leafygreen-ui/tokens@^2.2.0", "@leafygreen-ui/tokens@^2.5.1", "@leafygreen-ui/tokens@^2.5.2", "@leafygreen-ui/tokens@^2.6.0", "@leafygreen-ui/tokens@^2.7.0":
+"@leafygreen-ui/tokens@^2.0.0", "@leafygreen-ui/tokens@^2.0.1", "@leafygreen-ui/tokens@^2.0.3", "@leafygreen-ui/tokens@^2.1.1", "@leafygreen-ui/tokens@^2.1.4", "@leafygreen-ui/tokens@^2.2.0", "@leafygreen-ui/tokens@^2.5.1", "@leafygreen-ui/tokens@^2.5.2", "@leafygreen-ui/tokens@^2.6.0":
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@leafygreen-ui/tokens/-/tokens-2.6.0.tgz#88ad46df6b79544d2bd4cf4f7b8bc0b1c1b55158"
+  integrity sha512-UN4xsrT51W4xlPuUm7CpcorlAjVQvJPW87nj/AS9tqxDsl4RMZChbxzNZIyQnoa9Ta3rGVzHE3MiK/AtoHKZ4g==
+  dependencies:
+    "@leafygreen-ui/palette" "^4.0.9"
+
+"@leafygreen-ui/tokens@^2.7.0":
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/tokens/-/tokens-2.7.0.tgz#c4cfd9395b69d4d9739393a8eb3aaf5c6b19f820"
   integrity sha512-MnzXPUd/MkWyY6lDrxTcww9/6hR/3TQzlKM1LTf75mSc8QTuxpHgXQtwUZdYoUWBCeI4NH8ELCnKsiQSOvTNlg==
@@ -3891,7 +3819,7 @@
     "@leafygreen-ui/polymorphic" "^1.3.7"
     "@leafygreen-ui/tokens" "^2.5.2"
 
-"@leafygreen-ui/typography@^16.1.0", "@leafygreen-ui/typography@^16.3.0", "@leafygreen-ui/typography@^16.4.0", "@leafygreen-ui/typography@^16.5.1", "@leafygreen-ui/typography@^16.5.4":
+"@leafygreen-ui/typography@^16.1.0", "@leafygreen-ui/typography@^16.3.0", "@leafygreen-ui/typography@^16.5.1", "@leafygreen-ui/typography@^16.5.4":
   version "16.5.5"
   resolved "https://registry.yarnpkg.com/@leafygreen-ui/typography/-/typography-16.5.5.tgz#65cc0ce7e39f5b8f72f9b9a4dbea80868ac09694"
   integrity sha512-mErhTYM0C1PZaeADTkp5v/MAS6aEhavWHZ3otHthBSo/zwI5uAYnkreheiYElc66B/0bcOxCikLVkP3zaFnX2A==
@@ -7033,20 +6961,6 @@ aggregate-error@^3.0.0:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
-ajv-formats@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
-  integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
-  dependencies:
-    ajv "^8.0.0"
-
-ajv-keywords@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
-  integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-
 ajv@8.11.0:
   version "8.11.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
@@ -7067,16 +6981,6 @@ ajv@^6.12.4, ajv@^6.7.0:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.9.0:
-  version "8.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
-  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
 ansi-align@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
@@ -7458,14 +7362,6 @@ babel-core@^7.0.0-bridge.0:
   resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-7.0.0-bridge.0.tgz#95a492ddd90f9b4e9a4a1da14eb335b87b634ece"
   integrity sha512-poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==
 
-babel-loader@^9.1.3:
-  version "9.1.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-9.1.3.tgz#3d0e01b4e69760cc694ee306fe16d358aa1c6f9a"
-  integrity sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==
-  dependencies:
-    find-cache-dir "^4.0.0"
-    schema-utils "^4.0.0"
-
 babel-plugin-import-graphql@2.8.1, babel-plugin-import-graphql@^2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-import-graphql/-/babel-plugin-import-graphql-2.8.1.tgz#dec677dc47327181d69e8c451aff290460ca2ed6"
@@ -7473,13 +7369,6 @@ babel-plugin-import-graphql@2.8.1, babel-plugin-import-graphql@^2.8.1:
   dependencies:
     graphql-tag "^2.9.2"
 
-babel-plugin-import@^1.13.6:
-  version "1.13.8"
-  resolved "https://registry.yarnpkg.com/babel-plugin-import/-/babel-plugin-import-1.13.8.tgz#782c517f6bbf2de3b1f75aaafd6d20a491c4878c"
-  integrity sha512-36babpjra5m3gca44V6tSTomeBlPA7cHUynrE2WiQIm3rEGD9xy28MKsx5IdO45EbnpJY7Jrgd00C6Dwt/l/2Q==
-  dependencies:
-    "@babel/helper-module-imports" "^7.0.0"
-
 babel-plugin-istanbul@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
@@ -7509,7 +7398,7 @@ babel-plugin-polyfill-corejs2@^0.4.10:
     "@babel/helper-define-polyfill-provider" "^0.6.1"
     semver "^6.3.1"
 
-babel-plugin-polyfill-corejs3@^0.10.1, babel-plugin-polyfill-corejs3@^0.10.4:
+babel-plugin-polyfill-corejs3@^0.10.4:
   version "0.10.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.10.4.tgz#789ac82405ad664c20476d0233b485281deb9c77"
   integrity sha512-25J6I8NGfa5YkCDogHRID3fVCadIR8/pGl1/spvCkzb6lVn6SR3ojpx9nOn9iEBcUsjY24AmdKm5khcfKdylcg==
@@ -7529,11 +7418,6 @@ babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
   integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
 
-babel-plugin-transform-react-remove-prop-types@^0.4.24:
-  version "0.4.24"
-  resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.24.tgz#f2edaf9b4c6a5fbe5c1d678bfb531078c1555f3a"
-  integrity sha512-eqj0hVcJUR57/Ug2zE1Yswsw4LhuqqHhD+8v120T1cl3kjg76QwtyBrdIk4WVwK+lAhBJVYCd/v+4nc4y+8JsA==
-
 babel-preset-fbjs@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz#38a14e5a7a3b285a3f3a86552d650dca5cf6111c"
@@ -7567,28 +7451,6 @@ babel-preset-fbjs@^3.4.0:
     "@babel/plugin-transform-template-literals" "^7.0.0"
     babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
 
-babel-preset-react-app@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-react-app/-/babel-preset-react-app-10.0.1.tgz#ed6005a20a24f2c88521809fa9aea99903751584"
-  integrity sha512-b0D9IZ1WhhCWkrTXyFuIIgqGzSkRIH5D5AmB0bXbzYAB1OBAwHcUeyWW2LorutLWF5btNo/N7r/cIdmvvKJlYg==
-  dependencies:
-    "@babel/core" "^7.16.0"
-    "@babel/plugin-proposal-class-properties" "^7.16.0"
-    "@babel/plugin-proposal-decorators" "^7.16.4"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.0"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.0"
-    "@babel/plugin-proposal-private-methods" "^7.16.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.16.0"
-    "@babel/plugin-transform-react-display-name" "^7.16.0"
-    "@babel/plugin-transform-runtime" "^7.16.4"
-    "@babel/preset-env" "^7.16.4"
-    "@babel/preset-react" "^7.16.0"
-    "@babel/preset-typescript" "^7.16.0"
-    "@babel/runtime" "^7.16.3"
-    babel-plugin-macros "^3.1.0"
-    babel-plugin-transform-react-remove-prop-types "^0.4.24"
-
 balanced-match@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
@@ -8173,11 +8035,6 @@ comment-parser@1.4.1:
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.1.tgz#bdafead37961ac079be11eb7ec65c4d021eaf9cc"
   integrity sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==
 
-common-path-prefix@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/common-path-prefix/-/common-path-prefix-3.0.0.tgz#7d007a7e07c58c4b4d5f433131a19141b29f11e0"
-  integrity sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==
-
 common-tags@1.8.2, common-tags@^1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -10010,14 +9867,6 @@ find-cache-dir@^3.0.0:
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-cache-dir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-4.0.0.tgz#a30ee0448f81a3990708f6453633c733e2f6eec2"
-  integrity sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==
-  dependencies:
-    common-path-prefix "^3.0.0"
-    pkg-dir "^7.0.0"
-
 find-root@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4"
@@ -10046,14 +9895,6 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
-find-up@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
-  integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
-  dependencies:
-    locate-path "^7.1.0"
-    path-exists "^5.0.0"
-
 flat-cache@^3.0.4:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
@@ -11954,13 +11795,6 @@ locate-path@^6.0.0:
   dependencies:
     p-locate "^5.0.0"
 
-locate-path@^7.1.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-7.2.0.tgz#69cb1779bd90b35ab1e771e1f2f89a202c2a8a8a"
-  integrity sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==
-  dependencies:
-    p-locate "^6.0.0"
-
 lodash-es@^4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.21.tgz#43e626c46e6591b7750beb2b50117390c609e3ee"
@@ -12759,13 +12593,6 @@ p-limit@^2.0.0, p-limit@^2.2.0:
   dependencies:
     p-try "^2.0.0"
 
-p-limit@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-4.0.0.tgz#914af6544ed32bfa54670b061cafcbd04984b644"
-  integrity sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==
-  dependencies:
-    yocto-queue "^1.0.0"
-
 p-limit@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-5.0.0.tgz#6946d5b7140b649b7a33a027d89b4c625b3a5985"
@@ -12794,13 +12621,6 @@ p-locate@^5.0.0:
   dependencies:
     p-limit "^3.0.2"
 
-p-locate@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-6.0.0.tgz#3da9a49d4934b901089dca3302fa65dc5a05c04f"
-  integrity sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==
-  dependencies:
-    p-limit "^4.0.0"
-
 p-map@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
@@ -12895,11 +12715,6 @@ path-exists@^4.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
-path-exists@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-5.0.0.tgz#a6aad9489200b21fab31e49cf09277e5116fb9e7"
-  integrity sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==
-
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -13048,13 +12863,6 @@ pkg-dir@^5.0.0:
   dependencies:
     find-up "^5.0.0"
 
-pkg-dir@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11"
-  integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==
-  dependencies:
-    find-up "^6.3.0"
-
 pkg-types@^1.0.3, pkg-types@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/pkg-types/-/pkg-types-1.1.1.tgz#07b626880749beb607b0c817af63aac1845a73f2"
@@ -14427,16 +14235,6 @@ scheduler@^0.23.0:
   dependencies:
     loose-envify "^1.1.0"
 
-schema-utils@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
-  integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
-  dependencies:
-    "@types/json-schema" "^7.0.9"
-    ajv "^8.9.0"
-    ajv-formats "^2.1.1"
-    ajv-keywords "^5.1.0"
-
 scroll-into-view-if-needed@^2.2.25:
   version "2.2.31"
   resolved "https://registry.yarnpkg.com/scroll-into-view-if-needed/-/scroll-into-view-if-needed-2.2.31.tgz#d3c482959dc483e37962d1521254e3295d0d1587"
@@ -14647,10 +14445,10 @@ signedsource@^1.0.0:
   resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
   integrity sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==
 
-simple-git@3.19.1:
-  version "3.19.1"
-  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.19.1.tgz#ff9c021961a3d876a1b115b1893bed9a28855d30"
-  integrity sha512-Ck+rcjVaE1HotraRAS8u/+xgTvToTuoMkT9/l9lvuP5jftwnYUp6DwuJzsKErHgfyRk8IB8pqGHWEbM3tLgV1w==
+simple-git@3.24.0:
+  version "3.24.0"
+  resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-3.24.0.tgz#33a8c88dc6fa74e53eaf3d6bfc27d0182a49ec00"
+  integrity sha512-QqAKee9Twv+3k8IFOFfPB2hnk6as6Y6ACUpwCtQvRYBAes23Wv3SZlHVobAzqcE8gfsisCvPw3HGW3HYM+VYYw==
   dependencies:
     "@kwsites/file-exists" "^1.1.1"
     "@kwsites/promise-deferred" "^1.1.1"
@@ -14890,16 +14688,7 @@ string-env-interpolation@1.0.1, string-env-interpolation@^1.0.1:
   resolved "https://registry.yarnpkg.com/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz#ad4397ae4ac53fe6c91d1402ad6f6a52862c7152"
   integrity sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==
 
-"string-width-cjs@npm:string-width@^4.2.0":
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
-  dependencies:
-    emoji-regex "^8.0.0"
-    is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
-
-string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -14991,14 +14780,7 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
-
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -16242,7 +16024,7 @@ wordwrap@^1.0.0:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -16260,15 +16042,6 @@ wrap-ansi@^6.0.1, wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
-wrap-ansi@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
-  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
-  dependencies:
-    ansi-styles "^4.0.0"
-    string-width "^4.1.0"
-    strip-ansi "^6.0.0"
-
 wrap-ansi@^8.0.1, wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"