Fix bug where active payment methods were checked too early

woocommerce · Sep 1, 2022 · 58b791e · 58b791e
1 parent b253a6d
commit 58b791e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/assets/js/data/cart/index.ts b/assets/js/data/cart/index.ts
@@ -33,6 +33,12 @@ const registeredStore = registerStore< State >( STORE_KEY, {
 
 registeredStore.subscribe( pushChanges );
 registeredStore.subscribe( async () => {
+	const isInitialized =
+		wpDataSelect( STORE_KEY ).hasFinishedResolution( 'getCartData' );
+
+	if ( ! isInitialized ) {
+		return;
+	}
 	await checkPaymentMethodsCanPay();
 	await checkPaymentMethodsCanPay( true );
 } );

diff --git a/assets/js/data/checkout/index.ts b/assets/js/data/checkout/index.ts
@@ -34,6 +34,7 @@ register( store );
 
 const isEditor = !! wpDataSelect( 'core/editor' );
 
+// This is needed to ensure that the payment methods are displayed in the editor
 if ( isEditor ) {
 	subscribe( async () => {
 		await checkPaymentMethodsCanPay();