From 56a04684c1fb77ea7b21afc6b0d2e1c4773906f6 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Wed, 11 Feb 2026 20:10:43 -0800 Subject: format --- src/components/404.svelte | 6 ++-- src/components/About.svelte | 9 ++--- src/components/Account.svelte | 66 ++++++++++------------------------- src/components/Amount.svelte | 3 +- src/components/AmountField.svelte | 23 +++--------- src/components/AppForm.svelte | 58 ++++++------------------------ src/components/AppHeader.svelte | 7 ++-- src/components/Avatar.svelte | 23 +++--------- src/components/Balance.svelte | 18 ++-------- src/components/Code.svelte | 7 +--- src/components/DarkToggle.svelte | 5 +-- src/components/Event.svelte | 15 ++------ src/components/Footer.svelte | 25 ++++--------- src/components/HowItWorksCard.svelte | 3 +- src/components/InvoiceActions.svelte | 27 +++++--------- src/components/InvoiceData.svelte | 7 +--- src/components/InvoiceTypes.svelte | 54 ++++++++-------------------- src/components/ItemForm.svelte | 15 ++------ src/components/LandingHeader.svelte | 40 +++++---------------- src/components/LandingInfoCard.svelte | 16 ++------- src/components/Lnurlp.svelte | 3 +- src/components/Lnurlw.svelte | 32 +++-------------- src/components/LoadingSplash.svelte | 6 +--- src/components/LocationsMap.svelte | 32 +++++------------ src/components/Media.svelte | 6 ++-- src/components/Menu.svelte | 12 ++----- src/components/Nostr.svelte | 28 ++++----------- src/components/Numpad.svelte | 51 ++++++--------------------- src/components/Password.svelte | 15 +++----- src/components/PasswordInput.svelte | 14 ++------ src/components/Payments.svelte | 32 ++++------------- src/components/Pin.svelte | 8 ++--- src/components/Pinpad.svelte | 19 +++------- src/components/Popup.svelte | 6 +--- src/components/Qr.svelte | 3 +- src/components/SetAmount.svelte | 27 +++----------- src/components/SetMemo.svelte | 27 +++----------- src/components/SetType.svelte | 14 ++------ src/components/Slider.svelte | 10 +----- src/components/Spinner.svelte | 9 +---- src/components/Success.svelte | 9 +---- src/components/Toggle.svelte | 8 +---- src/components/WalletPass.svelte | 11 ++---- 43 files changed, 176 insertions(+), 633 deletions(-) (limited to 'src/components') diff --git a/src/components/404.svelte b/src/components/404.svelte index d5fdfa38..5a7ba663 100644 --- a/src/components/404.svelte +++ b/src/components/404.svelte @@ -5,12 +5,10 @@
- + - +

{$t("404.404")}

{$t("404.pageNotFound")}

diff --git a/src/components/About.svelte b/src/components/About.svelte index 0c8be717..dbcf7854 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -33,10 +33,7 @@
- +
{$t("about.locations.header")} -

+

{@html $t("about.locations.description")}

