From 211511570b447ad0256a992bf8e3b5dfa8a82fb7 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 26 Feb 2026 22:10:12 -0800 Subject: fix amount toggles --- src/components/Amount.svelte | 18 +++++------------- src/components/InvoiceData.svelte | 7 ++----- src/components/Lnurlw.svelte | 18 ++++++------------ src/components/Numpad.svelte | 16 +++++++--------- src/components/Payments.svelte | 13 +++++-------- 5 files changed, 25 insertions(+), 47 deletions(-) (limited to 'src/components') diff --git a/src/components/Amount.svelte b/src/components/Amount.svelte index f368e96c..1f2b1f29 100644 --- a/src/components/Amount.svelte +++ b/src/components/Amount.svelte @@ -33,25 +33,17 @@ onclick={toggleFiat} aria-label="Toggle currency display" > - {#if !canShowFiat} - - {/if} - {#if canShowFiat} - {f(toFiat(amount, rate), currency, locale)} - {:else} - {s(amount, locale)} - {/if} + + {f(toFiat(amount, rate), currency, locale)} + {s(amount, locale)} {#if tip}
+
- {#if canShowFiat} - {f(toFiat(tip, rate), currency, locale)} - {:else} - {s(tip, locale)} - {/if} + {f(toFiat(tip, rate), currency, locale)} + {s(tip, locale)}
{/if} diff --git a/src/components/InvoiceData.svelte b/src/components/InvoiceData.svelte index 105eb471..b572ed93 100644 --- a/src/components/InvoiceData.svelte +++ b/src/components/InvoiceData.svelte @@ -66,11 +66,8 @@
{i.quantity}
{i.name}
- {#if $fiat} -
{f(itemTotal, currency)}
- {:else} -
{sat(btc(itemTotal, rate))}
- {/if} +
{f(itemTotal, currency)}
+
{sat(btc(itemTotal, rate))}
{/each} diff --git a/src/components/Lnurlw.svelte b/src/components/Lnurlw.svelte index 0cc6f824..b952b082 100644 --- a/src/components/Lnurlw.svelte +++ b/src/components/Lnurlw.svelte @@ -48,13 +48,10 @@ {#if minWithdrawable === maxWithdrawable}
- {#if $fiat} -
{f(amountFiat, currency)}
- {:else} -
- ⚡️{`${s(amount)}`} -
- {/if} +
{f(amountFiat, currency)}
+
+ ⚡️{`${s(amount)}`} +
{:else} @@ -78,11 +75,8 @@ disabled={submitting} onkeydown={setMax} > - {#if $fiat} - Max {f((Math.floor(maxWithdrawable / 1000) * rate) / sats, currency)} - {:else} - Max ⚡️{s(Math.floor(maxWithdrawable / 1000))} - {/if} + Max {f((Math.floor(maxWithdrawable / 1000) * rate) / sats, currency)} + Max ⚡️{s(Math.floor(maxWithdrawable / 1000))} {/if} diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte index 5ba6e244..8e4cba13 100644 --- a/src/components/Numpad.svelte +++ b/src/components/Numpad.svelte @@ -255,12 +255,11 @@
- {#if fiat} + {#if position === "before"}{symbol}{/if} - {:else} - - {/if} + +
@@ -302,12 +301,11 @@ swap(); }} > - {#if fiat} + {s(amount, locale)} - {:else} - {f(amountFiat, currency, locale)} - {/if} + + {f(amountFiat, currency, locale)}
diff --git a/src/components/Payments.svelte b/src/components/Payments.svelte index b616742f..a16bf4ea 100644 --- a/src/components/Payments.svelte +++ b/src/components/Payments.svelte @@ -24,14 +24,11 @@ >
-- cgit v1.2.3