From 120187ebfd362e4966d9516bdf04ef6d5d4bd1bb Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 23 Sep 2025 02:08:00 +0530
Subject: [PATCH 01/10] feat: implement email verification flow with route
 guard and modal

---
 .../account/sendVerificationEmailModal.svelte | 169 ++++++++++++++----
 src/routes/(console)/+layout.svelte           |   4 +-
 .../(console)/verify-email/+page.svelte       | 150 ++++++++++++++++
 src/routes/(console)/verify-email/+page.ts    |   9 +
 src/routes/+layout.ts                         |  10 ++
 5 files changed, 309 insertions(+), 33 deletions(-)
 create mode 100644 src/routes/(console)/verify-email/+page.svelte
 create mode 100644 src/routes/(console)/verify-email/+page.ts

diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index bbe676142..259782ed3 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -1,32 +1,99 @@
 <script lang="ts">
-    import { invalidate } from '$app/navigation';
+    import { invalidate, goto } from '$app/navigation';
     import { Modal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
-    import { addNotification } from '$lib/stores/notifications';
     import { sdk } from '$lib/stores/sdk';
     import { user } from '$lib/stores/user';
     import { get } from 'svelte/store';
     import { page } from '$app/state';
+    import Link from '$lib/elements/link.svelte';
     import { Card, Layout, Typography } from '@appwrite.io/pink-svelte';
     import { Dependencies } from '$lib/constants';
-    import { onMount } from 'svelte';
+    import { onMount, onDestroy } from 'svelte';
+    import { base } from '$app/paths';
+    import { browser } from '$app/environment';
 
-    let { show = $bindable(false) } = $props();
+    let { show = $bindable(false), email } = $props();
     let creating = $state(false);
     let emailSent = $state(false);
+    let resendTimer = $state(0);
+    let timerInterval: NodeJS.Timeout | null = null;
+
+    async function logout(redirect = true) {
+        try {
+            await sdk.forConsole.account.deleteSession({ sessionId: 'current' });
+            if (redirect) {
+                goto(`${base}/login`);
+            }
+        } catch (error) {
+            console.error('Logout error:', error);
+        }
+    }
 
     let cleanUrl = $derived(page.url.origin + page.url.pathname);
 
+    // Manage resend timer in localStorage
+    const TIMER_END_KEY = 'email_verification_timer_end';
+    const EMAIL_SENT_KEY = 'email_verification_sent';
+
+    function startResendTimer() {
+        const timerEndTime = Date.now() + 60 * 1000;
+        resendTimer = 60;
+        emailSent = true;
+        if (browser) {
+            localStorage.setItem(TIMER_END_KEY, timerEndTime.toString());
+            localStorage.setItem(EMAIL_SENT_KEY, 'true');
+        }
+        startTimerCountdown(timerEndTime);
+    }
+
+    function restoreTimerState() {
+        if (!browser) return;
+        const savedTimerEnd = localStorage.getItem(TIMER_END_KEY);
+        const savedEmailSent = localStorage.getItem(EMAIL_SENT_KEY);
+        if (savedTimerEnd && savedEmailSent) {
+            const timerEndTime = parseInt(savedTimerEnd);
+            const now = Date.now();
+            const remainingTime = Math.max(0, Math.ceil((timerEndTime - now) / 1000));
+            if (remainingTime > 0) {
+                resendTimer = remainingTime;
+                emailSent = true;
+                startTimerCountdown(timerEndTime);
+            } else {
+                // Timer has expired, clean up
+                localStorage.removeItem(TIMER_END_KEY);
+                localStorage.removeItem(EMAIL_SENT_KEY);
+                resendTimer = 0;
+                emailSent = false;
+            }
+        }
+    }
+
+    function startTimerCountdown(timerEndTime: number) {
+        timerInterval = setInterval(() => {
+            const now = Date.now();
+            const remainingTime = Math.max(0, Math.ceil((timerEndTime - now) / 1000));
+            resendTimer = remainingTime;
+            if (remainingTime <= 0) {
+                clearInterval(timerInterval);
+                timerInterval = null;
+                if (browser) {
+                    localStorage.removeItem(TIMER_END_KEY);
+                    localStorage.removeItem(EMAIL_SENT_KEY);
+                }
+            }
+        }, 1000);
+    }
+
     async function onSubmit() {
-        if (creating) return;
+        if (creating || resendTimer > 0) return;
         creating = true;
         try {
             await sdk.forConsole.account.createVerification({ url: cleanUrl });
-            addNotification({ message: 'Verification email has been sent', type: 'success' });
             emailSent = true;
-            show = false;
+            startResendTimer();
         } catch (error) {
-            addNotification({ message: error.message, type: 'error' });
+            console.error('Failed to send verification email:', error);
         } finally {
             creating = false;
         }
@@ -40,40 +107,82 @@
         if (userId && secret) {
             try {
                 await sdk.forConsole.account.updateVerification({ userId, secret });
-                addNotification({
-                    message: 'Email verified successfully',
-                    type: 'success'
-                });
                 await Promise.all([
                     invalidate(Dependencies.ACCOUNT),
                     invalidate(Dependencies.FACTORS)
                 ]);
+
+                goto(`${base}/`);
             } catch (error) {
-                addNotification({
-                    message: error.message,
-                    type: 'error'
-                });
+                console.error('Failed to verify email:', error);
             }
         }
     }
 
     onMount(() => {
         updateEmailVerification();
+        restoreTimerState(); // Check for existing timer
+    });
+
+    onDestroy(() => {
+        if (timerInterval) {
+            clearInterval(timerInterval);
+        }
+        if (browser) {
+            localStorage.removeItem(TIMER_END_KEY);
+            localStorage.removeItem(EMAIL_SENT_KEY);
+        }
     });
 </script>
 
-<Modal bind:show title="Send verification email" {onSubmit}>
-    <Card.Base variant="secondary" padding="s">
-        <Layout.Stack gap="m">
-            <Typography.Text gap="m">
-                To continue using Appwrite Cloud, please verify your email address. An email will be
-                sent to <Typography.Text variant="m-600" style="display: inline;"
-                    >{get(user)?.email}</Typography.Text>
-            </Typography.Text>
-        </Layout.Stack>
-    </Card.Base>
+<div class="email-verification-scrim">
+    <Modal
+        show={true}
+        title="Verify your email address"
+        {onSubmit}
+        dismissible={false}
+        autoClose={false}>
+        <Card.Base variant="secondary" padding="s">
+            <Layout.Stack gap="s">
+                <Typography.Text gap="m">
+                    To continue using Appwrite Cloud, please verify your email address. An email
+                    will be sent to <Typography.Text
+                        variant="m-600"
+                        color="neutral-secondary"
+                        style="display: inline;">{email || get(user)?.email}</Typography.Text>
+                </Typography.Text>
+                <Layout.Stack class="u-margin-block-start-4 u-margin-block-end-24">
+                    <Layout.Stack direction="row">
+                        <Link variant="default" on:click={() => logout(false)}>Switch account</Link>
+                    </Layout.Stack>
+                </Layout.Stack>
+                {#if emailSent && resendTimer > 0}
+                    <Typography.Text color="neutral-secondary">
+                        Didn't get the email? Try again in {resendTimer}s
+                    </Typography.Text>
+                {/if}
+            </Layout.Stack>
+        </Card.Base>
 
-    <svelte:fragment slot="footer">
-        <Button submit disabled={creating}>{emailSent ? 'Resend email' : 'Send email'}</Button>
-    </svelte:fragment>
-</Modal>
+        <svelte:fragment slot="footer">
+            <Button submit disabled={creating || resendTimer > 0}>
+                {emailSent ? 'Resend email' : 'Send email'}
+            </Button>
+        </svelte:fragment>
+    </Modal>
+</div>
+
+<style>
+    .email-verification-scrim {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background-color: hsl(240 5% 8% / 0.6);
+        backdrop-filter: blur(4px);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+    }
+</style>
diff --git a/src/routes/(console)/+layout.svelte b/src/routes/(console)/+layout.svelte
index a8e6e30c7..d3a77a8c4 100644
--- a/src/routes/(console)/+layout.svelte
+++ b/src/routes/(console)/+layout.svelte
@@ -45,7 +45,7 @@
     import { headerAlert } from '$lib/stores/headerAlert';
     import { UsageRates } from '$lib/components/billing';
     import { canSeeProjects } from '$lib/stores/roles';
-    import { BottomModalAlert, EmailVerificationBanner } from '$lib/components';
+    import { BottomModalAlert } from '$lib/components';
     import {
         IconAnnotation,
         IconBookOpen,
@@ -346,8 +346,6 @@
     <Footer slot="footer" />
 </Shell>
 
-<EmailVerificationBanner />
-
 {#if $wizard.show && $wizard.component}
     <svelte:component this={$wizard.component} {...$wizard.props} />
 {:else if $wizard.cover}
diff --git a/src/routes/(console)/verify-email/+page.svelte b/src/routes/(console)/verify-email/+page.svelte
new file mode 100644
index 000000000..a3ccb63f5
--- /dev/null
+++ b/src/routes/(console)/verify-email/+page.svelte
@@ -0,0 +1,150 @@
+<script lang="ts">
+    import Sidebar from '$lib/components/sidebar.svelte';
+    import Navbar from '$lib/components/navbar.svelte';
+    import SendVerificationEmailModal from '$lib/components/account/sendVerificationEmailModal.svelte';
+    import { writable } from 'svelte/store';
+    import { invalidate } from '$app/navigation';
+    import { goto } from '$app/navigation';
+    import { onMount } from 'svelte';
+    import { base } from '$app/paths';
+    import { Dependencies } from '$lib/constants';
+    import type { PageData } from './$types';
+
+    let { data }: { data: PageData } = $props();
+
+    let sideBarIsOpen = writable(false);
+    let showAccountMenu = writable(false);
+    let project: any = {
+        $id: 'verify-email-project',
+        region: 'us-east-1',
+        name: 'Verify Email Project'
+    };
+    let avatar = '/images/default-avatar.png';
+    let progressCard = {
+        title: 'Get started',
+        percentage: 33
+    };
+
+    let navbarProps = {
+        logo: {
+            src: '/images/appwrite-logo-light.svg',
+            alt: 'Appwrite Logo'
+        },
+        avatar: avatar,
+        organizations: [],
+        currentProject: project
+    };
+
+    let showVerificationModal = $state(!data.user?.emailVerification);
+
+    $effect(() => {
+        if (data.user?.emailVerification) {
+            checkEmailVerification();
+        }
+    });
+
+    async function checkEmailVerification() {
+        if (data.user?.emailVerification) {
+            await goto(`${base}/`);
+        }
+    }
+
+    onMount(() => {
+        if (!data.user) {
+            goto(`${base}/login`);
+            return;
+        }
+
+        // If email is already verified, redirect immediately
+        if (data.user?.emailVerification) {
+            checkEmailVerification();
+            return;
+        }
+
+        const interval = setInterval(async () => {
+            await invalidate(Dependencies.ACCOUNT);
+            checkEmailVerification();
+        }, 2000);
+
+        return () => clearInterval(interval);
+    });
+</script>
+
+<svelte:head>
+    <title>Verify Email - Appwrite Console</title>
+</svelte:head>
+
+<div class="verify-email-page">
+    <Navbar
+        {...navbarProps}
+        bind:sideBarIsOpen={$sideBarIsOpen}
+        bind:showAccountMenu={$showAccountMenu} />
+
+    <Sidebar
+        bind:sideBarIsOpen={$sideBarIsOpen}
+        bind:showAccountMenu={$showAccountMenu}
+        {project}
+        {avatar}
+        {progressCard}
+        state="open" />
+
+    <div class="main-content">
+        <!-- Main content area -->
+    </div>
+
+    <!-- email verification modal -->
+    <SendVerificationEmailModal bind:show={showVerificationModal} email={data.user?.email} />
+</div>
+
+<style lang="scss">
+    .verify-email-page {
+        display: flex;
+        min-height: 100vh;
+        position: relative;
+        width: 100%;
+        margin: 0;
+        padding: 0;
+    }
+
+    .main-content {
+        flex: 1;
+        padding: 2rem;
+        margin-left: 190px;
+        min-height: 100vh;
+    }
+    :global(.verify-email-page .sidebar) {
+        position: fixed !important;
+        left: 0 !important;
+        top: 0 !important;
+        height: 100vh !important;
+        z-index: 1000 !important;
+        filter: blur(4px);
+        opacity: 0.6;
+    }
+
+    /* Blur the navbar */
+    :global(.verify-email-page .navbar),
+    :global(.verify-email-page [data-pink-navbar]),
+    :global(.verify-email-page header) {
+        filter: blur(2px);
+        opacity: 0.4;
+        z-index: 1;
+    }
+
+    .main-content {
+        filter: blur(4px);
+        opacity: 0.6;
+    }
+
+    /* ensure modal is above everything and not blurred */
+    :global(.verify-email-page .email-verification-scrim) {
+        z-index: 9999 !important;
+        filter: none !important;
+        opacity: 1 !important;
+    }
+
+    :global(.verify-email-page .email-verification-scrim *) {
+        filter: none !important;
+        opacity: 1 !important;
+    }
+</style>
diff --git a/src/routes/(console)/verify-email/+page.ts b/src/routes/(console)/verify-email/+page.ts
new file mode 100644
index 000000000..69e7c63ac
--- /dev/null
+++ b/src/routes/(console)/verify-email/+page.ts
@@ -0,0 +1,9 @@
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({ parent }) => {
+    const { account } = await parent();
+
+    return {
+        user: account
+    };
+};
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 46b84cc98..2133f99ed 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -29,6 +29,16 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
     }
 
     if (account) {
+        if (isCloud && !account.emailVerification) {
+            const isPublicRoute = route.id?.startsWith('/(public)');
+            const isAuthRoute = route.id?.startsWith('/(authenticated)');
+            const isVerifyEmailPage = url.pathname === `${base}/verify-email`;
+
+            if (!isPublicRoute && !isAuthRoute && !isVerifyEmailPage) {
+                redirect(303, `${base}/verify-email`);
+            }
+        }
+
         return {
             account: account,
             organizations: !isCloud

From 45cf897bac5dc62668537e7e9ab5616b7b857c34 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 23 Sep 2025 02:23:05 +0530
Subject: [PATCH 02/10] build error fix

---
 src/lib/components/account/sendVerificationEmailModal.svelte | 5 +++--
 src/lib/components/alerts/emailVerificationBanner.svelte     | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index 259782ed3..f5169174e 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -23,6 +23,7 @@
         try {
             await sdk.forConsole.account.deleteSession({ sessionId: 'current' });
             if (redirect) {
+                await invalidate(Dependencies.ACCOUNT);
                 goto(`${base}/login`);
             }
         } catch (error) {
@@ -137,7 +138,7 @@
 
 <div class="email-verification-scrim">
     <Modal
-        show={true}
+        bind:show
         title="Verify your email address"
         {onSubmit}
         dismissible={false}
@@ -153,7 +154,7 @@
                 </Typography.Text>
                 <Layout.Stack class="u-margin-block-start-4 u-margin-block-end-24">
                     <Layout.Stack direction="row">
-                        <Link variant="default" on:click={() => logout(false)}>Switch account</Link>
+                        <Link variant="default" on:click={() => logout()}>Switch account</Link>
                     </Layout.Stack>
                 </Layout.Stack>
                 {#if emailSent && resendTimer > 0}
diff --git a/src/lib/components/alerts/emailVerificationBanner.svelte b/src/lib/components/alerts/emailVerificationBanner.svelte
index 9af46d418..de2941f55 100644
--- a/src/lib/components/alerts/emailVerificationBanner.svelte
+++ b/src/lib/components/alerts/emailVerificationBanner.svelte
@@ -32,5 +32,5 @@
                 >Verify email</Button>
         </svelte:fragment>
     </HeaderAlert>
-    <SendVerificationEmailModal bind:show={showSendVerification} />
+    <SendVerificationEmailModal bind:show={showSendVerification} email={$user?.email} />
 {/if}

From ff76c6353148ad8ed6a6ae31a57d07059820c881 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 23 Sep 2025 02:29:27 +0530
Subject: [PATCH 03/10] lint issue : any

---
 src/lib/components/account/sendVerificationEmailModal.svelte | 2 +-
 src/routes/(console)/verify-email/+page.svelte               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index f5169174e..7683a4cf5 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -17,7 +17,7 @@
     let creating = $state(false);
     let emailSent = $state(false);
     let resendTimer = $state(0);
-    let timerInterval: NodeJS.Timeout | null = null;
+    let timerInterval: ReturnType<typeof setInterval> | null = null;
 
     async function logout(redirect = true) {
         try {
diff --git a/src/routes/(console)/verify-email/+page.svelte b/src/routes/(console)/verify-email/+page.svelte
index a3ccb63f5..729cbf908 100644
--- a/src/routes/(console)/verify-email/+page.svelte
+++ b/src/routes/(console)/verify-email/+page.svelte
@@ -14,6 +14,7 @@
 
     let sideBarIsOpen = writable(false);
     let showAccountMenu = writable(false);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     let project: any = {
         $id: 'verify-email-project',
         region: 'us-east-1',

From e84df2d58f596633ddebc37d73e7d2ad49d70304 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Tue, 23 Sep 2025 02:34:34 +0530
Subject: [PATCH 04/10] code rabbit suggestion:

---
 .../components/account/sendVerificationEmailModal.svelte    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index 7683a4cf5..b48be7540 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -5,7 +5,7 @@
     import { sdk } from '$lib/stores/sdk';
     import { user } from '$lib/stores/user';
     import { get } from 'svelte/store';
-    import { page } from '$app/state';
+    import { page } from '$app/stores';
     import Link from '$lib/elements/link.svelte';
     import { Card, Layout, Typography } from '@appwrite.io/pink-svelte';
     import { Dependencies } from '$lib/constants';
@@ -31,7 +31,7 @@
         }
     }
 
-    let cleanUrl = $derived(page.url.origin + page.url.pathname);
+    const cleanUrl = $derived($page.url.origin + $page.url.pathname);
 
     // Manage resend timer in localStorage
     const TIMER_END_KEY = 'email_verification_timer_end';
@@ -101,7 +101,7 @@
     }
 
     async function updateEmailVerification() {
-        const searchParams = page.url.searchParams;
+        const searchParams = $page.url.searchParams;
         const userId = searchParams.get('userId');
         const secret = searchParams.get('secret');
 

From bfdbc38f78ed251efa076a24846bf3046a898133 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Fri, 26 Sep 2025 12:45:38 +0530
Subject: [PATCH 05/10] use page from app/state and removed div added notifs

---
 .../account/sendVerificationEmailModal.svelte | 25 +++++++++++++----
 .../(console)/verify-email/+page.svelte       | 27 +++++++------------
 src/routes/(console)/verify-email/+page.ts    |  9 -------
 3 files changed, 29 insertions(+), 32 deletions(-)
 delete mode 100644 src/routes/(console)/verify-email/+page.ts

diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index b48be7540..e58c9ec85 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -5,15 +5,16 @@
     import { sdk } from '$lib/stores/sdk';
     import { user } from '$lib/stores/user';
     import { get } from 'svelte/store';
-    import { page } from '$app/stores';
+    import { page } from '$app/state';
     import Link from '$lib/elements/link.svelte';
     import { Card, Layout, Typography } from '@appwrite.io/pink-svelte';
     import { Dependencies } from '$lib/constants';
     import { onMount, onDestroy } from 'svelte';
     import { base } from '$app/paths';
     import { browser } from '$app/environment';
+    import { addNotification } from '$lib/stores/notifications';
 
-    let { show = $bindable(false), email } = $props();
+    let { show = $bindable(false), email }: { show?: boolean; email?: string } = $props();
     let creating = $state(false);
     let emailSent = $state(false);
     let resendTimer = $state(0);
@@ -27,11 +28,15 @@
                 goto(`${base}/login`);
             }
         } catch (error) {
-            console.error('Logout error:', error);
+            addNotification({
+                type: 'error',
+                title: 'Logout failed',
+                message: 'Unable to log out. Please try again or refresh the page.'
+            });
         }
     }
 
-    const cleanUrl = $derived($page.url.origin + $page.url.pathname);
+    const cleanUrl = $derived(page.url.origin + page.url.pathname);
 
     // Manage resend timer in localStorage
     const TIMER_END_KEY = 'email_verification_timer_end';
@@ -94,6 +99,11 @@
             emailSent = true;
             startResendTimer();
         } catch (error) {
+            addNotification({
+                type: 'error',
+                title: 'Failed to send verification email',
+                message: 'Unable to send verification email. Please try again.'
+            });
             console.error('Failed to send verification email:', error);
         } finally {
             creating = false;
@@ -101,7 +111,7 @@
     }
 
     async function updateEmailVerification() {
-        const searchParams = $page.url.searchParams;
+        const searchParams = page.url.searchParams;
         const userId = searchParams.get('userId');
         const secret = searchParams.get('secret');
 
@@ -115,6 +125,11 @@
 
                 goto(`${base}/`);
             } catch (error) {
+                addNotification({
+                    type: 'error',
+                    title: 'Email verification failed',
+                    message: 'Unable to verify your email. Please try again.'
+                });
                 console.error('Failed to verify email:', error);
             }
         }
diff --git a/src/routes/(console)/verify-email/+page.svelte b/src/routes/(console)/verify-email/+page.svelte
index 729cbf908..462743262 100644
--- a/src/routes/(console)/verify-email/+page.svelte
+++ b/src/routes/(console)/verify-email/+page.svelte
@@ -8,9 +8,7 @@
     import { onMount } from 'svelte';
     import { base } from '$app/paths';
     import { Dependencies } from '$lib/constants';
-    import type { PageData } from './$types';
-
-    let { data }: { data: PageData } = $props();
+    import { page } from '$app/state';
 
     let sideBarIsOpen = writable(false);
     let showAccountMenu = writable(false);
@@ -36,28 +34,28 @@
         currentProject: project
     };
 
-    let showVerificationModal = $state(!data.user?.emailVerification);
+    let showVerificationModal = $state(!page.data.account?.emailVerification);
 
     $effect(() => {
-        if (data.user?.emailVerification) {
+        if (page.data.account?.emailVerification) {
             checkEmailVerification();
         }
     });
 
     async function checkEmailVerification() {
-        if (data.user?.emailVerification) {
+        if (page.data.account?.emailVerification) {
             await goto(`${base}/`);
         }
     }
 
     onMount(() => {
-        if (!data.user) {
+        if (!page.data.account) {
             goto(`${base}/login`);
             return;
         }
 
         // If email is already verified, redirect immediately
-        if (data.user?.emailVerification) {
+        if (page.data.account?.emailVerification) {
             checkEmailVerification();
             return;
         }
@@ -89,12 +87,10 @@
         {progressCard}
         state="open" />
 
-    <div class="main-content">
-        <!-- Main content area -->
-    </div>
-
     <!-- email verification modal -->
-    <SendVerificationEmailModal bind:show={showVerificationModal} email={data.user?.email} />
+    <SendVerificationEmailModal
+        bind:show={showVerificationModal}
+        email={page.data.account?.email} />
 </div>
 
 <style lang="scss">
@@ -132,11 +128,6 @@
         z-index: 1;
     }
 
-    .main-content {
-        filter: blur(4px);
-        opacity: 0.6;
-    }
-
     /* ensure modal is above everything and not blurred */
     :global(.verify-email-page .email-verification-scrim) {
         z-index: 9999 !important;
diff --git a/src/routes/(console)/verify-email/+page.ts b/src/routes/(console)/verify-email/+page.ts
deleted file mode 100644
index 69e7c63ac..000000000
--- a/src/routes/(console)/verify-email/+page.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { PageLoad } from './$types';
-
-export const load: PageLoad = async ({ parent }) => {
-    const { account } = await parent();
-
-    return {
-        user: account
-    };
-};

From 3f7fbf8356e748f2a5a70b6832750b189251e3b7 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Fri, 26 Sep 2025 12:59:53 +0530
Subject: [PATCH 06/10] proper scss

---
 .../(console)/verify-email/+page.svelte       | 60 +++++++++----------
 1 file changed, 27 insertions(+), 33 deletions(-)

diff --git a/src/routes/(console)/verify-email/+page.svelte b/src/routes/(console)/verify-email/+page.svelte
index 462743262..b08667cd3 100644
--- a/src/routes/(console)/verify-email/+page.svelte
+++ b/src/routes/(console)/verify-email/+page.svelte
@@ -101,42 +101,36 @@
         width: 100%;
         margin: 0;
         padding: 0;
-    }
 
-    .main-content {
-        flex: 1;
-        padding: 2rem;
-        margin-left: 190px;
-        min-height: 100vh;
-    }
-    :global(.verify-email-page .sidebar) {
-        position: fixed !important;
-        left: 0 !important;
-        top: 0 !important;
-        height: 100vh !important;
-        z-index: 1000 !important;
-        filter: blur(4px);
-        opacity: 0.6;
-    }
+        :global {
+            .sidebar {
+                position: fixed !important;
+                left: 0 !important;
+                top: 0 !important;
+                height: 100vh !important;
+                z-index: 1000 !important;
+                filter: blur(4px);
+                opacity: 0.6;
+            }
 
-    /* Blur the navbar */
-    :global(.verify-email-page .navbar),
-    :global(.verify-email-page [data-pink-navbar]),
-    :global(.verify-email-page header) {
-        filter: blur(2px);
-        opacity: 0.4;
-        z-index: 1;
-    }
+            .navbar,
+            [data-pink-navbar],
+            header {
+                filter: blur(2px);
+                opacity: 0.4;
+                z-index: 1;
+            }
 
-    /* ensure modal is above everything and not blurred */
-    :global(.verify-email-page .email-verification-scrim) {
-        z-index: 9999 !important;
-        filter: none !important;
-        opacity: 1 !important;
-    }
+            .email-verification-scrim {
+                z-index: 9999 !important;
+                filter: none !important;
+                opacity: 1 !important;
 
-    :global(.verify-email-page .email-verification-scrim *) {
-        filter: none !important;
-        opacity: 1 !important;
+                * {
+                    filter: none !important;
+                    opacity: 1 !important;
+                }
+            }
+        }
     }
 </style>

From d5ef69cfdff92e2db0da5f0598cb78eb331e93e6 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Wed, 1 Oct 2025 16:25:24 +0530
Subject: [PATCH 07/10]  use realtime account subscription with 10s fallback

---
 src/routes/(console)/verify-email/+page.svelte | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/routes/(console)/verify-email/+page.svelte b/src/routes/(console)/verify-email/+page.svelte
index b08667cd3..8e0f5b490 100644
--- a/src/routes/(console)/verify-email/+page.svelte
+++ b/src/routes/(console)/verify-email/+page.svelte
@@ -9,6 +9,7 @@
     import { base } from '$app/paths';
     import { Dependencies } from '$lib/constants';
     import { page } from '$app/state';
+    import { realtime } from '$lib/stores/sdk';
 
     let sideBarIsOpen = writable(false);
     let showAccountMenu = writable(false);
@@ -60,12 +61,20 @@
             return;
         }
 
+        const unsubscribe = realtime.forProject('', '').subscribe(['account'], async () => {
+            await invalidate(Dependencies.ACCOUNT);
+            checkEmailVerification();
+        });
+
         const interval = setInterval(async () => {
             await invalidate(Dependencies.ACCOUNT);
             checkEmailVerification();
-        }, 2000);
+        }, 10000);
 
-        return () => clearInterval(interval);
+        return () => {
+            clearInterval(interval);
+            unsubscribe();
+        };
     });
 </script>
 

From d4b9066887580363193c359384e1aea4a883e806 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Wed, 1 Oct 2025 16:35:05 +0530
Subject: [PATCH 08/10] always invalidate and redirect to login

---
 .../components/account/sendVerificationEmailModal.svelte  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index e58c9ec85..3fe8c8f6b 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -20,13 +20,11 @@
     let resendTimer = $state(0);
     let timerInterval: ReturnType<typeof setInterval> | null = null;
 
-    async function logout(redirect = true) {
+    async function logout() {
         try {
             await sdk.forConsole.account.deleteSession({ sessionId: 'current' });
-            if (redirect) {
-                await invalidate(Dependencies.ACCOUNT);
-                goto(`${base}/login`);
-            }
+            await invalidate(Dependencies.ACCOUNT);
+            goto(`${base}/login`);
         } catch (error) {
             addNotification({
                 type: 'error',

From 860cd4078c5cb281deda18156fa074fba4dd1607 Mon Sep 17 00:00:00 2001
From: Darshan <itznotabug@gmail.com>
Date: Sun, 5 Oct 2025 13:50:06 +0530
Subject: [PATCH 09/10] update: refactor.

---
 .../account/sendVerificationEmailModal.svelte | 114 ++++++++----------
 .../alerts/emailVerificationBanner.svelte     |  41 -------
 src/lib/components/index.ts                   |   2 +-
 .../(console)/verify-email/+page.svelte       |  92 +++-----------
 src/routes/(console)/verify-email/+page.ts    |  45 +++++++
 src/routes/+layout.ts                         |  15 ++-
 6 files changed, 126 insertions(+), 183 deletions(-)
 delete mode 100644 src/lib/components/alerts/emailVerificationBanner.svelte
 create mode 100644 src/routes/(console)/verify-email/+page.ts

diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index 3fe8c8f6b..bb9d20bcb 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -10,44 +10,51 @@
     import { Card, Layout, Typography } from '@appwrite.io/pink-svelte';
     import { Dependencies } from '$lib/constants';
     import { onMount, onDestroy } from 'svelte';
-    import { base } from '$app/paths';
+    import { resolve } from '$app/paths';
     import { browser } from '$app/environment';
-    import { addNotification } from '$lib/stores/notifications';
+    import { slide } from 'svelte/transition';
 
-    let { show = $bindable(false), email }: { show?: boolean; email?: string } = $props();
+    let {
+        show = $bindable(false),
+        email
+    }: {
+        show?: boolean;
+        email?: string;
+    } = $props();
+
+    let error = $state(null);
     let creating = $state(false);
     let emailSent = $state(false);
     let resendTimer = $state(0);
     let timerInterval: ReturnType<typeof setInterval> | null = null;
 
     async function logout() {
+        error = null;
         try {
             await sdk.forConsole.account.deleteSession({ sessionId: 'current' });
             await invalidate(Dependencies.ACCOUNT);
-            goto(`${base}/login`);
-        } catch (error) {
-            addNotification({
-                type: 'error',
-                title: 'Logout failed',
-                message: 'Unable to log out. Please try again or refresh the page.'
-            });
+            await goto(resolve('/login'));
+        } catch (err) {
+            error = err.message;
         }
     }
 
     const cleanUrl = $derived(page.url.origin + page.url.pathname);
 
-    // Manage resend timer in localStorage
-    const TIMER_END_KEY = 'email_verification_timer_end';
+    // manage resend timer in localStorage
     const EMAIL_SENT_KEY = 'email_verification_sent';
+    const TIMER_END_KEY = 'email_verification_timer_end';
 
     function startResendTimer() {
-        const timerEndTime = Date.now() + 60 * 1000;
         resendTimer = 60;
         emailSent = true;
+        const timerEndTime = Date.now() + 60 * 1000;
+
         if (browser) {
-            localStorage.setItem(TIMER_END_KEY, timerEndTime.toString());
             localStorage.setItem(EMAIL_SENT_KEY, 'true');
+            localStorage.setItem(TIMER_END_KEY, timerEndTime.toString());
         }
+
         startTimerCountdown(timerEndTime);
     }
 
@@ -55,18 +62,21 @@
         if (!browser) return;
         const savedTimerEnd = localStorage.getItem(TIMER_END_KEY);
         const savedEmailSent = localStorage.getItem(EMAIL_SENT_KEY);
+
         if (savedTimerEnd && savedEmailSent) {
             const timerEndTime = parseInt(savedTimerEnd);
             const now = Date.now();
             const remainingTime = Math.max(0, Math.ceil((timerEndTime - now) / 1000));
+
             if (remainingTime > 0) {
                 resendTimer = remainingTime;
                 emailSent = true;
                 startTimerCountdown(timerEndTime);
             } else {
-                // Timer has expired, clean up
+                // timer has expired, clean up
                 localStorage.removeItem(TIMER_END_KEY);
                 localStorage.removeItem(EMAIL_SENT_KEY);
+
                 resendTimer = 0;
                 emailSent = false;
             }
@@ -91,57 +101,26 @@
 
     async function onSubmit() {
         if (creating || resendTimer > 0) return;
+        error = null;
         creating = true;
         try {
             await sdk.forConsole.account.createVerification({ url: cleanUrl });
             emailSent = true;
             startResendTimer();
-        } catch (error) {
-            addNotification({
-                type: 'error',
-                title: 'Failed to send verification email',
-                message: 'Unable to send verification email. Please try again.'
-            });
-            console.error('Failed to send verification email:', error);
+        } catch (err) {
+            error = err.message;
         } finally {
             creating = false;
         }
     }
 
-    async function updateEmailVerification() {
-        const searchParams = page.url.searchParams;
-        const userId = searchParams.get('userId');
-        const secret = searchParams.get('secret');
-
-        if (userId && secret) {
-            try {
-                await sdk.forConsole.account.updateVerification({ userId, secret });
-                await Promise.all([
-                    invalidate(Dependencies.ACCOUNT),
-                    invalidate(Dependencies.FACTORS)
-                ]);
-
-                goto(`${base}/`);
-            } catch (error) {
-                addNotification({
-                    type: 'error',
-                    title: 'Email verification failed',
-                    message: 'Unable to verify your email. Please try again.'
-                });
-                console.error('Failed to verify email:', error);
-            }
-        }
-    }
-
-    onMount(() => {
-        updateEmailVerification();
-        restoreTimerState(); // Check for existing timer
-    });
+    onMount(() => restoreTimerState);
 
     onDestroy(() => {
         if (timerInterval) {
             clearInterval(timerInterval);
         }
+
         if (browser) {
             localStorage.removeItem(TIMER_END_KEY);
             localStorage.removeItem(EMAIL_SENT_KEY);
@@ -152,12 +131,13 @@
 <div class="email-verification-scrim">
     <Modal
         bind:show
+        bind:error
         title="Verify your email address"
         {onSubmit}
         dismissible={false}
         autoClose={false}>
         <Card.Base variant="secondary" padding="s">
-            <Layout.Stack gap="s">
+            <Layout.Stack gap="xxs">
                 <Typography.Text gap="m">
                     To continue using Appwrite Cloud, please verify your email address. An email
                     will be sent to <Typography.Text
@@ -165,21 +145,27 @@
                         color="neutral-secondary"
                         style="display: inline;">{email || get(user)?.email}</Typography.Text>
                 </Typography.Text>
-                <Layout.Stack class="u-margin-block-start-4 u-margin-block-end-24">
-                    <Layout.Stack direction="row">
-                        <Link variant="default" on:click={() => logout()}>Switch account</Link>
-                    </Layout.Stack>
-                </Layout.Stack>
+
+                <Link variant="default" on:click={() => logout()}>Switch account</Link>
+
                 {#if emailSent && resendTimer > 0}
-                    <Typography.Text color="neutral-secondary">
-                        Didn't get the email? Try again in {resendTimer}s
-                    </Typography.Text>
+                    <div transition:slide={{ duration: 150 }}>
+                        <Typography.Text
+                            color="neutral-secondary"
+                            style="margin-block-start: var(--gap-L, 16px);">
+                            Didn't get the email? Try again in {resendTimer}s
+                        </Typography.Text>
+                    </div>
                 {/if}
             </Layout.Stack>
         </Card.Base>
 
         <svelte:fragment slot="footer">
-            <Button submit disabled={creating || resendTimer > 0}>
+            <Button
+                submit
+                submissionLoader
+                forceShowLoader={creating}
+                disabled={creating || resendTimer > 0}>
                 {emailSent ? 'Resend email' : 'Send email'}
             </Button>
         </svelte:fragment>
@@ -199,4 +185,10 @@
         align-items: center;
         justify-content: center;
     }
+
+    /* avoids the background scroll and bars */
+    :global(html:has(.email-verification-scrim)) {
+        height: 100%;
+        overflow: hidden !important;
+    }
 </style>
diff --git a/src/lib/components/alerts/emailVerificationBanner.svelte b/src/lib/components/alerts/emailVerificationBanner.svelte
deleted file mode 100644
index f3803ce79..000000000
--- a/src/lib/components/alerts/emailVerificationBanner.svelte
+++ /dev/null
@@ -1,41 +0,0 @@
-<script lang="ts">
-    import { Button } from '$lib/elements/forms';
-    import { HeaderAlert } from '$lib/layout';
-    import { Typography } from '@appwrite.io/pink-svelte';
-    import { user } from '$lib/stores/user';
-    import SendVerificationEmailModal from '../account/sendVerificationEmailModal.svelte';
-    import { page } from '$app/state';
-    import { wizard, isNewWizardStatusOpen } from '$lib/stores/wizard';
-    import { isCloud, VARS } from '$lib/system';
-
-    const hasUser = $derived(!!$user);
-    const needsEmailVerification = $derived(hasUser && !$user.emailVerification);
-    const notOnOnboarding = $derived(!page.route.id.includes('/onboarding'));
-    const notOnWizard = $derived(!$wizard.show && !$isNewWizardStatusOpen);
-    const shouldShowEmailBanner = $derived(
-        VARS.EMAIL_VERIFICATION &&
-            isCloud &&
-            hasUser &&
-            needsEmailVerification &&
-            notOnOnboarding &&
-            notOnWizard
-    );
-
-    let showSendVerification = $state(false);
-</script>
-
-{#if shouldShowEmailBanner}
-    <HeaderAlert type="warning" title="Your email address needs to be verified">
-        <svelte:fragment>
-            To avoid losing access to your projects, make sure <Typography.Text
-                variant="m-500"
-                style="display:inline">{$user.email}</Typography.Text> is valid and up to date. Email
-            verification will be required soon.
-        </svelte:fragment>
-        <svelte:fragment slot="buttons">
-            <Button secondary size="s" on:click={() => (showSendVerification = true)}
-                >Verify email</Button>
-        </svelte:fragment>
-    </HeaderAlert>
-    <SendVerificationEmailModal bind:show={showSendVerification} email={$user?.email} />
-{/if}
diff --git a/src/lib/components/index.ts b/src/lib/components/index.ts
index 47afdf41a..b9d6e57ed 100644
--- a/src/lib/components/index.ts
+++ b/src/lib/components/index.ts
@@ -85,5 +85,5 @@ export { default as ViewToggle } from './viewToggle.svelte';
 export { default as RegionEndpoint } from './regionEndpoint.svelte';
 export { default as ExpirationInput } from './expirationInput.svelte';
 export { default as EstimatedCard } from './estimatedCard.svelte';
-export { default as EmailVerificationBanner } from './alerts/emailVerificationBanner.svelte';
 export { default as SortButton, type SortDirection } from './sortButton.svelte';
+export { default as SendVerificationEmailModal } from './account/sendVerificationEmailModal.svelte';
diff --git a/src/routes/(console)/verify-email/+page.svelte b/src/routes/(console)/verify-email/+page.svelte
index 8e0f5b490..c70b0e2d3 100644
--- a/src/routes/(console)/verify-email/+page.svelte
+++ b/src/routes/(console)/verify-email/+page.svelte
@@ -1,85 +1,33 @@
 <script lang="ts">
-    import Sidebar from '$lib/components/sidebar.svelte';
-    import Navbar from '$lib/components/navbar.svelte';
-    import SendVerificationEmailModal from '$lib/components/account/sendVerificationEmailModal.svelte';
-    import { writable } from 'svelte/store';
-    import { invalidate } from '$app/navigation';
-    import { goto } from '$app/navigation';
-    import { onMount } from 'svelte';
-    import { base } from '$app/paths';
-    import { Dependencies } from '$lib/constants';
     import { page } from '$app/state';
-    import { realtime } from '$lib/stores/sdk';
+    import { writable } from 'svelte/store';
+    import type { Models } from '@appwrite.io/console';
+    import { Navbar, SendVerificationEmailModal, Sidebar } from '$lib/components';
 
     let sideBarIsOpen = writable(false);
     let showAccountMenu = writable(false);
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    let project: any = {
-        $id: 'verify-email-project',
-        region: 'us-east-1',
-        name: 'Verify Email Project'
-    };
-    let avatar = '/images/default-avatar.png';
-    let progressCard = {
-        title: 'Get started',
-        percentage: 33
-    };
-
-    let navbarProps = {
-        logo: {
-            src: '/images/appwrite-logo-light.svg',
-            alt: 'Appwrite Logo'
-        },
-        avatar: avatar,
-        organizations: [],
-        currentProject: project
-    };
-
     let showVerificationModal = $state(!page.data.account?.emailVerification);
 
-    $effect(() => {
-        if (page.data.account?.emailVerification) {
-            checkEmailVerification();
-        }
-    });
+    // fake props!
+    const project = {
+        region: 'fra',
+        $id: 'appwrite',
+        name: 'Appwrite Project'
+    } as Models.Project;
 
-    async function checkEmailVerification() {
-        if (page.data.account?.emailVerification) {
-            await goto(`${base}/`);
-        }
-    }
-
-    onMount(() => {
-        if (!page.data.account) {
-            goto(`${base}/login`);
-            return;
-        }
-
-        // If email is already verified, redirect immediately
-        if (page.data.account?.emailVerification) {
-            checkEmailVerification();
-            return;
-        }
-
-        const unsubscribe = realtime.forProject('', '').subscribe(['account'], async () => {
-            await invalidate(Dependencies.ACCOUNT);
-            checkEmailVerification();
-        });
-
-        const interval = setInterval(async () => {
-            await invalidate(Dependencies.ACCOUNT);
-            checkEmailVerification();
-        }, 10000);
-
-        return () => {
-            clearInterval(interval);
-            unsubscribe();
-        };
-    });
+    const progressCard = { title: 'Get started', percentage: 33 };
+    const navbarProps = {
+        logo: {
+            src: 'https://appwrite.io/images/logos/logo.svg',
+            alt: 'Logo Appwrite'
+        },
+        avatar: undefined,
+        organizations: []
+    };
 </script>
 
 <svelte:head>
-    <title>Verify Email - Appwrite Console</title>
+    <title>Verify Email - Appwrite</title>
 </svelte:head>
 
 <div class="verify-email-page">
@@ -92,7 +40,7 @@
         bind:sideBarIsOpen={$sideBarIsOpen}
         bind:showAccountMenu={$showAccountMenu}
         {project}
-        {avatar}
+        avatar={navbarProps.avatar}
         {progressCard}
         state="open" />
 
diff --git a/src/routes/(console)/verify-email/+page.ts b/src/routes/(console)/verify-email/+page.ts
new file mode 100644
index 000000000..15ad453bc
--- /dev/null
+++ b/src/routes/(console)/verify-email/+page.ts
@@ -0,0 +1,45 @@
+import { resolve } from '$app/paths';
+import { redirect } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
+import { Dependencies } from '$lib/constants';
+import { sdk } from '$lib/stores/sdk';
+import { addNotification } from '$lib/stores/notifications';
+import { VARS } from '$lib/system';
+
+export const load: PageLoad = async ({ parent, depends, url }) => {
+    if (!VARS.EMAIL_VERIFICATION) {
+        redirect(303, resolve('/'));
+    }
+
+    const { account } = await parent();
+    depends(Dependencies.ACCOUNT);
+
+    const user = url.searchParams.get('userId') ?? null;
+    const secret = url.searchParams.get('secret') ?? null;
+
+    if (account && account.emailVerification === true) {
+        redirect(303, resolve('/'));
+    } else if (user && secret) {
+        try {
+            await sdk.forConsole.account.updateVerification({
+                userId: user,
+                secret
+            });
+
+            addNotification({
+                type: 'success',
+                message: 'Email has been verified',
+                timeout: 10000 // 10 seconds max, because if succeeded, loads takes some time!
+            });
+        } catch (error) {
+            addNotification({
+                type: 'error',
+                message: error.message
+            });
+        } finally {
+            redirect(303, resolve('/'));
+        }
+    } else {
+        redirect(303, resolve('/'));
+    }
+};
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 2133f99ed..5ee94b650 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -6,10 +6,10 @@ import { redirect } from '@sveltejs/kit';
 import { Dependencies } from '$lib/constants';
 import type { LayoutLoad } from './$types';
 import { redirectTo } from './store';
-import { base } from '$app/paths';
+import { base, resolve } from '$app/paths';
 import type { Account } from '$lib/stores/user';
 import type { AppwriteException } from '@appwrite.io/console';
-import { isCloud } from '$lib/system';
+import { isCloud, VARS } from '$lib/system';
 import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
 
 export const ssr = false;
@@ -29,13 +29,12 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
     }
 
     if (account) {
-        if (isCloud && !account.emailVerification) {
-            const isPublicRoute = route.id?.startsWith('/(public)');
-            const isAuthRoute = route.id?.startsWith('/(authenticated)');
-            const isVerifyEmailPage = url.pathname === `${base}/verify-email`;
+        if (isCloud && !account.emailVerification && VARS.EMAIL_VERIFICATION) {
+            const isConsoleRoute = route.id?.startsWith('/(console)');
+            const isVerifyEmailPage = url.pathname === resolve('/verify-email');
 
-            if (!isPublicRoute && !isAuthRoute && !isVerifyEmailPage) {
-                redirect(303, `${base}/verify-email`);
+            if (isConsoleRoute && !isVerifyEmailPage) {
+                redirect(303, resolve('/verify-email'));
             }
         }
 

From 528e43b72bd23c0619e2f0601354ab8134138992 Mon Sep 17 00:00:00 2001
From: Harsh Mahajan <127186841+HarshMN2345@users.noreply.github.com>
Date: Sun, 5 Oct 2025 15:17:27 +0530
Subject: [PATCH 10/10] Update
 src/lib/components/account/sendVerificationEmailModal.svelte

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
---
 src/lib/components/account/sendVerificationEmailModal.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/account/sendVerificationEmailModal.svelte b/src/lib/components/account/sendVerificationEmailModal.svelte
index bb9d20bcb..1ad53ed1b 100644
--- a/src/lib/components/account/sendVerificationEmailModal.svelte
+++ b/src/lib/components/account/sendVerificationEmailModal.svelte
@@ -114,7 +114,7 @@
         }
     }
 
-    onMount(() => restoreTimerState);
+    onMount(restoreTimerState);
 
     onDestroy(() => {
         if (timerInterval) {