From 96b3919e52c59a4bd9ce49abd40c647eaea12b76 Mon Sep 17 00:00:00 2001
From: Usman Baig <mubaig@pm.me>
Date: Fri, 20 Feb 2026 03:47:10 +0100
Subject: [PATCH] fix: refactor CheckoutReturnPage to use Suspense for loading
 state and separate content into CheckoutReturnContent component

---
 app/checkout/return/page.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/checkout/return/page.tsx b/app/checkout/return/page.tsx
index e2aceac..bd448e4 100644
--- a/app/checkout/return/page.tsx
+++ b/app/checkout/return/page.tsx
@@ -6,13 +6,13 @@
  * Fetches session status and redirects to dashboard on success.
  */
 
-import { useEffect, useState } from 'react'
+import { Suspense, useEffect, useState } from 'react'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { getCheckoutSessionStatus } from '@/lib/api/billing'
 import { LoadingOverlay } from '@ciphera-net/ui'
 import Link from 'next/link'
 
-export default function CheckoutReturnPage() {
+function CheckoutReturnContent() {
   const router = useRouter()
   const searchParams = useSearchParams()
   const sessionId = searchParams.get('session_id')
@@ -91,3 +91,11 @@ export default function CheckoutReturnPage() {
     </div>
   )
 }
+
+export default function CheckoutReturnPage() {
+  return (
+    <Suspense fallback={<LoadingOverlay logoSrc="/pulse_icon_no_margins.png" title="Loading…" />}>
+      <CheckoutReturnContent />
+    </Suspense>
+  )
+}