From 675a086140f1adb4db46963037df64269d66faae Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 3 Mar 2026 09:34:56 -0800 Subject: hasark flag --- src/components/InvoiceTypes.svelte | 23 +++++++++++++---------- src/components/SetType.svelte | 3 ++- src/routes/(app)/+layout.server.ts | 7 +++++-- src/routes/(app)/[username]/receive/+page.svelte | 3 ++- src/routes/(app)/invoice/[id]/+page.svelte | 2 ++ 5 files changed, 24 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/components/InvoiceTypes.svelte b/src/components/InvoiceTypes.svelte index dd27c7ef..b518364d 100644 --- a/src/components/InvoiceTypes.svelte +++ b/src/components/InvoiceTypes.svelte @@ -8,6 +8,7 @@ newAmount = $bindable(), invoice, user, + hasArk = false, t, toggleType, setAmount, @@ -142,16 +143,18 @@
Liquid
- + {#if hasArk} + + {/if}
diff --git a/src/components/SetType.svelte b/src/components/SetType.svelte index 5794700d..99bf676f 100644 --- a/src/components/SetType.svelte +++ b/src/components/SetType.svelte @@ -6,6 +6,7 @@ newAmount = $bindable(), invoice, user, + hasArk = false, submit = $bindable(), settingType, setAmount, @@ -19,7 +20,7 @@ {#if settingType}
- +
{/if} diff --git a/src/routes/(app)/+layout.server.ts b/src/routes/(app)/+layout.server.ts index 494cc91e..249c0451 100644 --- a/src/routes/(app)/+layout.server.ts +++ b/src/routes/(app)/+layout.server.ts @@ -1,4 +1,4 @@ -import { get } from "$lib/utils"; +import { auth, get } from "$lib/utils"; import { error, redirect } from "@sveltejs/kit"; export async function load({ cookies, request, url, params, parent }) { @@ -7,6 +7,9 @@ export async function load({ cookies, request, url, params, parent }) { const token = cookies.get("token"); const { user } = await parent(); + const hasArk = token + ? (await get("/accounts", auth(cookies))).some((a: any) => a.type === "ark") + : false; let subject; @@ -34,5 +37,5 @@ export async function load({ cookies, request, url, params, parent }) { const theme = cookies.get("theme") || "light"; - return { user, token, subject, theme }; + return { user, token, subject, theme, hasArk }; } diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte index a0ab38a2..10aea0ef 100644 --- a/src/routes/(app)/[username]/receive/+page.svelte +++ b/src/routes/(app)/[username]/receive/+page.svelte @@ -19,7 +19,7 @@ let showOptions; let id = $state(); - let { rate, subject, user, text } = $derived(data); + let { rate, subject, user, text, hasArk } = $derived(data); let locale = $derived(loc(user)); let { currency, username } = $derived(subject); @@ -176,6 +176,7 @@ {aid} {invoice} {user} + {hasArk} {type} {settingType} {setType} diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index e4a5b85e..9dac7a7c 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -29,6 +29,7 @@ let id = $derived(data.id); let subject = $derived(data.subject); let user = $derived(data.user); + let hasArk = $derived(data.hasArk); let invoice = $derived(data.invoice); let src = $derived(data.src); let { aid, amount, rate, tip, hash, text, type } = $derived(invoice); @@ -194,6 +195,7 @@ {setAmount} {invoice} {user} + {hasArk} {type} {settingType} {setType} -- cgit v1.2.3