Skip to content

Open-source event management and ticket selling platform — perfect for concerts, conferences, and everything in between 🎟️ If you find this project helpful, please consider giving us a star ⭐️

Fix payment page showing incorrect message while loading

Dave Earley414d3793c259
diff --git a/frontend/src/components/forms/StripeCheckoutForm/index.tsx b/frontend/src/components/forms/StripeCheckoutForm/index.tsx
index a6c7bd53d..83b1b4e13 100644
--- a/frontend/src/components/forms/StripeCheckoutForm/index.tsx
+++ b/frontend/src/components/forms/StripeCheckoutForm/index.tsx
@@ -54,6 +54,14 @@ export default function StripeCheckoutForm() {
});
}, [stripe]);
+ if (!isOrderFetched || !isEventFetched || !order?.payment_status) {
+ return (
+ <CheckoutContent>
+ <Skeleton height={300} mb={20}/>
+ </CheckoutContent>
+ )
+ }
+
if (order?.payment_status === 'PAYMENT_RECEIVED') {
return (
<HomepageInfoMessage
@@ -107,14 +115,6 @@ export default function StripeCheckoutForm() {
},
}
- if (!isOrderFetched || !isEventFetched) {
- return (
- <CheckoutContent>
- <Skeleton height={300} mb={20}/>
- </CheckoutContent>
- )
- }
-
return (
<form id="payment-form" onSubmit={handleSubmit}>
<CheckoutContent>