Merge branch 'self-custody'

1 files changed, 6 insertions, 4 deletions

diff --git a/src/lib/invoice.ts b/src/lib/invoice.ts
index 7897dadc..fa2f7786 100644
--- a/src/lib/invoice.ts
+++ b/src/lib/invoice.ts
@@ -2,12 +2,14 @@ import { auth, get, post } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export default async ({ cookies, request }) => {
+  let aid = cookies.get("aid");
   let form = await request.formData();
 
   let rates = await get("/rates");
   let amount = parseInt(form.get("amount"));
 
   let invoice = {
+    aid,
     amount,
     items: JSON.parse(form.get("items")),
     memo: form.get("memo"),
@@ -16,7 +18,7 @@ export default async ({ cookies, request }) => {
     type: form.get("type"),
     prompt: form.get("prompt") === "true",
     rate: parseFloat(form.get("rate")) || rates[form.get("currency")],
-    id: undefined
+    id: undefined,
   };
 
   let user = { username: form.get("username"), currency: form.get("currency") };
@@ -25,9 +27,9 @@ export default async ({ cookies, request }) => {
   let { id } = invoice;
 
   if (invoice.prompt && invoice.tip === null)
-    redirect(307, `/${user.username}/invoice/${id}/tip`);
+    redirect(307, `/invoice/${id}/tip`);
 
   if (invoice.memoPrompt && !invoice.memo) {
-    redirect(307, `/${user.username}/invoice/${id}/memo`);
-  } else redirect(307, `/${user.username}/invoice/${id}`);
+    redirect(307, `/invoice/${id}/memo`);
+  } else redirect(307, `/invoice/${id}`);
 };