diff options
| -rw-r--r-- | src/lib/invoice.js | 7 | ||||
| -rw-r--r-- | src/lib/socket.js | 1 | ||||
| -rw-r--r-- | src/routes/(app)/[username]/receive/[...recipient]/+page.svelte | 24 |
3 files changed, 19 insertions, 13 deletions
diff --git a/src/lib/invoice.js b/src/lib/invoice.js index 5bf05d90..e280a1a1 100644 --- a/src/lib/invoice.js +++ b/src/lib/invoice.js @@ -5,10 +5,12 @@ export default async ({ cookies, request }) => { let form = await request.formData(); let rates = await get('/rates'); + let amount = + parseInt(form.get('amount')); let requester = form.get('requester'); let invoice = { - amount: parseInt(form.get('amount')), + amount, tip: parseInt(form.get('tip')), network: 'lightning', prompt: form.get('prompt') === 'true', @@ -19,9 +21,8 @@ export default async ({ cookies, request }) => { let user = { username: form.get('username') }; let { uuid } = await post('/invoice', { invoice, user }, auth(cookies)); - console.log('R', requester); - if (requester) return { requester }; + if (requester) return { amount }; if (invoice.prompt) { throw redirect(307, `/invoice/${uuid}/tip`); diff --git a/src/lib/socket.js b/src/lib/socket.js index acb2b186..079c8f96 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -29,7 +29,6 @@ export const messages = (data) => ({ }, request() { - console.log("REQ", data) request.set(data); }, diff --git a/src/routes/(app)/[username]/receive/[...recipient]/+page.svelte b/src/routes/(app)/[username]/receive/[...recipient]/+page.svelte index 7afc2956..19e307e4 100644 --- a/src/routes/(app)/[username]/receive/[...recipient]/+page.svelte +++ b/src/routes/(app)/[username]/receive/[...recipient]/+page.svelte @@ -3,7 +3,9 @@ import { t } from '$lib/translations'; import { enhance } from '$app/forms'; import { page } from '$app/stores'; - import { request } from '$lib/store'; + import { invoices, request } from '$lib/store'; + import { browser } from '$app/environment'; + import { goto } from '$app/navigation'; export let data; export let form; @@ -22,8 +24,12 @@ let { currency, username } = data.subject; let { user } = data; + + $: paid = browser && form && Object.values($invoices).find((inv) => inv.amount === form.amount); + $: paid && goto(`/invoice/${paid.uuid}/paid`); </script> -{#if form} + +{#if form && req} <div class="container px-4 mt-20 max-w-xl mx-auto space-y-8"> <div class="text-center mb-8 space-y-5"> <p class="text-5xl break-words"> @@ -35,13 +41,13 @@ <p class="text-4xl break-words my-auto">{req.requester.username}</p> </div> </div> - <div class="text-center"> - <a href={`/${user.username}/dashboard`} class="mx-auto text-center"> - <button class="bg-black text-white rounded-2xl w-20 py-3 font-bold hover:opacity-80"> - Done - </button> - </a> - </div> + <div class="text-center"> + <a href={`/${user.username}/dashboard`} class="mx-auto text-center"> + <button class="bg-black text-white rounded-2xl w-20 py-3 font-bold hover:opacity-80"> + Done + </button> + </a> + </div> </div> {:else} <form method="POST" class="flex justify-center items-center mt-24 mb-3 px-3" use:enhance> |