From a33398f65c2403b51554e6b357746ba7840e234f Mon Sep 17 00:00:00 2001
From: XiNiHa <me@xiniha.dev>
Date: Wed, 11 Feb 2026 17:31:42 +0900
Subject: [PATCH 1/3] delay showing resend verification email button

---
 .../web/app/src/pages/auth-verify-email.tsx     | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/web/app/src/pages/auth-verify-email.tsx b/packages/web/app/src/pages/auth-verify-email.tsx
index dcb2312009a..9881d0547af 100644
--- a/packages/web/app/src/pages/auth-verify-email.tsx
+++ b/packages/web/app/src/pages/auth-verify-email.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useSessionContext } from 'supertokens-auth-react/recipe/session';
 import { useMutation } from 'urql';
 import { AuthCard, AuthCardContent, AuthCardHeader, AuthCardStack } from '@/components/auth';
@@ -42,12 +42,14 @@ function AuthVerifyEmail() {
   const session = useSessionContext();
   const navigate = useNavigate();
 
-  const [sendEmailMutation, sendEmailImpl] = useMutation(SendVerificationEmailMutation);
+  const [, sendEmailImpl] = useMutation(SendVerificationEmailMutation);
   const [verifyMutation, verify] = useMutation(VerifyEmailMutation);
+  const [resendDisabled, setResendDisabled] = useState(true);
 
   const sendEmail = useCallback(
     async (resend?: boolean) => {
       if (session.loading) return;
+      setResendDisabled(true);
 
       const result = await sendEmailImpl(
         {
@@ -69,6 +71,7 @@ function AuthVerifyEmail() {
           title: 'Verification email sent',
           description: 'Please check your email inbox.',
         });
+        await new Promise(resolve => setTimeout(resolve, 3000));
       } else if (result.data?.sendVerificationEmail.error?.emailAlreadyVerified) {
         void navigate({ to: '/' });
       } else {
@@ -80,6 +83,8 @@ function AuthVerifyEmail() {
             'An unknown error occurred.',
         });
       }
+
+      setResendDisabled(false);
     },
     [session.loading, sendEmailImpl, toast],
   );
