invoice types

24 files changed, 315 insertions, 144 deletions

diff --git a/src/components/InvoiceActions.svelte b/src/components/InvoiceActions.svelte
index 0f500fe6..31af3d36 100644
--- a/src/components/InvoiceActions.svelte
+++ b/src/components/InvoiceActions.svelte
@@ -1,13 +1,14 @@
 <script>
+  import { amountPrompt } from "$lib/store";
+  import { types } from "$lib/utils";
+  import { page } from "$app/stores";
   import { goto } from "$app/navigation";
-  import InvoiceTypes from "$comp/InvoiceTypes.svelte";
   let {
     user,
     invoice,
     copy,
     t,
     link,
-    type,
     showQr = $bindable(),
     txt,
     setAmount,
@@ -17,19 +18,68 @@
     setType,
     toggleMemo,
   } = $props();
+
+  let { aid, address_type, type } = $derived(invoice);
 </script>
 
 <div class="text-secondary space-y-2 text-xl pt-2">
-  <InvoiceTypes
-    {invoice}
-    {user}
-    {toggleType}
-    bind:newAmount
-    {setAmount}
-    {setType}
-    t={$t}
-    activeOnly={true}
-  />
+  <button
+    class="btn flex-nowrap"
+    class:bg-base-300={type === types.ecash}
+    class:text-secondary={type === types.ecash}
+    class:hidden={type !== types.ecash}
+    onclick={setType(types.ecash)}
+  >
+    <img src="/images/cash.png" class="w-8 my-auto" />
+    <div class="my-auto text-lg">Ecash</div>
+  </button>
+
+  <button
+    class="btn flex-nowrap"
+    class:bg-base-300={type === types.liquid}
+    class:text-secondary={type === types.liquid}
+    class:hidden={type !== types.liquid}
+    onclick={() => setType(types.liquid)}
+  >
+    <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
+    <div class="my-auto text-lg">Liquid</div>
+  </button>
+
+  <div class="flex gap-2">
+    <button
+      class="btn flex-nowrap !w-auto grow"
+      class:bg-base-300={type === types.lightning}
+      class:text-secondary={type === types.lightning}
+      onclick={() => {
+        $amountPrompt = false;
+        newAmount = undefined;
+        setType(types.lightning);
+      }}
+    >
+      <div
+        class="bg-black rounded-full w-8 h-8 items-center justify-center flex"
+      >
+        <div class="m-auto">
+          <iconify-icon
+            noobserver
+            icon="ph:lightning-fill"
+            class="text-yellow-300 text-2xl"
+          ></iconify-icon>
+        </div>
+      </div>
+      <div class="my-auto text-lg">Lightning</div>
+    </button>
+
+    <button
+      class="btn flex-nowrap !w-auto grow"
+      class:bg-base-300={type === types.bitcoin}
+      class:text-secondary={type === types.bitcoin}
+      onclick={() => setType(types.bitcoin)}
+    >
+      <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
+      <div class="my-auto text-lg">Bitcoin</div>
+    </button>
+  </div>
 
   <div class="flex flex-wrap gap-2 justify-around text-secondary w-full">
     <button type="button" class="btn !w-auto grow" onclick={() => copy(txt)}>
@@ -93,4 +143,10 @@
       >
     </div>
   {/if}
+
+  <button type="button" class="btn" onclick={toggleType}>
+    <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
+    <img src="/images/cash.png" class="w-8 my-auto" />
+    <div class="my-auto">{t("payments.moreOptions")}</div>
+  </button>
 </div>
diff --git a/src/components/InvoiceTypes.svelte b/src/components/InvoiceTypes.svelte
index 0829fc82..a238dcde 100644
--- a/src/components/InvoiceTypes.svelte
+++ b/src/components/InvoiceTypes.svelte
@@ -16,49 +16,10 @@
   let { aid, address_type, type } = $derived(invoice);
 </script>
 