diff --git a/src/components/Account.svelte b/src/components/Account.svelte index c88c1118..88b944b3 100644 --- a/src/components/Account.svelte +++ b/src/components/Account.svelte @@ -9,21 +9,10 @@ import { t } from "$lib/translations"; import { versions } from "$lib/utils"; import { arkkey } from "$lib/ark"; - import { - getRememberedWalletPassword, - forgetWalletPassword, - } from "$lib/passwordCache"; + import { getRememberedWalletPassword, forgetWalletPassword } from "$lib/passwordCache"; let { user, rate, account }: any = $props(); - let { - name, - seed, - fingerprint, - balance, - id, - type: accountType, - arkAddress, - } = $derived(account); + let { name, seed, fingerprint, balance, id, type: accountType, arkAddress } = $derived(account); let arkBalance = $state(0); let arkLoading = $state(false); @@ -45,12 +34,11 @@ $arkkey = hex.encode(decrypt(seed, cached) as Uint8Array); } else if (user.seed) { // Master seed: derive m/86'/0'/0'/0/0 - const [{ HDKey }, { entropyToMnemonic, mnemonicToSeed }, { wordlist }] = - await Promise.all([ - import("@scure/bip32"), - import("@scure/bip39"), - import("@scure/bip39/wordlists/english.js"), - ]); + const [{ HDKey }, { entropyToMnemonic, mnemonicToSeed }, { wordlist }] = await Promise.all([ + import("@scure/bip32"), + import("@scure/bip39"), + import("@scure/bip39/wordlists/english.js"), + ]); let entropy = await decrypt(user.seed, cached); let mnemonic = entropyToMnemonic(entropy, wordlist); let s = await mnemonicToSeed(mnemonic, cached); @@ -91,12 +79,11 @@ if (seed) { $arkkey = hex.encode(decrypt(seed, password!) as Uint8Array); } else if (user.seed) { - const [{ HDKey }, { entropyToMnemonic, mnemonicToSeed }, { wordlist }] = - await Promise.all([ - import("@scure/bip32"), - import("@scure/bip39"), - import("@scure/bip39/wordlists/english.js"), - ]); + const [{ HDKey }, { entropyToMnemonic, mnemonicToSeed }, { wordlist }] = await Promise.all([ + import("@scure/bip32"), + import("@scure/bip39"), + import("@scure/bip39/wordlists/english.js"), + ]); let entropy = await decrypt(user.seed, password!); let mnemonic = entropyToMnemonic(entropy, wordlist); let s = await mnemonicToSeed(mnemonic, password!); @@ -153,14 +140,9 @@ onclick={goSettings} > {#if isArk} - Ark + Ark {:else if seed || (user.seed && fingerprint)} - + {:else} {/if} @@ -169,20 +151,9 @@
- setAccount(e, "/invoice")} - > - diff --git a/src/components/Amount.svelte b/src/components/Amount.svelte index 8cfb9942..f368e96c 100644 --- a/src/components/Amount.svelte +++ b/src/components/Amount.svelte @@ -34,8 +34,7 @@ aria-label="Toggle currency display" > {#if !canShowFiat} - + {/if} {#if canShowFiat} {f(toFiat(amount, rate), currency, locale)} diff --git a/src/components/AmountField.svelte b/src/components/AmountField.svelte index 21c36631..b5c4261e 100644 --- a/src/components/AmountField.svelte +++ b/src/components/AmountField.svelte @@ -38,13 +38,10 @@ +
{/if} diff --git a/src/components/AppForm.svelte b/src/components/AppForm.svelte index 2f65372c..2fedca47 100644 --- a/src/components/AppForm.svelte +++ b/src/components/AppForm.svelte @@ -16,17 +16,7 @@ PUBLIC_COINOS_RELAY as relayUrl, } from "$env/static/public"; - let { - rate, - user, - name, - max_fee, - max_amount, - budget_renewal, - pubkey, - secret, - notify, - } = $props(); + let { rate, user, name, max_fee, max_amount, budget_renewal, pubkey, secret, notify } = $props(); let { currency } = $derived(user); onMount(() => { @@ -95,9 +85,7 @@ />
- + @@ -118,16 +104,9 @@
- +
- -
@@ -173,8 +138,7 @@ {/if}
- + {#if pubkey} {/each} diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte index c9bacf65..c56b7486 100644 --- a/src/components/Avatar.svelte +++ b/src/components/Avatar.svelte @@ -9,29 +9,16 @@ class?: string; } - let { - user, - size = 32, - disabled = false, - class: className = "", - }: Props = $props(); + let { user, size = 32, disabled = false, class: className = "" }: Props = $props(); let s = $derived(size.toString()); - let link = $derived( - user ? (user.anon ? `/${user.pubkey}` : `/${user.username}`) : undefined, - ); + let link = $derived(user ? (user.anon ? `/${user.pubkey}` : `/${user.username}`) : undefined); let base = "/api/public"; - let profile = $derived( - user?.profile ? `${base}/${user.profile}.webp` : user?.picture, - ); - let fallback = $derived( - `${base}/punks/` + punk(user?.pubkey || user?.id || "aa"), - ); + let profile = $derived(user?.profile ? `${base}/${user.profile}.webp` : user?.picture); + let fallback = $derived(`${base}/punks/` + punk(user?.pubkey || user?.id || "aa")); let tmp = $derived( - ($avatar as any)?.id && - ($avatar as any).id === user?.id && - ($avatar as any).src, + ($avatar as any)?.id && ($avatar as any).id === user?.id && ($avatar as any).src, ); let src = $derived(tmp || profile || fallback); diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte index 41b55c7a..440c260d 100644 --- a/src/components/Balance.svelte +++ b/src/components/Balance.svelte @@ -27,13 +27,8 @@
{#if user.haspin && !$pin} - {:else if !isNaN(rate)} @@ -47,14 +42,7 @@ /> {#if locked && id === user.id}
- +
{/if}
diff --git a/src/components/Code.svelte b/src/components/Code.svelte index 4f182ff2..48c132b0 100644 --- a/src/components/Code.svelte +++ b/src/components/Code.svelte @@ -5,12 +5,7 @@ {#snippet cp(something)} - {/snippet} diff --git a/src/components/DarkToggle.svelte b/src/components/DarkToggle.svelte index ebeaf762..78506c88 100644 --- a/src/components/DarkToggle.svelte +++ b/src/components/DarkToggle.svelte @@ -7,10 +7,7 @@ }; -
@@ -99,11 +94,7 @@
{:else} {/if} @@ -95,11 +91,9 @@
- - + + {/if} {#if user} - - {:else} - - {/if} @@ -78,10 +61,7 @@ class="block lg:hidden absolute top-[34.5px] right-10 z" onclick={() => (showMobileMenu = !showMobileMenu)} > - @@ -96,9 +76,7 @@ - + diff --git a/src/components/LandingInfoCard.svelte b/src/components/LandingInfoCard.svelte index cb16c5dd..8b85518c 100644 --- a/src/components/LandingInfoCard.svelte +++ b/src/components/LandingInfoCard.svelte @@ -1,13 +1,7 @@
@@ -17,14 +11,10 @@ 'reverse' && 'order-last'}" />
-

+

{title}

-

+

{#if description} {description} {:else} diff --git a/src/components/Lnurlp.svelte b/src/components/Lnurlp.svelte index c735c5a8..360c05db 100644 --- a/src/components/Lnurlp.svelte +++ b/src/components/Lnurlp.svelte @@ -9,8 +9,7 @@ let { data, form, send = $bindable(), comment = $bindable() } = $props(); let { currency } = data.user; - let { minSendable, maxSendable, commentAllowed, callback, metadata, rate } = - data; + let { minSendable, maxSendable, commentAllowed, callback, metadata, rate } = data; let amount = $state(Math.round(minSendable / 1000)), loading = $state(); diff --git a/src/components/Lnurlw.svelte b/src/components/Lnurlw.svelte index 006fda8b..9b374fcd 100644 --- a/src/components/Lnurlw.svelte +++ b/src/components/Lnurlw.svelte @@ -11,14 +11,7 @@ let { data, form } = $props(); let { currency, username } = data.user; - let { - defaultDescription, - minWithdrawable, - maxWithdrawable, - k1, - callback, - rate, - } = data; + let { defaultDescription, minWithdrawable, maxWithdrawable, k1, callback, rate } = data; let amount = $state(Math.round(minWithdrawable / 1000)); let amountFiat = $derived(parseFloat(((amount * rate) / sats).toFixed(2))); @@ -56,9 +49,7 @@

{f(amountFiat, currency)}
{:else}
- ⚡️{`${s(amount)}`} + ⚡️{`${s(amount)}`}
{/if}
@@ -66,12 +57,7 @@ {/if} -
+ @@ -89,22 +75,14 @@ disabled={submitting} onkeydown={setMax} >{#if $fiat} - Max {f( - (Math.floor(maxWithdrawable / 1000) * rate) / sats, - currency, - )} + Max {f((Math.floor(maxWithdrawable / 1000) * rate) / sats, currency)} {:else} Max ⚡️{s(Math.floor(maxWithdrawable / 1000))} {/if} {/if} -
@@ -318,12 +308,10 @@
{#if search} {:else} - + {/if}
@@ -354,11 +342,9 @@ aria-label={timeout ? "Resume map" : "Pause map"} > {#if timeout} - + {:else} - + {/if}
diff --git a/src/components/Media.svelte b/src/components/Media.svelte index 9c2c21f8..6471d190 100644 --- a/src/components/Media.svelte +++ b/src/components/Media.svelte @@ -1,8 +1,6 @@
-
+

{$t("user.settings.pleaseEnterYourPassword")}

- - {$t("payments.cancel")} +
diff --git a/src/components/PasswordInput.svelte b/src/components/PasswordInput.svelte index 3f784290..8d16aad6 100644 --- a/src/components/PasswordInput.svelte +++ b/src/components/PasswordInput.svelte @@ -15,21 +15,11 @@ let icon = $derived(show ? "ph:eye-bold" : "ph:eye-slash-bold"); -
{:else} -
{s(Math.abs(amount), locale)}
{/if} @@ -49,9 +44,7 @@ {/if}
-
+
{#if p.type === types.fund} {#if fund}
@@ -65,10 +58,7 @@ {:else}
-
{$t("payments.fund")}
@@ -87,16 +77,12 @@ {:else}
{#if p.type === types.lightning || p.type === types.bolt12} - {:else if p.type === types.ecash} Ecash {:else if p.type === types.bitcoin} - + {:else if p.type === types.liquid}
{:else if p.type === types.ark} - Ark + Ark {/if}
diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte index 9c5d8664..72bbf78d 100644 --- a/src/components/Pin.svelte +++ b/src/components/Pin.svelte @@ -55,16 +55,12 @@ aria-labelledby="title" tabindex="-1" > -
+

{title}

- + - @@ -88,9 +79,7 @@ {:else} - + {/if} {/each}
diff --git a/src/components/Popup.svelte b/src/components/Popup.svelte index e696c5cc..58b37eae 100644 --- a/src/components/Popup.svelte +++ b/src/components/Popup.svelte @@ -4,11 +4,7 @@ let { tags } = $props(); let addr = (tags) => { - let { - "addr:housenumber": house, - "addr:street": street, - "addr:city": city, - } = tags; + let { "addr:housenumber": house, "addr:street": street, "addr:city": city } = tags; if (house) return `${house} ${street}`; return ""; }; diff --git a/src/components/Qr.svelte b/src/components/Qr.svelte index 37b1708c..c2014348 100644 --- a/src/components/Qr.svelte +++ b/src/components/Qr.svelte @@ -22,8 +22,7 @@ class="w-72 sm:w-80 mx-auto cursor-pointer" bind:this={qr} onclick={() => screenfull?.toggle?.(qr)} - onkeydown={(e) => - (e.key === "Enter" || e.key === " ") && screenfull?.toggle?.(qr)} + onkeydown={(e) => (e.key === "Enter" || e.key === " ") && screenfull?.toggle?.(qr)} role="button" tabindex="0" aria-label="Toggle fullscreen QR" diff --git a/src/components/SetAmount.svelte b/src/components/SetAmount.svelte index ce58e146..c339aa7d 100644 --- a/src/components/SetAmount.svelte +++ b/src/components/SetAmount.svelte @@ -21,33 +21,14 @@ {#if settingAmount}
-
+
- +
- -
diff --git a/src/components/SetMemo.svelte b/src/components/SetMemo.svelte index 54921f56..e9f2524b 100644 --- a/src/components/SetMemo.svelte +++ b/src/components/SetMemo.svelte @@ -1,38 +1,19 @@ {#if settingMemo}
-
+
- -
diff --git a/src/components/SetType.svelte b/src/components/SetType.svelte index d06ca345..5794700d 100644 --- a/src/components/SetType.svelte +++ b/src/components/SetType.svelte @@ -18,18 +18,8 @@ {#if settingType}
-
- +
+
{/if} diff --git a/src/components/Slider.svelte b/src/components/Slider.svelte index 846d32a6..946878ee 100644 --- a/src/components/Slider.svelte +++ b/src/components/Slider.svelte @@ -9,12 +9,4 @@ let { value = $bindable(), handle, min = 0, max = 100 }: Props = $props(); - + diff --git a/src/components/Spinner.svelte b/src/components/Spinner.svelte index e9c3348f..f08cb3f3 100644 --- a/src/components/Spinner.svelte +++ b/src/components/Spinner.svelte @@ -4,14 +4,7 @@ fill="none" viewBox="0 0 24 24" > - +