From 9167a04e20e303a4ce52cf0931f83af0eed4743b Mon Sep 17 00:00:00 2001 From: Tarun Vijwani Date: Fri, 14 Oct 2022 14:29:06 +0400 Subject: [PATCH] Refactor force billing: remove forcedBillingAddress from conditions for showBillingFields (https://github.com/woocommerce/woocommerce-blocks/pull/7393) Co-authored-by: Niels Lange --- .../assets/js/base/context/hooks/use-checkout-address.ts | 3 +-- .../inner-blocks/checkout-billing-address-block/frontend.tsx | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins/woocommerce-blocks/assets/js/base/context/hooks/use-checkout-address.ts b/plugins/woocommerce-blocks/assets/js/base/context/hooks/use-checkout-address.ts index 71a5ab7a49b..eb794558539 100644 --- a/plugins/woocommerce-blocks/assets/js/base/context/hooks/use-checkout-address.ts +++ b/plugins/woocommerce-blocks/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/plugins/woocommerce-blocks/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx b/plugins/woocommerce-blocks/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx index 86b4ed1c746..663fb04a652 100644 --- a/plugins/woocommerce-blocks/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx +++ b/plugins/woocommerce-blocks/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; }