-{#if invoice.uid === aid}
+<div class="text-xl">Bitcoin</div>
+<div class="flex flex-wrap gap-2">
   <button
-    class="btn flex-nowrap"
-    class:bg-base-300={type === types.lightning &&
-      $page.url.pathname.includes("/receive")}
-    class:text-secondary={type === types.lightning &&
-      $page.url.pathname.includes("/receive")}
-    class:hidden={activeOnly &&
-      (type !== types.lightning || !$page.url.pathname.includes("/receive"))}
-    onclick={() => {
-      if (activeOnly) toggleType();
-      else {
-        $amountPrompt = false;
-        newAmount = undefined;
-        setType(types.lightning);
-      }
-    }}
-  >
-    <div class="bg-black rounded-full w-8 h-8 items-center justify-center flex">
-      <div class="m-auto">
-        <iconify-icon
-          noobserver
-          icon="ph:lightning-fill"
-          class="text-yellow-300 text-2xl"
-        ></iconify-icon>
-      </div>
-    </div>
-    <div class="my-auto text-lg">LNURL</div>
-  </button>
-
-  <button
-    class="btn flex-nowrap"
-    class:bg-base-300={type === types.ecash}
-    class:text-secondary={type === types.ecash}
-    class:hidden={activeOnly && type !== types.ecash}
-    onclick={() => (activeOnly ? toggleType() : setType(types.ecash))}
-  >
-    <img src="/images/cash.png" class="w-8 my-auto" />
-    <div class="my-auto text-lg">Ecash</div>
-  </button>
-
-  <button
-    class="btn flex-nowrap"
+    class="btn flex-nowrap !w-auto grow"
     class:bg-base-300={type === types.bitcoin && address_type === "bech32"}
     class:text-secondary={type === types.bitcoin && address_type === "bech32"}
     class:hidden={activeOnly &&
@@ -70,49 +31,22 @@
   </button>
 
   <button
-    class="btn flex-nowrap"
-    class:bg-base-300={type === types.liquid}
-    class:text-secondary={type === types.liquid}
-    class:hidden={activeOnly && type !== types.liquid}
-    onclick={() => (activeOnly ? toggleType() : setType(types.liquid))}
-  >
-    <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
-    <div class="my-auto text-lg">Liquid</div>
-  </button>
-
-  <button
-    class="btn flex-nowrap"
-    class:bg-base-300={type === types.lightning &&
-      !$page.url.pathname.includes("/receive")}
-    class:text-secondary={type === types.lightning &&
-      !$page.url.pathname.includes("/receive")}
+    class="btn flex-nowrap !w-auto grow"
+    class:bg-base-300={type === types.bitcoin && address_type === "bech32m"}
+    class:text-secondary={type === types.bitcoin && address_type === "bech32m"}
     class:hidden={activeOnly &&
-      (type !== types.lightning || $page.url.pathname.includes("/receive"))}
-    onclick={() => {
-      if (activeOnly) toggleType();
-      else {
-        $amountPrompt = false;
-        newAmount = 0;
-        setType(types.lightning);
-      }
-    }}
+      (type !== types.bitcoin || address_type !== "bech32m")}
+    onclick={() =>
+      activeOnly ? toggleType() : setType(types.bitcoin, "bech32m")}
   >
-    <div class="bg-black rounded-full w-8 h-8 items-center justify-center flex">
-      <div class="m-auto">
-        <iconify-icon
-          noobserver
-          icon="ph:lightning-fill"
-          class="text-yellow-300 text-2xl"
-        ></iconify-icon>
-      </div>
-    </div>
-    <div class="my-auto text-lg">Bolt 11</div>
+    <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
+    <div class="my-auto text-lg">Taproot</div>
   </button>
 
   <button
-    class="btn flex-nowrap"
-    class:bg-base-300={type === types.bitcoin && address_type !== "legacy"}
-    class:text-secondary={type === types.bitcoin && address_type !== "legacy"}
+    class="btn flex-nowrap !w-auto grow"
+    class:bg-base-300={type === types.bitcoin && address_type === "legacy"}
+    class:text-secondary={type === types.bitcoin && address_type === "legacy"}
     class:hidden={activeOnly &&
       (type !== types.bitcoin || address_type !== "legacy")}
     onclick={() =>
@@ -121,36 +55,124 @@
     <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
     <div class="my-auto text-lg">Legacy</div>
   </button>
+</div>
 
-  <button
-    class="btn flex-nowrap"
-    class:bg-base-300={type === types.bolt12}
-    class:text-secondary={type === types.bolt12}
-    class:hidden={activeOnly && type !== types.bolt12}
-    onclick={() => (activeOnly ? toggleType() : setType(types.bolt12))}
-  >
-    <div class="bg-black rounded-full w-8 h-8 items-center justify-center flex">
-      <div class="m-auto">
-        <iconify-icon
-          noobserver
-          icon="ph:lightning-fill"
-          class="text-yellow-300 text-2xl"
-        ></iconify-icon>
+{#if invoice.uid === aid}
+  <div class="text-xl">Lightning</div>
+  <div class="flex flex-wrap gap-2">
+    <button
+      class="btn flex-nowrap !w-auto grow"
+      class:bg-base-300={type === types.lightning &&
+        $page.url.pathname.includes("/receive")}
+      class:text-secondary={type === types.lightning &&
+        $page.url.pathname.includes("/receive")}
+      class:hidden={activeOnly &&
+        (type !== types.lightning || !$page.url.pathname.includes("/receive"))}
+      onclick={() => {
+        if (activeOnly) toggleType();
+        else {
+          $amountPrompt = false;
+          newAmount = undefined;
+          setType(types.lightning);
+        }
+      }}
+    >
+      <div
+        class="bg-black rounded-full w-8 h-8 items-center justify-center flex"
+      >
+        <div class="m-auto">
+          <iconify-icon
+            noobserver
+            icon="ph:lightning-fill"
+            class="text-yellow-300 text-2xl"
+          ></iconify-icon>
+        </div>
       </div>
-    </div>
-    <div class="my-auto text-lg">Bolt 12</div>
-  </button>
+      <div class="my-auto text-lg">LNURL</div>
+    </button>
+    <button
+      class="btn flex-nowrap !w-auto grow"
+      class:bg-base-300={type === types.bolt12}
+      class:text-secondary={type === types.bolt12}
+      class:hidden={activeOnly && type !== types.bolt12}
+      onclick={() => (activeOnly ? toggleType() : setType(types.bolt12))}
+    >
+      <div
+        class="bg-black rounded-full w-8 h-8 items-center justify-center flex"
+      >
+        <div class="m-auto">
+          <iconify-icon
+            noobserver
+            icon="ph:lightning-fill"
+            class="text-yellow-300 text-2xl"
+          ></iconify-icon>
+        </div>
+      </div>
+      <div class="my-auto text-lg">Bolt 12</div>
+    </button>
 
-  <button
-    class="btn flex-nowrap"
-    class:bg-base-300={type === types.bitcoin}
-    class:text-secondary={type === types.bitcoin}
-    class:hidden={activeOnly &&
-      (type !== types.bitcoin || address_type !== "bech32m")}
-    onclick={() =>
-      activeOnly ? toggleType() : setType(types.bitcoin, "bech32m")}
-  >
-    <img src="/images/bitcoin.svg" class="w-8" alt="Bitcoin" />
-    <div class="my-auto text-lg">Taproot</div>
+    <button
+      class="btn flex-nowrap !w-auto grow"
+      class:bg-base-300={type === types.lightning &&
+        !$page.url.pathname.includes("/receive")}
+      class:text-secondary={type === types.lightning &&
+        !$page.url.pathname.includes("/receive")}
+      class:hidden={activeOnly &&
+        (type !== types.lightning || $page.url.pathname.includes("/receive"))}
+      onclick={() => {
+        if (activeOnly) toggleType();
+        else {
+          $amountPrompt = false;
+          newAmount = 0;
+          setType(types.lightning);
+        }
+      }}
+    >
+      <div
+        class="bg-black rounded-full w-8 h-8 items-center justify-center flex"
+      >
+        <div class="m-auto">
+          <iconify-icon
+            noobserver
+            icon="ph:lightning-fill"
+            class="text-yellow-300 text-2xl"
+          ></iconify-icon>
+        </div>
+      </div>
+      <div class="my-auto text-lg">Bolt 11</div>
+    </button>
+  </div>
+
+  <div class="text-xl">{t("payments.other")}</div>
+  <div class="flex flex-wrap gap-2">
+    <button
+      class="btn flex-nowrap !w-auto grow"
+      class:bg-base-300={type === types.ecash}
+      class:text-secondary={type === types.ecash}
+      class:hidden={activeOnly && type !== types.ecash}
+      onclick={() => (activeOnly ? toggleType() : setType(types.ecash))}
+    >
+      <img src="/images/cash.png" class="w-8 my-auto" />
+      <div class="my-auto text-lg">Ecash</div>
+    </button>
+
+    <button
+      class="btn flex-nowrap !w-auto grow"
+      class:bg-base-300={type === types.liquid}
+      class:text-secondary={type === types.liquid}
+      class:hidden={activeOnly && type !== types.liquid}
+      onclick={() => (activeOnly ? toggleType() : setType(types.liquid))}
+    >
+      <img src="/images/liquid.svg" class="w-8" alt="Liquid" />
+      <div class="my-auto text-lg">Liquid</div>
+    </button>
+  </div>
+
+  <div></div>
+  <button type="button" class="btn" onclick={toggleType}>
+    <iconify-icon noobserver icon="ph:x-bold" width="32"></iconify-icon>
+    <div class="my-auto">
+      {t("payments.cancel")}
+    </div>
   </button>
 {/if}
diff --git a/src/components/SetType.svelte b/src/components/SetType.svelte
index 7e80d0bc..ecbfcba4 100644
--- a/src/components/SetType.svelte
+++ b/src/components/SetType.svelte
@@ -30,7 +30,8 @@
         {invoice}
         {user}
         {setType}
-        t={$t}
+        {toggleType}
+        {t}
       />
     </div>
   </div>
diff --git a/src/locales/ar.json b/src/locales/ar.json
index a72cf906..53f86aa8 100644
--- a/src/locales/ar.json
+++ b/src/locales/ar.json
@@ -127,9 +127,9 @@
 		"pitch3": "إذا كنت تعتقد أنك يمكن أن تجعل أثرا، نود أن نسمع منك. أرسل لنا سيرتك الذاتية"
 	},
 	"landing": {
-    "header_before_icon": "أبسط",
-    "header_with_icon": "وأسرع",
-    "header_after_icon": "طريقة للبدء باستخدام البيتكوين.",
+		"header_before_icon": "أبسط",
+		"header_with_icon": "وأسرع",
+		"header_after_icon": "طريقة للبدء باستخدام البيتكوين.",
 		"subheader": "محفظة شبكية مجانية وصفحة دفع للجميع.",
 		"info1": {
 			"title": "مدفوعات محدودة عن طريق البرق",
@@ -447,7 +447,8 @@
 		"fundsClaimed": "الأموال المطالب بها!",
 		"print": "الطباعة",
 		"onlyLbtc": "نحن فقط ندعم",
-		"dontDeposit": "من فضلك لا تودع أصول سائلة أخرى"
+		"dontDeposit": "من فضلك لا تودع أصول سائلة أخرى",
+		"other": "أخرى"
 	},
 	"items": {
 		"add": "البند",
@@ -456,5 +457,9 @@
 		"price": "السعر",
 		"submit": "Submit",
 		"image": "الصورة"
+	},
+	"notes": {
+		"contents": "المحتويات",
+		"notFound": "No notes found"
 	}
 }
diff --git a/src/locales/bn.json b/src/locales/bn.json
index 78d04f33..f17954f5 100644
--- a/src/locales/bn.json
+++ b/src/locales/bn.json
@@ -447,7 +447,8 @@
 		"fundsClaimed": "তহবিল দাবি করেছে!",
 		"print": "প্রিন্ট করুন",
 		"onlyLbtc": "আমরা শুধু সমর্থন করি",
-		"dontDeposit": "অনুগ্রহ করে অন্য তরল সম্পদ জমা করবেন না"
+		"dontDeposit": "অনুগ্রহ করে অন্য তরল সম্পদ জমা করবেন না",
+		"other": "অন্যান্য"
 	},
 	"items": {
 		"add": "বস্তু যোগ করুন",
@@ -456,5 +457,9 @@
 		"price": "মূল্য",
 		"submit": "জমা করুন",
 		"image": "ছবি"
+	},
+	"notes": {
+		"contents": "নোটের বিষয়বস্তু",
+		"notFound": "সহায়ক তথ্য পাওয়া যায়নি"
 	}
 }
