Merge branch 'release/9.4.0' of https://github.com/woocommerce/woocommerce-blocks into release/9.4.1

Author: gigitux

assets/js/blocks/cart/inner-blocks/filled-cart-block/frontend.tsx

@@ -6,7 +6,7 @@ import { SidebarLayout } from '@woocommerce/base-components/sidebar-layout';
 import { useStoreCart } from '@woocommerce/base-context/hooks';
 import { useEffect } from '@wordpress/element';
 import { decodeEntities } from '@wordpress/html-entities';
-import { useDispatch, useSelect } from '@wordpress/data';
+import { select, useDispatch } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -24,21 +24,19 @@ const FrontendBlock = ( {
 	const { hasDarkControls } = useCartBlockContext();
 	const { createErrorNotice, removeNotice } = useDispatch( 'core/notices' );
 
-	/*
-	 * The code for removing old notices is also present in the filled-mini-cart-contents-block/frontend.tsx file and
-	 * will take care of removing outdated errors in the Mini Cart block.
-	 */
-	const currentlyDisplayedErrorNoticeCodes = useSelect( ( select ) => {
-		return select( 'core/notices' )
+	useEffect( () => {
+		/*
+		 * The code for removing old notices is also present in the filled-mini-cart-contents-block/frontend.tsx file and
+		 * will take care of removing outdated errors in the Mini Cart block.
+		 */
+		const currentlyDisplayedErrorNoticeCodes = select( 'core/notices' )
 			.getNotices( 'wc/cart' )
 			.filter(
 				( notice ) =>
 					notice.status === 'error' && notice.type === 'default'
 			)
 			.map( ( notice ) => notice.id );
-	} );
 
-	useEffect( () => {
 		// Clear errors out of the store before adding the new ones from the response.
 		currentlyDisplayedErrorNoticeCodes.forEach( ( id ) => {
 			removeNotice( id, 'wc/cart' );
@@ -52,12 +50,7 @@ const FrontendBlock = ( {
 				context: 'wc/cart',
 			} );
 		} );
-	}, [
-		createErrorNotice,
-		cartItemErrors,
-		currentlyDisplayedErrorNoticeCodes,
-		removeNotice,
-	] );
+	}, [ createErrorNotice, cartItemErrors, removeNotice ] );
 
 	if ( cartIsLoading || cartItems.length >= 1 ) {
 		return (

assets/js/blocks/mini-cart/mini-cart-contents/inner-blocks/filled-mini-cart-contents-block/frontend.tsx

@@ -4,7 +4,7 @@
 import { StoreNoticesContainer } from '@woocommerce/blocks-checkout';
 import { useStoreCart } from '@woocommerce/base-context/hooks';
 
-import { useDispatch, useSelect } from '@wordpress/data';
+import { select, useDispatch } from '@wordpress/data';
 import { useEffect } from '@wordpress/element';
 import { decodeEntities } from '@wordpress/html-entities';
 
@@ -21,22 +21,25 @@ const FilledMiniCartContentsBlock = ( {
 
 	const { createErrorNotice, removeNotice } = useDispatch( 'core/notices' );
 
-	/*
-	 * The code for removing old notices is also present in the filled-cart-block/frontend.tsx file and will take care
-	 * of removing outdated errors in the Cart block.
-	 */
-	const currentlyDisplayedErrorNoticeCodes = useSelect( ( select ) => {
-		return select( 'core/notices' )
+	// Ensures any cart errors listed in the API response get shown.
+	useEffect( () => {
+		/*
+		 * The code for removing old notices is also present in the filled-mini-cart-contents-block/frontend.tsx file and
+		 * will take care of removing outdated errors in the Mini Cart block.
+		 */
+		const currentlyDisplayedErrorNoticeCodes = select( 'core/notices' )
 			.getNotices( 'wc/cart' )
 			.filter(
 				( notice ) =>
 					notice.status === 'error' && notice.type === 'default'
 			)
 			.map( ( notice ) => notice.id );
-	} );
 
-	// Ensures any cart errors listed in the API response get shown.
-	useEffect( () => {
+		// Clear errors out of the store before adding the new ones from the response.
+		currentlyDisplayedErrorNoticeCodes.forEach( ( id ) => {
+			removeNotice( id, 'wc/cart' );
+		} );
+
 		// Clear errors out of the store before adding the new ones from the response.
 		currentlyDisplayedErrorNoticeCodes.forEach( ( id ) => {
 			removeNotice( id, 'wc/cart' );
@@ -49,12 +52,7 @@ const FilledMiniCartContentsBlock = ( {
 				context: 'wc/cart',
 			} );
 		} );
-	}, [
-		createErrorNotice,
-		cartItemErrors,
-		currentlyDisplayedErrorNoticeCodes,
-		removeNotice,
-	] );
+	}, [ createErrorNotice, cartItemErrors, removeNotice ] );
 
 	if ( cartItems.length === 0 ) {
 		return null;