From 43c8d6ec7b69146e6ddd4add337fd2fd4d381705 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 12 Nov 2022 23:42:37 -0800
Subject: initialize transactions

---
 src/lib/invoice.js                                 |  1 -
 src/lib/socket.js                                  |  1 +
 .../(app)/[username]/dashboard/+page.server.js     |  5 +++-
 src/routes/(app)/[username]/dashboard/+page.svelte | 27 ++--------------------
 .../[username]/transactions/[...page]/+page.svelte |  2 +-
 5 files changed, 8 insertions(+), 28 deletions(-)

(limited to 'src')

diff --git a/src/lib/invoice.js b/src/lib/invoice.js
index 657da735..78693090 100644
--- a/src/lib/invoice.js
+++ b/src/lib/invoice.js
@@ -22,7 +22,6 @@ export default async ({ cookies, request, url }) => {
 	let { uuid } = await post('/invoice', { invoice, user }, auth(cookies));
 
 	if (request_id) {
-		console.log('HERE', request_id);
 		if (url.pathname.endsWith('tip')) throw redirect(307, `/send/${uuid}`);
 		throw redirect(307, `/${user.username}/request/${request_id}`);
 	}
diff --git a/src/lib/socket.js b/src/lib/socket.js
index 8d84073c..37aab4af 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -31,6 +31,7 @@ export const messages = (data) => ({
 
 	request() {
 		request.set(data);
+		invalidate('app:invoice');
 	},
 
 	async payment() {
diff --git a/src/routes/(app)/[username]/dashboard/+page.server.js b/src/routes/(app)/[username]/dashboard/+page.server.js
index b283bc9d..f73c8209 100644
--- a/src/routes/(app)/[username]/dashboard/+page.server.js
+++ b/src/routes/(app)/[username]/dashboard/+page.server.js
@@ -1,3 +1,6 @@
 import { auth, get } from '$lib/utils';
 
-export let load = async ({ cookies }) => get('/requests', auth(cookies));
+export async function load({ cookies, depends}) {
+	depends('app:invoice');
+	return get('/requests', auth(cookies));
+}
diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
index 7acae7bd..e18b55bb 100644
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ b/src/routes/(app)/[username]/dashboard/+page.svelte
@@ -93,6 +93,7 @@
 
 	<div>
 		{#each invoices as { request_id, amount, currency, rate, user: recipient, requester, uuid }}
+      <a href={`/invoice/${uuid}/tip`} class:pointer-events-none={user.username === recipient.username}>
 			<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
 				<div class="flex gap-2">
 					<div>
@@ -122,32 +123,8 @@
 						<div class="text-secondary">{sat(amount)}</div>
 					</div>
 				</div>
-				<div class="w-full flex">
-					<div class="flex mx-auto my-auto gap-2">
-						{#if user.username === requester.username}
-							<a href={`/invoice/${uuid}/tip`}>
-								<div class="p-2 border rounded-full">
-									<div class="flex">
-										<Icon icon="send" style="w-6" />
-										<div>Pay</div>
-									</div>
-								</div>
-							</a>
-						{/if}
-						<form action={`/${user.username}/request?/delete`} method="POST" use:enhance>
-							<input type="hidden" name="request_id" value={request_id} />
-							<div class="p-2 border rounded-full bg-white flex">
-								<button type="submit">
-									<div class="flex">
-										<Icon icon="close" style="w-6" />
-										<div>Dismiss</div>
-									</div>
-								</button>
-							</div>
-						</form>
-					</div>
-				</div>
 			</div>
+      </a>
 		{/each}
 	</div>
 
diff --git a/src/routes/(app)/[username]/transactions/[...page]/+page.svelte b/src/routes/(app)/[username]/transactions/[...page]/+page.svelte
index 4d6fbc33..7f4410cc 100644
--- a/src/routes/(app)/[username]/transactions/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/transactions/[...page]/+page.svelte
@@ -29,7 +29,7 @@
 		total,
 		transactions = [],
 		pages = [];
-	$: data && ({ page: p, pages, start, end, total, transactions } = data);
+	$: data && ({ page: p, pages, start, end, total, transactions: $txns } = data);
 
 	$: $page && ($newPayment = false);
 	$: $newPayment && invalidate(`/users/${user.username}`);
-- 
cgit v1.2.3