From 8eb6cfb222c6c438374421b4e3918372a66e28b5 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 13 Feb 2026 21:08:25 -0800 Subject: get currency from account --- src/components/Account.svelte | 8 +++++--- src/components/Balance.svelte | 5 +++-- src/components/InvoiceData.svelte | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) (limited to 'src/components') diff --git a/src/components/Account.svelte b/src/components/Account.svelte index df2c51ea..d588932a 100644 --- a/src/components/Account.svelte +++ b/src/components/Account.svelte @@ -12,7 +12,9 @@ import { arkkey } from "$lib/ark"; import { getRememberedWalletPassword, forgetWalletPassword } from "$lib/passwordCache"; - let { user, rate, account }: any = $props(); + let { user, rates, account }: any = $props(); + let currency = $derived(account.currency || user.currency); + let rate = $derived(rates[currency]); let { name, seed, fingerprint, balance, pending, id, type: accountType, arkAddress } = $derived(account); let arkBalance = $state(0); @@ -135,10 +137,10 @@
{displayName}
- + {#if pending}
- +{$fiat && rate ? f(toFiat(pending, rate), user.currency, loc(user)) : s(pending)} pending + +{$fiat && rate ? f(toFiat(pending, rate), currency, loc(user)) : s(pending)} pending
{/if}
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte index 440c260d..6abb1449 100644 --- a/src/components/Balance.svelte +++ b/src/components/Balance.svelte @@ -6,8 +6,9 @@ import { t } from "$lib/translations"; let show = $state(); - let { id, user, rate, balance } = $props(); - let { currency, locked } = $derived(user); + let { id, user, rate, balance, currency: currencyProp = undefined } = $props(); + let currency = $derived(currencyProp || user.currency); + let { locked } = $derived(user); let locale = $derived(loc(user)); let toggleShow = (e) => { e.preventDefault(); diff --git a/src/components/InvoiceData.svelte b/src/components/InvoiceData.svelte index 84a52308..105eb471 100644 --- a/src/components/InvoiceData.svelte +++ b/src/components/InvoiceData.svelte @@ -19,6 +19,7 @@ }: any = $props(); let loaded = $state(false); + let expanded = $state(false); let { memo } = $derived(invoice); let load = () => (loaded = true); @@ -52,11 +53,11 @@ -- cgit v1.2.3