receiveCartContents during checkout

assets/js/base/context/hooks/cart/use-store-cart.ts

@@ -114,6 +114,7 @@ export const defaultCartData: StoreCart = {
 	cartHasCalculatedShipping: false,
 	paymentRequirements: EMPTY_PAYMENT_REQUIREMENTS,
 	receiveCart: () => undefined,
+	receiveCartContents: () => undefined,
 	extensions: EMPTY_EXTENSIONS,
 };
 
@@ -175,6 +176,7 @@ export const useStoreCart = (
 						typeof previewCart?.receiveCart === 'function'
 							? previewCart.receiveCart
 							: () => undefined,
+					receiveCartContents: () => undefined,
 				};
 			}
 
@@ -186,7 +188,7 @@ export const useStoreCart = (
 				! store.hasFinishedResolution( 'getCartData' );
 
 			const isLoadingRates = store.isCustomerDataUpdating();
-			const { receiveCart } = dispatch( storeKey );
+			const { receiveCart, receiveCartContents } = dispatch( storeKey );
 			const billingAddress = decodeValues( cartData.billingAddress );
 			const shippingAddress = cartData.needsShipping
 				? decodeValues( cartData.shippingAddress )
@@ -233,6 +235,7 @@ export const useStoreCart = (
 				cartHasCalculatedShipping: cartData.hasCalculatedShipping,
 				paymentRequirements: cartData.paymentRequirements,
 				receiveCart,
+				receiveCartContents,
 			};
 		},
 		[ shouldSelect ]

assets/js/base/context/providers/cart-checkout/checkout-processor.ts

@@ -84,7 +84,8 @@ const CheckoutProcessor = () => {
 		select( CART_STORE_KEY ).getCustomerData()
 	);
 
-	const { cartNeedsPayment, cartNeedsShipping, receiveCart } = useStoreCart();
+	const { cartNeedsPayment, cartNeedsShipping, receiveCartContents } =
+		useStoreCart();
 
 	const {
 		activePaymentMethod,
@@ -275,7 +276,8 @@ const CheckoutProcessor = () => {
 						)
 						.then( ( response: CheckoutResponseError ) => {
 							if ( response.data?.cart ) {
-								receiveCart( response.data.cart );
+								// We don't want to receive the address here because it will overwrite fields.
+								receiveCartContents( response.data.cart );
 							}
 							processErrorResponse( response );
 							__internalProcessCheckoutResponse( response );
@@ -304,7 +306,7 @@ const CheckoutProcessor = () => {
 		shouldCreateAccount,
 		extensionData,
 		cartNeedsShipping,
-		receiveCart,
+		receiveCartContents,
 		__internalSetHasError,
 		__internalProcessCheckoutResponse,
 	] );