diff --git a/src/locales/de.json b/src/locales/de.json
index 6dac9bdf..f7bc9846 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -450,7 +450,8 @@
 		"ecashToken": "Ecash token",
 		"lnurlw": "LNURLW",
 		"createFund": "Einen Fonds erstellen",
-		"withdraw": "Zurückziehen"
+		"withdraw": "Zurückziehen",
+		"other": "Sonstige"
 	},
 	"items": {
 		"add": "Artikel hinzufügen",
@@ -485,5 +486,9 @@
 		"finish": "Beenden",
 		"showQR": "QR anzeigen",
 		"revealNwc": "NWC enthüllen"
+	},
+	"notes": {
+		"contents": "Inhalt",
+		"notFound": "Keine Notizen gefunden"
 	}
 }
diff --git a/src/locales/el.json b/src/locales/el.json
index 6bb1fec5..59c80296 100644
--- a/src/locales/el.json
+++ b/src/locales/el.json
@@ -441,7 +441,8 @@
 		"ecashToken": "Ένδειξη Ecash",
 		"lnurlw": "LNURLW",
 		"createFund": "Δημιουργία ενός ταμείου",
-		"withdraw": "Αποσυρθείτε"
+		"withdraw": "Αποσυρθείτε",
+		"other": "Άλλα"
 	},
 	"items": {
 		"add": "Πρόσθεσε είδος",
@@ -476,5 +477,9 @@
 		"finish": "Φινίρισμα",
 		"showQR": "Εμφάνιση QR",
 		"revealNwc": "Αποκαλύψτε το NWC"
+	},
+	"notes": {
+		"contents": "Περιεχόμενα σημείωσης",
+		"notFound": "Δε βρέθηκαν σημειώσεις"
 	}
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index 0e2f0077..22634184 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -352,6 +352,8 @@
 		}
 	},
 	"payments": {
+		"moreOptions": "More options...",
+		"other": "Other",
 		"ok": "Ok",
 		"cancel": "Cancel",
 		"failedToRoute": "Failed to route payment, recipient may not be reachable. Try sending a smaller amount or increasing the max fee reserve.",
diff --git a/src/locales/es.json b/src/locales/es.json
index 73be679a..e48c95ed 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -423,7 +423,8 @@
 		"ecashToken": "Ecash token",
 		"lnurlw": "LNURLw",
 		"createFund": "Crear un fondo",
-		"withdraw": "Retirada"
+		"withdraw": "Retirada",
+		"other": "Otros"
 	},
 	"items": {
 		"add": "Añadir artículo",
@@ -458,5 +459,9 @@
 		"finish": "Finalizar",
 		"showQR": "Mostrar código QR",
 		"revealNwc": "Revelar NWC"
+	},
+	"notes": {
+		"contents": "Contenido de la nota",
+		"notFound": "No hay notas encontradas"
 	}
 }
