From 10f78c5ee8e0b4f7398f616e83018b84704b5041 Mon Sep 17 00:00:00 2001
From: tellthemachines <isabel@tellthemachines.com>
Date: Fri, 31 Jul 2020 16:05:13 +1000
Subject: [PATCH] Move option to general section

---
 .../edit-post/src/components/options-modal/index.js   | 10 ++++------
 .../options-modal/test/__snapshots__/index.js.snap    | 11 ++++-------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/packages/edit-post/src/components/options-modal/index.js b/packages/edit-post/src/components/options-modal/index.js
index 0b7ee806a4599..f7e60fe493025 100644
--- a/packages/edit-post/src/components/options-modal/index.js
+++ b/packages/edit-post/src/components/options-modal/index.js
@@ -54,6 +54,10 @@ export function OptionsModal( { isModalActive, isViewable, closeModal } ) {
 						'Enable the Most Used Blocks category in the block library'
 					) }
 				/>
+				<EnableFeature
+					featureName="showIconLabels"
+					label={ __( 'Show button text labels' ) }
+				/>
 			</Section>
 			<Section title={ __( 'Keyboard options' ) }>
 				<EnableFeature
@@ -105,12 +109,6 @@ export function OptionsModal( { isModalActive, isViewable, closeModal } ) {
 				</PageAttributesCheck>
 			</Section>
 			<MetaBoxesSection title={ __( 'Advanced panels' ) } />
-			<Section title={ __( 'Labels' ) }>
-				<EnableFeature
-					featureName="showIconLabels"
-					label={ __( 'Show button text labels' ) }
-				/>
-			</Section>
 		</Modal>
 	);
 }
diff --git a/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap b/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap
index 7932d0f917418..0bf5becdb51b3 100644
--- a/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap
+++ b/packages/edit-post/src/components/options-modal/test/__snapshots__/index.js.snap
@@ -16,6 +16,10 @@ exports[`OptionsModal should match snapshot when the modal is active 1`] = `
       featureName="mostUsedBlocks"
       label="Enable the Most Used Blocks category in the block library"
     />
+    <WithSelect(WithDispatch(BaseOption))
+      featureName="showIconLabels"
+      label="Show button text labels"
+    />
   </Section>
   <Section
     title="Keyboard options"
@@ -67,12 +71,5 @@ exports[`OptionsModal should match snapshot when the modal is active 1`] = `
   <WithSelect(MetaBoxesSection)
     title="Advanced panels"
   />
-  <Section
-    title="Icon Labels"
-  >
-    <WithSelect(WithDispatch(BaseOption))
-      label="Show Icon Labels"
-    />
-  </Section>
 </WithInstanceId(Modal)>
 `;