notes

2 files changed, 16 insertions, 12 deletions

diff --git a/src/routes/(app)/send/zap/[pubkey]/[...id]/+page.server.ts b/src/routes/(app)/send/zap/[id]/[...amount]/+page.server.ts
index 1dd80d20..2219c370 100644
--- a/src/routes/(app)/send/zap/[pubkey]/[...id]/+page.server.ts
+++ b/src/routes/(app)/send/zap/[id]/[...amount]/+page.server.ts
@@ -2,26 +2,26 @@ import getRates from "$lib/rates";
 import { auth, fd, post } from "$lib/utils";
 import { fail, redirect } from "@sveltejs/kit";
 
-export async function load({ params, parent }) {
+export async function load({ cookies, params, parent }) {
 	const { user } = await parent();
-	const data = { ...params };
+	const { amount, id } = params;
 	const rates = await getRates();
 
-	data.rate = rates[user.currency];
-	return data;
+	let request;
+	if (amount)
+		request = await post("/zapRequest", { amount, id }, auth(cookies));
+
+	const rate = rates[user.currency];
+	return { amount, id, rates, rate, request };
 }
 
 export const actions = {
 	setAmount: async ({ cookies, params, request }) => {
 		const data = await fd(request);
-		const { id, pubkey } = params;
+		const { id } = params;
 		const { amount } = data;
 
-		data.request = await post(
-			"/zapRequest",
-			{ id, amount, pubkey },
-			auth(cookies),
-		);
+		data.request = await post("/zapRequest", { amount, id }, auth(cookies));
 
 		return data;
 	},
@@ -32,7 +32,9 @@ export const actions = {
 			const body = await fd(request);
 
 			p = await post("/payments", body, auth(cookies));
+			console.log("P", p);
 		} catch (_) {
+			console.log("WHAT", _);
 			return fail(400, { message: "payments.failedToRoute" });
 		}
 
diff --git a/src/routes/(app)/send/zap/[pubkey]/[...id]/+page.svelte b/src/routes/(app)/send/zap/[id]/[...amount]/+page.svelte
index eb0be4c8..e6dd1384 100644
--- a/src/routes/(app)/send/zap/[pubkey]/[...id]/+page.svelte
+++ b/src/routes/(app)/send/zap/[id]/[...amount]/+page.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { tick } from "svelte";
   import { goto } from "$app/navigation";
   import { untrack } from "svelte";
   import { t } from "$lib/translations";
@@ -14,14 +15,14 @@
   let { data, form } = $props();
 
   let { id, request, user } = $derived({ ...data, ...form });
-  let a = $state();
+  let a = $state(data.amount);
   let { currency } = $derived(user);
   let locale = loc(user);
   let event = $state();
 
   $effect(() => ($rate ||= data.rate));
   $effect(async () => {
-    if (form) {
+    if (form || request) {
       try {
         loading = false;
         event = await sign(request);
@@ -29,6 +30,7 @@
         await post("/post/payments", { amount, payreq, pin: $pin });
         goto(`/e/${id}`);
       } catch (e) {
+        console.log(e);
         fail(e.message);
       }
     }