diff --git a/src/locales/fa.json b/src/locales/fa.json
index 968ef2af..531341e3 100644
--- a/src/locales/fa.json
+++ b/src/locales/fa.json
@@ -423,7 +423,8 @@
 		"ecashToken": "توکن Ecash",
 		"lnurlw": "LNURLw",
 		"createFund": "ایجاد یک صندوق",
-		"withdraw": "برگرفته از:"
+		"withdraw": "برگرفته از:",
+		"other": "دیگر"
 	},
 	"items": {
 		"add": "این مورد را اضافه کنید",
@@ -458,5 +459,9 @@
 		"finish": "پایان",
 		"showQR": "نمایش QR",
 		"revealNwc": "NWC را آشکار کنید"
+	},
+	"notes": {
+		"contents": "مطالب توجه",
+		"notFound": "هیچ یادداشتی پیدا نشد"
 	}
 }
diff --git a/src/locales/fr.json b/src/locales/fr.json
index 1ad4bfe8..7e899b8d 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -423,7 +423,8 @@
 		"ecashToken": "Jeton Ecash",
 		"lnurlw": "LNURLw",
 		"createFund": "Créer un fonds",
-		"withdraw": "Retrait"
+		"withdraw": "Retrait",
+		"other": "Autres"
 	},
 	"items": {
 		"add": "Ajouter un article",
@@ -458,5 +459,9 @@
 		"finish": "Terminer",
 		"showQR": "Afficher le QR code",
 		"revealNwc": "Révéler le NWC"
+	},
+	"notes": {
+		"contents": "Table des matières",
+		"notFound": "Aucune note trouvée"
 	}
 }
