Use hasSelectedLocalPickup from useShippingData directly

senadir · claude · senadir · commit 58a274c45604 · 2026-03-06T17:12:25.000+01:00
Instead of manually checking for 'pickup_location' method_id which
doesn't cover all local pickup methods, use the existing
hasSelectedLocalPickup property from useShippingData hook.

Co-Authored-By: Claude Opus 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx b/plugins/woocommerce/client/blocks/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx
@@ -40,13 +40,7 @@ const FrontendBlock = ( {
 	const { showBillingFields, forcedBillingAddress, useBillingAsShipping } =
 		useCheckoutAddress();
 
-	const { shippingRates } = useShippingData();
-
-	const hasSelectedLocalPickup = shippingRates.some( ( pkg ) =>
-		pkg.shipping_rates.some(
-			( rate ) => rate.method_id === 'pickup_location' && rate.selected
-		)
-	);
+	const { hasSelectedLocalPickup } = useShippingData();
 
 	if ( ! showBillingFields && ! useBillingAsShipping ) {
 		return null;
