Refactor force billing: remove forcedBillingAddress from conditions for showBillingFields (#7393)

Co-authored-by: Niels Lange <[email protected]>

Author: 2 people

assets/js/base/context/hooks/use-checkout-address.ts

@@ -90,8 +90,7 @@ export const useCheckoutAddress = (): CheckoutAddress => {
 		useShippingAsBilling,
 		setUseShippingAsBilling: __internalSetUseShippingAsBilling,
 		showShippingFields: ! forcedBillingAddress && needsShipping,
-		showBillingFields:
-			forcedBillingAddress || ! needsShipping || ! useShippingAsBilling,
+		showBillingFields: ! needsShipping || ! useShippingAsBilling,
 		forcedBillingAddress,
 	};
 };

assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx

@@ -38,9 +38,9 @@ const FrontendBlock = ( {
 		showCompanyField,
 		showPhoneField,
 	} = useCheckoutBlockContext();
-	const { showBillingFields } = useCheckoutAddress();
+	const { showBillingFields, forcedBillingAddress } = useCheckoutAddress();
 
-	if ( ! showBillingFields ) {
+	if ( ! showBillingFields && ! forcedBillingAddress ) {
 		return null;
 	}