@blocklet/payment-react-headless 1.29.8 → 1.29.9

package/es/checkout/hooks/useCustomerForm.js

@@ -49,6 +49,7 @@ export function useCustomerForm(sessionData, currencyId, methodId) {
           }));
         }
       } catch {
+        setPrefetched(true);
       }
     };
     fetchCustomer();
@@ -105,6 +106,7 @@ export function useCustomerForm(sessionData, currencyId, methodId) {
         }));
       }
     } catch {
+      setPrefetched(true);
     }
   });
   return {

package/es/checkout/hooks/useSubmit.js

@@ -105,6 +105,29 @@ export function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit
       setContext({ type: "error", message: getErrorMessage(err) || "Payment verification failed" });
     }
   });
+  useEffect(() => {
+    if (completedDetectedRef.current || !sessionId) return;
+    if (status !== "idle" && status !== "waiting_stripe") return;
+    let redirectStatus = null;
+    let hasPaymentIntent = false;
+    try {
+      const params = new URLSearchParams(window.location.search);
+      redirectStatus = params.get("redirect_status");
+      hasPaymentIntent = !!params.get("payment_intent");
+    } catch {
+      return;
+    }
+    if (!redirectStatus && !hasPaymentIntent) return;
+    completedDetectedRef.current = true;
+    if (redirectStatus === "failed" || redirectStatus === "canceled") {
+      setStatus("failed");
+      setContext({ type: "error", message: "Payment was not completed. Please try again." });
+      return;
+    }
+    setStatus("submitting");
+    setContext(null);
+    handleCompletion();
+  }, [sessionId]);
   useEffect(() => {
     if (status !== "completed" || !sessionId) return void 0;
     const hasVendors = session?.line_items?.some(

package/lib/checkout/hooks/useCustomerForm.js

@@ -62,7 +62,9 @@ function useCustomerForm(sessionData, currencyId, methodId) {
             }
           }));
         }
-      } catch {}
+      } catch {
+        setPrefetched(true);
+      }
     };
     fetchCustomer();
   }, [session?.id]);
@@ -124,7 +126,9 @@ function useCustomerForm(sessionData, currencyId, methodId) {
           }
         }));
       }
-    } catch {}
+    } catch {
+      setPrefetched(true);
+    }
   });
   return {
     fields,

package/lib/checkout/hooks/useSubmit.js

@@ -104,6 +104,32 @@ function useSubmit(sessionData, sessionId, currencyId, isStripe, isCredit, isDon
       });
     }
   });
+  (0, _react.useEffect)(() => {
+    if (completedDetectedRef.current || !sessionId) return;
+    if (status !== "idle" && status !== "waiting_stripe") return;
+    let redirectStatus = null;
+    let hasPaymentIntent = false;
+    try {
+      const params = new URLSearchParams(window.location.search);
+      redirectStatus = params.get("redirect_status");
+      hasPaymentIntent = !!params.get("payment_intent");
+    } catch {
+      return;
+    }
+    if (!redirectStatus && !hasPaymentIntent) return;
+    completedDetectedRef.current = true;
+    if (redirectStatus === "failed" || redirectStatus === "canceled") {
+      setStatus("failed");
+      setContext({
+        type: "error",
+        message: "Payment was not completed. Please try again."
+      });
+      return;
+    }
+    setStatus("submitting");
+    setContext(null);
+    handleCompletion();
+  }, [sessionId]);
   (0, _react.useEffect)(() => {
     if (status !== "completed" || !sessionId) return void 0;
     const hasVendors = session?.line_items?.some(item => !!item?.price?.product?.vendor_config?.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/payment-react-headless",
-  "version": "1.29.8",
+  "version": "1.29.9",
   "description": "Headless React hooks for payment-kit checkout",
   "keywords": [
     "react",
@@ -35,7 +35,7 @@
   "dependencies": {
     "@arcblock/ws": "^1.30.24",
     "@blocklet/js-sdk": "workspace:*",
-    "@blocklet/payment-types": "1.29.8",
+    "@blocklet/payment-types": "1.29.9",
     "@ocap/util": "^1.30.24",
     "ahooks": "^3.8.5",
     "google-libphonenumber": "^3.2.42",
@@ -60,5 +60,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "547c0614f1f83abad80ea08452d2f5a9f4f5aa07"
+  "gitHead": "249bd9bf3c6cc54f77c260edb4b4d3c0be60f126"
 }

package/src/checkout/hooks/useCustomerForm.ts

@@ -82,7 +82,11 @@ export function useCustomerForm(
           }));
         }
       } catch {
-        // Ignore - customer info is optional
+        // /customers/me is best-effort. Still mark prefetch as attempted so the
+        // customer-info card renders an editable form (letting the user fill the
+        // required name/email manually) instead of staying hidden forever — e.g.
+        // when the endpoint 403s under embedded (no resolvable payment session).
+        setPrefetched(true);
       }
     };
 
@@ -149,7 +153,8 @@ export function useCustomerForm(
         }));
       }
     } catch {
-      // Ignore - customer info is optional
+      // Best-effort (see prefetch above) — mark attempted so the form still renders.
+      setPrefetched(true);
     }
   });
 

package/src/checkout/hooks/useSubmit.ts

@@ -197,6 +197,48 @@ export function useSubmit(
     }
   });
 
+  // Stripe redirect fallback: when confirmPayment redirects back to return_url
+  // (3DS or redirect-based methods), the page fully reloads — onConfirm →
+  // stripeConfirm never runs, and the completion event only arrives via the
+  // WebSocket relay, which is unreachable on embedded/no-relay runtimes. Stripe
+  // appends redirect_status / payment_intent to the return URL; detect it and
+  // start polling until the backend reconciles, instead of getting stuck on
+  // loading until the user manually refreshes.
+  useEffect(() => {
+    if (completedDetectedRef.current || !sessionId) return;
+    if (status !== 'idle' && status !== 'waiting_stripe') return;
+    let redirectStatus: string | null = null;
+    let hasPaymentIntent = false;
+    try {
+      const params = new URLSearchParams(window.location.search);
+      redirectStatus = params.get('redirect_status');
+      hasPaymentIntent = !!params.get('payment_intent');
+    } catch {
+      return;
+    }
+    // Not a Stripe redirect return — nothing to reconcile.
+    if (!redirectStatus && !hasPaymentIntent) return;
+
+    completedDetectedRef.current = true;
+
+    // A failed/canceled redirect ALSO carries `payment_intent`, so the bare presence
+    // of that param is not a success signal. Surface the failure immediately instead
+    // of polling a session that will never reach paid until the 5-minute timeout.
+    if (redirectStatus === 'failed' || redirectStatus === 'canceled') {
+      setStatus('failed');
+      setContext({ type: 'error', message: 'Payment was not completed. Please try again.' });
+      return;
+    }
+
+    // succeeded / pending / (param present without an explicit status) → the backend
+    // is the source of truth; poll until it reconciles. waitForCheckoutComplete also
+    // early-throws on a surfaced last_payment_error, so a hard decline still ends fast.
+    setStatus('submitting');
+    setContext(null);
+    handleCompletion();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [sessionId]);
+
   // Vendor order polling after completion
   useEffect(() => {
     if (status !== 'completed' || !sessionId) return undefined;