From 63f1a6780bab85ebb48ca1fc142cc6beaf772faa Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 3 Oct 2022 23:13:49 -0700
Subject: refactoring

---
 src/routes/send/+page.server.js                    |  2 +-
 src/routes/send/+page.svelte                       | 14 +++++---------
 src/routes/send/bitcoin/[address]/+page.svelte     |  5 +++--
 src/routes/send/lightning/[payreq]/+page.server.js |  2 +-
 src/routes/send/lightning/[payreq]/+page.svelte    | 17 ++++++-----------
 5 files changed, 16 insertions(+), 24 deletions(-)

(limited to 'src/routes/send')

diff --git a/src/routes/send/+page.server.js b/src/routes/send/+page.server.js
index 837060f2..d0fefdee 100644
--- a/src/routes/send/+page.server.js
+++ b/src/routes/send/+page.server.js
@@ -1,7 +1,7 @@
 import validate from 'bitcoin-address-validation';
 import bip21 from 'bip21';
 import { get } from '$lib/utils';
-import { invalid, redirect } from "@sveltejs/kit";
+import { invalid, redirect } from '@sveltejs/kit';
 
 export const actions = {
 	default: async ({ request }) => {
diff --git a/src/routes/send/+page.svelte b/src/routes/send/+page.svelte
index 8963345a..8a695ac6 100644
--- a/src/routes/send/+page.svelte
+++ b/src/routes/send/+page.svelte
@@ -1,16 +1,16 @@
 <script>
+	import { enhance } from '$app/forms';
 	import { onMount } from 'svelte';
 	import { browser } from '$app/environment';
 	import { t } from '$lib/translations';
-	import { AppHeader, Icon, Spinner } from '$comp';
+	import { Icon, Spinner } from '$comp';
 	import { back, failure } from '$lib/utils';
 
 	export let form;
 
 	let el;
 	let placeholder = 'Address, Invoice, Username';
-	let text = placeholder,
-		loading;
+	let text = placeholder;
 
 	let focus = () => text === placeholder && (text = '');
 	let keypress = (e) => e.key === 'Enter' && e.preventDefault() && el.submit();
@@ -26,7 +26,7 @@
 	<Icon icon="arrow-left" style="w-10" />
 </button>
 
-<form method="POST" class="container px-4 mt-20 max-w-xl mx-auto" bind:this={el}>
+<form method="POST" class="container px-4 mt-20 max-w-xl mx-auto" bind:this={el} use:enhance>
 	<div class="mb-2">
 		<label for="invoice" class="font-bold mb-1 block">Destination</label>
 		<input type="hidden" name="text" bind:value={text} />
@@ -70,11 +70,7 @@
 				? 'opacity-50'
 				: 'opacity-100 hover:opacity-80'} bg-black text-white border rounded-full px-6 py-2 font-bold"
 		>
-			{#if loading}
-				<Spinner />
-			{:else}
-				Next
-			{/if}
+			Next
 		</button>
 	</div>
 </form>
diff --git a/src/routes/send/bitcoin/[address]/+page.svelte b/src/routes/send/bitcoin/[address]/+page.svelte
index 2b472124..2de624ce 100644
--- a/src/routes/send/bitcoin/[address]/+page.svelte
+++ b/src/routes/send/bitcoin/[address]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-	import { AppHeader, Icon, Numpad, Spinner } from '$comp';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
 	import { back } from '$lib/utils';
 	export let data;
@@ -20,7 +21,7 @@
 	</div>
 	<Numpad bind:amount {currency} />
 
-	<form method="POST">
+	<form method="POST" use:enhance>
 		<input name="address" value={address} type="hidden" />
 		<input name="amount" value={amount} type="hidden" />
 		<div class="flex w-full">
diff --git a/src/routes/send/lightning/[payreq]/+page.server.js b/src/routes/send/lightning/[payreq]/+page.server.js
index 885222c1..f17d6a60 100644
--- a/src/routes/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/send/lightning/[payreq]/+page.server.js
@@ -8,7 +8,7 @@ export async function load({ params }) {
 export const actions = {
 	default: async ({ cookies, request }) => {
 		let body = Object.fromEntries(await request.formData());
-    let { amount, confirmed } = body;
+		let { amount, confirmed } = body;
 
 		if (!confirmed) {
 			return invalid(403, { amount, confirm: true });
diff --git a/src/routes/send/lightning/[payreq]/+page.svelte b/src/routes/send/lightning/[payreq]/+page.svelte
index a2a07a98..65e8989e 100644
--- a/src/routes/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/send/lightning/[payreq]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-	import { AppHeader, Icon, Numpad, Spinner } from '$comp';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
 	import { back, s } from '$lib/utils';
 	export let data;
@@ -9,9 +10,7 @@
 	let { alias } = data;
 
 	let { currency } = data.user;
-  let amount = form?.amount || data.amount;
-
-	let loading;
+	let amount = form?.amount || data.amount;
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
@@ -30,21 +29,17 @@
 		<Numpad bind:amount {currency} />
 	{/if}
 
-	<form method="POST">
+	<form method="POST" use:enhance>
 		<input name="payreq" value={payreq} type="hidden" />
 		<input name="amount" value={amount} type="hidden" />
-    <input name="confirmed" value={form?.confirm} type="hidden" />
+		<input name="confirmed" value={form?.confirm} type="hidden" />
 
 		<div class="flex w-full">
 			<button
 				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"
 			>
-				{#if loading}
-					<Spinner />
-				{:else}
-					Send
-				{/if}
+				Send
 			</button>
 		</div>
 	</form>
-- 
cgit v1.2.3