diff --git a/src/locales/hi.json b/src/locales/hi.json
index 94f49ba3..0def6bdb 100644
--- a/src/locales/hi.json
+++ b/src/locales/hi.json
@@ -447,7 +447,8 @@
 		"fundsClaimed": "फंडों का दावा!",
 		"print": "छाप",
 		"onlyLbtc": "हम केवल समर्थन करते हैं",
-		"dontDeposit": "कृपया अन्य तरल परिसंपत्तियों को जमा न करें"
+		"dontDeposit": "कृपया अन्य तरल परिसंपत्तियों को जमा न करें",
+		"other": "अन्य"
 	},
 	"items": {
 		"add": "आइटम जोड़ें",
@@ -477,5 +478,9 @@
 		"nl": "Nederlands",
 		"th": "ไทย",
 		"pl": "Polski"
+	},
+	"notes": {
+		"contents": "नोट सामग्री",
+		"notFound": "कोई नोट नहीं मिला"
 	}
 }
diff --git a/src/locales/it.json b/src/locales/it.json
index 7867d86f..061c4b8c 100644
--- a/src/locales/it.json
+++ b/src/locales/it.json
@@ -447,7 +447,8 @@
 		"fundsClaimed": "Fondi richiesti!",
 		"print": "Stampa",
 		"onlyLbtc": "Supportiamo solo",
