From 936bb881f5fd34eafe1197fc5e2ab16e6f4ed6f3 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 22 Dec 2023 12:57:14 -0800 Subject: show ln platform fee --- src/routes/(app)/send/invoice/[id]/+page.server.js | 1 + src/routes/(app)/send/invoice/[id]/+page.svelte | 16 +++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'src/routes/(app)/send/invoice') diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js index 39f2a5dd..88017362 100644 --- a/src/routes/(app)/send/invoice/[id]/+page.server.js +++ b/src/routes/(app)/send/invoice/[id]/+page.server.js @@ -20,6 +20,7 @@ export async function load({ params: { id }, parent, url }) { redirect(307, `/${recipient.username}/invoice/${id}/tip`); if (recipient.username === user.username) error(500, { message: "Cannot send to self" }); + return { amount, address, diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte index ae997bce..c2163a81 100644 --- a/src/routes/(app)/send/invoice/[id]/+page.svelte +++ b/src/routes/(app)/send/invoice/[id]/+page.svelte @@ -13,9 +13,17 @@ export let data; export let form; - let { address, hash, rate, payreq, recipient, tip, rates, user } = data; + let { address, hash, payreq, recipient, tip, rates, user } = data; let { currency } = user; + $: reload(data); + let reload = (data) => { + ({ address, hash, payreq, recipient, tip, rates, user } = data); + ({ currency } = user); + }; + + $: rate = data.rate * (rates[user.currency] / rates[data.currency]); + let amount = form?.amount || data.amount; let a, af, @@ -42,8 +50,6 @@ }); }; - $: rate = data.rate * (rates[user.currency] / rates[data.currency]); - $: update(form); let update = () => { if (form?.message.includes("pin")) $pin = undefined; @@ -80,7 +86,7 @@ {/if} -
+
{#if amount}

@@ -164,7 +170,7 @@ {/if}

-
+
-- cgit v1.2.3