Local Pickup: Fix render logic for regular shipping rates

plugins/woocommerce-blocks/assets/js/base/components/cart-checkout/shipping-rates-control/index.tsx

@@ -98,7 +98,6 @@ const ShippingRatesControl = ( {
 	};
 	const { isEditor } = useEditorContext();
 	const { hasSelectedLocalPickup } = useShippingData();
-
 	return (
 		<LoadingMask
 			isLoading={ isLoadingRates }
@@ -109,21 +108,21 @@ const ShippingRatesControl = ( {
 			showSpinner={ true }
 		>
 			<ExperimentalOrderShippingPackages.Slot { ...slotFillProps } />
+			{ hasSelectedLocalPickup &&
+				shippingRates.length > 1 &&
+				! isEditor && (
+					<StoreNotice
+						className="wc-block-components-notice"
+						isDismissible={ false }
+						status="warning"
+					>
+						{ __(
+							'Multiple shipments must have the same pickup location',
+							'woo-gutenberg-products-block'
+						) }
+					</StoreNotice>
+				) }
 			<ExperimentalOrderShippingPackages>
-				{ hasSelectedLocalPickup &&
-					shippingRates.length > 1 &&
-					! isEditor && (
-						<StoreNotice
-							className="wc-block-components-notice"
-							isDismissible={ false }
-							status="warning"
-						>
-							{ __(
-								'Multiple shipments must have the same pickup location',
-								'woo-gutenberg-products-block'
-							) }
-						</StoreNotice>
-					) }
 				<Packages
 					packages={ shippingRates }
 					noResultsMessage={ noResultsMessage }

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

@@ -33,6 +33,7 @@ interface CheckoutAddress {
 	showBillingFields: boolean;
 	forcedBillingAddress: boolean;
 	useBillingAsShipping: boolean;
+	needsShipping: boolean;
 }
 
 /**
@@ -94,6 +95,7 @@ export const useCheckoutAddress = (): CheckoutAddress => {
 		defaultAddressFields,
 		useShippingAsBilling,
 		setUseShippingAsBilling: __internalSetUseShippingAsBilling,
+		needsShipping,
 		showShippingFields:
 			! forcedBillingAddress && needsShipping && ! prefersCollection,
 		showBillingFields:

plugins/woocommerce-blocks/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/frontend.tsx

@@ -32,12 +32,18 @@ const FrontendBlock = ( {
 	children: JSX.Element;
 	className?: string;
 } ) => {
-	const checkoutIsProcessing = useSelect( ( select ) =>
-		select( CHECKOUT_STORE_KEY ).isProcessing()
+	const { checkoutIsProcessing, prefersCollection } = useSelect(
+		( select ) => {
+			const checkoutStore = select( CHECKOUT_STORE_KEY );
+			return {
+				checkoutIsProcessing: checkoutStore.isProcessing(),
+				prefersCollection: checkoutStore.prefersCollection(),
+			};
+		}
 	);
-	const { showShippingFields, useBillingAsShipping } = useCheckoutAddress();
+	const { needsShipping } = useCheckoutAddress();
 
-	if ( ! showShippingFields && ! useBillingAsShipping ) {
+	if ( ! needsShipping || prefersCollection ) {
 		return null;
 	}