sign in from registration page if the password works

5 files changed, 14 insertions, 6 deletions

diff --git a/src/routes/register/+page.server.js b/src/routes/register/+page.server.js
index 5667914b..acb96575 100644
--- a/src/routes/register/+page.server.js
+++ b/src/routes/register/+page.server.js
@@ -7,14 +7,22 @@ export const actions = {
 		let { username, password, redirect: r } = form;
 
 		let user = { username, password };
+		let error;
 
 		try {
 			await post('/register', { user });
+		} catch (e) {
+			if (e.message.includes('taken')) error = e.message;
+		}
+
+		try {
 			await login(user, cookies);
+			error = null;
 		} catch (e) {
-			return invalid(400, { error: e.message });
+			error ||= e.message;
 		}
 
+		if (error) return invalid(400, { error });
 		throw redirect(303, r || `/${user.username}/dashboard`);
 	}
 };
diff --git a/src/routes/send/[uuid=uuid]/+page.svelte b/src/routes/send/[uuid=uuid]/+page.svelte
index f625978f..aa798bc1 100644
--- a/src/routes/send/[uuid=uuid]/+page.svelte
+++ b/src/routes/send/[uuid=uuid]/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { goto } from "$app/navigation";
+	import { goto } from '$app/navigation';
 	import { selectedRate } from '$lib/store';
 	import { enhance } from '$app/forms';
 	import { Icon, Numpad, Spinner } from '$comp';
diff --git a/src/routes/send/user/[username]/[...amount]/+page.server.js b/src/routes/send/user/[username]/[...amount]/+page.server.js
index d878fe2f..12bae186 100644
--- a/src/routes/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/send/user/[username]/[...amount]/+page.server.js
@@ -3,9 +3,9 @@ import { btc as asset, auth, get, post } from '$lib/utils';
 
 export async function load({ params, parent }) {
 	let { user } = await parent();
-  let { amount } = params;
+	let { amount } = params;
 	let recipient = await get(`/users/${params.username}`);
-	if (recipient.username === user.username) throw error(500, { message: 'Cannot send to self' });
+	if (recipient.username === user?.username) throw error(500, { message: 'Cannot send to self' });
 	return { amount, recipient };
 }
 
diff --git a/src/routes/send/user/[username]/[...amount]/+page.svelte b/src/routes/send/user/[username]/[...amount]/+page.svelte
index a50dea53..e50acd5b 100644
--- a/src/routes/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/send/user/[username]/[...amount]/+page.svelte
@@ -9,7 +9,7 @@
 	export let form;
 
 	let { recipient, user } = data;
-	let { currency } = user;
+	let currency = user?.currency || 'USD';
 
 	let amount = form?.amount || data.amount;
 	let a,
diff --git a/src/routes/sent/+page.svelte b/src/routes/sent/+page.svelte
index 95612a17..5c2301fa 100644
--- a/src/routes/sent/+page.svelte
+++ b/src/routes/sent/+page.svelte
@@ -10,7 +10,7 @@
 
 	let payment = user.payments[0];
 	let { amount, rate } = payment;
-  amount = Math.abs(amount);
+	amount = Math.abs(amount);
 
 	let fiat = (amount * rate) / sats;