switch from event subscription to status watch (#2119)

woocommerce · Apr 4, 2020 · d0b182c · d0b182c
1 parent e6757ab
commit d0b182c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/assets/js/blocks/cart-checkout/checkout/block.js b/assets/js/blocks/cart-checkout/checkout/block.js
@@ -61,7 +61,11 @@ const Checkout = ( {
 	shippingRates = [],
 } ) => {
 	const { isEditor } = useEditorContext();
-	const { hasOrder, onCheckoutCompleteError } = useCheckoutContext();
+	const {
+		hasOrder,
+		hasError: checkoutHasError,
+		isComplete: checkoutIsComplete,
+	} = useCheckoutContext();
 	const { showAllValidationErrors } = useValidationContext();
 	const {
 		shippingRatesLoading,
@@ -121,14 +125,11 @@ const Checkout = ( {
 	}, [ shippingAsBilling, setBillingData ] );
 
 	useEffect( () => {
-		const unsubscribeCompleteError = onCheckoutCompleteError( () => {
+		if ( checkoutIsComplete && checkoutHasError ) {
 			showAllValidationErrors();
 			scrollToTop( { focusableSelector: 'input:invalid' } );
-		} );
-		return () => {
-			unsubscribeCompleteError();
-		};
-	}, [ onCheckoutCompleteError ] );
+		}
+	}, [ checkoutIsComplete, checkoutHasError ] );
 
 	if ( ! isEditor && ! hasOrder ) {
 		return <CheckoutOrderError />;