From 5f1014b41fab3ecb67e033e270e19060ad2af88f Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 22 Aug 2022 10:49:04 -0700
Subject: get user from data prop

---
 src/routes/+layout.svelte | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/routes/+layout.svelte')

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index dfe52894..185eb140 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -18,15 +18,12 @@
 	$rates = data.rates;
 	$: $selectedRate = data.user && $rate * (data.rates[data.user.currency] / data.rates.USD);
 
-	let ready = false;
-
 	onMount(() => {
 		if (protectedRoutes.find((p) => $page.url.pathname.match(p))) {
 			if (!$token) {
 				goto('/login');
 				warning($t('error.signIn'));
 			}
-			user.subscribe((u) => u?.username && (ready = true));
 		} else {
 			ready = true;
 		}
@@ -35,12 +32,8 @@
 	});
 </script>
 
-{#if ready}
-	<SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
-	<slot />
-{:else}
-	<LoadingSplash />
-{/if}
+<SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
+<slot />
 
 <style>
 	:root {
-- 
cgit v1.2.3