Removing the ability to edit the OC container title (#4559)

* Removing the ability to edit the OC container title

* Removing additional references

* Fix classic checkout title

* Changelog and readme entries

* Update changelog.txt

Co-authored-by: daledupreez <[email protected]>

* Changelog entry update

* Removing the translation function calls

---------

Co-authored-by: daledupreez <[email protected]>

Author: wjrosa

changelog.txt

@@ -1,6 +1,7 @@
 *** Changelog ***
 
 = 9.8.0 - xxxx-xx-xx =
+* Update - Removes the ability to change the title for the Optimized Checkout payment element, as it is now set to "Stripe" by default
 * Update - Copy for the Optimized Checkout settings and notices
 * Dev - Implements WooCommerce constants for the tax statuses
 * Add - Adds the current setting value for the Optimized Checkout to the Stripe System Status Report data

client/classic/upe/index.js

@@ -315,12 +315,9 @@ jQuery( function ( $ ) {
 			// Change the payment method container title when the Optimized Checkout is enabled
 			if (
 				getStripeServerData()?.isOCEnabled &&
-				getStripeServerData()?.OCTitle &&
 				$( 'input#payment_method_stripe' ).is( ':checked' )
 			) {
-				$( 'label[for=payment_method_stripe]' ).text(
-					getStripeServerData()?.OCTitle
-				);
+				$( 'label[for=payment_method_stripe]' ).text( 'Stripe' );
 			}
 
 			maybeClearBlikCodeValidation();

client/data/settings/hooks.js

@@ -166,7 +166,6 @@ export const useIsShortAccountStatementEnabled = makeSettingsHook(
 export const useDebugLog = makeSettingsHook( 'is_debug_log_enabled' );
 export const useIsUpeEnabled = makeSettingsHook( 'is_upe_enabled' );
 export const useIsOCEnabled = makeSettingsHook( 'is_oc_enabled' );
-export const useOCTitle = makeSettingsHook( 'oc_title', 'Stripe' );
 export const useIsPMCEnabled = makeReadOnlySettingsHook(
 	'is_pmc_enabled',
 	false

client/settings/advanced-settings-section/__tests__/index.test.js

@@ -5,7 +5,6 @@ import AdvancedSettings from '..';
 import {
 	useDebugLog,
 	useIsUpeEnabled,
-	useOCTitle,
 	useGetSavingError,
 	useSettings,
 	useIsOCEnabled,
@@ -15,7 +14,6 @@ jest.mock( 'wcstripe/data', () => ( {
 	useDebugLog: jest.fn(),
 	useIsUpeEnabled: jest.fn(),
 	useIsOCEnabled: jest.fn(),
-	useOCTitle: jest.fn(),
 	useGetSavingError: jest.fn(),
 	useSettings: jest.fn(),
 } ) );
@@ -27,7 +25,6 @@ describe( 'AdvancedSettings', () => {
 		useDebugLog.mockReturnValue( [ true, jest.fn() ] );
 		useIsUpeEnabled.mockReturnValue( [ true, jest.fn() ] );
 		useIsOCEnabled.mockReturnValue( [ false, jest.fn() ] );
-		useOCTitle.mockReturnValue( 'Stripe' );
 		useGetSavingError.mockReturnValue( null );
 
 		// Set `isLoading` to false so `LoadableSettingsSection` can render.
@@ -79,19 +76,4 @@ describe( 'AdvancedSettings', () => {
 			)
 		).toBeInTheDocument();
 	} );
-
-	it( 'should display the Optimized Checkout title setting if the Optimized Checkout feature is enabled', () => {
-		global.wc_stripe_settings_params = { is_oc_available: true };
-
-		useIsOCEnabled.mockReturnValue( [ true, jest.fn() ] );
-
-		render( <AdvancedSettings /> );
-
-		expect(
-			screen.queryByText(
-				'This will appear as the title of the Optimized Checkout Suite payment element on checkout.'
-			)
-		).toBeInTheDocument();
-		expect( screen.queryByLabelText( 'Title' ) ).toBeInTheDocument();
-	} );
 } );

client/settings/advanced-settings-section/optimized-checkout-feature.js

@@ -1,17 +1,12 @@
 import { __ } from '@wordpress/i18n';
 import { createInterpolateElement } from '@wordpress/element';
-import {
-	CheckboxControl,
-	ExternalLink,
-	TextControl,
-} from '@wordpress/components';
-import React, { useEffect, useRef, useState } from 'react';
+import { CheckboxControl, ExternalLink } from '@wordpress/components';
+import React, { useEffect, useRef } from 'react';
 import { getQuery } from '@woocommerce/navigation';
-import { useIsOCEnabled, useIsUpeEnabled, useOCTitle } from '../../data';
+import { useIsOCEnabled, useIsUpeEnabled } from '../../data';
 
 const OptimizedCheckoutFeature = () => {
 	const [ isOCEnabled, setIsOCEnabled ] = useIsOCEnabled();
-	const [ OCTitle, setOCTitle ] = useOCTitle();
 	const [ isUpeEnabled ] = useIsUpeEnabled();
 	const headingRef = useRef( null );
 
@@ -21,14 +16,6 @@ const OptimizedCheckoutFeature = () => {
 		}
 	}, [ isUpeEnabled, setIsOCEnabled ] );
 
-	// Local state for the title input to prevent value reset during typing
-	const [ localOCTitle, setLocalOCTitle ] = useState( OCTitle );
-
-	// Update local state when store value changes
-	useEffect( () => {
-		setLocalOCTitle( OCTitle );
-	}, [ OCTitle ] );
-
 	useEffect( () => {
 		if ( ! headingRef.current ) {
 			return;
@@ -43,22 +30,6 @@ const OptimizedCheckoutFeature = () => {
 		}
 	}, [ headingRef ] );
 
-	const handleTitleChange = ( value ) => {
-		setLocalOCTitle( value );
-	};
-
-	const handleTitleBlur = () => {
-		const finalTitle = localOCTitle.trim() || OCTitle;
-		setOCTitle( finalTitle );
-		setLocalOCTitle( finalTitle );
-	};
-
-	const handleTitleKeyDown = ( event ) => {
-		if ( event.key === 'Enter' ) {
-			handleTitleBlur();
-		}
-	};
-
 	return (
 		<>
 			<h4 ref={ headingRef }>
@@ -88,19 +59,6 @@ const OptimizedCheckoutFeature = () => {
 				onChange={ setIsOCEnabled }
 				disabled={ ! isUpeEnabled }
 			/>
-			{ isOCEnabled && (
-				<TextControl
-					help={ __(
-						'This will appear as the title of the Optimized Checkout Suite payment element on checkout.',
-						'woocommerce-gateway-stripe'
-					) }
-					label={ __( 'Title', 'woocommerce-gateway-stripe' ) }
-					value={ localOCTitle }
-					onChange={ handleTitleChange }
-					onBlur={ handleTitleBlur }
-					onKeyDown={ handleTitleKeyDown }
-				/>
-			) }
 		</>
 	);
 };

includes/admin/class-wc-rest-stripe-settings-controller.php

@@ -80,11 +80,6 @@ public function register_routes() {
 						'type'              => 'boolean',
 						'validate_callback' => 'rest_validate_request_arg',
 					],
-					'oc_title'                         => [
-						'description'       => __( 'The default title to show above the Optimized Checkout element.', 'woocommerce-gateway-stripe' ),
-						'type'              => 'string',
-						'validate_callback' => 'rest_validate_request_arg',
-					],
 					'amazon_pay_button_size'           => [
 						'description'       => __( 'Express checkout button sizes.', 'woocommerce-gateway-stripe' ),
 						'type'              => 'string',
@@ -247,7 +242,6 @@ public function get_settings() {
 				'is_debug_log_enabled'                     => 'yes' === $this->gateway->get_option( 'logging' ),
 				'is_upe_enabled'                           => $is_upe_enabled,
 				'is_oc_enabled'                            => 'yes' === $this->gateway->get_option( 'optimized_checkout_element' ),
-				'oc_title'                                 => $this->gateway->get_validated_option( 'optimized_checkout_element_title' ),
 				'is_pmc_enabled'                           => 'yes' === $this->gateway->get_option( 'pmc_enabled' ),
 			]
 		);
@@ -541,7 +535,6 @@ private function update_payment_request_settings( WP_REST_Request $request ) {
 	private function update_oc_settings( WP_REST_Request $request ) {
 		$attributes = [
 			'is_oc_enabled' => 'optimized_checkout_element',
-			'oc_title'      => 'optimized_checkout_element_title',
 		];
 		foreach ( $attributes as $request_key => $attribute ) {
 			$value = $request->get_param( $request_key );

includes/payment-methods/class-wc-stripe-upe-payment-gateway.php

@@ -516,7 +516,6 @@ public function javascript_params() {
 
 		// Optimized Checkout feature flag + setting.
 		$stripe_params['isOCEnabled'] = $this->oc_enabled;
-		$stripe_params['OCTitle']     = $this->get_option( 'optimized_checkout_element_title', __( 'Stripe', 'woocommerce-gateway-stripe' ) );
 
 		// Single Payment Element payment method parent configuration ID
 		$stripe_params['paymentMethodConfigurationParentId'] = WC_Stripe_Payment_Method_Configurations::get_parent_configuration_id();

includes/payment-methods/class-wc-stripe-upe-payment-method-cc.php

@@ -166,7 +166,7 @@ private function get_optimized_checkout_title( $payment_details = false ) {
 
 		// Block checkout and pay for order (checkout) page.
 		if ( ( has_block( 'woocommerce/checkout' ) || ! empty( $_GET['pay_for_order'] ) ) && ! is_wc_endpoint_url( 'order-received' ) ) { // phpcs:ignore WordPress.Security.NonceVerification
-			return $this->oc_title;
+			return 'Stripe';
 		}
 
 		return parent::get_title();

includes/payment-methods/class-wc-stripe-upe-payment-method.php

@@ -119,13 +119,6 @@ abstract class WC_Stripe_UPE_Payment_Method extends WC_Payment_Gateway {
 	 */
 	protected $oc_enabled;
 
-	/**
-	 * The default title for the Optimized Checkout element
-	 *
-	 * @var string
-	 */
-	protected $oc_title;
-
 	/**
 	 * Create instance of payment method
 	 */
@@ -140,7 +133,6 @@ public function __construct() {
 		$this->supports                 = [ 'products', 'refunds' ];
 		$this->supports_deferred_intent = true;
 		$this->oc_enabled               = WC_Stripe_Feature_Flags::is_oc_available() && 'yes' === $this->get_option( 'optimized_checkout_element' );
-		$this->oc_title                 = $this->get_option( 'optimized_checkout_element_title', __( 'Stripe', 'woocommerce-gateway-stripe' ) );
 	}
 
 	/**

readme.txt

@@ -111,6 +111,7 @@ If you get stuck, you can ask for help in the [Plugin Forum](https://wordpress.o
 == Changelog ==
 
 = 9.8.0 - xxxx-xx-xx =
+* Update - Removes the ability to change the title for the Optimized Checkout payment element, as it is now set to "Stripe" by default
 * Update - Copy for the Optimized Checkout settings and notices
 * Dev - Implements WooCommerce constants for the tax statuses
 * Add - Adds the current setting value for the Optimized Checkout to the Stripe System Status Report data