Merge branch 'master' into swapee

7 files changed, 16 insertions, 14 deletions

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index d7045d5f..53dd8ebf 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -147,11 +147,8 @@
 {/if}
 
 <style>
-  .z {
-    z-index: 100;
-  }
-
   header {
+    z-index: 50;
     view-transition-name: header;
   }
 </style>
diff --git a/src/components/Lnurlp.svelte b/src/components/Lnurlp.svelte
index 6db7e7d7..6785061a 100644
--- a/src/components/Lnurlp.svelte
+++ b/src/components/Lnurlp.svelte
@@ -5,7 +5,7 @@
   import Spinner from "$comp/Spinner.svelte";
   import { pin } from "$lib/store";
 
-  export let data, form;
+  export let data, form, send;
   let { currency } = data.user;
   let { minSendable, maxSendable, callback, metadata, rates } = data;
 
@@ -36,7 +36,7 @@
     </div>
   {/if}
 
-  <Numpad bind:amount bind:rate {currency} />
+  <Numpad bind:amount bind:rate {currency} bind:submit={send} />
 
   <form action="?/pay" method="POST" use:enhance on:submit={submit}>
     <input name="amount" value={amount} type="hidden" />
@@ -47,6 +47,7 @@
 
     <div class="flex w-full">
       <button
+        bind:this={send}
         type="submit"
         class="opacity-100 hover:opacity-80'} rounded-2xl border py-3 font-bold mx-auto mt-2 bg-black text-white px-4 w-24"
       >
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 13f42379..901d11ba 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -1,7 +1,7 @@
 <script>
   import Left from "$comp/Left.svelte";
   import Icon from "$comp/Icon.svelte";
-  import { f, s, post, warning, sat, sats } from "$lib/utils";
+  import { f, s, focus, post, warning, sat, sats } from "$lib/utils";
   import { t } from "$lib/translations";
 
   export let amount,
@@ -93,9 +93,7 @@
       } else if (value !== "<" && parseInt(amount + value) > sats) {
         warning($t("user.receive.lessThan1BTCWarning"));
       } else {
-        console.log("CLICK", amount.toString(), value);
         amount = parseInt(amount.toString() + value);
-        console.log("AMOUNT", amount);
       }
     }
   };
@@ -163,7 +161,7 @@
     }, 0);
   };
 
-  let focus = (e) => {
+  let select = (e) => {
     let range = document.createRange();
     range.selectNodeContents(e.target);
     let sel = getSelection();
@@ -171,6 +169,10 @@
     sel.addRange(range);
   };
 
+  let blur = () => {
+    if (!html) html = "0";
+  };
+
   let keydown = (e) =>
     e.key === "Enter" && (e.preventDefault() || submit.click());
 </script>
@@ -185,9 +187,11 @@
           {fiat ? symbol : "⚡️"}
         </div>
         <div
+          use:focus
           contenteditable
           bind:innerHTML={html}
-          on:focus={focus}
+          on:focus={select}
+          on:blur={blur}
           on:input={input}
           on:keydown={keydown}
           class="outline-none my-auto"
diff --git a/src/components/Popup.svelte b/src/components/Popup.svelte
index d59cfcfc..df96215f 100644
--- a/src/components/Popup.svelte
+++ b/src/components/Popup.svelte
@@ -15,7 +15,7 @@
 </script>
 
 {#if tags}
-  {#if tags.user}
+  {#if tags.user && tags.user.username}
     <a href={`/${tags.user.username}`}>
       <div class="space-y-5">
         <div>
diff --git a/src/components/Qr.svelte b/src/components/Qr.svelte
index 8a716b14..e98497c4 100644
--- a/src/components/Qr.svelte
+++ b/src/components/Qr.svelte
@@ -5,7 +5,7 @@
 </script>
 
 <div
-  class="w-80 mx-auto my-5 cursor-pointer"
+  class="w-80 mx-auto cursor-pointer"
   bind:this={qr}
   on:click={() => screenfull.toggle(qr)}
   on:keydown={() => screenfull.toggle(qr)}
diff --git a/src/components/Toggle.svelte b/src/components/Toggle.svelte
index 1e4cf4c4..2f92837d 100644
--- a/src/components/Toggle.svelte
+++ b/src/components/Toggle.svelte
@@ -12,6 +12,6 @@
     class="sr-only peer"
   />
   <div
-    class="w-11 h-6 bg-gray-200 rounded-full peer dark:bg-gray-700 peer-focus:ring-4 peer-focus:ring-gray-300 dark:peer-focus:ring-gray-800 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-gray-600"
+    class="w-11 h-6 bg-gray-200 rounded-full peer dark:bg-gray-700 peer-focus:ring-4 peer-focus:ring-gray-300 dark:peer-focus:ring-gray-800 peer-checked:after:translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:left-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-green-500"
   />
 </label>
diff --git a/src/components/index.js b/src/components/index.js
deleted file mode 100644
index e69de29b..00000000
--- a/src/components/index.js
+++ /dev/null