From 29ed3a4366eb9719d32dac390764bf119c40afff Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sun, 22 Jan 2023 21:03:57 -0800 Subject: rename txns --- .../send/bitcoin/[address]/[...amount]/+page.server.js | 5 +++-- src/routes/(app)/send/lightning/[payreq]/+page.server.js | 3 +++ src/routes/(app)/send/lightning/[payreq]/+page.svelte | 14 +++++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) (limited to 'src/routes/(app)/send') diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js index 642593ab..066043e7 100644 --- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js +++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js @@ -4,9 +4,10 @@ import { auth, post } from '$lib/utils'; export const actions = { default: async ({ cookies, request }) => { try { + let feeRate, subtract; let { address, amount, pin } = Object.fromEntries(await request.formData()); - let { tx } = await post('/bitcoin/fee', { address, amount }, auth(cookies)); - await post('/bitcoin/send', { address, pin, tx }, auth(cookies)); + let { tx } = await post('/bitcoin/fee', { address, amount, feeRate, subtract }, auth(cookies)); + await post('/bitcoin/send', { pin, tx }, auth(cookies)); } catch (e) { return invalid(400, { message: e.message }); } diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js index 2ae693aa..a72e1c07 100644 --- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js +++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js @@ -9,11 +9,14 @@ export const actions = { setAmount: async ({ cookies, request }) => { return Object.fromEntries(await request.formData()); }, + send: async ({ cookies, request }) => { try { let body = Object.fromEntries(await request.formData()); let { amount, confirmed } = body; + console.log("AMOUNT", amount); + if (!confirmed) { return invalid(403, { amount, confirm: true }); } diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte index 6fff5665..76ab432f 100644 --- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte +++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte @@ -15,6 +15,7 @@ let { currency } = data.user; let amount = form?.amount || data.amount; let a; + let maxfee = 100; let loading; let submit = () => (loading = true); @@ -46,12 +47,23 @@

{alias}

-
+ +
+ + + +
+ sats +
+
+