From f80c02c04b11190501554a0f1001f37fa58382c6 Mon Sep 17 00:00:00 2001
From: Gregor Billing <gbilling@worldcubeassociation.org>
Date: Mon, 6 Jan 2025 12:13:31 +0900
Subject: [PATCH] Clean up merge whoopsie

---
 .../CompetitionsFilters.js                    | 16 ++++++-------
 .../CompetitionsOverview/CompetitionsView.js  | 24 +++++--------------
 2 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/app/webpacker/components/CompetitionsOverview/CompetitionsFilters.js b/app/webpacker/components/CompetitionsOverview/CompetitionsFilters.js
index a285cb7cc6..b2f8c8c85d 100644
--- a/app/webpacker/components/CompetitionsOverview/CompetitionsFilters.js
+++ b/app/webpacker/components/CompetitionsOverview/CompetitionsFilters.js
@@ -31,17 +31,17 @@ function CompetitionsFilters({
         />
       </Form.Field>
 
-      <Form.Group>
-        <Form.Field width={8}>
+      <Form.Group widths="equal">
+        <Form.Field>
           <RegionSelector region={filterState.region} dispatchFilter={dispatchFilter} />
         </Form.Field>
-        <Form.Field width={8}>
+        <Form.Field>
           <SearchBar text={filterState.search} dispatchFilter={dispatchFilter} />
         </Form.Field>
       </Form.Group>
 
       {shouldShowAdminDetails && (
-        <Form.Field width={16}>
+        <Form.Field>
           <DelegateSelector delegateId={filterState.delegate} dispatchFilter={dispatchFilter} />
         </Form.Field>
       )}
@@ -61,11 +61,9 @@ function CompetitionsFilters({
       </Form.Group>
 
       {canViewAdminDetails && shouldShowAdminDetails && (
-        <Form.Group>
-          <Form.Field>
-            <AdminStatusButtonGroup filterState={filterState} dispatchFilter={dispatchFilter} />
-          </Form.Field>
-        </Form.Group>
+        <Form.Field>
+          <AdminStatusButtonGroup filterState={filterState} dispatchFilter={dispatchFilter} />
+        </Form.Field>
       )}
     </Form>
   );
diff --git a/app/webpacker/components/CompetitionsOverview/CompetitionsView.js b/app/webpacker/components/CompetitionsOverview/CompetitionsView.js
index e679017947..12913aecfe 100644
--- a/app/webpacker/components/CompetitionsOverview/CompetitionsView.js
+++ b/app/webpacker/components/CompetitionsOverview/CompetitionsView.js
@@ -16,7 +16,7 @@ import I18n from '../../lib/i18n';
 import { apiV0Urls, WCA_API_PAGINATION } from '../../lib/requests/routes.js.erb';
 import { fetchJsonOrError } from '../../lib/requests/fetchWithAuthenticityToken';
 
-import CompetitionsFilters, { CompDisplayCheckboxes, ToggleListOrMapDisplay } from './CompetitionsFilters';
+import CompetitionsFilters, { ToggleListOrMapDisplay } from './CompetitionsFilters';
 import ListView from './ListView';
 import MapView from './MapView';
 import {
@@ -125,27 +125,15 @@ function CompetitionsView({ canViewAdminDetails = false }) {
             dispatchFilter={dispatchFilter}
             shouldShowAdminDetails={shouldShowAdminDetails}
             canViewAdminDetails={canViewAdminDetails}
+            displayMode={displayMode}
           />
         </Segment>
       </Transition>
 
-      <Form>
-        <Form.Group inline>
-          <CompDisplayCheckboxes
-            shouldIncludeCancelled={filterState.shouldIncludeCancelled}
-            dispatchFilter={dispatchFilter}
-            shouldShowAdminDetails={shouldShowAdminDetails}
-            canViewAdminDetails={canViewAdminDetails}
-            displayMode={displayMode}
-          />
-        </Form.Group>
-        <Form.Field>
-          <ToggleListOrMapDisplay
-            displayMode={displayMode}
-            setDisplayMode={setDisplayMode}
-          />
-        </Form.Field>
-      </Form>
+      <ToggleListOrMapDisplay
+        displayMode={displayMode}
+        setDisplayMode={setDisplayMode}
+      />
 
       <Segment basic>
         {