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 }
>
-
-
-
-
- { children }
-
-
-
-
+
+
+
+ { children }
+
+
+
);
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 }
>
-
-
- { /* SlotFillProvider need to be defined before CheckoutProvider so fills have the SlotFill context ready when they mount. */ }
-
-
-
-
- { children }
-
-
-
-
-
-
+
+ { /* SlotFillProvider need to be defined before CheckoutProvider so fills have the SlotFill context ready when they mount. */ }
+
+
+
+
+ { children }
+
+
+
+
+
);
};
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"
>
-
-
-
+
{
- return (
-
-
-
- );
+ return ;
};
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 }
>
-
-
-
+
{ children }