@@ -117,11 +122,7 @@ function AuthVerifyEmail() {
           <AuthCardContent>
             <AuthCardStack>
               <p>There was an unexpected error when verifying your email address.</p>
-              <Button
-                className="w-full"
-                disabled={sendEmailMutation.fetching}
-                onClick={() => sendEmail(true)}
-              >
+              <Button className="w-full" disabled={resendDisabled} onClick={() => sendEmail(true)}>
                 Resend verification email
               </Button>
               <Button asChild className="w-full" variant="outline">
@@ -198,7 +199,7 @@ function AuthVerifyEmail() {
           <Button
             type="button"
             className="w-full"
-            disabled={sendEmailMutation.fetching}
+            disabled={resendDisabled}
             onClick={() => sendEmail(true)}
           >
             Resend verification email

From 88c26f0e47685386b89f70827a4affdd4191dae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iha=20Shin=20=28=EC=8B=A0=EC=9D=98=ED=95=98=29?=
 <me@xiniha.dev>
Date: Wed, 11 Feb 2026 17:43:04 +0900
Subject: [PATCH 2/3] gemini fixes

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 packages/web/app/src/pages/auth-verify-email.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/web/app/src/pages/auth-verify-email.tsx b/packages/web/app/src/pages/auth-verify-email.tsx
index 9881d0547af..64aac01c404 100644
--- a/packages/web/app/src/pages/auth-verify-email.tsx
+++ b/packages/web/app/src/pages/auth-verify-email.tsx
@@ -44,7 +44,7 @@ function AuthVerifyEmail() {
 
   const [, sendEmailImpl] = useMutation(SendVerificationEmailMutation);
   const [verifyMutation, verify] = useMutation(VerifyEmailMutation);
-  const [resendDisabled, setResendDisabled] = useState(true);
+  const [resendDisabled, setResendDisabled] = useState(!search.userIdentityId);
 
   const sendEmail = useCallback(
     async (resend?: boolean) => {
@@ -74,6 +74,7 @@ function AuthVerifyEmail() {
         await new Promise(resolve => setTimeout(resolve, 3000));
       } else if (result.data?.sendVerificationEmail.error?.emailAlreadyVerified) {
         void navigate({ to: '/' });
+        return;
       } else {
         toast({
           title: 'Failed to send verification email',

From c9c2534d877aa62cce345802c2e9b540c9ccd21b Mon Sep 17 00:00:00 2001
From: XiNiHa <me@xiniha.dev>
Date: Thu, 12 Feb 2026 14:26:11 +0900
Subject: [PATCH 3/3] utilize useTimed

---
 .../web/app/src/pages/auth-verify-email.tsx   | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/packages/web/app/src/pages/auth-verify-email.tsx b/packages/web/app/src/pages/auth-verify-email.tsx
index 64aac01c404..219502d8be8 100644
--- a/packages/web/app/src/pages/auth-verify-email.tsx
+++ b/packages/web/app/src/pages/auth-verify-email.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useCallback, useEffect } from 'react';
 import { useSessionContext } from 'supertokens-auth-react/recipe/session';
 import { useMutation } from 'urql';
 import { AuthCard, AuthCardContent, AuthCardHeader, AuthCardStack } from '@/components/auth';
@@ -6,6 +6,7 @@ import { Button } from '@/components/ui/button';
 import { Meta } from '@/components/ui/meta';
 import { useToast } from '@/components/ui/use-toast';
 import { graphql } from '@/gql';
+import { useTimed } from '@/lib/hooks/use-timed';
 import { authVerifyEmailRoute } from '@/router';
 import { Link, useNavigate } from '@tanstack/react-router';
 
@@ -42,14 +43,13 @@ function AuthVerifyEmail() {
   const session = useSessionContext();
   const navigate = useNavigate();
 
-  const [, sendEmailImpl] = useMutation(SendVerificationEmailMutation);
+  const [sendEmailMutation, sendEmailImpl] = useMutation(SendVerificationEmailMutation);
   const [verifyMutation, verify] = useMutation(VerifyEmailMutation);
-  const [resendDisabled, setResendDisabled] = useState(!search.userIdentityId);
+  const [emailSent, startEmailSentTimer] = useTimed(3000);
 
   const sendEmail = useCallback(
     async (resend?: boolean) => {
       if (session.loading) return;
-      setResendDisabled(true);
 
       const result = await sendEmailImpl(
         {
@@ -71,7 +71,7 @@ function AuthVerifyEmail() {
           title: 'Verification email sent',
           description: 'Please check your email inbox.',
         });
-        await new Promise(resolve => setTimeout(resolve, 3000));
+        startEmailSentTimer();
       } else if (result.data?.sendVerificationEmail.error?.emailAlreadyVerified) {
         void navigate({ to: '/' });
         return;
@@ -84,8 +84,6 @@ function AuthVerifyEmail() {
             'An unknown error occurred.',
         });
       }
-
-      setResendDisabled(false);
     },
     [session.loading, sendEmailImpl, toast],
   );
@@ -123,7 +121,11 @@ function AuthVerifyEmail() {
           <AuthCardContent>
             <AuthCardStack>
               <p>There was an unexpected error when verifying your email address.</p>
-              <Button className="w-full" disabled={resendDisabled} onClick={() => sendEmail(true)}>
+              <Button
+                className="w-full"
+                disabled={sendEmailMutation.fetching || emailSent}
+                onClick={() => sendEmail(true)}
+              >
                 Resend verification email
               </Button>
               <Button asChild className="w-full" variant="outline">
@@ -200,7 +202,7 @@ function AuthVerifyEmail() {
           <Button
             type="button"
             className="w-full"
-            disabled={resendDisabled}
+            disabled={sendEmailMutation.fetching || emailSent}
             onClick={() => sendEmail(true)}
           >
             Resend verification email