wip

7 files changed, 16 insertions, 18 deletions

diff --git a/src/components/Invoice.svelte b/src/components/Invoice.svelte
index 5955bcc0..bf6e5f7b 100644
--- a/src/components/Invoice.svelte
+++ b/src/components/Invoice.svelte
@@ -24,12 +24,6 @@
 						Pay
 					</button>
 				</a>
-				<button
-					class="text-lg rounded-full border py-3 px-7 font-bold hover:opacity-80 w-40"
-					on:click={() => ($invoice = undefined)}
-				>
-					Dismiss
-				</button>
 			</div>
 		</div>
 	</div>
diff --git a/src/components/Request.svelte b/src/components/Request.svelte
index 2f05dc75..642d7159 100644
--- a/src/components/Request.svelte
+++ b/src/components/Request.svelte
@@ -17,22 +17,13 @@
 					<Avatar user={$request.requester} size={12} />
 					<h1 class="my-auto"><b>{$request.requester.username}</b> is ready to pay</h1>
 				</div>
-				{#if $request.memo}
-					<div class="border-l-4 pl-4 my-2">{$request.memo}</div>
-				{/if}
 			</div>
 			<div class="mx-auto my-auto flex gap-2">
 				<a href={`/${user.username}/receive/${$request.id}`}>
-					<button class="text-lg rounded-full border py-3 px-7 font-bold hover:opacity-80 w-40">
+					<button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-32">
 						Invoice
 					</button>
 				</a>
-				<button
-					class="text-lg rounded-full border py-3 px-7 font-bold hover:opacity-80 w-full"
-					on:click={() => ($request = undefined)}
-				>
-					Dismiss
-				</button>
 			</div>
 		</div>
 	</div>
diff --git a/src/lib/invoice.js b/src/lib/invoice.js
index 78693090..dbcb837b 100644
--- a/src/lib/invoice.js
+++ b/src/lib/invoice.js
@@ -2,6 +2,7 @@ import { auth, get, post } from '$lib/utils';
 import { redirect } from '@sveltejs/kit';
 
 export default async ({ cookies, request, url }) => {
+  console.log("WHAT")
 	let form = await request.formData();
 
 	let rates = await get('/rates');
@@ -22,8 +23,11 @@ export default async ({ cookies, request, url }) => {
 	let { uuid } = await post('/invoice', { invoice, user }, auth(cookies));
 
 	if (request_id) {
+    console.log("WHAT", request_id, url.pathname.endsWith("tip"))
 		if (url.pathname.endsWith('tip')) throw redirect(307, `/send/${uuid}`);
+    console.log("HERE WE GO")
 		throw redirect(307, `/${user.username}/request/${request_id}`);
+    console.log("NO GO")
 	}
 
 	if (invoice.prompt) {
diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
index 238780d7..eb4b99ae 100644
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ b/src/routes/(app)/[username]/dashboard/+page.svelte
@@ -110,7 +110,7 @@
 								<div class="flex">
 									<Avatar user={requester} size={20} />
 									<div class="my-auto text-left">
-										<p class="text-secondary">You invoiced</p>
+										<p class="text-secondary">Awaiting</p>
 										<p class="ml-1 text-lg break-words">{requester.username}</p>
 									</div>
 								</div>
@@ -131,6 +131,7 @@
 
 	<div>
 		{#each requests as { id, invoice, memo, requester: r }}
+      <a href={`/${user.username}/receive/${id}`}>
 			<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
 				<div class="flex">
 					<div>
@@ -142,8 +143,14 @@
 							</div>
 						</div>
 					</div>
+						<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
+			<button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
+				>Invoice</button
+			>
+						</div>
 				</div>
 			</div>
+      </a>
 		{/each}
 	</div>
 </div>
diff --git a/src/routes/(app)/[username]/request/+page.server.js b/src/routes/(app)/[username]/request/+page.server.js
index 039d4235..44c9d3a7 100644
--- a/src/routes/(app)/[username]/request/+page.server.js
+++ b/src/routes/(app)/[username]/request/+page.server.js
@@ -2,6 +2,7 @@ import { redirect } from '@sveltejs/kit';
 import { auth, post } from '$lib/utils';
 
 export let load = ({ locals }) => {
+  console.log("YO")
 	if (!locals.user) throw redirect(307, '/login');
 };
 
diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js
index 99f2e8e2..8245bef6 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/request/[id]/+page.server.js
@@ -7,6 +7,7 @@ export let load = async ({ cookies, depends, locals: { user }, params }) => {
 
 	let { request } = await get(`/request/${params.id}`, auth(cookies));
 	let { invoice } = request;
+
 	if (invoice) {
 		let { amount, received, uuid } = invoice;
 		if ((received && !amount) || received >= amount) throw redirect(307, `/send/${uuid}`);
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
index 5efcb176..b0ec9a6a 100644
--- a/src/routes/(app)/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -73,7 +73,7 @@
 	};
 </script>
 
-<button class="ml-5 mt-5 sm:mt-10 hover:opacity-80" on:click={back}>
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
 	<Icon icon="arrow-left" style="w-10" />
 </button>