rebase code on oct-10-2023

wp/wp-content/plugins/woocommerce/packages/woocommerce-blocks/assets/js/settings/shared/utils.ts

@@ -21,25 +21,7 @@ export const getSetting = < T >(
 	filter = ( val: unknown, fb: unknown ) =>
 		typeof val !== 'undefined' ? val : fb
 ): T => {
-	let value = fallback;
-
-	if ( name in allSettings ) {
-		value = allSettings[ name ];
-	} else if ( name.includes( '_data' ) ) {
-		// This handles back compat with payment data _data properties after the move to camelCase and the dedicated
-		// paymentMethodData setting.
-		const nameWithoutData = name.replace( '_data', '' );
-		const paymentMethodData = getSetting(
-			'paymentMethodData',
-			{}
-		) as Record< string, unknown >;
-
-		value =
-			nameWithoutData in paymentMethodData
-				? paymentMethodData[ nameWithoutData ]
-				: fallback;
-	}
-
+	const value = name in allSettings ? allSettings[ name ] : fallback;
 	return filter( value, fallback ) as T;
 };
 
@@ -124,17 +106,3 @@ export const isWcVersion = (
  */
 export const getAdminLink = ( path: string ): string =>
 	getSetting( 'adminUrl' ) + path;
-
-/**
- * Get payment method data from the paymentMethodData setting.
- */
-export const getPaymentMethodData = (
-	paymentMethodId: string,
-	defaultValue: null | unknown = null
-) => {
-	const paymentMethodData = getSetting( 'paymentMethodData', {} ) as Record<
-		string,
-		unknown
-	>;
-	return paymentMethodData[ paymentMethodId ] ?? defaultValue;
-};