From 376ff340ad9a0e15efec997c560f7e4db765f65c Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Tue, 8 Nov 2022 16:33:17 -0800 Subject: handle on-chain deposits --- src/lib/socket.js | 13 ++- src/lib/store.js | 1 + .../(app)/[username]/address/+page.server.js | 13 +++ src/routes/(app)/[username]/address/+page.svelte | 0 .../(app)/[username]/bitcoin/+page.server.js | 4 - src/routes/(app)/[username]/bitcoin/+page.svelte | 0 src/routes/(app)/[username]/dashboard/+page.svelte | 28 ++++--- .../[username]/receive/[...recipient]/+page.svelte | 2 +- .../[username]/transactions/[...page]/+page.svelte | 98 +++++++++++----------- src/routes/(app)/invoice/[id]/+page.svelte | 37 ++++---- src/routes/(app)/invoice/[id]/pending/+page.svelte | 56 +++++++++++++ 11 files changed, 167 insertions(+), 85 deletions(-) create mode 100644 src/routes/(app)/[username]/address/+page.server.js create mode 100644 src/routes/(app)/[username]/address/+page.svelte delete mode 100644 src/routes/(app)/[username]/bitcoin/+page.server.js delete mode 100644 src/routes/(app)/[username]/bitcoin/+page.svelte create mode 100644 src/routes/(app)/invoice/[id]/pending/+page.svelte (limited to 'src') diff --git a/src/lib/socket.js b/src/lib/socket.js index 079c8f96..6678b979 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -1,7 +1,8 @@ import { get } from 'svelte/store'; -import { invoices, invoice, request, newPayment, last, rate, user } from '$lib/store'; +import { invoices, invoice, request, newPayment, last, rate, txns, user } from '$lib/store'; import { success, sat } from '$lib/utils'; import { env } from '$env/dynamic/public'; +import { invalidate } from '$app/navigation'; const socketUrl = env.PUBLIC_SOCKET; const btc = env.PUBLIC_BTC; @@ -41,9 +42,15 @@ export const messages = (data) => ({ if (get(user).account_id !== data.account_id) return; - newPayment.set(true); + let payments = get(txns); + let i = payments.findIndex((p) => p.id === data.id); + if (~i) (payments[i] = data), txns.set(payments); + else newPayment.set(true); + + invalidate((url) => url.pathname === '/payments'); + if (amount > 0) { - success(`Received ${sat(amount)}!`); + success(`${data.confirmed ? 'Received' : 'Detected'} ${sat(amount)}!`); } else { success(`Sent ${sat(amount)}!`); } diff --git a/src/lib/store.js b/src/lib/store.js index 3faa234b..3105419c 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -46,3 +46,4 @@ export const pin = persistSession('pin', undefined, 5 * 60 * 1000); export const last = writable(); export const request = writable(); export const invoice = writable(); +export const txns = persistLocal('transactions', []); diff --git a/src/routes/(app)/[username]/address/+page.server.js b/src/routes/(app)/[username]/address/+page.server.js new file mode 100644 index 00000000..c18bcdba --- /dev/null +++ b/src/routes/(app)/[username]/address/+page.server.js @@ -0,0 +1,13 @@ +import { auth, get, post } from '$lib/utils'; +import { redirect } from '@sveltejs/kit'; + +export async function load({ cookies, params, parent }) { + let user = (await parent()).subject; + let rates = await get('/rates'); + let invoice = { + network: 'bitcoin', + rate: rates[user.currency] + }; + let { uuid } = await post('/invoice', { invoice, user }, auth(cookies)); + throw redirect(307, `/invoice/${uuid}`); +} diff --git a/src/routes/(app)/[username]/address/+page.svelte b/src/routes/(app)/[username]/address/+page.svelte new file mode 100644 index 00000000..e69de29b diff --git a/src/routes/(app)/[username]/bitcoin/+page.server.js b/src/routes/(app)/[username]/bitcoin/+page.server.js deleted file mode 100644 index 7ef65346..00000000 --- a/src/routes/(app)/[username]/bitcoin/+page.server.js +++ /dev/null @@ -1,4 +0,0 @@ -import { redirect } from '@sveltejs/kit'; -export async function load({ params }) { - throw redirect(303, `/${params.username}`); -} diff --git a/src/routes/(app)/[username]/bitcoin/+page.svelte b/src/routes/(app)/[username]/bitcoin/+page.svelte deleted file mode 100644 index e69de29b..00000000 diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte index 93fac986..0ea0e0a8 100644 --- a/src/routes/(app)/[username]/dashboard/+page.svelte +++ b/src/routes/(app)/[username]/dashboard/+page.svelte @@ -52,23 +52,25 @@
+ + + - {#if user.account.balance > 0} - - - - {:else} - - - - {/if} + + + + + +
diff --git a/src/routes/(app)/[username]/receive/[...recipient]/+page.svelte b/src/routes/(app)/[username]/receive/[...recipient]/+page.svelte index 634b091a..41958cd0 100644 --- a/src/routes/(app)/[username]/receive/[...recipient]/+page.svelte +++ b/src/routes/(app)/[username]/receive/[...recipient]/+page.svelte @@ -56,7 +56,7 @@ - + {#if req} diff --git a/src/routes/(app)/[username]/transactions/[...page]/+page.svelte b/src/routes/(app)/[username]/transactions/[...page]/+page.svelte index f5fae1d9..c7007af4 100644 --- a/src/routes/(app)/[username]/transactions/[...page]/+page.svelte +++ b/src/routes/(app)/[username]/transactions/[...page]/+page.svelte @@ -2,7 +2,7 @@ import { Avatar, Icon } from '$comp'; import { onMount } from 'svelte'; import { format, parseISO } from 'date-fns'; - import { newPayment } from '$lib/store'; + import { newPayment, txns } from '$lib/store'; import { t } from '$lib/translations'; import { f, s, sat, sats } from '$lib/utils'; import { page } from '$app/stores'; @@ -31,17 +31,21 @@ pages = []; $: data && ({ page: p, pages, start, end, total, transactions } = data); + $: console.log($txns.length), ($txns = transactions); + $: $page && ($newPayment = false); $: $newPayment && invalidate(`/users/${user.username}`); - $: path = $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf('/')); + $: path = $page.params.page + ? $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf('/')) + : $page.url.pathname; let csv = () => { const keys = ['hash', 'updatedAt', 'rate', 'currency', 'amount', 'fee', 'tip']; const csv = keys.map((k) => `"${k}"`).join(',') + '\n' + - transactions.map((r) => keys.map((k) => `"${r[k]}"`).join(',')).join('\n'); + $txns.map((r) => keys.map((k) => `"${r[k]}"`).join(',')).join('\n'); const filename = 'transactions.csv'; let blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' }); @@ -108,61 +112,59 @@
- {#if transactions.length} - {#each transactions as tx} -
-
-
- {f(tx.amount * (tx.rate / sats), tx.currency)} - - {#if tx.tip} - - +{f(tx.tip * (tx.rate / sats), tx.currency)} - - {/if} -
+ {#each $txns as tx} +
+
+
+ {f(tx.amount * (tx.rate / sats), tx.currency)} + + {#if tx.tip} + + +{f(tx.tip * (tx.rate / sats), tx.currency)} + + {/if} +
- {sat(tx.amount)} + {sat(tx.amount)} - {#if tx.tip} - - +{sat(tx.tip)} - - {/if} - -
+ {#if tx.tip} + + +{sat(tx.tip)} + + {/if} + +
-
- {#if tx.with} - -
-
- -
-
{tx.with.username}
+
+ {#if tx.with} + +
+
+
- - {:else} -
- {tx.amount > 0 ? 'Received' : 'Sent'} +
{tx.with.username}
- {/if} -
- -
-
- {format(parseISO(tx.createdAt), 'h:mm aaa')} -
-
- {format(parseISO(tx.createdAt), 'MMM d')} + + {:else} +
+ {tx.amount > 0 ? (tx.confirmed ? 'Received' : 'Pending') : 'Sent'}
+ {/if} +
+ +
+
+ {format(parseISO(tx.createdAt), 'h:mm aaa')} +
+
+ {format(parseISO(tx.createdAt), 'MMM d')}
- {/each} +
{:else}

{$t('user.transactions.empty')}

- {/if} + {/each}
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte index 463cf31f..dec33b62 100644 --- a/src/routes/(app)/invoice/[id]/+page.svelte +++ b/src/routes/(app)/invoice/[id]/+page.svelte @@ -27,7 +27,7 @@ user: { username, currency } } = invoice; -let src = sm; + let src = sm; let qr; let tipPercent = 0; @@ -51,9 +51,12 @@ let src = sm; $invoices[id] = { amount, id, rate, received, text, tip, username }; $: browser && + $invoices[id].amount > 0 && $invoices[id]?.received >= $invoices[id]?.amount && goto(($invoices[id].memo === 'launch' && '/launch/purchase') || `/invoice/${id}/paid`); + $: browser && $invoices[id].pending > 0 && goto(`/invoice/${id}/pending`); + $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2)); $: tipAmount = ((tip * rate) / sats).toFixed(2); @@ -69,13 +72,13 @@ let src = sm; $: link = address ? text : `lightning:${text}`; - let full; - let toggle = () => { - screenfull.toggle(qr); - full = !full; - if (full) src = lg; - else src = sm; - } + let full; + let toggle = () => { + screenfull.toggle(qr); + full = !full; + if (full) src = lg; + else src = sm; + }; +
-- cgit v1.2.3