use subject currency

4 files changed, 12 insertions, 8 deletions

diff --git a/src/app.html b/src/app.html
index 728900ed..d2316082 100644
--- a/src/app.html
+++ b/src/app.html
@@ -14,6 +14,6 @@
     %sveltekit.head%
   </head>
   <body>
-    <div>%sveltekit.body%</div>
+    <div style="display: contents">%sveltekit.body%</div>
   </body>
 </html>
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 1f7c5417..9fe179eb 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -95,8 +95,7 @@
     if (invoice.memoPrompt) {
       return goto(`/${subject.username}/invoice/${id}/memo`);
     }
-    if (user) goto(`/send/invoice/${id}`, { invalidateAll: true });
-    else goto(`/${subject.username}/invoice/${id}`);
+    goto(`/${subject.username}/invoice/${id}`);
   };
 
   let reset = () =>
@@ -295,7 +294,7 @@
         </div>
       </div>
     </button>
-  {:else}
+  {:else if user.username !== subject.username}
     <a href={`/pay/${subject.username}`} class="contents">
       <button
         class="rounded-2xl py-5 px-6 font-bold hover:bg-neutral-700 flex bg-black text-white mx-auto"
diff --git a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
index ab8a3add..474e6a3d 100644
--- a/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/pay/[username]/[...amount]/+page.svelte
@@ -15,7 +15,7 @@
   export let form;
 
   let { subject, rate, rates, user } = data;
-  let currency = user?.currency || subject?.currency || "USD";
+  let currency = subject?.currency || "USD";
   let next;
 
   let amount = form?.amount || data.amount;
@@ -25,7 +25,7 @@
     hash,
     amountFiat = 0;
 
-  $: r = rate || rates[user?.currency || subject?.currency];
+  $: r = rate || rates[subject?.currency];
 
   let setAmount = async () => {
     amount = a;
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index e3ee9297..af3f5913 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -51,9 +51,14 @@
   let submit = () => (submitting = true);
 
   let external = async () => {
-    let invoice = { type: "lightning", amount, currency };
     let { id } = await post(`/${recipient.username}/invoice`, {
-      invoice,
+      invoice: {
+        ...invoice,
+        type: "lightning",
+        amount,
+        currency,
+        rate,
+      },
       user: { username: recipient.username },
     });