Refactor force billing: remove forcedBillingAddress from conditions f…

…or showBillingFields (woocommerce#7393) Co-authored-by: Niels Lange <[email protected]>
senadir · Nov 12, 2022 · 38caed3 · 38caed3
1 parent a5d410b
commit 38caed3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/assets/js/base/context/hooks/use-checkout-address.ts b/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,
 	};
 };
diff --git a/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx b/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;
 	}