From a133003edcbadb82fcb70d12c8a72b87f4dd0205 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Sat, 9 Nov 2024 20:14:34 -0800 Subject: fix tips --- src/lib/settings.ts | 2 +- src/routes/(app)/pay/[username]/[...amount]/+page.server.ts | 7 ++++--- src/routes/(app)/pay/[username]/[...amount]/+page.svelte | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/lib/settings.ts b/src/lib/settings.ts index b78d83fe..3ce1edd5 100644 --- a/src/lib/settings.ts +++ b/src/lib/settings.ts @@ -8,7 +8,7 @@ type Error = { export default async ({ cookies, request }) => { const form = await fd(request); - if (form.tab === "pos") { + if (form.tab === "preferences") { form.notify = form.notify === "on"; form.push = form.push === "on"; form.nip5 = form.nip5 === "on"; diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts b/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts index 7b439dcd..624a90f8 100644 --- a/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts +++ b/src/routes/(app)/pay/[username]/[...amount]/+page.server.ts @@ -40,10 +40,10 @@ export async function load({ cookies, params, parent }) { export const actions = { default: async ({ cookies, request }) => { let id; - try { - const body = await fd(request); - const { amount, rate, prompt, type, username } = body; + const body = await fd(request); + const { amount, rate, prompt, type, username } = body; + try { ({ id } = await post( "/invoice", { @@ -63,6 +63,7 @@ export const actions = { return fail(400, { message }); } + if (prompt) redirect(307, `/invoice/${id}/tip`); redirect(307, `/invoice/${id}`); }, }; diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte index 478d2529..8d882363 100644 --- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte +++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte @@ -32,6 +32,7 @@ +