Redirect to market after verification

web/components/bet/bet-panel.tsx

@@ -691,7 +691,10 @@ export const BuyPanelBody = (props: {
           <Col className="gap-2">
             {user ? (
               shouldPromptVerification ? (
-                <VerifyButton content={<span>Verify to {TRADE_TERM}</span>} />
+                <VerifyButton
+                  redirectHereAfterVerify
+                  content={<span>Verify to {TRADE_TERM}</span>}
+                />
               ) : (
                 <>
                   <LocationMonitor

web/components/bet/limit-order-panel.tsx

@@ -481,7 +481,10 @@ export default function LimitOrderPanel(props: {
         <Col className="gap-2">
           {user ? (
             shouldPromptVerification ? (
-              <VerifyButton content={<span>Verify to {TRADE_TERM}</span>} />
+              <VerifyButton
+                redirectHereAfterVerify
+                content={<span>Verify to {TRADE_TERM}</span>}
+              />
             ) : (
               <>
                 <LocationMonitor

web/components/gidx/register-user-form.tsx

@@ -50,7 +50,6 @@ export const RegisterUserForm = (props: {
   const user = useUser() ?? props.user
   const privateUser = usePrivateUser() ?? props.privateUser
   const router = useRouter()
-  const { redirect } = router.query
   const [page, setPage] = useState(
     user.idVerified ||
       user.kycDocumentStatus === 'pending' ||
@@ -96,7 +95,11 @@ export const RegisterUserForm = (props: {
   useEffect(() => {
     if (userSuccesfullyVerified) {
       setTimeout(() => {
-        router.push('/checkout')
+        const { redirect } = router.query
+
+        // Get the redirect URL from query params, defaulting to /checkout
+        const redirectTo = redirect ?? '/checkout'
+        router.push(redirectTo as string)
       }, TIME_TO_REDIRECT)
     }
   }, [userSuccesfullyVerified, router])

web/components/sweeps/sweep-verify-section.tsx

@@ -21,6 +21,7 @@ import { CoinNumber } from '../widgets/coin-number'
 import { Tooltip } from '../widgets/tooltip'
 import { RainingCoins } from '../raining-coins'
 import { SweepiesFlatCoin } from 'web/public/custom-components/sweepiesFlatCoin'
+import { useRouter } from 'next/router'
 
 export function SweepVerifySection(props: { className?: string }) {
   const { className } = props
@@ -105,7 +106,10 @@ export function SweepVerifySection(props: { className?: string }) {
         </div>
 
         <Col className="gap-2">
-          <VerifyButton className=" !hover:from-amber-800 !hover:via-amber-700 !hover:to-amber-800 !mx-auto !w-fit !bg-gradient-to-r !from-amber-700 !via-amber-600 !to-amber-700 !text-white drop-shadow-lg" />
+          <VerifyButton
+            redirectHereAfterVerify
+            className=" !hover:from-amber-800 !hover:via-amber-700 !hover:to-amber-800 !mx-auto !w-fit !bg-gradient-to-r !from-amber-700 !via-amber-600 !to-amber-700 !text-white drop-shadow-lg"
+          />
 
           <Row className=" w-full">
             <button
@@ -185,15 +189,20 @@ export function VerifyButton(props: {
   className?: string
   content?: ReactNode
   color?: ColorType
+  redirectHereAfterVerify?: boolean
 }) {
-  const { className, content, color } = props
-
+  const { className, content, color, redirectHereAfterVerify } = props
+  const router = useRouter()
   const user = useUser()
   const amount = useKYCGiftAmount(user)
 
   return (
     <Link
-      href={'/gidx/register'}
+      href={`/gidx/register${
+        redirectHereAfterVerify
+          ? `?redirect=${encodeURIComponent(router.asPath)}`
+          : ''
+      }`}
       className={clsx(
         buttonClass('xl', color ?? 'gradient-pink'),
         'w-full font-semibold',

web/pages/checkout.tsx

@@ -77,7 +77,7 @@ const CheckoutPage = () => {
     setError(null)
     setLoading(true)
     if (!user.idVerified) {
-      router.push('/gidx/register?redirect=checkout')
+      router.push('/gidx/register')
       return
     }
     const { status, message } = getVerificationStatus(user, privateUser)