From ef1dc660684e6a7d270a100ef32225254406f77c Mon Sep 17 00:00:00 2001
From: Alex Florisca <alex.florisca@automattic.com>
Date: Mon, 22 Aug 2022 16:50:37 +0100
Subject: [PATCH] Remove all traces of Notification Context

---
 .../assets/js/blocks/cart/block.js            | 21 +++++------
 .../assets/js/blocks/checkout/block.tsx       | 35 +++++++++----------
 .../js/blocks/products/all-products/block.js  |  9 ++---
 .../blocks/products/all-products/frontend.js  |  7 +---
 .../assets/js/blocks/single-product/block.js  |  9 ++---
 5 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart/block.js b/plugins/woocommerce-blocks/assets/js/blocks/cart/block.js
index ac907d3cace..acb264e9d0d 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/cart/block.js
+++ b/plugins/woocommerce-blocks/assets/js/blocks/cart/block.js
@@ -13,10 +13,7 @@ import { CURRENT_USER_IS_ADMIN } from '@woocommerce/settings';
 import BlockErrorBoundary from '@woocommerce/base-components/block-error-boundary';
 import { translateJQueryEventToNative } from '@woocommerce/base-utils';
 import withScrollToTop from '@woocommerce/base-hocs/with-scroll-to-top';
-import {
-	StoreNoticesProvider,
-	CartProvider,
-} from '@woocommerce/base-context/providers';
+import { CartProvider } from '@woocommerce/base-context/providers';
 import { SlotFillProvider } from '@woocommerce/blocks-checkout';
 
 /**
@@ -87,15 +84,13 @@ const Block = ( { attributes, children, scrollToTop } ) => (
 		showErrorMessage={ CURRENT_USER_IS_ADMIN }
 	>
 		<SnackbarNoticesContainer context="wc/cart" />
-		<StoreNoticesProvider>
-			<StoreNoticesContainer context="wc/cart" />
-			<SlotFillProvider>
-				<CartProvider>
-					<Cart attributes={ attributes }>{ children }</Cart>
-					<ScrollOnError scrollToTop={ scrollToTop } />
-				</CartProvider>
-			</SlotFillProvider>
-		</StoreNoticesProvider>
+		<StoreNoticesContainer context="wc/cart" />
+		<SlotFillProvider>
+			<CartProvider>
+				<Cart attributes={ attributes }>{ children }</Cart>
+				<ScrollOnError scrollToTop={ scrollToTop } />
+			</CartProvider>
+		</SlotFillProvider>
 	</BlockErrorBoundary>
 );
 export default withScrollToTop( Block );
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/checkout/block.tsx b/plugins/woocommerce-blocks/assets/js/blocks/checkout/block.tsx
index 4b96f45db57..be4e1be5de8 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/checkout/block.tsx
+++ b/plugins/woocommerce-blocks/assets/js/blocks/checkout/block.tsx
@@ -31,7 +31,6 @@ import { LOGIN_TO_CHECKOUT_URL, isLoginRequired, reloadPage } from './utils';
 import type { Attributes } from './types';
 import { CheckoutBlockContext } from './context';
 import { hasNoticesOfType } from '../../utils/notices';
-import { StoreNoticesProvider } from '../../base/context/providers';
 
 const LoginPrompt = () => {
 	return (
@@ -185,24 +184,22 @@ const Block = ( {
 			showErrorMessage={ CURRENT_USER_IS_ADMIN }
 		>
 			<SnackbarNoticesContainer context="wc/checkout" />
-			<StoreNoticesProvider>
-				<StoreNoticesContainer context="wc/checkout" />
-				{ /* SlotFillProvider need to be defined before CheckoutProvider so fills have the SlotFill context ready when they mount. */ }
-				<SlotFillProvider>
-					<CheckoutProvider>
-						<SidebarLayout
-							className={ classnames( 'wc-block-checkout', {
-								'has-dark-controls': attributes.hasDarkControls,
-							} ) }
-						>
-							<Checkout attributes={ attributes }>
-								{ children }
-							</Checkout>
-							<ScrollOnError scrollToTop={ scrollToTop } />
-						</SidebarLayout>
-					</CheckoutProvider>
-				</SlotFillProvider>
-			</StoreNoticesProvider>
+			<StoreNoticesContainer context="wc/checkout" />
+			{ /* SlotFillProvider need to be defined before CheckoutProvider so fills have the SlotFill context ready when they mount. */ }
+			<SlotFillProvider>
+				<CheckoutProvider>
+					<SidebarLayout
+						className={ classnames( 'wc-block-checkout', {
+							'has-dark-controls': attributes.hasDarkControls,
+						} ) }
+					>
+						<Checkout attributes={ attributes }>
+							{ children }
+						</Checkout>
+						<ScrollOnError scrollToTop={ scrollToTop } />
+					</SidebarLayout>
+				</CheckoutProvider>
+			</SlotFillProvider>
 		</BlockErrorBoundary>
 	);
 };
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/block.js b/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/block.js
index 3bb88879c5b..6122b1324e5 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/block.js
+++ b/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/block.js
@@ -6,10 +6,7 @@ import PropTypes from 'prop-types';
 import { ProductListContainer } from '@woocommerce/base-components/product-list';
 import { InnerBlockLayoutContextProvider } from '@woocommerce/shared-context';
 import { gridBlockPreview } from '@woocommerce/resource-previews';