-		"dontDeposit": "Non depositare altri beni Liquid"
+		"dontDeposit": "Non depositare altri beni Liquid",
+		"other": "Altri"
 	},
 	"items": {
 		"add": "Aggiungi articolo",
@@ -477,5 +478,9 @@
 		"nl": "Olandese",
 		"th": "Thailandese",
 		"pl": "Polacco"
+	},
+	"notes": {
+		"contents": "Contenuto della nota",
+		"notFound": "Nessun commento trovato"
 	}
 }
diff --git a/src/locales/ja.json b/src/locales/ja.json
index c6b6b83e..d355f9d4 100644
--- a/src/locales/ja.json
+++ b/src/locales/ja.json
@@ -423,7 +423,8 @@
 		"ecashToken": "Ecashトークン",
 		"lnurlw": "ログイン",
 		"createFund": "ファンドを作成する",
-		"withdraw": "フィードバック"
+		"withdraw": "フィードバック",
+		"other": "その他"
 	},
 	"items": {
 		"add": "アイテムの追加",
@@ -458,5 +459,9 @@
 		"finish": "仕上げる",
 		"showQR": "QRコードを表示",
 		"revealNwc": "NWCを公開"
+	},
+	"notes": {
+		"contents": "コンテンツ",
+		"notFound": "ノートが見つかりません"
 	}
 }
diff --git a/src/locales/ko.json b/src/locales/ko.json
index 9e95ee88..8006c762 100644
--- a/src/locales/ko.json
+++ b/src/locales/ko.json
@@ -447,7 +447,8 @@
 		"fundsClaimed": "자금 청구!",
 		"print": "제품정보",
 		"onlyLbtc": "우리는 단지 지원",
