From a4c2b673ded38c31d869f93fdb8b0a656ff01c17 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 3 Feb 2026 16:37:51 -0800 Subject: fix warnings --- src/routes/(app)/+error.svelte | 5 ++--- src/routes/(app)/+layout.svelte | 6 ++++-- src/routes/(app)/invoice/[id]/+page.svelte | 7 +++++-- src/routes/(app)/pay/[username]/[...amount]/+page.svelte | 6 ++++-- src/routes/(app)/send/+layout.svelte | 2 +- src/routes/(static)/+layout.svelte | 8 +++----- src/routes/(static)/support/+page.svelte | 8 ++++++-- src/routes/+error.svelte | 5 ++--- src/routes/+layout.svelte | 5 +++-- src/routes/map/+page.svelte | 2 +- 10 files changed, 31 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte index b950608b..64f8aaa0 100644 --- a/src/routes/(app)/+error.svelte +++ b/src/routes/(app)/+error.svelte @@ -4,9 +4,8 @@ import { page } from "$app/stores"; let { data } = $props(); - let { user } = data; - - let link = user ? `/${user.username}` : "/"; + let user = $derived(data.user); + let link = $derived(user ? `/${user.username}` : "/");
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 66596038..19c0708d 100644 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -26,8 +26,10 @@ let { data, children } = $props(); - let { user, subject, token } = $derived(data); - let { theme } = $state(data); + let user = $derived(data.user); + let subject = $derived(data.subject); + let token = $derived(data.token); + let theme = $derived(data.theme); $effect(() => ($themeStore = theme)); $effect(() => (theme = $themeStore)); diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index a2c204d1..d66bdb12 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -39,8 +39,11 @@ let readingerror = (e) => console.log("nfc error", e); - let { id, subject, user } = $state(data); - let { invoice, src } = $derived(data); + let id = $derived(data.id); + let subject = $derived(data.subject); + let user = $derived(data.user); + let invoice = $derived(data.invoice); + let src = $derived(data.src); let { aid, amount, rate, tip, hash, text, type } = $derived(invoice); let memo = $state(); let { username, currency } = $derived(invoice.user); diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte index 82fa3750..df506d43 100644 --- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte +++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte @@ -10,8 +10,10 @@ let { data, form } = $props(); - let { subject, rate, user } = $state(data); - let currency = subject?.currency || "USD"; + let subject = $derived(data.subject); + let rate = $derived(data.rate); + let user = $derived(data.user); + let currency = $derived(subject?.currency || "USD"); let locale = $derived(() => loc(subject)); let next = $state(); diff --git a/src/routes/(app)/send/+layout.svelte b/src/routes/(app)/send/+layout.svelte index 5c6d8f11..58f44736 100644 --- a/src/routes/(app)/send/+layout.svelte +++ b/src/routes/(app)/send/+layout.svelte @@ -5,7 +5,7 @@ let { data, children } = $props(); - let { user } = data; + let user = $derived(data.user); let cancel = () => goto(`/${user.username}`); diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte index a0061a19..ff763126 100644 --- a/src/routes/(static)/+layout.svelte +++ b/src/routes/(static)/+layout.svelte @@ -1,6 +1,4 @@ diff --git a/src/routes/(static)/support/+page.svelte b/src/routes/(static)/support/+page.svelte index 4cf9706d..1c0aa76d 100644 --- a/src/routes/(static)/support/+page.svelte +++ b/src/routes/(static)/support/+page.svelte @@ -8,15 +8,19 @@ import { t } from "$lib/translations"; let { data } = $props(); - let { user } = data; + let user = $derived(data.user); - let username = $state(user?.username); + let username = $state(); let email = $state(); let message = $state(); let sent = $state(); let recaptchaSiteKey = PUBLIC_RECAPTCHA_SITE_KEY; let isTor = browser && location.hostname.endsWith(".onion"); + $effect(() => { + if (typeof username === "undefined") username = user?.username; + }); + onMount(() => { if (!isTor && recaptchaSiteKey) { let s = document.createElement("script"); diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index c9e65806..bafa7039 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -3,9 +3,8 @@ import { page } from "$app/stores"; let { data } = $props(); - let { user } = data; - - let link = user ? `/${user.username}` : "/"; + let user = $derived(data.user); + let link = $derived(user ? `/${user.username}` : "/");
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 7653e05a..704278b6 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -11,8 +11,9 @@ const map = { light: 'lofi', dark: 'black', system: 'system' }; let { data, children } = $props(); - let { pathname, theme } = $state(data); - $effect(() => ($themeStore = data.theme)); + let pathname = $derived(data.pathname); + let theme = $derived(data.theme); + $effect(() => ($themeStore = theme)); $effect(() => (theme = $themeStore)); $effect(() => { const v = map[theme] ?? theme; diff --git a/src/routes/map/+page.svelte b/src/routes/map/+page.svelte index 3e0fae5a..faa34ddf 100644 --- a/src/routes/map/+page.svelte +++ b/src/routes/map/+page.svelte @@ -3,7 +3,7 @@ import LocationsMap from "$comp/LocationsMap.svelte"; let { data } = $props(); - let { locations } = data; + let locations = $derived(data.locations);
-- cgit v1.2.3