autowithdrawals

3 files changed, 12 insertions, 11 deletions

diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 41b58bfb..489650a5 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -9,7 +9,7 @@
   import Avatar from "$comp/Avatar.svelte";
   import Icon from "$comp/Icon.svelte";
   import Spinner from "$comp/Spinner.svelte";
-  import { back, fail } from "$lib/utils";
+  import { back, fail, focus } from "$lib/utils";
 
   export let data;
   export let form;
@@ -18,10 +18,9 @@
   let { contacts } = data;
   let w;
 
-  let el, textarea, text;
-  let placeholder = $t("user.send.placeholder");
+  let el, text;
+
 
-  $: $page && setTimeout(() => w > 800 && textarea?.focus(), 0);
   let keypress = (e) => e.key === "Enter" && (e.preventDefault() || el.click());
 
   let paste = async () => {
@@ -48,12 +47,12 @@
 
     <div class="mb-2">
       <textarea
+        use:focus
         name="text"
-        {placeholder}
+          placeholder={$t("user.send.placeholder")}
         on:keypress={keypress}
         class="w-full p-4 border rounded-xl h-48"
         bind:value={text}
-        bind:this={textarea}
       />
     </div>
 
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js
index 88017362..c6b0a9a4 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.js
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.js
@@ -41,6 +41,7 @@ export const actions = {
 
       await post("/payments", body, auth(cookies));
     } catch (e) {
+      console.log("payment failed", params, e);
       return fail(400, { message: e.message });
     }
 
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index e857f717..dd637d70 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -35,8 +35,8 @@
     amountFiat = af;
   };
 
-  let loading;
-  let submit = () => (loading = true);
+  let submitting;
+  let submit = () => (submitting = true);
 
   let external = async () => {
     let invoice = { type: "lightning", amount, currency };
@@ -52,8 +52,8 @@
 
   $: update(form);
   let update = () => {
-    if (form?.message.includes("pin")) $pin = undefined;
-    loading = false;
+    if (form?.message?.includes("pin")) $pin = undefined;
+    submitting = false;
   };
 
   // onMount(async () => {
@@ -152,8 +152,9 @@
           use:focus
           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"
+          disabled={submitting}
         >
-          {#if loading}
+          {#if submitting}
             <Spinner />
           {:else}
             {$t("payments.send")}