1 files changed, 6 insertions, 9 deletions
diff --git a/src/lib/invoice.js b/src/lib/invoice.js
index d2f70146..98f6f2ca 100644
--- a/src/lib/invoice.js
+++ b/src/lib/invoice.js
@@ -6,17 +6,16 @@ export default async ({ cookies, request, url }) => {
 
   let rates = await get("/rates");
   let amount = parseInt(form.get("amount"));
-  let request_id = form.get("request_id");
-  if (request_id === "undefined") request_id = undefined;
 
   let invoice = {
     amount,
     items: JSON.parse(form.get("items")),
+    memo: form.get("memo"),
+    memoPrompt: form.get("memoPrompt"),
     tip: parseInt(form.get("tip")) || 0,
     type: form.get("type"),
     prompt: form.get("prompt") === "true",
     rate: parseFloat(form.get("rate")) || rates[form.get("currency")],
-    request_id,
   };
 
   let user = { username: form.get("username"), currency: form.get("currency") };
@@ -24,14 +23,12 @@ export default async ({ cookies, request, url }) => {
   invoice = await post("/invoice", { invoice, user }, auth(cookies));
   let { id } = invoice;
 
-  if (request_id) {
-    if (url.pathname.endsWith("tip")) {
-      redirect(307, `/send/invoice/${id}`);
-    }
+  if (invoice.prompt && invoice.tip === null)
+    redirect(307, `/${user.username}/invoice/${id}/tip`);
 
-    redirect(307, `/${user.username}/request/${request_id}`);
+  if (invoice.memoPrompt && !invoice.memo) {
+    redirect(307, `/${user.username}/invoice/${id}/memo`);
   }
 
-  if (invoice.prompt) redirect(307, `/${user.username}/invoice/${id}/tip`);
   else redirect(307, `/${user.username}/invoice/${id}`);
 };