2 files changed, 12 insertions, 5 deletions
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js
index 39f2a5dd..88017362 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.js
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.js
@@ -20,6 +20,7 @@ export async function load({ params: { id }, parent, url }) {
     redirect(307, `/${recipient.username}/invoice/${id}/tip`);
   if (recipient.username === user.username)
     error(500, { message: "Cannot send to self" });
+
   return {
     amount,
     address,
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index ae997bce..c2163a81 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -13,9 +13,17 @@
   export let data;
   export let form;
 
-  let { address, hash, rate, payreq, recipient, tip, rates, user } = data;
+  let { address, hash, payreq, recipient, tip, rates, user } = data;
   let { currency } = user;
 
+  $: reload(data);
+  let reload = (data) => {
+    ({ address, hash, payreq, recipient, tip, rates, user } = data);
+    ({ currency } = user);
+  };
+
+  $: rate = data.rate * (rates[user.currency] / rates[data.currency]);
+
   let amount = form?.amount || data.amount;
   let a,
     af,
@@ -42,8 +50,6 @@
     });
   };
 
-  $: rate = data.rate * (rates[user.currency] / rates[data.currency]);
-
   $: update(form);
   let update = () => {
     if (form?.message.includes("pin")) $pin = undefined;
@@ -80,7 +86,7 @@
   </div>
 {/if}
 
-<div class="container px-4 mt-20 max-w-xl mx-auto">
+<div class="container px-4 max-w-xl mx-auto">
   {#if amount}
     <div class="text-center mb-8">
       <h1 class="text-xl md:text-2xl text-secondary mb-2">
@@ -164,7 +170,7 @@
       {/if}
     </div>
   </form>
-  <div class="flex my-20">
+  <div class="flex my-10">
     <button class="mx-auto" on:click={external}
       >{$t("payments.moreOptions")}</button
     >