-import {
-	StoreNoticesProvider,
-	StoreNoticesContainer,
-} from '@woocommerce/base-context';
+import { StoreNoticesContainer } from '@woocommerce/base-context';
 
 /**
  * The All Products Block.
@@ -40,9 +37,7 @@ class Block extends Component {
 				parentName="woocommerce/all-products"
 				parentClassName="wc-block-grid"
 			>
-				<StoreNoticesProvider>
-					<StoreNoticesContainer context={ 'wc/all-products' } />
-				</StoreNoticesProvider>
+				<StoreNoticesContainer context={ 'wc/all-products' } />
 				<ProductListContainer
 					attributes={ attributes }
 					urlParameterSuffix={ urlParameterSuffix }
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/frontend.js b/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/frontend.js
index 4d704bd3e34..9e583d4083e 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/frontend.js
+++ b/plugins/woocommerce-blocks/assets/js/blocks/products/all-products/frontend.js
@@ -1,7 +1,6 @@
 /**
  * External dependencies
  */
-import { StoreNoticesProvider } from '@woocommerce/base-context';
 import { renderFrontend } from '@woocommerce/base-utils';
 
 /**
@@ -15,11 +14,7 @@ import Block from './block';
  * @param {*} props
  */
 const AllProductsFrontend = ( props ) => {
-	return (
-		<StoreNoticesProvider context="wc/all-products">
-			<Block { ...props } />
-		</StoreNoticesProvider>
-	);
+	return <Block { ...props } />;
 };
 
 const getProps = ( el ) => ( {
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/single-product/block.js b/plugins/woocommerce-blocks/assets/js/blocks/single-product/block.js
index 25e26f066f8..b07e05ae621 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/single-product/block.js
+++ b/plugins/woocommerce-blocks/assets/js/blocks/single-product/block.js
@@ -7,10 +7,7 @@ import {
 	InnerBlockLayoutContextProvider,
 	ProductDataContextProvider,
 } from '@woocommerce/shared-context';
-import {
-	StoreNoticesProvider,
-	StoreNoticesContainer,
-} from '@woocommerce/base-context';
+import { StoreNoticesContainer } from '@woocommerce/base-context';
 import { useStoreEvents } from '@woocommerce/base-context/hooks';
 
 /**
@@ -49,9 +46,7 @@ const Block = ( { isLoading, product, children } ) => {
 				product={ product }
 				isLoading={ isLoading }
 			>
-				<StoreNoticesProvider>
-					<StoreNoticesContainer context={ noticeContext } />
-				</StoreNoticesProvider>
+				<StoreNoticesContainer context={ noticeContext } />
 				<div className={ className }>{ children }</div>
 			</ProductDataContextProvider>
 		</InnerBlockLayoutContextProvider>