-		"dontDeposit": "다른 액체 자산을 입금하지 마십시오"
+		"dontDeposit": "다른 액체 자산을 입금하지 마십시오",
+		"other": "이름 *"
 	},
 	"items": {
 		"add": "더 보기",
@@ -477,5 +478,9 @@
 		"nl": "Nederlands",
 		"th": "ไทย",
 		"pl": "Polski"
+	},
+	"notes": {
+		"contents": "공지사항",
+		"notFound": "발견 된 노트"
 	}
 }
diff --git a/src/locales/nl.json b/src/locales/nl.json
index 28320741..ad223498 100644
--- a/src/locales/nl.json
+++ b/src/locales/nl.json
@@ -152,7 +152,7 @@
 		"continue": "Doorgaan",
 		"reset": "Wachtwoord resetten",
 		"resetDesc": "We kunnen een reset link sturen als je jouw e-mail hebt toegevoegd en geverifieerd. Anders kun je contact opnemen met",
-			"optional": "Facultatief",
+		"optional": "Facultatief",
 		"submit": "Verzenden",
 		"token": "2FA Token",
 		"username": "Gebruikersnaam",
@@ -447,7 +447,8 @@
 		"fundsClaimed": "Geld geclaimd!",
 		"print": "Afdrukken",
 		"onlyLbtc": "Wij ondersteunen alleen",
-		"dontDeposit": "Gelieve geen andere soorten te sturen"
+		"dontDeposit": "Gelieve geen andere soorten te sturen",
+		"other": "Andere"
 	},
 	"items": {
 		"add": "Item toevoegen",
@@ -477,5 +478,9 @@
 		"nl": "Nederlands",
 		"th": "ไทย",
 		"pl": "Polski"
+	},
+	"notes": {
+		"contents": "Inhoud notitie",
+		"notFound": "Geen notities gevonden"
 	}
 }
diff --git a/src/locales/pl.json b/src/locales/pl.json
index bf64a616..42c5f0f2 100644
--- a/src/locales/pl.json
+++ b/src/locales/pl.json
@@ -447,7 +447,8 @@
 		"fundsClaimed": "Pieniądze!",
 		"print": "Drukuj",
 		"onlyLbtc": "My tylko popieramy",
-		"dontDeposit": "Proszę nie deponować innych aktywów płynnych"
+		"dontDeposit": "Proszę nie deponować innych aktywów płynnych",
+		"other": "Inne"
 	},
 	"items": {
 		"add": "Dodaj element",
@@ -477,5 +478,9 @@
 		"nl": "Nederlands",
 		"th": "ไทย",
 		"pl": "Polski"
+	},
+	"notes": {
+		"contents": "Zawartość notatki",
+		"notFound": "Nie znaleziono notatek"
 	}
 }
diff --git a/src/locales/pt.json b/src/locales/pt.json
index 9f8faea4..88c3c59c 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -445,7 +445,8 @@
 		"ecashToken": "Token de Ecash",
 		"lnurlw": "LNURLW",
 		"createFund": "Criar um fundo",
-		"withdraw": "Retirar"
+		"withdraw": "Retirar",
+		"other": "Outros"
 	},
 	"items": {
 		"add": "Adicionar item",
@@ -480,5 +481,9 @@
 		"finish": "Terminar",
 		"showQR": "Mostrar QR",
 		"revealNwc": "Revelar NWC"
+	},
+	"notes": {
+		"contents": "Conteúdo de nota",
+		"notFound": "Nenhuma nota encontrada"
 	}
 }
diff --git a/src/locales/ru.json b/src/locales/ru.json
index 71f4b307..f50944f0 100644
--- a/src/locales/ru.json
+++ b/src/locales/ru.json
@@ -423,7 +423,8 @@
 		"ecashToken": "Токен Ecash",
 		"lnurlw": "Нюрлу",
 		"createFund": "Создать фонд",
