From aead4b929f5a16491cb2539ea9b7935f0b3946db Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Tue, 7 Feb 2023 01:01:26 +0530
Subject: [PATCH 1/2] Add AMP Settings label for gallery block toggle settings

---
 assets/src/block-editor/helpers/index.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/assets/src/block-editor/helpers/index.js b/assets/src/block-editor/helpers/index.js
index 27d95e86549..837ae5888b2 100644
--- a/assets/src/block-editor/helpers/index.js
+++ b/assets/src/block-editor/helpers/index.js
@@ -344,8 +344,13 @@ ImageBlockLayoutAttributes.propTypes = {
  */
 const GalleryBlockLayoutAttributes = (props) => (
 	<InspectorAdvancedControls>
-		<AmpLightboxToggle {...props} />
-		<AmpCarouselToggle {...props} />
+		<div>
+			<p className="components-base-control__label">
+				{__('AMP Settings', 'amp')}
+			</p>
+			<AmpLightboxToggle {...props} />
+			<AmpCarouselToggle {...props} />
+		</div>
 	</InspectorAdvancedControls>
 );
 

From 46d4166c6ef109c75ecd80e0f5be6eba62725a8b Mon Sep 17 00:00:00 2001
From: thelovekesh <lovekesh.kumar@rtcamp.com>
Date: Tue, 7 Feb 2023 03:20:14 +0530
Subject: [PATCH 2/2] Update AMP gallery block settings to be wrapped in
 <BaseControl />

---
 assets/src/block-editor/helpers/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/assets/src/block-editor/helpers/index.js b/assets/src/block-editor/helpers/index.js
index 837ae5888b2..c02f54f4519 100644
--- a/assets/src/block-editor/helpers/index.js
+++ b/assets/src/block-editor/helpers/index.js
@@ -8,7 +8,7 @@ import { isFunction, isObject, isString } from 'lodash';
  * WordPress dependencies
  */
 import { __ } from '@wordpress/i18n';
-import { ToggleControl, PanelBody } from '@wordpress/components';
+import { ToggleControl, PanelBody, BaseControl } from '@wordpress/components';
 import {
 	InspectorControls,
 	InspectorAdvancedControls,
@@ -344,13 +344,13 @@ ImageBlockLayoutAttributes.propTypes = {
  */
 const GalleryBlockLayoutAttributes = (props) => (
 	<InspectorAdvancedControls>
-		<div>
-			<p className="components-base-control__label">
+		<BaseControl __nextHasNoMarginBottom>
+			<BaseControl.VisualLabel>
 				{__('AMP Settings', 'amp')}
-			</p>
+			</BaseControl.VisualLabel>
 			<AmpLightboxToggle {...props} />
 			<AmpCarouselToggle {...props} />
-		</div>
+		</BaseControl>
 	</InspectorAdvancedControls>
 );