From 285dd8a9c23fef4a2d77656cba3618c2baa3b3f6 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Tue, 5 Sep 2023 17:42:30 +0200
Subject: [PATCH 1/2] Move enhanced pagination under settings

---
 .../query/edit/inspector-controls/index.js    | 53 ++++++++-----------
 1 file changed, 23 insertions(+), 30 deletions(-)

diff --git a/packages/block-library/src/query/edit/inspector-controls/index.js b/packages/block-library/src/query/edit/inspector-controls/index.js
index 492f276ccf6151..be9dfb8efc6e7f 100644
--- a/packages/block-library/src/query/edit/inspector-controls/index.js
+++ b/packages/block-library/src/query/edit/inspector-controls/index.js
@@ -215,6 +215,29 @@ export default function QueryInspectorControls( props ) {
 								}
 							/>
 						) }
+						<ToggleControl
+							label={ __( 'Enhanced pagination' ) }
+							help={ __(
+								"Don't refresh the page when paginating to another page."
+							) }
+							checked={ !! enhancedPagination }
+							onChange={ ( value ) =>
+								setAttributes( {
+									enhancedPagination: !! value,
+								} )
+							}
+						/>
+						{ enhancedPagination && (
+							<div>
+								<Notice
+									spokenMessage={ null }
+									status="warning"
+									isDismissible={ false }
+								>
+									{ enhancedPaginationNotice }
+								</Notice>
+							</div>
+						) }
 					</PanelBody>
 				</InspectorControls>
 			) }
@@ -293,36 +316,6 @@ export default function QueryInspectorControls( props ) {
 					</ToolsPanel>
 				</InspectorControls>
 			) }
-			<InspectorControls>
-				<PanelBody
-					title={ __( 'User Experience' ) }
-					initialOpen={ false }
-				>
-					<ToggleControl
-						label={ __( 'Enhanced pagination' ) }
-						help={ __(
-							"Don't refresh the page when paginating to another page."
-						) }
-						checked={ !! enhancedPagination }
-						onChange={ ( value ) =>
-							setAttributes( {
-								enhancedPagination: !! value,
-							} )
-						}
-					/>
-					{ enhancedPagination && (
-						<div>
-							<Notice
-								spokenMessage={ null }
-								status="warning"
-								isDismissible={ false }
-							>
-								{ enhancedPaginationNotice }
-							</Notice>
-						</div>
-					) }
-				</PanelBody>
-			</InspectorControls>
 		</>
 	);
 }

From 866bcdcb7044ee7306e24e1c668db95ca7383ab4 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Tue, 5 Sep 2023 17:43:20 +0200
Subject: [PATCH 2/2] Update Enhanced pagination help message

---
 .../block-library/src/query/edit/inspector-controls/index.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-library/src/query/edit/inspector-controls/index.js b/packages/block-library/src/query/edit/inspector-controls/index.js
index be9dfb8efc6e7f..b0f38cf70b9e25 100644
--- a/packages/block-library/src/query/edit/inspector-controls/index.js
+++ b/packages/block-library/src/query/edit/inspector-controls/index.js
@@ -218,7 +218,7 @@ export default function QueryInspectorControls( props ) {
 						<ToggleControl
 							label={ __( 'Enhanced pagination' ) }
 							help={ __(
-								"Don't refresh the page when paginating to another page."
+								'Browsing between pages won’t require a full page reload.'
 							) }
 							checked={ !! enhancedPagination }
 							onChange={ ( value ) =>