-		"withdraw": "Отозвать"
+		"withdraw": "Отозвать",
+		"other": "Другой"
 	},
 	"items": {
 		"add": "Добавить элемент",
@@ -458,5 +459,9 @@
 		"finish": "Заканчивать",
 		"showQR": "Показать QR-код",
 		"revealNwc": "Раскрыть NWC"
+	},
+	"notes": {
+		"contents": "Содержание заметок",
+		"notFound": "Никаких записей не найдено"
 	}
 }
diff --git a/src/locales/th.json b/src/locales/th.json
index 3b11aa8d..478d793b 100644
--- a/src/locales/th.json
+++ b/src/locales/th.json
@@ -447,7 +447,8 @@
 		"fundsClaimed": "กองทุนเรียกร้อง!",
 		"print": "พิมพ์",
 		"onlyLbtc": "เราสนับสนุนเท่านั้น",
-		"dontDeposit": "โปรดอย่าฝากของไหลอื่น"
+		"dontDeposit": "โปรดอย่าฝากของไหลอื่น",
+		"other": "อื่นๆ"
 	},
 	"items": {
 		"add": "เพิ่มรายการ",
@@ -477,5 +478,9 @@
 		"nl": "Nederlands",
 		"th": "ไทย",
 		"pl": "Polski"
+	},
+	"notes": {
+		"contents": "ข้อความบันทึกย่อ",
+		"notFound": "ไม่พบบันทึกย่อ"
 	}
 }
diff --git a/src/locales/tr.json b/src/locales/tr.json
index e8ad2874..d24b3672 100644
--- a/src/locales/tr.json
+++ b/src/locales/tr.json
@@ -447,7 +447,8 @@
 		"fundsClaimed": "Fonlar iddia etti!",
 		"print": "Baskı",
 		"onlyLbtc": "Sadece destek veriyoruz",
-		"dontDeposit": "Lütfen diğer Sıvı varlıklardan depozito almayın"
+		"dontDeposit": "Lütfen diğer Sıvı varlıklardan depozito almayın",
+		"other": "Diğer"
 	},
 	"items": {
 		"add": "Ekle item",
@@ -477,5 +478,9 @@
 		"nl": "Nederlands",
 		"th": "ไทย",
 		"pl": "Polski"
+	},
+	"notes": {
+		"contents": "Not Content",
+		"notFound": "Hiçbir not bulunamadı"
 	}
 }
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 35a3922f..a649402e 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -423,7 +423,8 @@
 		"ecashToken": "现金代号",
 		"lnurlw": "拉脱维亚",
 		"createFund": "创建基金",
-		"withdraw": "撤销"
+		"withdraw": "撤销",
+		"other": "其它"
 	},
 	"items": {
 		"add": "新增项目",
@@ -458,5 +459,9 @@
 		"finish": "结束",
 		"showQR": "显示二维码",
 		"revealNwc": "显示 NWC"
+	},
+	"notes": {
+		"contents": "说明内容",
+		"notFound": "未找到笔记"
 	}
 }
diff --git a/src/routes/(app)/[username]/receive/+page.svelte b/src/routes/(app)/[username]/receive/+page.svelte
index 887e9680..16adfb8f 100644
--- a/src/routes/(app)/[username]/receive/+page.svelte
+++ b/src/routes/(app)/[username]/receive/+page.svelte
@@ -19,7 +19,6 @@
   import Avatar from "$comp/Avatar.svelte";
   import InvoiceData from "$comp/InvoiceData.svelte";
   import InvoiceActions from "$comp/InvoiceActions.svelte";
-  import InvoiceTypes from "$comp/InvoiceTypes.svelte";
   import SetAmount from "$comp/SetAmount.svelte";
   import SetMemo from "$comp/SetMemo.svelte";
   import SetType from "$comp/SetType.svelte";
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
index 4c5c3b50..0cb5aeac 100644
--- a/src/routes/(app)/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -160,6 +160,7 @@
   <InvoiceActions
     bind:newAmount
     {setAmount}
+    {setType}
     {toggleType}
     {toggleAmount}
     {toggleMemo}