From 7a71ff36579e9fd79b13ea3f0b8652a37a655a8f Mon Sep 17 00:00:00 2001
From: Philipp Stracker <p.stracker@syde.com>
Date: Wed, 22 Jan 2025 15:48:11 +0100
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Remove=20description-locat?=
 =?UTF-8?q?ion-logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/ReusableComponents/SettingsBlock.js   | 12 ++++--------
 .../SettingsBlocks/ControlTextInput.js               | 10 ++++++++--
 .../TabSettingsElements/Blocks/PaypalSettings.js     |  4 ++--
 .../Components/Settings/Blocks/InvoicePrefix.js      |  7 ++-----
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlock.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlock.js
index b80d8f253..58fde60c2 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlock.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlock.js
@@ -6,7 +6,6 @@ const SettingsBlock = ( {
 	children,
 	title,
 	titleSuffix,
-	headerDescription,
 	description,
 	horizontalLayout = false,
 	separatorAndGap = true,
@@ -20,16 +19,13 @@ const SettingsBlock = ( {
 		<div className={ blockClassName }>
 			<Header>
 				<Title>
-					{ title } <TitleExtra>{ titleSuffix }</TitleExtra>
+					{ title }
+					<TitleExtra>{ titleSuffix }</TitleExtra>
 				</Title>
-				<Description>{ headerDescription }</Description>
+				<Description>{ description }</Description>
 			</Header>
 
-			<Content asCard={ false }>
-				{ children }
-
-				<Description>{ description }</Description>
-			</Content>
+			<Content asCard={ false }>{ children }</Content>
 		</div>
 	);
 };
diff --git a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/ControlTextInput.js b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/ControlTextInput.js
index 08e6a8d11..ef597ded4 100644
--- a/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/ControlTextInput.js
+++ b/modules/ppcp-settings/resources/js/Components/ReusableComponents/SettingsBlocks/ControlTextInput.js
@@ -1,8 +1,13 @@
 import { TextControl } from '@wordpress/components';
 
-import { Action } from '../Elements';
+import { Action, Description } from '../Elements';
 
-const ControlTextInput = ( { value, onChange, placeholder = '' } ) => {
+const ControlTextInput = ( {
+	value,
+	description,
+	onChange,
+	placeholder = '',
+} ) => {
 	return (
 		<Action>
 			<TextControl
@@ -11,6 +16,7 @@ const ControlTextInput = ( { value, onChange, placeholder = '' } ) => {
 				value={ value }
 				onChange={ onChange }
 			/>
+			<Description>{ description }</Description>
 		</Action>
 	);
 };
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/PaypalSettings.js b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/PaypalSettings.js
index 304b38815..a8561adac 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/PaypalSettings.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Overview/TabSettingsElements/Blocks/PaypalSettings.js
@@ -84,7 +84,7 @@ const PaypalSettings = ( { updateFormValue, settings } ) => {
 
 			<SettingsBlock
 				title={ __( 'Brand name', 'woocommerce-paypal-payments' ) }
-				headerDescription={ __(
+				description={ __(
 					'What business name to show to your buyers during checkout and on receipts.',
 					'woocommerce-paypal-payments'
 				) }
@@ -101,7 +101,7 @@ const PaypalSettings = ( { updateFormValue, settings } ) => {
 
 			<SettingsBlock
 				title={ __( 'Soft Descriptor', 'woocommerce-paypal-payments' ) }
-				headerDescription={ __(
+				description={ __(
 					"The dynamic text used to construct the statement descriptor that appears on a payer's card statement. Applies to PayPal and Credit Card transactions. Max value of 22 characters.",
 					'woocommerce-paypal-payments'
 				) }
diff --git a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Blocks/InvoicePrefix.js b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Blocks/InvoicePrefix.js
index f009c679e..0f47284b1 100644
--- a/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Blocks/InvoicePrefix.js
+++ b/modules/ppcp-settings/resources/js/Components/Screens/Settings/Components/Settings/Blocks/InvoicePrefix.js
@@ -9,11 +9,7 @@ const InvoicePrefix = () => {
 	return (
 		<SettingsBlock
 			title="Invoice Prefix"
-			supplementaryLabel={ __(
-				'(Recommended)',
-				'woocommerce-paypal-payments'
-			) }
-			description="Add a unique prefix to invoice numbers for site-specific tracking (recommended)."
+			titleSuffix={ __( '(Recommended)', 'woocommerce-paypal-payments' ) }
 		>
 			<ControlTextInput
 				placeholder={ __(
@@ -22,6 +18,7 @@ const InvoicePrefix = () => {
 				) }
 				onChange={ setInvoicePrefix }
 				value={ invoicePrefix }
+				description="Add a unique prefix to invoice numbers for site-specific tracking (recommended)."
 			/>
 		</SettingsBlock>
 	);