diff --git a/src/routes/(auth)/login/(methods)/+layout.ts b/src/routes/(auth)/login/(methods)/+layout.ts index b3bec5ae..7a920930 100644 --- a/src/routes/(auth)/login/(methods)/+layout.ts +++ b/src/routes/(auth)/login/(methods)/+layout.ts @@ -4,6 +4,6 @@ import { userEmailStore } from '../_lib'; export const load = async () => { const userEmail = get(userEmailStore); - if (!userEmail) throw redirect(303, '/login'); + if (!userEmail) redirect(303, '/login'); return { userEmail }; }; diff --git a/src/routes/(auth)/login/+layout.ts b/src/routes/(auth)/login/+layout.ts index 35c72b67..8c6175ae 100644 --- a/src/routes/(auth)/login/+layout.ts +++ b/src/routes/(auth)/login/+layout.ts @@ -4,7 +4,7 @@ import { redirect } from '@sveltejs/kit'; export const load = async () => { // const keypair = await getKeypairPreference(); - // if (Boolean(keypair)) throw redirect(303, '/wallet'); + // if (Boolean(keypair)) redirect(303, '/wallet'); /** * Note * Temporairly commenting this, as it disrupts the user flow in /login diff --git a/src/routes/(protected)/+layout.ts b/src/routes/(protected)/+layout.ts index 4c158564..f7ed5b2b 100644 --- a/src/routes/(protected)/+layout.ts +++ b/src/routes/(protected)/+layout.ts @@ -4,9 +4,9 @@ import { redirect } from '@sveltejs/kit'; export const load = async () => { const keypair = await getKeypairPreference(); - if (!Boolean(keypair)) throw redirect(303, '/login'); + if (!keypair) redirect(303, '/login'); const isLocked = await isAppLocked(); - if (isLocked) throw redirect(303, '/unlock'); + if (isLocked) redirect(303, '/unlock'); else await lockApp(); // Locking back after the user has got in }; diff --git a/src/routes/(protected)/logout/+page.ts b/src/routes/(protected)/logout/+page.ts index c45e8446..2c76b613 100644 --- a/src/routes/(protected)/logout/+page.ts +++ b/src/routes/(protected)/logout/+page.ts @@ -6,5 +6,5 @@ import { lockApp } from '$lib/preferences/locked'; export const load = async () => { await removePreference(KEYPAIR_PREFERENCES_KEY); await lockApp(); - throw redirect(303, '/login'); + redirect(303, '/login'); }; diff --git a/src/routes/+page.ts b/src/routes/+page.ts index a24bb560..da9c10b1 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -1,5 +1,5 @@ import { redirect } from '@sveltejs/kit'; export const load = async () => { - throw redirect(301, '/home'); + redirect(301, '/home'); };