Fix block checkout page reloading on form errors.

woocommerce · Dec 13, 2023 · 2f0f0a7 · 2f0f0a7
1 parent be28f81
commit 2f0f0a7
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/modules/ppcp-blocks/resources/js/checkout-block.js b/modules/ppcp-blocks/resources/js/checkout-block.js
@@ -31,6 +31,7 @@ const PayPalComponent = ({
     const {responseTypes} = emitResponse;
 
     const [paypalOrder, setPaypalOrder] = useState(null);
+    const [gotoContinuation, setGotoContinuation] = useState(false);
 
     const methodId = fundingSource ? `${config.id}-${fundingSource}` : config.id;
 
@@ -152,6 +153,7 @@ const PayPalComponent = ({
             if (config.finalReviewEnabled) {
                 location.href = getCheckoutRedirectUrl();
             } else {
+                setGotoContinuation(true);
                 onSubmit();
             }
         } catch (err) {
@@ -170,15 +172,15 @@ const PayPalComponent = ({
             if (config.scriptData.continuation) {
                 return true;
             }
-            if (wp.data.select('wc/store/validation').hasValidationErrors()) {
+            if (gotoContinuation && wp.data.select('wc/store/validation').hasValidationErrors()) {
                 location.href = getCheckoutRedirectUrl();
                 return { type: responseTypes.ERROR };
             }
 
             return true;
         });
         return unsubscribe;
-    }, [onCheckoutValidation] );
+    }, [onCheckoutValidation, gotoContinuation] );
 
     const handleClick = (data, actions) => {
         if (isEditing) {