Merge branch 'coinos:master' into master

4 files changed, 78 insertions, 40 deletions

diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts
index 590e5d4d..ab41dddc 100644
--- a/src/routes/(app)/invoice/[id]/+layout.server.ts
+++ b/src/routes/(app)/invoice/[id]/+layout.server.ts
@@ -12,19 +12,8 @@ export async function load({ cookies, depends, params, url, parent }) {
 	if (id) {
 		invoice = await get(`/invoice/${id}`);
 		const options = !!url.searchParams.get("options");
-
-		if (
-			user &&
-			invoice.uid !== user.id &&
-			!(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
-			!options
-		) {
-			redirect(307, `/send/invoice/${id}`);
-		}
-
 		let { amount, pending, received } = invoice;
 		amount = parseInt(amount);
-		subject = invoice.user;
 
 		const paid =
 			(!amount && (pending || received)) ||
@@ -32,6 +21,21 @@ export async function load({ cookies, depends, params, url, parent }) {
 		if (paid && !url.pathname.endsWith("paid")) {
 			redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : ""));
 		}
+
+		subject = invoice.user;
+
+		if (
+			user &&
+			invoice.uid !== user?.id &&
+			!(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
+			!options
+		) {
+			if (invoice.prompt && invoice.tip === null)
+				redirect(307, `/invoice/${id}/tip`);
+			else {
+				redirect(307, `/send/invoice/${id}`);
+			}
+		}
 	}
 
 	const theme = cookies.get("theme") || "light";
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
index 0cb5aeac..29dd815d 100644
--- a/src/routes/(app)/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -56,16 +56,18 @@
 
   let subbed = false;
 
-  onMount(async () => {
-    if (browser) {
-      last.subscribe((v) => {
-        if (!v || subbed) return;
-        subbed = true;
-        send("subscribe", invoice);
-      });
+  $effect(() => {
+    if (!browser) return;
+    last.subscribe((v) => {
+      if (!v || subbed) return;
+      subbed = true;
+      send("subscribe", invoice);
+    });
+  });
 
-      if ($amountPrompt && !amount) toggleAmount();
-    }
+  onMount(async () => {
+    if (!browser) return;
+    if ($amountPrompt && !amount) toggleAmount();
   });
 
   let update = async () => {
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.server.ts b/src/routes/(app)/invoice/[id]/tip/+page.server.ts
index c3be68f0..851d3f1b 100644
--- a/src/routes/(app)/invoice/[id]/tip/+page.server.ts
+++ b/src/routes/(app)/invoice/[id]/tip/+page.server.ts
@@ -1,11 +1,36 @@
-import invoice from "$lib/invoice";
 import getRates from "$lib/rates";
-import { redirect } from "@sveltejs/kit";
+import { auth, fd, get, post } from "$lib/utils";
+import { fail, redirect } from "@sveltejs/kit";
 
-export async function load({ parent }) {
+export async function load({ cookies, params, parent }) {
+	const { id } = params;
 	const rates = await getRates();
-	const { invoice, subject } = await parent();
+	let { invoice, subject, user } = await parent();
 	if (!invoice.amount) redirect(307, `/invoice/${invoice.id}`);
+	const pin = cookies.get("pin");
+
+	if (user) {
+		const trust = await get("/trust", auth(cookies));
+		const trusted = trust.includes(invoice.uid);
+		if (trusted && (pin || !user.haspin)) {
+			let p;
+			try {
+				if (invoice.tip === null && invoice.user.prompt) {
+					if (user.tip > 0) {
+						invoice.tip = Math.round(invoice.amount * (user.tip / 100));
+						invoice = await post(`/invoice/${id}`, { invoice }, auth(cookies));
+						p = await post("/payments", { ...invoice, pin }, auth(cookies));
+					}
+				} else {
+					p = await post("/payments", { ...invoice, pin }, auth(cookies));
+				}
+			} catch (e) {
+				const { message } = e as Error;
+				fail(400, { message });
+			}
+			if (p) redirect(307, `/sent/${p.id}`);
+		}
+	}
 
 	const rate = rates[subject?.currency];
 	const invoiceRate = rates[invoice.currency];
@@ -13,5 +38,18 @@ export async function load({ parent }) {
 }
 
 export const actions = {
-	default: invoice,
+	default: async ({ cookies, request }) => {
+		const form = await fd(request);
+		const invoice = {
+			tip: form.tip ?? null,
+		};
+
+		const { id } = await post(
+			`/invoice/${form.id}`,
+			{ invoice },
+			auth(cookies),
+		);
+
+		redirect(307, `/invoice/${id}`);
+	},
 };
diff --git a/src/routes/(app)/invoice/[id]/tip/+page.svelte b/src/routes/(app)/invoice/[id]/tip/+page.svelte
index d609d86a..a1ea3586 100644
--- a/src/routes/(app)/invoice/[id]/tip/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/tip/+page.svelte
@@ -97,19 +97,8 @@
 
 <div class="container px-4 max-w-lg text-center mx-auto">
   <form method="POST" use:enhance class="space-y-5">
-    <input type="hidden" name="aid" value={aid} />
-    <input type="hidden" name="amount" value={amount} />
+    <input type="hidden" name="id" value={id} />
     <input type="hidden" name="tip" value={tip} />
-    <input type="hidden" name="username" value={username} />
-    <input type="hidden" name="rate" value={invoice.rate} />
-    <input type="hidden" name="prompt" value="false" />
-    <input type="hidden" name="type" value={type} />
-    <input type="hidden" name="hash" value={hash} />
-    <input type="hidden" name="items" value={JSON.stringify(items)} />
-
-    {#if invoice.memoPrompt}
-      <input type="hidden" name="memoPrompt" value={invoice.memoPrompt} />
-    {/if}
 
     <h1 class="text-4xl font-semibold my-8">{$t("invoice.addTipq")}</h1>
     {#if !showCustomAmount}
@@ -127,7 +116,10 @@
 
         <div class="ml-auto text-lg flex gap-2">
           <div class="flex items-center">
-            <iconify-icon noobserver icon="ph:lightning-fill" class="text-yellow-300"
+            <iconify-icon
+              noobserver
+              icon="ph:lightning-fill"
+              class="text-yellow-300"
             ></iconify-icon>
             <div>{s(amount, locale)}</div>
           </div>
@@ -170,12 +162,14 @@
         {/if}
       </div>
 
-      <div>
+      <div class="space-y-2">
         <button
           type="button"
           class="btn"
-          onclick={() => (showCustomAmount = true)}>Custom</button
+          onclick={() => (showCustomAmount = true)}
+          >{$t("payments.custom")}</button
         >
+        <a href={`/invoice/${id}`} class="btn">{$t("payments.cancel")}</a>
       </div>
     {/if}