diff --git a/plugins/woocommerce-blocks/assets/js/base/components/payment-methods/express-payment/cart-express-payment.js b/plugins/woocommerce-blocks/assets/js/base/components/payment-methods/express-payment/cart-express-payment.js
index 5192ef7a94a..b85c52d60a6 100644
--- a/plugins/woocommerce-blocks/assets/js/base/components/payment-methods/express-payment/cart-express-payment.js
+++ b/plugins/woocommerce-blocks/assets/js/base/components/payment-methods/express-payment/cart-express-payment.js
@@ -2,7 +2,10 @@
* External dependencies
*/
import { __ } from '@wordpress/i18n';
-import { useExpressPaymentMethods } from '@woocommerce/base-hooks';
+import {
+ useEmitResponse,
+ useExpressPaymentMethods,
+} from '@woocommerce/base-hooks';
import { StoreNoticesProvider } from '@woocommerce/base-context';
/**
@@ -13,6 +16,7 @@ import './style.scss';
const CartExpressPayment = () => {
const { paymentMethods, isInitialized } = useExpressPaymentMethods();
+ const { noticeContexts } = useEmitResponse();
if (
! isInitialized ||
@@ -25,7 +29,9 @@ const CartExpressPayment = () => {
<>
-
+
diff --git a/plugins/woocommerce-blocks/assets/js/base/context/cart-checkout/payment-methods/payment-method-data-context.js b/plugins/woocommerce-blocks/assets/js/base/context/cart-checkout/payment-methods/payment-method-data-context.js
index 9272fa80390..c2cb8e85308 100644
--- a/plugins/woocommerce-blocks/assets/js/base/context/cart-checkout/payment-methods/payment-method-data-context.js
+++ b/plugins/woocommerce-blocks/assets/js/base/context/cart-checkout/payment-methods/payment-method-data-context.js
@@ -195,17 +195,17 @@ export const PaymentMethodDataProvider = ( { children } ) => {
( message ) => {
if ( message ) {
addErrorNotice( message, {
- context: 'wc/express-payment-area',
+ context: noticeContexts.EXPRESS_PAYMENTS,
id: 'wc-express-payment-error',
} );
} else {
removeNotice(
'wc-express-payment-error',
- 'wc/express-payment-area'
+ noticeContexts.EXPRESS_PAYMENTS
);
}
},
- [ addErrorNotice, removeNotice ]
+ [ addErrorNotice, noticeContexts.EXPRESS_PAYMENTS, removeNotice ]
);
// ensure observers are always current.
useEffect( () => {
diff --git a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/form/payment-method-step.js b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/form/payment-method-step.js
index a8ba0eb7ce7..34d15d99438 100644
--- a/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/form/payment-method-step.js
+++ b/plugins/woocommerce-blocks/assets/js/blocks/cart-checkout/checkout/form/payment-method-step.js
@@ -7,13 +7,18 @@ import {
useCheckoutContext,
StoreNoticesProvider,
} from '@woocommerce/base-context';
-import { usePaymentMethods, useStoreCart } from '@woocommerce/base-hooks';
+import {
+ useEmitResponse,
+ usePaymentMethods,
+ useStoreCart,
+} from '@woocommerce/base-hooks';
import { PaymentMethods } from '@woocommerce/base-components/payment-methods';
const PaymentMethodStep = () => {
const { isProcessing: checkoutIsProcessing } = useCheckoutContext();
const { cartNeedsPayment } = useStoreCart();
const { paymentMethods } = usePaymentMethods();
+ const { noticeContexts } = useEmitResponse();
if ( ! cartNeedsPayment ) {
return null;
@@ -34,7 +39,7 @@ const PaymentMethodStep = () => {
: ''
}
>
-
+