Refactor isRequired assignments

Automattic · Nov 13, 2024 · 3955748 · 3955748
1 parent a61119f
commit 3955748
Showing 1 changed file with 4 additions and 10 deletions.
diff --git a/client/checkout/classic/event-handlers.js b/client/checkout/classic/event-handlers.js
@@ -291,19 +291,13 @@ jQuery( function ( $ ) {
 		return Boolean(
 			billingFieldsToValidate.find( ( fieldName ) => {
 				const $field = document.querySelector( `#${ fieldName }` );
-				let isRequired = false;
+				let isRequired = enabledBillingFields[ fieldName ]?.required;
 
 				if ( country && locale && fieldName !== 'billing_email' ) {
 					const key = fieldName.replace( 'billing_', '' );
-					const fieldSettings = jQuery.extend(
-						true,
-						{},
-						locale.default[ key ],
-						locale[ country ][ key ]
-					);
-					isRequired = fieldSettings.required;
-				} else {
-					isRequired = enabledBillingFields[ fieldName ]?.required;
+					isRequired =
+						locale[ country ][ key ]?.required ??
+						locale.default[ key ]?.required;
 				}
 
 				const hasValue = $field?.value;