From 032449b2a4adcabe5f4bc00bb0281d55a8d84c45 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 24 Oct 2023 23:14:24 -0700
Subject: print button

---
 src/locales/en.json                                |  3 +-
 src/routes/(app)/payment/[id]/+page.svelte         | 47 +++++++++----
 .../(app)/payment/[id]/plain/+page.server.js       |  6 ++
 src/routes/(app)/payment/[id]/plain/+page.svelte   | 77 ++++++++++++++++++++++
 4 files changed, 120 insertions(+), 13 deletions(-)
 create mode 100644 src/routes/(app)/payment/[id]/plain/+page.server.js
 create mode 100644 src/routes/(app)/payment/[id]/plain/+page.svelte

(limited to 'src')

diff --git a/src/locales/en.json b/src/locales/en.json
index 7dd7c258..1ec8cced 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -312,6 +312,7 @@
 		"redeemed": "Redeemed",
 		"redeemedBy": "Redeemed by",
 		"sendMessage": "Write a message...",
-    "fundsClaimed": "Funds claimed!"
+    "fundsClaimed": "Funds claimed!",
+    "print": "Print"
 	}
 }
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 12bb1c2d..38b91658 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -18,11 +18,16 @@
 	};
 
 	fee = fee || 0;
+
+  let direction = amount > 0 ? $t('payments.from') : $t('payments.to')
+  direction = direction[0].toUpperCase() + direction.substr(1, direction.length);
 </script>
 
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
+<a href={`/${username}/payments`}>
+	<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80">
+		<Icon icon="arrow-left" style="w-10" />
+	</button>
+</a>
 
 <div class="container mx-auto max-w-lg px-4 space-y-8 break-all text-2xl">
 	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
@@ -31,7 +36,7 @@
 
 	{#if p.with}
 		<div>
-			<span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
+			<span class="text-lg text-secondary my-auto mr-2">{direction}</span>
 			<a href={`/${p.with.username}`}>
 				<div class="flex">
 					<div class="my-auto">
@@ -44,7 +49,7 @@
 	{/if}
 	{#if p.type === types.pot}
 		<div>
-			<span class="text-lg text-secondary my-auto mr-2">{amount > 0 ? 'From' : 'To'}</span>
+			<span class="text-lg text-secondary my-auto mr-2">{direction}</span>
 			<a href={`/pot/${p.memo}`}>
 				<div class="flex">
 					<div class="my-auto">
@@ -56,7 +61,7 @@
 		</div>
 	{/if}
 	<div>
-		<span class="text-lg text-secondary">Amount</span>
+		<span class="text-lg text-secondary">{$t('payments.amount')}</span>
 		<div>
 			{f(fiat(a, rate), currency)}
 			<span class="text-secondary text-lg">
@@ -67,7 +72,7 @@
 
 	{#if tip}
 		<div>
-			<span class="text-lg text-secondary">Tip</span>
+			<span class="text-lg text-secondary">{$t('invoice.tip')}</span>
 			<div>
 				{f(fiat(tip, rate), currency)}
 				({Math.round((tip * 100) / Math.abs(a))}%)
@@ -126,10 +131,28 @@
 		</div>
 	{/if}
 
-	{#if ['laughingbean', 'burnabyartigiano', 'milanowestend', 'eotl', 'bigbite', 'edgemontartigiano'].includes(user.username.toLowerCase())}
-		<button
-			class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
-			on:click={print}>Print Receipt</button
-		>
+	{#if user.hasprinter}
+		<div>
+			<button
+				class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
+				on:click={print}
+			>
+				<div class="mx-auto flex">
+					<Icon icon="printer" style="my-auto h-6 mr-2" />
+					<div class="my-auto mt-1 text-base">{$t('payments.print')}</div>
+				</div>
+			</button>
+		</div>
+	{:else}
+		<div>
+			<a href={`/payment/${id}/plain`}>
+				<button class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60">
+					<div class="mx-auto flex">
+						<Icon icon="printer" style="my-auto h-6 mr-2" />
+						<div class="my-auto mt-1 text-base">{$t('payments.print')}</div>
+					</div>
+				</button>
+			</a>
+		</div>
 	{/if}
 </div>
diff --git a/src/routes/(app)/payment/[id]/plain/+page.server.js b/src/routes/(app)/payment/[id]/plain/+page.server.js
new file mode 100644
index 00000000..1c90ab69
--- /dev/null
+++ b/src/routes/(app)/payment/[id]/plain/+page.server.js
@@ -0,0 +1,6 @@
+import { auth, get } from '$lib/utils';
+
+export async function load({ cookies, params }) {
+	let payment = await get(`/payments/${params.id}`, auth(cookies));
+	return { payment };
+}
diff --git a/src/routes/(app)/payment/[id]/plain/+page.svelte b/src/routes/(app)/payment/[id]/plain/+page.svelte
new file mode 100644
index 00000000..5ffd1656
--- /dev/null
+++ b/src/routes/(app)/payment/[id]/plain/+page.svelte
@@ -0,0 +1,77 @@
+<script>
+	import { goto } from '$app/navigation';
+	import { onMount } from 'svelte';
+	import { browser } from '$app/environment';
+	import { t } from '$lib/translations';
+	import { back, copy, f, s, fiat, post, sats, success, types } from '$lib/utils';
+	import { Avatar, Icon } from '$comp';
+	import { format } from 'date-fns';
+	import { PUBLIC_EXPLORER as expl } from '$env/static/public';
+
+	export let data;
+	let { user, payment: p } = data;
+
+	let { username } = user;
+	let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
+	let a = Math.abs(amount);
+
+	onMount(() => {
+		if (browser) {
+			let main = document.querySelector('main');
+			main.style.paddingBottom = '0';
+			window.onfocus = () => goto(`/payment/${id}`);
+			window.print();
+		}
+	});
+
+	fee = fee || 0;
+</script>
+
+<div class="space-y-5">
+	<div>
+		<span class="text-lg text-secondary">Amount</span>
+		<div>
+			{f(fiat(a, rate), currency)}
+		</div>
+	</div>
+
+	{#if tip}
+		<div>
+			<span class="text-lg text-secondary">Tip</span>
+			<div>
+				{f(fiat(tip, rate), currency)}
+				({Math.round((tip * 100) / Math.abs(a))}%)
+			</div>
+		</div>
+
+		<div>
+			<span class="text-lg text-secondary">Total</span>
+			<div>
+				{f(fiat(a + (tip || 0), rate), currency)}
+			</div>
+		</div>
+	{/if}
+
+	<div>
+		<span class="text-lg text-secondary">Date</span>
+		<div>
+			{format(new Date(created), 'MMMM d')},
+			{format(new Date(created), 'h:mm aaa')}
+		</div>
+	</div>
+
+	{#if type === 'bitcoin'}
+		<div>
+			<span class="text-lg text-secondary">Txid</span>
+			<div class="flex">
+				<div>
+					{id}
+				</div>
+			</div>
+		</div>
+	{/if}
+</div>
+
+<a href={`/payment/${id}`}>
+	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
-- 
cgit v1.2.3


From f558ffd47a7666ce292bf1f8dde949b12904351e Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 24 Oct 2023 23:34:39 -0700
Subject: fix classic payments

---
 src/routes/(app)/send/invoice/[id]/+page.svelte | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index a558895c..02ab9d41 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -102,8 +102,16 @@
 			<h1 class="text-xl md:text-2xl text-secondary mb-2">{$t('payments.to')}</h1>
 
 			<div class="flex p-1 gap-2 justify-center">
-				<Avatar user={recipient} size={'20'} />
-				<p class="text-4xl break-words my-auto">{recipient.username}</p>
+				{#if recipient.username.includes('@classic')}
+					<img
+						src="/images/classic.png"
+						class="w-24 border-4 border-transparent mr-1"
+						alt="Bitcoin"
+					/>
+				{:else}
+					<Avatar user={recipient} size={'20'} />
+				{/if}
+				<p class="text-4xl break-words my-auto">{recipient.username.replace('@classic', '')}</p>
 			</div>
 		</div>
 	{:else}
-- 
cgit v1.2.3


From 7334c3c6b6311807627bfa244429ced4921c3e27 Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <adrien.p.hopkins@gmail.com>
Date: Fri, 3 Nov 2023 16:31:36 -0500
Subject: Met à jour la traduction française
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/fr.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/locales/fr.json b/src/locales/fr.json
index 3fc0c9a7..f6ce8bbb 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -312,6 +312,7 @@
 		"redeemed": "Racheté",
 		"redeemedBy": "Racheté par",
 		"sendMessage": "Écrire une message...",
-		"fundsClaimed": "Les fonds sont réclamés!"
+		"fundsClaimed": "Les fonds sont réclamés!",
+		"print": "Imprime"
 	}
 }
-- 
cgit v1.2.3


From e2608b3fe00d4575c08846af4f7a192e4f1100ed Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 26 Oct 2023 14:24:43 -0700
Subject: reveal seed phrase

---
 src/lib/nostr.js                                   |  9 ++++--
 src/locales/en.json                                |  1 +
 .../[username]/settings/[...tab]/_security.svelte  | 36 +++++++++++++++++-----
 3 files changed, 35 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/lib/nostr.js b/src/lib/nostr.js
index 987b89d0..28dbe50f 100644
--- a/src/lib/nostr.js
+++ b/src/lib/nostr.js
@@ -58,7 +58,7 @@ function typedArrayToBuffer(array) {
 	return array.buffer.slice(array.byteOffset, array.byteLength + array.byteOffset);
 }
 
-let getPrivateKey = async (user) => {
+export let getMnemonic = async (user) => {
 	let { cipher, username, salt } = user;
 	let password = get(pw);
 
@@ -85,8 +85,11 @@ let getPrivateKey = async (user) => {
 		)
 	);
 
-	mnemonic = entropyToMnemonic(entropy, wordlist);
-	return privateKeyFromSeedWords(mnemonic);
+	return entropyToMnemonic(entropy, wordlist);
+};
+
+let getPrivateKey = async (user) => {
+	return privateKeyFromSeedWords(await getMnemonic(user));
 };
 
 export let sign = async ({ event, user }) => {
diff --git a/src/locales/en.json b/src/locales/en.json
index 1ec8cced..9c098763 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -206,6 +206,7 @@
 			"placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
 		},
 		"settings": {
+      "revealSeed": "Reveal seed phrase",
 			"saveSettings": "Save Settings",
 			"bannerImage": "Banner Image",
 			"profileImage": "Profile Image",
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index c01db734..f3df3fa3 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -1,4 +1,5 @@
 <script>
+	import { getMnemonic } from '$lib/nostr';
 	import { tick } from 'svelte';
 	import { t } from '$lib/translations';
 	import { Pin, Icon, Qr } from '$comp';
@@ -8,18 +9,28 @@
 	import { page } from '$app/stores';
 
 	export let user, submit;
-	let pin, verify;
-	let settingPin, setting2fa, disabling2fa, confirming2fa;
 
-	let password, revealPassword;
-	let token = '';
-	let old;
+	let confirming2fa,
+		disabling2fa,
+		locked,
+		mnemonic,
+		old,
+		otp,
+		password,
+		pin,
+		revealPassword,
+		revealSeed,
+		token = '',
+		setting2fa,
+		settingPin,
+		verify;
 
 	let togglePassword = () => (revealPassword = !revealPassword);
+	let toggleSeed = async () => {
+		mnemonic = await getMnemonic(user);
+		revealSeed = !revealSeed;
+	};
 
-	let otp;
-
-	let locked;
 	$: verifying = pin?.length > 5;
 	$: verify && checkPin(pin);
 	let checkPin = async () => {
@@ -211,3 +222,12 @@
 		<option value={8 * 60 * 60}>8 {$t('user.settings.hours')}</option>
 	</select>
 </div>
+
+<button type="button" class="primary" on:click={toggleSeed}>
+	<Icon icon="mobile" style="mr-1" />
+	{$t('user.settings.revealSeed')}
+</button>
+
+{#if revealSeed}
+	{mnemonic}
+{/if}
-- 
cgit v1.2.3


From aeb5f5001eaa3613335784f74c491ffc442ce318 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 1 Nov 2023 12:18:26 -0700
Subject: user details

---
 package.json                                       |  3 +-
 pnpm-lock.yaml                                     |  8 +++
 src/locales/en.json                                |  1 +
 .../(app)/[username]/(profile)/+layout.svelte      | 84 +++++++++++++++++++---
 .../[username]/settings/[...tab]/_security.svelte  | 25 ++++---
 src/routes/(app)/qr/[text]/+page.svelte            | 21 ++++--
 static/icons/stats.svg                             | 12 ++++
 static/icons/warning.svg                           | 19 +++++
 8 files changed, 151 insertions(+), 22 deletions(-)
 create mode 100644 static/icons/stats.svg
 create mode 100644 static/icons/warning.svg

(limited to 'src')

diff --git a/package.json b/package.json
index 00d29f0a..2063fb63 100644
--- a/package.json
+++ b/package.json
@@ -55,6 +55,7 @@
 		"@scure/bip39": "^1.2.1",
 		"html2canvas": "^1.4.1",
 		"leaflet-tooltip-layout": "^0.1.2",
-		"maplibre-gl": "^3.3.1"
+		"maplibre-gl": "^3.3.1",
+		"uint8array-extras": "^0.5.0"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ce0d43d1..c6490728 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -17,6 +17,9 @@ dependencies:
   maplibre-gl:
     specifier: ^3.3.1
     version: 3.3.1
+  uint8array-extras:
+    specifier: ^0.5.0
+    version: 0.5.0
 
 devDependencies:
   '@scure/base':
@@ -1986,6 +1989,11 @@ packages:
       typewise-core: 1.2.0
     dev: false
 
+  /uint8array-extras@0.5.0:
+    resolution: {integrity: sha512-CKAKa+/rjCblsuGrcmIJLluHcZMYKcMwgdhAZZEnSplFFGCuGKF6e2L+CeVXK0zX5rYyerrqG2dnHIANm3i9qA==}
+    engines: {node: '>=18'}
+    dev: false
+
   /undici@5.21.0:
     resolution: {integrity: sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==}
     engines: {node: '>=12.18'}
diff --git a/src/locales/en.json b/src/locales/en.json
index 9c098763..3fe36200 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -206,6 +206,7 @@
 			"placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
 		},
 		"settings": {
+      "hideSeed": "Hide seed phrase",
       "revealSeed": "Reveal seed phrase",
 			"saveSettings": "Save Settings",
 			"bannerImage": "Banner Image",
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 331161bb..e7fa447c 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -1,16 +1,25 @@
 <script>
-	import { f, s, sats } from '$lib/utils';
+	import { hexToUint8Array } from 'uint8array-extras';
+	import { copy, f, s, sats } from '$lib/utils';
 	import { animatedRate } from '$lib/store';
 	import { Icon } from '$comp';
 	import { t } from '$lib/translations';
 	import { sign, send } from '$lib/nostr';
+	import { bech32m } from '@scure/base';
+	import { page } from '$app/stores';
 
 	export let data;
+
+	let { encode, toWords } = bech32m;
 	let events, user, subject, rates, src, text;
+
 	$: ({ events, user, rates, subject, src, text } = data);
 	$: ({ currency, username: n, display } = subject);
 
 	$: username = n.length > 60 ? n.substr(0, 6) : display || n;
+	$: npub = bech32m.encode('npub', toWords(hexToUint8Array(user.pubkey)), 180);
+	$: lnaddr = `${n}@${$page.url.host}`;
+	$: profile = `${$page.url.host}/${n}`;
 
 	let follow = async () => {
 		user.follows.push(['p', subject.pubkey, 'wss://nostr.coinos.io', subject.username]);
@@ -42,19 +51,76 @@
 
 	$: following = !!user?.follows.find((t) => t.includes(subject.pubkey));
 
-	let hideBio = true;
-	let toggleBio = () => (hideBio = false);
+	let showBio;
+	let toggleBio = () => (showBio = !showBio);
+
+	let showDetails;
+	let toggleDetails = () => (showDetails = !showDetails);
 </script>
 
 <div class="container mx-auto w-full px-4 mb-4 flex flex-wrap lg:flex-nowrap space-y-5">
-	<div class="hidden lg:block w-[240px] lg:mr-10" />
-	<div class="w-[240px] lg:absolute space-y-5 left-20 mx-auto lg:mr-10">
-		<h1 class="text-3xl font-bold text-center mx-auto">{display || username}</h1>
+	<div class="hidden lg:block lg:w-[300px]" />
+	<div class="lg:w-[300px] lg:absolute space-y-5 left-20 mx-auto">
+		<div
+			class="flex text-3xl font-bold text-center mx-auto justify-center gap-2"
+			on:click={toggleDetails}
+		>
+			<div class="my-auto">{display || username}</div>
+			<Icon icon="stats" style="w-12 rounded cursor-pointer" />
+		</div>
+
+		{#if showDetails}
+			<div>
+				<div class="flex gap-2">
+					<div class="break-all grow text-secondary text-lg">
+						{npub}
+					</div>
+					<div class="flex mb-auto gap-1">
+						<button class="my-auto" on:click={() => copy(npub)}
+							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
+						>
+						<a href={`/qr/${npub}`} class="my-auto">
+							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
+						</a>
+					</div>
+				</div>
+			</div>
+			<div>
+				<div class="flex gap-2">
+					<div class="break-all grow text-secondary text-lg">
+						{lnaddr}
+					</div>
+					<div class="flex mb-auto gap-1">
+						<button class="my-auto" on:click={() => copy(lnaddr)}
+							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
+						>
+						<a href={`/qr/${lnaddr}`} class="my-auto">
+							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
+						</a>
+					</div>
+				</div>
+			</div>
+			<div>
+				<div class="flex gap-2">
+					<div class="break-all grow text-secondary text-lg">
+						{profile}
+					</div>
+					<div class="flex mb-auto gap-1">
+						<button class="my-auto" on:click={() => copy(profile)}
+							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
+						>
+						<a href={`/qr/${profile}`} class="my-auto">
+							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
+						</a>
+					</div>
+				</div>
+			</div>
+		{/if}
 
 		{#if subject.address}
 			<div
 				class="text-secondary mx-auto text-center lg:text-left lg:mx-0"
-				class:line-clamp-3={hideBio}
+				class:line-clamp-3={showBio}
 				on:click={toggleBio}
 				on:keydown={toggleBio}
 			>
@@ -62,7 +128,7 @@
 			</div>
 		{/if}
 
-		<div class="flex justify-around">
+		<div class="flex justify-center gap-4">
 			<a href={`/${subject.pubkey}/follows`}
 				><b>{subject.follows.length}</b>
 				<span class="text-secondary">{$t('user.following')}</span></a
@@ -134,7 +200,7 @@
 	</div>
 
 	<div class="w-full">
-		<div class="mx-auto space-y-5 lg:max-w-lg xl:max-w-2xl">
+		<div class="mx-auto space-y-5 lg:max-w-lg xl:max-w-2xl lg:pl-10">
 			<slot />
 		</div>
 	</div>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index f3df3fa3..85f461ad 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -3,7 +3,7 @@
 	import { tick } from 'svelte';
 	import { t } from '$lib/translations';
 	import { Pin, Icon, Qr } from '$comp';
-	import { post, success, fail } from '$lib/utils';
+	import { copy, post, success, fail } from '$lib/utils';
 	import { pin as current } from '$lib/store';
 	import { invalidate } from '$app/navigation';
 	import { page } from '$app/stores';
@@ -223,11 +223,20 @@
 	</select>
 </div>
 
-<button type="button" class="primary" on:click={toggleSeed}>
-	<Icon icon="mobile" style="mr-1" />
-	{$t('user.settings.revealSeed')}
-</button>
+<div class="space-y-5">
+	<button type="button" class="primary" on:click={toggleSeed}>
+		<Icon icon="warning" style="mr-1 w-6 my-auto" />
+		{revealSeed ? $t('user.settings.hideSeed') : $t('user.settings.revealSeed')}
+	</button>
+
+	{#if revealSeed}
+		<div class="text-lg">
+			{mnemonic}
+		</div>
 
-{#if revealSeed}
-	{mnemonic}
-{/if}
+		<button type="button" class="primary" on:click={() => copy(mnemonic)}>
+			<Icon icon="copy" style="mr-1 w-6 my-auto" />
+			Copy
+		</button>
+	{/if}
+</div>
diff --git a/src/routes/(app)/qr/[text]/+page.svelte b/src/routes/(app)/qr/[text]/+page.svelte
index 9e56ab29..f3cd791a 100644
--- a/src/routes/(app)/qr/[text]/+page.svelte
+++ b/src/routes/(app)/qr/[text]/+page.svelte
@@ -1,11 +1,24 @@
 <script>
-	import { Qr } from '$comp';
+	import { Icon, Qr } from '$comp';
+  import { back } from "$lib/utils";
 	export let data;
 	let { src, text } = data;
 </script>
 
-<Qr {src} />
 
-<div class="text-center w-full font-bold">
-	{text}
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
+  <Icon icon="arrow-left" style="w-10" />
+</button>
+
+
+<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
+	<div class="flex justify-center items-center">
+		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
+      <Qr {src} />
+
+      <div class="text-center w-full text-2xl py-10 break-all">
+        {text}
+      </div>
+		</div>
+	</div>
 </div>
diff --git a/static/icons/stats.svg b/static/icons/stats.svg
new file mode 100644
index 00000000..4f1b709e
--- /dev/null
+++ b/static/icons/stats.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>contact-details-filled</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon" fill="#000000" transform="translate(42.666667, 85.333333)">
+            <path d="M426.666667,1.42108547e-14 L426.666667,341.333333 L3.55271368e-14,341.333333 L3.55271368e-14,1.42108547e-14 L426.666667,1.42108547e-14 Z M362.666667,213.333333 L234.666667,213.333333 L234.666667,245.333333 L362.666667,245.333333 L362.666667,213.333333 Z M125.333333,155.733333 L109.333333,155.733333 C78.4053873,155.733333 53.3333333,181.333333 53.3333333,213.333333 L53.3333333,213.333333 L181.333333,213.333333 C181.333333,181.333333 156.16,155.733333 125.333333,155.733333 L125.333333,155.733333 Z M362.666667,149.333333 L234.666667,149.333333 L234.666667,181.333333 L362.666667,181.333333 L362.666667,149.333333 Z M117.333333,78.62624 C101.86936,78.62624 89.3333333,91.162267 89.3333333,106.62624 C89.3333333,122.090213 101.86936,134.62624 117.333333,134.62624 C132.797306,134.62624 145.333333,122.090213 145.333333,106.62624 C145.333333,91.162267 132.797306,78.62624 117.333333,78.62624 Z M362.666667,85.3333333 L234.666667,85.3333333 L234.666667,117.333333 L362.666667,117.333333 L362.666667,85.3333333 Z" id="Combined-Shape">
+
+</path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/icons/warning.svg b/static/icons/warning.svg
new file mode 100644
index 00000000..d4729f32
--- /dev/null
+++ b/static/icons/warning.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" height="800px" width="800px" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 486.463 486.463" xml:space="preserve">
+<g>
+	<g>
+		<path d="M243.225,333.382c-13.6,0-25,11.4-25,25s11.4,25,25,25c13.1,0,25-11.4,24.4-24.4
+			C268.225,344.682,256.925,333.382,243.225,333.382z"/>
+		<path d="M474.625,421.982c15.7-27.1,15.8-59.4,0.2-86.4l-156.6-271.2c-15.5-27.3-43.5-43.5-74.9-43.5s-59.4,16.3-74.9,43.4
+			l-156.8,271.5c-15.6,27.3-15.5,59.8,0.3,86.9c15.6,26.8,43.5,42.9,74.7,42.9h312.8
+			C430.725,465.582,458.825,449.282,474.625,421.982z M440.625,402.382c-8.7,15-24.1,23.9-41.3,23.9h-312.8
+			c-17,0-32.3-8.7-40.8-23.4c-8.6-14.9-8.7-32.7-0.1-47.7l156.8-271.4c8.5-14.9,23.7-23.7,40.9-23.7c17.1,0,32.4,8.9,40.9,23.8
+			l156.7,271.4C449.325,369.882,449.225,387.482,440.625,402.382z"/>
+		<path d="M237.025,157.882c-11.9,3.4-19.3,14.2-19.3,27.3c0.6,7.9,1.1,15.9,1.7,23.8c1.7,30.1,3.4,59.6,5.1,89.7
+			c0.6,10.2,8.5,17.6,18.7,17.6c10.2,0,18.2-7.9,18.7-18.2c0-6.2,0-11.9,0.6-18.2c1.1-19.3,2.3-38.6,3.4-57.9
+			c0.6-12.5,1.7-25,2.3-37.5c0-4.5-0.6-8.5-2.3-12.5C260.825,160.782,248.925,155.082,237.025,157.882z"/>
+	</g>
+</g>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From ff833723cdfb4a5b05a1e51dd79247fbcecff991 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 1 Nov 2023 14:00:28 -0700
Subject: escape qr urls

---
 src/routes/(app)/[username]/(profile)/+layout.svelte | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index e7fa447c..b000891e 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -76,10 +76,10 @@
 						{npub}
 					</div>
 					<div class="flex mb-auto gap-1">
-						<button class="my-auto" on:click={() => copy(npub)}
+						<button class="my-auto hover:opacity-40" on:click={() => copy(npub)}
 							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
 						>
-						<a href={`/qr/${npub}`} class="my-auto">
+						<a href={`/qr/${encodeURIComponent(npub)}`} class="my-auto hover:opacity-40">
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
@@ -91,10 +91,10 @@
 						{lnaddr}
 					</div>
 					<div class="flex mb-auto gap-1">
-						<button class="my-auto" on:click={() => copy(lnaddr)}
+						<button class="my-auto hover:opacity-40" on:click={() => copy(lnaddr)}
 							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
 						>
-						<a href={`/qr/${lnaddr}`} class="my-auto">
+						<a href={`/qr/${encodeURIComponent(lnaddr)}`} class="my-auto hover:opacity-40">
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
@@ -106,10 +106,10 @@
 						{profile}
 					</div>
 					<div class="flex mb-auto gap-1">
-						<button class="my-auto" on:click={() => copy(profile)}
-							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
+						<button class="my-auto hover:opacity-40" on:click={() => copy(profile)}
+							><Icon icon="copy" style="max-w-max min-w-[32px] hover:opacity-40" /></button
 						>
-						<a href={`/qr/${profile}`} class="my-auto">
+						<a href={`/qr/${encodeURIComponent(profile)}`} class="my-auto hover:opacity-40">
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
-- 
cgit v1.2.3


From 84022507dd5d5a03aedb986f0ff28c81a3bcaeec Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 7 Nov 2023 13:09:52 -0800
Subject: profile details

---
 src/locales/de.json                                |  1 -
 src/locales/el.json                                |  1 -
 src/locales/en.json                                |  5 ++--
 src/locales/es.json                                |  3 +--
 src/locales/fa.json                                |  3 +--
 src/locales/fr.json                                |  3 +--
 src/locales/pt.json                                |  3 +--
 src/locales/zh.json                                |  3 +--
 .../(app)/[username]/(profile)/+layout.svelte      | 25 +++++++++++---------
 .../[username]/settings/[...tab]/_account.svelte   | 27 +---------------------
 10 files changed, 23 insertions(+), 51 deletions(-)

(limited to 'src')

diff --git a/src/locales/de.json b/src/locales/de.json
index 55d647fc..73fa778e 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -194,7 +194,6 @@
 		"scanToPayBTC": "Den QR-Code scannen um mit Bitcoin zu zahlen",
 		"this": "Das",
 		"lightningAddress": "Lightning Adresse",
-		"likeAnEmail": "ist wie eine E-Mail Adresse für Bitcoin. Sie können diese auf Ihrer Website oder auf Ihren Visitenkarten veröffentlichen und mehrfach verwenden.",
 		"dashboard": {
 			"go": "Los",
 			"dashboard": "Übersicht",
diff --git a/src/locales/el.json b/src/locales/el.json
index 054dcff1..d94c2627 100644
--- a/src/locales/el.json
+++ b/src/locales/el.json
@@ -176,7 +176,6 @@
 		"scanToPayBTC": "Σάρωση για πληρωμή με bitcoin",
 		"this": "Αυτό",
 		"lightningAddress": "διεύθυνση lightning",
-		"likeAnEmail": "Είναι σαν ένα μήνυμα ηλεκρτονικού ταχυδρομείου για το bitcoin. Μπορείτε να το δημοσιεύσετε στον ιστότοπο ή τις επαγγελματικές σας κάρτες και να το χρησιμοποιήσετε πολλές φορές ",
 		"dashboard": {
 			"go": "Πηγαίνετε",
 			"dashboard": "Πίνακας Ελέγχου",
diff --git a/src/locales/en.json b/src/locales/en.json
index 3fe36200..a1d0c0aa 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -161,6 +161,8 @@
 		"subheader": "Latest Updates"
 	},
 	"user": {
+    "profilePage": "Profile page",
+    "nostrPubkey": "Nostr pubkey",
     "requestPayment": "Request Payment",
     "welcome": "Welcome! Your account balance is empty. You can start by making a deposit or by asking someone to pay you.",
     "showBalance": "Show Balance",
@@ -180,8 +182,7 @@
 		"pay": "Pay",
 		"scanToPayBTC": "Scan to pay with bitcoin",
 		"this": "This",
-		"lightningAddress": "lightning address",
-		"likeAnEmail": "is like an email for bitcoin. You can publish it on your website or business cards and use it multiple times.",
+    "lightningAddress": "Lightning address",
 		"dashboard": {
 			"go": "Go",
 			"dashboard": "Dashboard",
diff --git a/src/locales/es.json b/src/locales/es.json
index 3742a6cf..e506696c 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -176,8 +176,7 @@
 		"remove": "Eliminar",
 		"scanToPayBTC": "Escanear para pagar con bitcoin",
 		"this": "Esta",
-		"lightningAddress": "dirección lightning",
-		"likeAnEmail": "es como un correo electrónico para bitcoin. Puede publicarlo en su sitio web o tarjetas de presentación y usarlo múltiples veces.",
+		"lightningAddress": "Dirección lightning",
 		"dashboard": {
 			"go": "Ir",
 			"dashboard": "Panel",
diff --git a/src/locales/fa.json b/src/locales/fa.json
index 28f7db2b..fb5a4418 100644
--- a/src/locales/fa.json
+++ b/src/locales/fa.json
@@ -156,8 +156,7 @@
 		"pay": "Pay",
 		"scanToPayBTC": "Scan to pay with bitcoin",
 		"this": "This",
-		"lightningAddress": "lightning address",
-		"likeAnEmail": "is like an email for bitcoin. You can publish it on your website or business cards and use it multiple times.",
+		"lightningAddress": "Lightning address",
 		"dashboard": {
 			"go": "Go",
 			"dashboard": "Dashboard",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index f6ce8bbb..b3f25bb8 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -235,8 +235,7 @@
 		"unfollow": "Ne plus suivre",
 		"following": "Vous suivez",
 		"this": "Cette",
-		"lightningAddress": "adresse de Lightning",
-		"likeAnEmail": "est comme un courriel pour bitcoin.  Vous pouvez le publier sur votre site web ou votre carte de visite et l'utiliser plusieurs fois.",
+		"lightningAddress": "Adresse de lightning",
 		"send": {
 			"contacts": "Contacts",
 			"scan": "Scannez",
diff --git a/src/locales/pt.json b/src/locales/pt.json
index ba7424ef..f4fb5408 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -183,8 +183,7 @@
 		"pay": "Pagar",
 		"scanToPayBTC": "Escaneie para pagar com bitcoin",
 		"this": "Este",
-		"lightningAddress": "endereço lightning",
-		"likeAnEmail": "é como um email para o bitcoin. Você pode publicá-lo em seu site ou cartão de visita e usá-lo várias vezes.",
+		"lightningAddress": "Endereço lightning",
 		"dashboard": {
 			"go": "Ir",
 			"dashboard": "Painel de controle",
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 402f0214..8fc41c38 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -165,8 +165,7 @@
 		"pay": "Pay",
 		"scanToPayBTC": "Scan to pay with bitcoin",
 		"this": "This",
-		"lightningAddress": "lightning address",
-		"likeAnEmail": "is like an email for bitcoin. You can publish it on your website or business cards and use it multiple times.",
+		"lightningAddress": "Lightning address",
 		"dashboard": {
 			"go": "Go",
 			"dashboard": "Dashboard",
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index b000891e..35c316bb 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -60,7 +60,7 @@
 
 <div class="container mx-auto w-full px-4 mb-4 flex flex-wrap lg:flex-nowrap space-y-5">
 	<div class="hidden lg:block lg:w-[300px]" />
-	<div class="lg:w-[300px] lg:absolute space-y-5 left-20 mx-auto">
+	<div class="lg:w-[300px] lg:absolute space-y-5 left-20 mx-auto max-w-md">
 		<div
 			class="flex text-3xl font-bold text-center mx-auto justify-center gap-2"
 			on:click={toggleDetails}
@@ -71,45 +71,48 @@
 
 		{#if showDetails}
 			<div>
+        <div class="font-bold">{$t('user.profilePage')}</div>
 				<div class="flex gap-2">
 					<div class="break-all grow text-secondary text-lg">
-						{npub}
+						{profile}
 					</div>
 					<div class="flex mb-auto gap-1">
-						<button class="my-auto hover:opacity-40" on:click={() => copy(npub)}
+						<button class="my-auto opacity-60 hover:opacity-100" on:click={() => copy(profile)}
 							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
 						>
-						<a href={`/qr/${encodeURIComponent(npub)}`} class="my-auto hover:opacity-40">
+						<a href={`/qr/${encodeURIComponent(profile)}`} class="my-auto opacity-60 hover:opacity-100">
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
 				</div>
 			</div>
 			<div>
+        <div class="font-bold">{$t('user.lightningAddress')}</div>
 				<div class="flex gap-2">
 					<div class="break-all grow text-secondary text-lg">
 						{lnaddr}
 					</div>
 					<div class="flex mb-auto gap-1">
-						<button class="my-auto hover:opacity-40" on:click={() => copy(lnaddr)}
+						<button class="my-auto opacity-60 hover:opacity-100" on:click={() => copy(lnaddr)}
 							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
 						>
-						<a href={`/qr/${encodeURIComponent(lnaddr)}`} class="my-auto hover:opacity-40">
+						<a href={`/qr/${encodeURIComponent(lnaddr)}`} class="my-auto opacity-60 hover:opacity-100">
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
 				</div>
 			</div>
 			<div>
+        <div class="font-bold">{$t('user.nostrPubkey')}</div>
 				<div class="flex gap-2">
 					<div class="break-all grow text-secondary text-lg">
-						{profile}
+						{npub}
 					</div>
-					<div class="flex mb-auto gap-1">
-						<button class="my-auto hover:opacity-40" on:click={() => copy(profile)}
-							><Icon icon="copy" style="max-w-max min-w-[32px] hover:opacity-40" /></button
+					<div class="flex my-auto gap-1">
+						<button class="my-auto opacity-60 hover:opacity-100" on:click={() => copy(npub)}
+							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
 						>
-						<a href={`/qr/${encodeURIComponent(profile)}`} class="my-auto hover:opacity-40">
+						<a href={`/qr/${encodeURIComponent(npub)}`} class="my-auto opacity-60 hover:opacity-100">
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
index 47c4c4c6..26c327c0 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
@@ -74,33 +74,8 @@
 			type="text"
 			name="username"
 			bind:value={user.username}
-			class="border-r-0 rounded-r-none w-auto min-w-0 pr-1 grow"
+			class="w-auto min-w-0 pr-1 grow"
 		/>
-		<div class="text-gray-600 p-4 my-auto bg-gray-100 border border-r-0 pl-1">
-			@{$page.url.host}
-		</div>
-		<div class="text-gray-600 border-l-0 bg-gray-100 rounded-r-2xl p-4 my-auto border w-16">
-			<a href={`/qr/${encodeURIComponent(addr)}`}>
-				<Icon icon="qr" style="invert" />
-			</a>
-		</div>
-	</div>
-
-	<div class="flex mb-2">
-		<div class="text-gray-600 rounded-l-2xl p-4 my-auto border bg-gray-100 pr-1">
-			{$page.url.host}/
-		</div>
-		<input
-			type="text"
-			name="username"
-			bind:value={user.username}
-			class="grow border-l-0 rounded-l-none border-r-0 rounded-r-none w-auto pl-1 min-w-0"
-		/>
-		<div class="text-gray-600 rounded-r-2xl p-4 my-auto border bg-gray-100 w-16">
-			<a href={`/qr/${encodeURIComponent(full)}`}>
-				<Icon icon="qr" style="invert" />
-			</a>
-		</div>
 	</div>
 </div>
 
-- 
cgit v1.2.3


From 8041f705373758940b9487ed5c4cd34bfb04ac16 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 8 Nov 2023 13:46:04 -0800
Subject: rename pot to fund

---
 src/lib/utils.js                                   |   2 +-
 src/locales/en.json                                |   2 +-
 .../(app)/[username]/card/[serial]/+page.server.js |   6 +-
 .../(app)/[username]/invoice/[id]/+page.svelte     |   2 +-
 src/routes/(app)/fund/[name]/+page.server.js       |  23 ++++
 src/routes/(app)/fund/[name]/+page.svelte          | 138 +++++++++++++++++++++
 src/routes/(app)/fund/[name]/sweep/+page.server.js |  14 +++
 src/routes/(app)/fund/[name]/sweep/+page.svelte    |  37 ++++++
 .../(app)/fund/[name]/withdraw/+page.server.js     |  20 +++
 src/routes/(app)/fund/[name]/withdraw/+page.svelte |  58 +++++++++
 src/routes/(app)/fund/[name]/withdraw/+server.js   |   6 +
 src/routes/(app)/payment/[id]/+page.svelte         |   4 +-
 src/routes/(app)/pot/[name]/+page.server.js        |  23 ----
 src/routes/(app)/pot/[name]/+page.svelte           | 138 ---------------------
 src/routes/(app)/pot/[name]/sweep/+page.server.js  |  14 ---
 src/routes/(app)/pot/[name]/sweep/+page.svelte     |  37 ------
 .../(app)/pot/[name]/withdraw/+page.server.js      |  20 ---
 src/routes/(app)/pot/[name]/withdraw/+page.svelte  |  58 ---------
 src/routes/(app)/pot/[name]/withdraw/+server.js    |   6 -
 src/routes/(app)/send/[...text]/+page.server.js    |   9 +-
 src/routes/(app)/send/[...text]/+page.svelte       |  13 --
 .../send/fund/[name]/[...amount]/+page.server.js   |  17 +++
 .../send/fund/[name]/[...amount]/+page.svelte      |  58 +++++++++
 .../send/pot/[name]/[...amount]/+page.server.js    |  17 ---
 .../(app)/send/pot/[name]/[...amount]/+page.svelte |  58 ---------
 25 files changed, 383 insertions(+), 397 deletions(-)
 create mode 100644 src/routes/(app)/fund/[name]/+page.server.js
 create mode 100644 src/routes/(app)/fund/[name]/+page.svelte
 create mode 100644 src/routes/(app)/fund/[name]/sweep/+page.server.js
 create mode 100644 src/routes/(app)/fund/[name]/sweep/+page.svelte
 create mode 100644 src/routes/(app)/fund/[name]/withdraw/+page.server.js
 create mode 100644 src/routes/(app)/fund/[name]/withdraw/+page.svelte
 create mode 100644 src/routes/(app)/fund/[name]/withdraw/+server.js
 delete mode 100644 src/routes/(app)/pot/[name]/+page.server.js
 delete mode 100644 src/routes/(app)/pot/[name]/+page.svelte
 delete mode 100644 src/routes/(app)/pot/[name]/sweep/+page.server.js
 delete mode 100644 src/routes/(app)/pot/[name]/sweep/+page.svelte
 delete mode 100644 src/routes/(app)/pot/[name]/withdraw/+page.server.js
 delete mode 100644 src/routes/(app)/pot/[name]/withdraw/+page.svelte
 delete mode 100644 src/routes/(app)/pot/[name]/withdraw/+server.js
 create mode 100644 src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
 create mode 100644 src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
 delete mode 100644 src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
 delete mode 100644 src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte

(limited to 'src')

diff --git a/src/lib/utils.js b/src/lib/utils.js
index 52494c88..9e1066e2 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -251,7 +251,7 @@ export let types = {
 	bitcoin: 'bitcoin',
 	lightning: 'lightning',
 	internal: 'internal',
-	pot: 'pot',
+	fund: 'fund',
 	classic: 'classic'
 };
 
diff --git a/src/locales/en.json b/src/locales/en.json
index a1d0c0aa..d3e294d4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -263,7 +263,7 @@
 		}
 	},
 	"payments": {
-    "moneyPot": "Money Pot",
+    "fund": "Fund",
     "addFunds": "Add Funds",
     "takeFunds": "Take Funds",
     "show": "Show",
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.server.js b/src/routes/(app)/[username]/card/[serial]/+page.server.js
index e2569536..40e375aa 100644
--- a/src/routes/(app)/[username]/card/[serial]/+page.server.js
+++ b/src/routes/(app)/[username]/card/[serial]/+page.server.js
@@ -3,14 +3,14 @@ import { redirect } from "@sveltejs/kit"
 
 export let load = async ({ cookies, params }) => {
 	let { serial } = params;
-	let pot;
+	let fund;
 	try {
-		pot = await get(`/pot/${serial}`, auth(cookies));
+		fund = await get(`/fund/${serial}`, auth(cookies));
 	} catch (e) {
 		console.log(e);
 	}
 
-	if (pot) throw redirect(307, `/pot/${serial}`);
+	if (fund) throw redirect(307, `/fund/${serial}`);
 
 	return params;
 };
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index 2d204255..a0894dd1 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -15,7 +15,7 @@
 
 	let reading = async ({ message, serialNumber }) => {
 		let name = serialNumber.replace(/:/g, '-');
-		let result = await post(`/pot/${name}/withdraw`, { amount, hash, name });
+		let result = await post(`/fund/${name}/withdraw`, { amount, hash, name });
 	};
 
 	let readingerror = (e) => console.log('nfc error', e);
diff --git a/src/routes/(app)/fund/[name]/+page.server.js b/src/routes/(app)/fund/[name]/+page.server.js
new file mode 100644
index 00000000..ad20c7d9
--- /dev/null
+++ b/src/routes/(app)/fund/[name]/+page.server.js
@@ -0,0 +1,23 @@
+import { error, redirect } from '@sveltejs/kit';
+import { auth, get, post } from '$lib/utils';
+import Qr from 'qrcode-base64';
+
+export let load = async ({ params: { name }, url }) => {
+	let { amount, payments } = await get(`/fund/${name}`);
+
+	let src = Qr.drawImg(url.href, { size: 300 });
+	return { amount, payments, src };
+};
+
+export const actions = {
+	default: async ({ cookies, locals, params, request }) => {
+		let { user } = locals;
+
+		if (user) {
+			await post('/redeem', params, auth(cookies));
+			throw redirect(307, `/${user.username}/payments`);
+		}
+
+		throw redirect(307, '/register');
+	}
+};
diff --git a/src/routes/(app)/fund/[name]/+page.svelte b/src/routes/(app)/fund/[name]/+page.svelte
new file mode 100644
index 00000000..0ac10c24
--- /dev/null
+++ b/src/routes/(app)/fund/[name]/+page.svelte
@@ -0,0 +1,138 @@
+<script>
+	import { format } from 'date-fns';
+	import { enhance } from '$app/forms';
+	import { page } from '$app/stores';
+	import { Avatar, Icon } from '$comp';
+	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
+	import { types, copy, f, s, sat, sats } from '$lib/utils';
+	import { loginRedirect } from '$lib/store';
+
+	export let data;
+
+	let { amount, src, payments, rates, user } = data;
+	let { name } = $page.params;
+
+	toast.pop(0);
+
+	let currency = user ? user.currency : 'CAD';
+	let rate = rates[currency];
+
+	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+	$loginRedirect = $page.url.pathname;
+
+	let show;
+	let toggle = () => (show = !show);
+</script>
+
+<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
+	<div class="flex justify-center items-center">
+		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
+			<div class="relative flex justify-center gap-2">
+				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
+				{#if name.split('-').length === 4}
+					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {name}</h1>
+				{:else}
+					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
+					<div class="my-auto">
+						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
+						<h1 class="text-secondary my-auto">{name}</h1>
+					</div>
+				{/if}
+			</div>
+			{#if show}
+				<img {src} class="mx-auto" alt={name} />
+			{/if}
+			<div class="flex justify-center gap-4">
+				<div class="my-auto">
+					<h2 class="text-2xl md:text-3xl font-semibold">
+						{f(amountFiat, currency)}
+					</h2>
+					<h3 class="text-secondary md:text-lg mt-1">
+						{sat(amount)}
+					</h3>
+				</div>
+			</div>
+			<div class="flex gap-2" data-sveltekit-prefetch="off">
+				<div class="grow">
+					<a href={`/send/fund/${name}`}>
+						<button
+							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+						>
+							<Icon icon="plus" />
+							{$t('payments.addFunds')}
+						</button>
+					</a>
+				</div>
+				<div class="grow">
+					<a href={`/fund/${name}/withdraw`}>
+						<button
+							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+						>
+							<Icon icon="minus" style="rotate-180" />
+							{$t('payments.takeFunds')}
+						</button>
+					</a>
+				</div>
+			</div>
+			<div class="flex gap-2" data-sveltekit-prefetch="off">
+				<button
+					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+					on:click={toggle}
+				>
+					<Icon icon="qr" style="invert" />
+					{show ? $t('payments.hide') : $t('payments.show')} QR
+				</button>
+				<button
+					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+					on:click={() => copy($page.url.host + $page.url.pathname)}
+				>
+					<Icon icon="copy" style="w-6" />
+					{$t('payments.copyLink')}
+				</button>
+			</div>
+			<div class="text-base">
+				{#each payments as p}
+					<a href={`/payment/${p.id}`}>
+						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
+							<div class="whitespace-nowrap my-auto">
+								<div class="font-bold" class:text-red-800={p.amount > 0}>
+									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+									{#if p.tip}
+										<span class="text-sm text-secondary">
+											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
+										</span>
+									{/if}
+								</div>
+
+								<div class="text-secondary">
+									{sat(Math.abs(p.amount) + (p.tip || 0))}
+								</div>
+							</div>
+
+							<div class="flex my-auto">
+								<div class="flex">
+									<div class="my-auto">
+										<Avatar user={p.user} size={16} disabled={true} />
+									</div>
+									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
+								</div>
+							</div>
+
+							<div class="text-secondary text-right text-sm my-auto">
+								<div>
+									{format(new Date(p.created), 'h:mm aaa')}
+								</div>
+								<div>
+									{format(new Date(p.created), 'MMM d')}
+								</div>
+							</div>
+						</div>
+					</a>
+				{:else}
+					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
+				{/each}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/routes/(app)/fund/[name]/sweep/+page.server.js b/src/routes/(app)/fund/[name]/sweep/+page.server.js
new file mode 100644
index 00000000..929348ef
--- /dev/null
+++ b/src/routes/(app)/fund/[name]/sweep/+page.server.js
@@ -0,0 +1,14 @@
+import { get, auth, post } from '$lib/utils';
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ cookies, params, parent }) {
+	let { user } = await parent();
+	let { name } = params;
+	let { amount } = await get(`/fund/${name}`);
+
+
+  if (!amount) throw redirect(307, `/fund/${name}`);
+	if (!user) throw redirect(307, `/register?redirect=/fund/${name}/sweep`);
+	await post('/take', { amount, name }, auth(cookies));
+	return { amount, name };
+}
diff --git a/src/routes/(app)/fund/[name]/sweep/+page.svelte b/src/routes/(app)/fund/[name]/sweep/+page.svelte
new file mode 100644
index 00000000..9b473af3
--- /dev/null
+++ b/src/routes/(app)/fund/[name]/sweep/+page.svelte
@@ -0,0 +1,37 @@
+<script>
+	import { scale } from 'svelte/transition';
+	import { fiat, f, s } from '$lib/utils';
+	import { Icon } from '$comp';
+	import { t } from '$lib/translations';
+
+	export let data;
+
+	let { amount, name, user, rates } = data;
+	let { currency } = user;
+	$: rate = rates[currency];
+</script>
+
+<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
+	<div class="w-full flex">
+		<a href="/" class="mx-auto">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
+		<Icon icon="check" style="mx-auto" />
+	</div>
+	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
+	<h2 class="text-2xl md:text-3xl font-semibold">
+		{f(fiat(amount, rate), currency)}
+	</h2>
+	<h3 class="text-secondary md:text-lg mb-6 mt-1">
+		⚡️{s(amount)}
+	</h3>
+</div>
+
+<a href={`/${user.username}/payments`}>
+	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
+
+<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/fund/[name]/withdraw/+page.server.js b/src/routes/(app)/fund/[name]/withdraw/+page.server.js
new file mode 100644
index 00000000..4d590890
--- /dev/null
+++ b/src/routes/(app)/fund/[name]/withdraw/+page.server.js
@@ -0,0 +1,20 @@
+import { fail, json, redirect } from '@sveltejs/kit';
+import { fd, auth, post } from '$lib/utils';
+
+export async function load({ parent }) {
+	let { user } = await parent();
+	if (!user) throw redirect(307, '/register');
+}
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let body = await fd(request);
+		try {
+			await post('/take', body, auth(cookies));
+		} catch (e) {
+			return fail(400, { message: e.message });
+		}
+
+		throw redirect(307, `/fund/${body.name}`);
+	}
+};
diff --git a/src/routes/(app)/fund/[name]/withdraw/+page.svelte b/src/routes/(app)/fund/[name]/withdraw/+page.svelte
new file mode 100644
index 00000000..7be643a9
--- /dev/null
+++ b/src/routes/(app)/fund/[name]/withdraw/+page.svelte
@@ -0,0 +1,58 @@
+<script>
+	import { t } from '$lib/translations';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
+	import { page } from '$app/stores';
+	import { back } from '$lib/utils';
+	import { pin } from '$lib/store';
+
+	export let data;
+	export let form;
+
+	let { rates } = data;
+	let { amount, name } = $page.params;
+	let { currency } = data.user;
+	let loading;
+
+	let submit = () => (loading = true);
+	$: update(form);
+	let update = () => {
+		if (form?.message.includes('pin')) $pin = undefined;
+		loading = false;
+	};
+
+	$: rate = rates[currency];
+</script>
+
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
+	<Icon icon="arrow-left" style="w-10" />
+</button>
+
+{#if form?.message}
+	<div class="text-red-600 text-center">
+		{form.message}
+	</div>
+{/if}
+
+<div class="container px-4 mt-20 max-w-xl mx-auto">
+	<Numpad bind:amount bind:currency bind:rate {submit} />
+
+	<form method="POST" use:enhance on:submit={submit}>
+		<input name="name" value={name} type="hidden" />
+		<input name="amount" value={amount} type="hidden" />
+		<input name="pin" value={$pin} 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}
+					{$t('payments.send')}
+				{/if}
+			</button>
+		</div>
+	</form>
+</div>
diff --git a/src/routes/(app)/fund/[name]/withdraw/+server.js b/src/routes/(app)/fund/[name]/withdraw/+server.js
new file mode 100644
index 00000000..0f9a23f3
--- /dev/null
+++ b/src/routes/(app)/fund/[name]/withdraw/+server.js
@@ -0,0 +1,6 @@
+import { json } from '@sveltejs/kit';
+import { auth, post } from '$lib/utils';
+
+export async function POST({ cookies, request }) {
+	return json(await post('/take', await request.json(), auth(cookies)));
+}
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 38b91658..98c5a68b 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -47,10 +47,10 @@
 			</a>
 		</div>
 	{/if}
-	{#if p.type === types.pot}
+	{#if p.type === types.fund}
 		<div>
 			<span class="text-lg text-secondary my-auto mr-2">{direction}</span>
-			<a href={`/pot/${p.memo}`}>
+			<a href={`/fund/${p.memo}`}>
 				<div class="flex">
 					<div class="my-auto">
 						<img src="/images/moneypot.png" class="w-12" alt="Pot" />
diff --git a/src/routes/(app)/pot/[name]/+page.server.js b/src/routes/(app)/pot/[name]/+page.server.js
deleted file mode 100644
index 8f8b9d8f..00000000
--- a/src/routes/(app)/pot/[name]/+page.server.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { error, redirect } from '@sveltejs/kit';
-import { auth, get, post } from '$lib/utils';
-import Qr from 'qrcode-base64';
-
-export let load = async ({ params: { name }, url }) => {
-	let { amount, payments } = await get(`/pot/${name}`);
-
-	let src = Qr.drawImg(url.href, { size: 300 });
-	return { amount, payments, src };
-};
-
-export const actions = {
-	default: async ({ cookies, locals, params, request }) => {
-		let { user } = locals;
-
-		if (user) {
-			await post('/redeem', params, auth(cookies));
-			throw redirect(307, `/${user.username}/payments`);
-		}
-
-		throw redirect(307, '/register');
-	}
-};
diff --git a/src/routes/(app)/pot/[name]/+page.svelte b/src/routes/(app)/pot/[name]/+page.svelte
deleted file mode 100644
index ea1e45f2..00000000
--- a/src/routes/(app)/pot/[name]/+page.svelte
+++ /dev/null
@@ -1,138 +0,0 @@
-<script>
-	import { format } from 'date-fns';
-	import { enhance } from '$app/forms';
-	import { page } from '$app/stores';
-	import { Avatar, Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { t } from '$lib/translations';
-	import { types, copy, f, s, sat, sats } from '$lib/utils';
-	import { loginRedirect } from '$lib/store';
-
-	export let data;
-
-	let { amount, src, payments, rates, user } = data;
-	let { name } = $page.params;
-
-	toast.pop(0);
-
-	let currency = user ? user.currency : 'CAD';
-	let rate = rates[currency];
-
-	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-	$loginRedirect = $page.url.pathname;
-
-	let show;
-	let toggle = () => (show = !show);
-</script>
-
-<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
-	<div class="flex justify-center items-center">
-		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
-			<div class="relative flex justify-center gap-2">
-				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
-				{#if name.split('-').length === 4}
-					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {name}</h1>
-				{:else}
-					<img src="/images/moneypot.jpg" class="w-24" alt="Pot" />
-					<div class="my-auto">
-						<h1 class="text-2xl font-semibold my-auto">{$t('payments.moneyPot')}</h1>
-						<h1 class="text-secondary my-auto">{name}</h1>
-					</div>
-				{/if}
-			</div>
-			{#if show}
-				<img {src} class="mx-auto" alt={name} />
-			{/if}
-			<div class="flex justify-center gap-4">
-				<div class="my-auto">
-					<h2 class="text-2xl md:text-3xl font-semibold">
-						{f(amountFiat, currency)}
-					</h2>
-					<h3 class="text-secondary md:text-lg mt-1">
-						{sat(amount)}
-					</h3>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<div class="grow">
-					<a href={`/send/pot/${name}`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="plus" />
-							{$t('payments.addFunds')}
-						</button>
-					</a>
-				</div>
-				<div class="grow">
-					<a href={`/pot/${name}/withdraw`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="minus" style="rotate-180" />
-							{$t('payments.takeFunds')}
-						</button>
-					</a>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={toggle}
-				>
-					<Icon icon="qr" style="invert" />
-					{show ? $t('payments.show') : $t('payments.hide')} QR
-				</button>
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={() => copy($page.url.host + $page.url.pathname)}
-				>
-					<Icon icon="copy" style="w-6" />
-					{$t('payments.copyLink')}
-				</button>
-			</div>
-			<div class="text-base">
-				{#each payments as p}
-					<a href={`/payment/${p.id}`}>
-						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
-							<div class="whitespace-nowrap my-auto">
-								<div class="font-bold" class:text-red-800={p.amount > 0}>
-									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
-									{#if p.tip}
-										<span class="text-sm text-secondary">
-											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
-										</span>
-									{/if}
-								</div>
-
-								<div class="text-secondary">
-									{sat(Math.abs(p.amount) + (p.tip || 0))}
-								</div>
-							</div>
-
-							<div class="flex my-auto">
-								<div class="flex">
-									<div class="my-auto">
-										<Avatar user={p.user} size={16} disabled={true} />
-									</div>
-									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
-								</div>
-							</div>
-
-							<div class="text-secondary text-right text-sm my-auto">
-								<div>
-									{format(new Date(p.created), 'h:mm aaa')}
-								</div>
-								<div>
-									{format(new Date(p.created), 'MMM d')}
-								</div>
-							</div>
-						</div>
-					</a>
-				{:else}
-					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
-				{/each}
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/src/routes/(app)/pot/[name]/sweep/+page.server.js b/src/routes/(app)/pot/[name]/sweep/+page.server.js
deleted file mode 100644
index c2c8051d..00000000
--- a/src/routes/(app)/pot/[name]/sweep/+page.server.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { get, auth, post } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
-
-export async function load({ cookies, params, parent }) {
-	let { user } = await parent();
-	let { name } = params;
-	let { amount } = await get(`/pot/${name}`);
-
-
-  if (!amount) throw redirect(307, `/pot/${name}`);
-	if (!user) throw redirect(307, `/register?redirect=/pot/${name}/sweep`);
-	await post('/take', { amount, name }, auth(cookies));
-	return { amount, name };
-}
diff --git a/src/routes/(app)/pot/[name]/sweep/+page.svelte b/src/routes/(app)/pot/[name]/sweep/+page.svelte
deleted file mode 100644
index 9b473af3..00000000
--- a/src/routes/(app)/pot/[name]/sweep/+page.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script>
-	import { scale } from 'svelte/transition';
-	import { fiat, f, s } from '$lib/utils';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-
-	export let data;
-
-	let { amount, name, user, rates } = data;
-	let { currency } = user;
-	$: rate = rates[currency];
-</script>
-
-<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
-	<div class="w-full flex">
-		<a href="/" class="mx-auto">
-			<Icon icon="logo" />
-		</a>
-	</div>
-
-	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
-	<h2 class="text-2xl md:text-3xl font-semibold">
-		{f(fiat(amount, rate), currency)}
-	</h2>
-	<h3 class="text-secondary md:text-lg mb-6 mt-1">
-		⚡️{s(amount)}
-	</h3>
-</div>
-
-<a href={`/${user.username}/payments`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
-</a>
-
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.server.js b/src/routes/(app)/pot/[name]/withdraw/+page.server.js
deleted file mode 100644
index e7ea29f1..00000000
--- a/src/routes/(app)/pot/[name]/withdraw/+page.server.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { fail, json, redirect } from '@sveltejs/kit';
-import { fd, auth, post } from '$lib/utils';
-
-export async function load({ parent }) {
-	let { user } = await parent();
-	if (!user) throw redirect(307, '/register');
-}
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = await fd(request);
-		try {
-			await post('/take', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
-
-		throw redirect(307, `/pot/${body.name}`);
-	}
-};
diff --git a/src/routes/(app)/pot/[name]/withdraw/+page.svelte b/src/routes/(app)/pot/[name]/withdraw/+page.svelte
deleted file mode 100644
index 7be643a9..00000000
--- a/src/routes/(app)/pot/[name]/withdraw/+page.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { rates } = data;
-	let { amount, name } = $page.params;
-	let { currency } = data.user;
-	let loading;
-
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
-		loading = false;
-	};
-
-	$: rate = rates[currency];
-</script>
-
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-{#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
-{/if}
-
-<div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount bind:currency bind:rate {submit} />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="name" value={name} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} 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}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
-</div>
diff --git a/src/routes/(app)/pot/[name]/withdraw/+server.js b/src/routes/(app)/pot/[name]/withdraw/+server.js
deleted file mode 100644
index 0f9a23f3..00000000
--- a/src/routes/(app)/pot/[name]/withdraw/+server.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
-
-export async function POST({ cookies, request }) {
-	return json(await post('/take', await request.json(), auth(cookies)));
-}
diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index cafce7c9..6b4b000e 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -30,7 +30,7 @@ let parse = async (t, host) => {
 		if (id) throw redirect(307, `/send/invoice/${id}`);
 	}
 
-	if (t.includes('/pot')) throw redirect(307, t.substring(t.indexOf('/pot')));
+	if (t.includes('/fund')) throw redirect(307, t.substring(t.indexOf('/fund')));
 
 	if (t.toLowerCase().startsWith('lnurl')) throw redirect(307, `/ln/${t}`);
 	if (t.includes(':')) t = t.split(':')[1];
@@ -66,13 +66,12 @@ let parse = async (t, host) => {
 
 	if (user) throw redirect(307, `/send/user/${t}`);
 
-	// pot
-	let pot;
+	let fund;
 	try {
-		pot = await get(`/pot/${t}`);
+		fund = await get(`/fund/${t}`);
 	} catch (e) {}
 
-	if (pot) throw redirect(307, `/send/pot/${t}`);
+	if (fund) throw redirect(307, `/send/fund/${t}`);
 
 	// invoice
 	let invoice;
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 3abc5a1a..c246f811 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -35,19 +35,6 @@
 	</h1>
 
 	<form method="POST" use:enhance>
-		{#if form?.error}
-			<div class="mb-5">
-				<div class="text-secondary">
-					Could not find anything with that name. Would you like to create a new pot?
-				</div>
-				<div class="w-full flex justify-center">
-					<a href={`/send/pot/${text}`}
-						><button class="bg-black text-white border rounded-full px-6 py-2 font-bold">Yes</button
-						></a
-					>
-				</div>
-			</div>
-		{/if}
 		<div class="mb-2">
 			<input type="hidden" name="text" bind:value={text} />
 
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
new file mode 100644
index 00000000..2cb3c4a9
--- /dev/null
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
@@ -0,0 +1,17 @@
+import { fail, redirect } from '@sveltejs/kit';
+import { auth, fd, post } from '$lib/utils';
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let body = await fd(request);
+		let p;
+
+		try {
+			p = await post('/payments', body, auth(cookies));
+		} catch (e) {
+			return fail(400, { message: e.message });
+		}
+
+		if (p) throw redirect(307, `/fund/${body.name}`);
+	}
+};
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
new file mode 100644
index 00000000..6aecf8f3
--- /dev/null
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
@@ -0,0 +1,58 @@
+<script>
+	import { t } from '$lib/translations';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
+	import { page } from '$app/stores';
+	import { back } from '$lib/utils';
+	import { pin } from '$lib/store';
+
+	export let data;
+	export let form;
+
+	let { amount, name } = $page.params;
+	let { rates } = data;
+	let { currency } = data.user;
+	let loading;
+
+	$: rate = rates[currency];
+
+	let submit = () => (loading = true);
+	$: update(form);
+	let update = () => {
+		if (form?.message?.includes('pin')) $pin = undefined;
+		loading = false;
+	};
+</script>
+
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
+	<Icon icon="arrow-left" style="w-10" />
+</button>
+
+{#if form?.message}
+	<div class="text-red-600 text-center">
+		{form.message}
+	</div>
+{/if}
+
+<div class="container px-4 mt-20 max-w-xl mx-auto">
+	<Numpad bind:amount {currency} bind:rate />
+
+	<form method="POST" use:enhance on:submit={submit}>
+		<input name="name" value={name} type="hidden" />
+		<input name="amount" value={amount} type="hidden" />
+		<input name="pin" value={$pin} 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}
+					{$t('payments.send')}
+				{/if}
+			</button>
+		</div>
+	</form>
+</div>
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
deleted file mode 100644
index 3f819696..00000000
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.server.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { auth, fd, post } from '$lib/utils';
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = await fd(request);
-		let p;
-
-		try {
-			p = await post('/payments', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
-
-		if (p) throw redirect(307, `/pot/${body.name}`);
-	}
-};
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
deleted file mode 100644
index 6aecf8f3..00000000
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { amount, name } = $page.params;
-	let { rates } = data;
-	let { currency } = data.user;
-	let loading;
-
-	$: rate = rates[currency];
-
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message?.includes('pin')) $pin = undefined;
-		loading = false;
-	};
-</script>
-
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-{#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
-{/if}
-
-<div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount {currency} bind:rate />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="name" value={name} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} 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}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
-</div>
-- 
cgit v1.2.3


From 9d554851a47ca9b4efd38f2682f313bd2623f8bf Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 9 Nov 2023 16:03:29 -0800
Subject: rename fund name to id

---
 src/routes/(app)/fund/[id]/+page.server.js         |  23 ++++
 src/routes/(app)/fund/[id]/+page.svelte            | 138 +++++++++++++++++++++
 src/routes/(app)/fund/[id]/sweep/+page.server.js   |  14 +++
 src/routes/(app)/fund/[id]/sweep/+page.svelte      |  37 ++++++
 .../(app)/fund/[id]/withdraw/+page.server.js       |  20 +++
 src/routes/(app)/fund/[id]/withdraw/+page.svelte   |  58 +++++++++
 src/routes/(app)/fund/[id]/withdraw/+server.js     |   6 +
 src/routes/(app)/fund/[name]/+page.server.js       |  23 ----
 src/routes/(app)/fund/[name]/+page.svelte          | 138 ---------------------
 src/routes/(app)/fund/[name]/sweep/+page.server.js |  14 ---
 src/routes/(app)/fund/[name]/sweep/+page.svelte    |  37 ------
 .../(app)/fund/[name]/withdraw/+page.server.js     |  20 ---
 src/routes/(app)/fund/[name]/withdraw/+page.svelte |  58 ---------
 src/routes/(app)/fund/[name]/withdraw/+server.js   |   6 -
 14 files changed, 296 insertions(+), 296 deletions(-)
 create mode 100644 src/routes/(app)/fund/[id]/+page.server.js
 create mode 100644 src/routes/(app)/fund/[id]/+page.svelte
 create mode 100644 src/routes/(app)/fund/[id]/sweep/+page.server.js
 create mode 100644 src/routes/(app)/fund/[id]/sweep/+page.svelte
 create mode 100644 src/routes/(app)/fund/[id]/withdraw/+page.server.js
 create mode 100644 src/routes/(app)/fund/[id]/withdraw/+page.svelte
 create mode 100644 src/routes/(app)/fund/[id]/withdraw/+server.js
 delete mode 100644 src/routes/(app)/fund/[name]/+page.server.js
 delete mode 100644 src/routes/(app)/fund/[name]/+page.svelte
 delete mode 100644 src/routes/(app)/fund/[name]/sweep/+page.server.js
 delete mode 100644 src/routes/(app)/fund/[name]/sweep/+page.svelte
 delete mode 100644 src/routes/(app)/fund/[name]/withdraw/+page.server.js
 delete mode 100644 src/routes/(app)/fund/[name]/withdraw/+page.svelte
 delete mode 100644 src/routes/(app)/fund/[name]/withdraw/+server.js

(limited to 'src')

diff --git a/src/routes/(app)/fund/[id]/+page.server.js b/src/routes/(app)/fund/[id]/+page.server.js
new file mode 100644
index 00000000..4194deed
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/+page.server.js
@@ -0,0 +1,23 @@
+import { error, redirect } from '@sveltejs/kit';
+import { auth, get, post } from '$lib/utils';
+import Qr from 'qrcode-base64';
+
+export let load = async ({ params: { id }, url }) => {
+	let { amount, payments } = await get(`/fund/${id}`);
+
+	let src = Qr.drawImg(url.href, { size: 300 });
+	return { amount, payments, src };
+};
+
+export const actions = {
+	default: async ({ cookies, locals, params, request }) => {
+		let { user } = locals;
+
+		if (user) {
+			await post('/redeem', params, auth(cookies));
+			throw redirect(307, `/${user.username}/payments`);
+		}
+
+		throw redirect(307, '/register');
+	}
+};
diff --git a/src/routes/(app)/fund/[id]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte
new file mode 100644
index 00000000..d2d3079c
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/+page.svelte
@@ -0,0 +1,138 @@
+<script>
+	import { format } from 'date-fns';
+	import { enhance } from '$app/forms';
+	import { page } from '$app/stores';
+	import { Avatar, Icon } from '$comp';
+	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
+	import { types, copy, f, s, sat, sats } from '$lib/utils';
+	import { loginRedirect } from '$lib/store';
+
+	export let data;
+
+	let { amount, src, payments, rates, user } = data;
+	let { id } = $page.params;
+
+	toast.pop(0);
+
+	let currency = user ? user.currency : 'CAD';
+	let rate = rates[currency];
+
+	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+	$loginRedirect = $page.url.pathname;
+
+	let show;
+	let toggle = () => (show = !show);
+</script>
+
+<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
+	<div class="flex justify-center items-center">
+		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
+			<div class="relative flex justify-center gap-2">
+				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
+				{#if id.split('-').length === 4}
+					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {id}</h1>
+				{:else}
+					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
+					<div class="my-auto">
+						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
+						<h1 class="text-secondary my-auto">{id}</h1>
+					</div>
+				{/if}
+			</div>
+			{#if show}
+				<img {src} class="mx-auto" alt={id} />
+			{/if}
+			<div class="flex justify-center gap-4">
+				<div class="my-auto">
+					<h2 class="text-2xl md:text-3xl font-semibold">
+						{f(amountFiat, currency)}
+					</h2>
+					<h3 class="text-secondary md:text-lg mt-1">
+						{sat(amount)}
+					</h3>
+				</div>
+			</div>
+			<div class="flex gap-2" data-sveltekit-prefetch="off">
+				<div class="grow">
+					<a href={`/send/fund/${id}`}>
+						<button
+							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+						>
+							<Icon icon="plus" />
+							{$t('payments.addFunds')}
+						</button>
+					</a>
+				</div>
+				<div class="grow">
+					<a href={`/fund/${id}/withdraw`}>
+						<button
+							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+						>
+							<Icon icon="minus" style="rotate-180" />
+							{$t('payments.takeFunds')}
+						</button>
+					</a>
+				</div>
+			</div>
+			<div class="flex gap-2" data-sveltekit-prefetch="off">
+				<button
+					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+					on:click={toggle}
+				>
+					<Icon icon="qr" style="invert" />
+					{show ? $t('payments.hide') : $t('payments.show')} QR
+				</button>
+				<button
+					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+					on:click={() => copy($page.url.host + $page.url.pathname)}
+				>
+					<Icon icon="copy" style="w-6" />
+					{$t('payments.copyLink')}
+				</button>
+			</div>
+			<div class="text-base">
+				{#each payments as p}
+					<a href={`/payment/${p.id}`}>
+						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
+							<div class="whitespace-nowrap my-auto">
+								<div class="font-bold" class:text-red-800={p.amount > 0}>
+									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+									{#if p.tip}
+										<span class="text-sm text-secondary">
+											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
+										</span>
+									{/if}
+								</div>
+
+								<div class="text-secondary">
+									{sat(Math.abs(p.amount) + (p.tip || 0))}
+								</div>
+							</div>
+
+							<div class="flex my-auto">
+								<div class="flex">
+									<div class="my-auto">
+										<Avatar user={p.user} size={16} disabled={true} />
+									</div>
+									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
+								</div>
+							</div>
+
+							<div class="text-secondary text-right text-sm my-auto">
+								<div>
+									{format(new Date(p.created), 'h:mm aaa')}
+								</div>
+								<div>
+									{format(new Date(p.created), 'MMM d')}
+								</div>
+							</div>
+						</div>
+					</a>
+				{:else}
+					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
+				{/each}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.server.js b/src/routes/(app)/fund/[id]/sweep/+page.server.js
new file mode 100644
index 00000000..9fd244a3
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/sweep/+page.server.js
@@ -0,0 +1,14 @@
+import { get, auth, post } from '$lib/utils';
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ cookies, params, parent }) {
+	let { user } = await parent();
+	let { id } = params;
+	let { amount } = await get(`/fund/${id}`);
+
+
+  if (!amount) throw redirect(307, `/fund/${id}`);
+	if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`);
+	await post('/take', { amount, id }, auth(cookies));
+	return { amount, id };
+}
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte
new file mode 100644
index 00000000..64bed4dd
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/sweep/+page.svelte
@@ -0,0 +1,37 @@
+<script>
+	import { scale } from 'svelte/transition';
+	import { fiat, f, s } from '$lib/utils';
+	import { Icon } from '$comp';
+	import { t } from '$lib/translations';
+
+	export let data;
+
+	let { amount, id, user, rates } = data;
+	let { currency } = user;
+	$: rate = rates[currency];
+</script>
+
+<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
+	<div class="w-full flex">
+		<a href="/" class="mx-auto">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
+		<Icon icon="check" style="mx-auto" />
+	</div>
+	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
+	<h2 class="text-2xl md:text-3xl font-semibold">
+		{f(fiat(amount, rate), currency)}
+	</h2>
+	<h3 class="text-secondary md:text-lg mb-6 mt-1">
+		⚡️{s(amount)}
+	</h3>
+</div>
+
+<a href={`/${user.username}/payments`}>
+	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
+
+<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.server.js b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
new file mode 100644
index 00000000..476149f2
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
@@ -0,0 +1,20 @@
+import { fail, json, redirect } from '@sveltejs/kit';
+import { fd, auth, post } from '$lib/utils';
+
+export async function load({ parent }) {
+	let { user } = await parent();
+	if (!user) throw redirect(307, '/register');
+}
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let body = await fd(request);
+		try {
+			await post('/take', body, auth(cookies));
+		} catch (e) {
+			return fail(400, { message: e.message });
+		}
+
+		throw redirect(307, `/fund/${body.id}`);
+	}
+};
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
new file mode 100644
index 00000000..9cad945a
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
@@ -0,0 +1,58 @@
+<script>
+	import { t } from '$lib/translations';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
+	import { page } from '$app/stores';
+	import { back } from '$lib/utils';
+	import { pin } from '$lib/store';
+
+	export let data;
+	export let form;
+
+	let { rates } = data;
+	let { amount, id } = $page.params;
+	let { currency } = data.user;
+	let loading;
+
+	let submit = () => (loading = true);
+	$: update(form);
+	let update = () => {
+		if (form?.message.includes('pin')) $pin = undefined;
+		loading = false;
+	};
+
+	$: rate = rates[currency];
+</script>
+
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
+	<Icon icon="arrow-left" style="w-10" />
+</button>
+
+{#if form?.message}
+	<div class="text-red-600 text-center">
+		{form.message}
+	</div>
+{/if}
+
+<div class="container px-4 mt-20 max-w-xl mx-auto">
+	<Numpad bind:amount bind:currency bind:rate {submit} />
+
+	<form method="POST" use:enhance on:submit={submit}>
+		<input name="id" value={id} type="hidden" />
+		<input name="amount" value={amount} type="hidden" />
+		<input name="pin" value={$pin} 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}
+					{$t('payments.send')}
+				{/if}
+			</button>
+		</div>
+	</form>
+</div>
diff --git a/src/routes/(app)/fund/[id]/withdraw/+server.js b/src/routes/(app)/fund/[id]/withdraw/+server.js
new file mode 100644
index 00000000..0f9a23f3
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/withdraw/+server.js
@@ -0,0 +1,6 @@
+import { json } from '@sveltejs/kit';
+import { auth, post } from '$lib/utils';
+
+export async function POST({ cookies, request }) {
+	return json(await post('/take', await request.json(), auth(cookies)));
+}
diff --git a/src/routes/(app)/fund/[name]/+page.server.js b/src/routes/(app)/fund/[name]/+page.server.js
deleted file mode 100644
index ad20c7d9..00000000
--- a/src/routes/(app)/fund/[name]/+page.server.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { error, redirect } from '@sveltejs/kit';
-import { auth, get, post } from '$lib/utils';
-import Qr from 'qrcode-base64';
-
-export let load = async ({ params: { name }, url }) => {
-	let { amount, payments } = await get(`/fund/${name}`);
-
-	let src = Qr.drawImg(url.href, { size: 300 });
-	return { amount, payments, src };
-};
-
-export const actions = {
-	default: async ({ cookies, locals, params, request }) => {
-		let { user } = locals;
-
-		if (user) {
-			await post('/redeem', params, auth(cookies));
-			throw redirect(307, `/${user.username}/payments`);
-		}
-
-		throw redirect(307, '/register');
-	}
-};
diff --git a/src/routes/(app)/fund/[name]/+page.svelte b/src/routes/(app)/fund/[name]/+page.svelte
deleted file mode 100644
index 0ac10c24..00000000
--- a/src/routes/(app)/fund/[name]/+page.svelte
+++ /dev/null
@@ -1,138 +0,0 @@
-<script>
-	import { format } from 'date-fns';
-	import { enhance } from '$app/forms';
-	import { page } from '$app/stores';
-	import { Avatar, Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { t } from '$lib/translations';
-	import { types, copy, f, s, sat, sats } from '$lib/utils';
-	import { loginRedirect } from '$lib/store';
-
-	export let data;
-
-	let { amount, src, payments, rates, user } = data;
-	let { name } = $page.params;
-
-	toast.pop(0);
-
-	let currency = user ? user.currency : 'CAD';
-	let rate = rates[currency];
-
-	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-	$loginRedirect = $page.url.pathname;
-
-	let show;
-	let toggle = () => (show = !show);
-</script>
-
-<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
-	<div class="flex justify-center items-center">
-		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
-			<div class="relative flex justify-center gap-2">
-				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
-				{#if name.split('-').length === 4}
-					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {name}</h1>
-				{:else}
-					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
-					<div class="my-auto">
-						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
-						<h1 class="text-secondary my-auto">{name}</h1>
-					</div>
-				{/if}
-			</div>
-			{#if show}
-				<img {src} class="mx-auto" alt={name} />
-			{/if}
-			<div class="flex justify-center gap-4">
-				<div class="my-auto">
-					<h2 class="text-2xl md:text-3xl font-semibold">
-						{f(amountFiat, currency)}
-					</h2>
-					<h3 class="text-secondary md:text-lg mt-1">
-						{sat(amount)}
-					</h3>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<div class="grow">
-					<a href={`/send/fund/${name}`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="plus" />
-							{$t('payments.addFunds')}
-						</button>
-					</a>
-				</div>
-				<div class="grow">
-					<a href={`/fund/${name}/withdraw`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="minus" style="rotate-180" />
-							{$t('payments.takeFunds')}
-						</button>
-					</a>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={toggle}
-				>
-					<Icon icon="qr" style="invert" />
-					{show ? $t('payments.hide') : $t('payments.show')} QR
-				</button>
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={() => copy($page.url.host + $page.url.pathname)}
-				>
-					<Icon icon="copy" style="w-6" />
-					{$t('payments.copyLink')}
-				</button>
-			</div>
-			<div class="text-base">
-				{#each payments as p}
-					<a href={`/payment/${p.id}`}>
-						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
-							<div class="whitespace-nowrap my-auto">
-								<div class="font-bold" class:text-red-800={p.amount > 0}>
-									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
-									{#if p.tip}
-										<span class="text-sm text-secondary">
-											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
-										</span>
-									{/if}
-								</div>
-
-								<div class="text-secondary">
-									{sat(Math.abs(p.amount) + (p.tip || 0))}
-								</div>
-							</div>
-
-							<div class="flex my-auto">
-								<div class="flex">
-									<div class="my-auto">
-										<Avatar user={p.user} size={16} disabled={true} />
-									</div>
-									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
-								</div>
-							</div>
-
-							<div class="text-secondary text-right text-sm my-auto">
-								<div>
-									{format(new Date(p.created), 'h:mm aaa')}
-								</div>
-								<div>
-									{format(new Date(p.created), 'MMM d')}
-								</div>
-							</div>
-						</div>
-					</a>
-				{:else}
-					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
-				{/each}
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/src/routes/(app)/fund/[name]/sweep/+page.server.js b/src/routes/(app)/fund/[name]/sweep/+page.server.js
deleted file mode 100644
index 929348ef..00000000
--- a/src/routes/(app)/fund/[name]/sweep/+page.server.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { get, auth, post } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
-
-export async function load({ cookies, params, parent }) {
-	let { user } = await parent();
-	let { name } = params;
-	let { amount } = await get(`/fund/${name}`);
-
-
-  if (!amount) throw redirect(307, `/fund/${name}`);
-	if (!user) throw redirect(307, `/register?redirect=/fund/${name}/sweep`);
-	await post('/take', { amount, name }, auth(cookies));
-	return { amount, name };
-}
diff --git a/src/routes/(app)/fund/[name]/sweep/+page.svelte b/src/routes/(app)/fund/[name]/sweep/+page.svelte
deleted file mode 100644
index 9b473af3..00000000
--- a/src/routes/(app)/fund/[name]/sweep/+page.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script>
-	import { scale } from 'svelte/transition';
-	import { fiat, f, s } from '$lib/utils';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-
-	export let data;
-
-	let { amount, name, user, rates } = data;
-	let { currency } = user;
-	$: rate = rates[currency];
-</script>
-
-<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
-	<div class="w-full flex">
-		<a href="/" class="mx-auto">
-			<Icon icon="logo" />
-		</a>
-	</div>
-
-	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
-	<h2 class="text-2xl md:text-3xl font-semibold">
-		{f(fiat(amount, rate), currency)}
-	</h2>
-	<h3 class="text-secondary md:text-lg mb-6 mt-1">
-		⚡️{s(amount)}
-	</h3>
-</div>
-
-<a href={`/${user.username}/payments`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
-</a>
-
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/fund/[name]/withdraw/+page.server.js b/src/routes/(app)/fund/[name]/withdraw/+page.server.js
deleted file mode 100644
index 4d590890..00000000
--- a/src/routes/(app)/fund/[name]/withdraw/+page.server.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { fail, json, redirect } from '@sveltejs/kit';
-import { fd, auth, post } from '$lib/utils';
-
-export async function load({ parent }) {
-	let { user } = await parent();
-	if (!user) throw redirect(307, '/register');
-}
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = await fd(request);
-		try {
-			await post('/take', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
-
-		throw redirect(307, `/fund/${body.name}`);
-	}
-};
diff --git a/src/routes/(app)/fund/[name]/withdraw/+page.svelte b/src/routes/(app)/fund/[name]/withdraw/+page.svelte
deleted file mode 100644
index 7be643a9..00000000
--- a/src/routes/(app)/fund/[name]/withdraw/+page.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { rates } = data;
-	let { amount, name } = $page.params;
-	let { currency } = data.user;
-	let loading;
-
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
-		loading = false;
-	};
-
-	$: rate = rates[currency];
-</script>
-
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-{#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
-{/if}
-
-<div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount bind:currency bind:rate {submit} />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="name" value={name} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} 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}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
-</div>
diff --git a/src/routes/(app)/fund/[name]/withdraw/+server.js b/src/routes/(app)/fund/[name]/withdraw/+server.js
deleted file mode 100644
index 0f9a23f3..00000000
--- a/src/routes/(app)/fund/[name]/withdraw/+server.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
-
-export async function POST({ cookies, request }) {
-	return json(await post('/take', await request.json(), auth(cookies)));
-}
-- 
cgit v1.2.3


From efdbc67c17fab67bf3cdce448a30aa82f62c5212 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 9 Nov 2023 16:49:10 -0800
Subject: funds

---
 src/components/AppHeader.svelte                    |   1 +
 src/locales/en.json                                |   4 +-
 src/routes/(app)/fund/[id]/+page.server.js         |  23 ----
 src/routes/(app)/fund/[id]/+page.svelte            | 138 ---------------------
 src/routes/(app)/fund/[id]/sweep/+page.server.js   |  14 ---
 src/routes/(app)/fund/[id]/sweep/+page.svelte      |  37 ------
 .../(app)/fund/[id]/withdraw/+page.server.js       |  20 ---
 src/routes/(app)/fund/[id]/withdraw/+page.svelte   |  58 ---------
 src/routes/(app)/fund/[id]/withdraw/+server.js     |   6 -
 src/routes/(app)/funds/[id]/+page.server.js        |  23 ++++
 src/routes/(app)/funds/[id]/+page.svelte           | 138 +++++++++++++++++++++
 src/routes/(app)/funds/[id]/sweep/+page.server.js  |  14 +++
 src/routes/(app)/funds/[id]/sweep/+page.svelte     |  37 ++++++
 .../(app)/funds/[id]/withdraw/+page.server.js      |  20 +++
 src/routes/(app)/funds/[id]/withdraw/+page.svelte  |  58 +++++++++
 src/routes/(app)/funds/[id]/withdraw/+server.js    |   6 +
 src/routes/(app)/send/[...text]/+page.svelte       |   8 ++
 static/icons/fund.svg                              |  63 ++++++++++
 18 files changed, 371 insertions(+), 297 deletions(-)
 delete mode 100644 src/routes/(app)/fund/[id]/+page.server.js
 delete mode 100644 src/routes/(app)/fund/[id]/+page.svelte
 delete mode 100644 src/routes/(app)/fund/[id]/sweep/+page.server.js
 delete mode 100644 src/routes/(app)/fund/[id]/sweep/+page.svelte
 delete mode 100644 src/routes/(app)/fund/[id]/withdraw/+page.server.js
 delete mode 100644 src/routes/(app)/fund/[id]/withdraw/+page.svelte
 delete mode 100644 src/routes/(app)/fund/[id]/withdraw/+server.js
 create mode 100644 src/routes/(app)/funds/[id]/+page.server.js
 create mode 100644 src/routes/(app)/funds/[id]/+page.svelte
 create mode 100644 src/routes/(app)/funds/[id]/sweep/+page.server.js
 create mode 100644 src/routes/(app)/funds/[id]/sweep/+page.svelte
 create mode 100644 src/routes/(app)/funds/[id]/withdraw/+page.server.js
 create mode 100644 src/routes/(app)/funds/[id]/withdraw/+page.svelte
 create mode 100644 src/routes/(app)/funds/[id]/withdraw/+server.js
 create mode 100644 static/icons/fund.svg

(limited to 'src')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 798073fb..4ee0c4a7 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -17,6 +17,7 @@
 		menuButtons = [
 			{ key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` },
 			{ key: 'nav.support', icon: 'support', href: `/support` },
+			{ key: 'nav.funds', icon: 'fund', href: `/${user.username}/funds` },
 			{ key: 'nav.map', icon: 'map', href: `/${user.username}/map` },
 			{ key: 'nav.merch', icon: 'shirt', href: `https://coinosmerch.com` },
 			{ key: 'nav.signOut', icon: 'logout', href: `/logout` }
diff --git a/src/locales/en.json b/src/locales/en.json
index d3e294d4..7aa157d1 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -26,7 +26,8 @@
 	"error": {
 		"header": "Error",
 		"message": "Please try again or contact support.",
-		"signIn": "Please sign in to continue."
+		"signIn": "Please sign in to continue.",
+    "unrecognizedInput": "Unrecognized input"
 	},
 	"faq": {
 		"header": "FAQ",
@@ -145,6 +146,7 @@
 		"failed": "Login failed"
 	},
 	"nav": {
+    "funds": "Funds",
     "map": "Map",
     "merch": "Merch",
 		"profile": "Profile",
diff --git a/src/routes/(app)/fund/[id]/+page.server.js b/src/routes/(app)/fund/[id]/+page.server.js
deleted file mode 100644
index 4194deed..00000000
--- a/src/routes/(app)/fund/[id]/+page.server.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { error, redirect } from '@sveltejs/kit';
-import { auth, get, post } from '$lib/utils';
-import Qr from 'qrcode-base64';
-
-export let load = async ({ params: { id }, url }) => {
-	let { amount, payments } = await get(`/fund/${id}`);
-
-	let src = Qr.drawImg(url.href, { size: 300 });
-	return { amount, payments, src };
-};
-
-export const actions = {
-	default: async ({ cookies, locals, params, request }) => {
-		let { user } = locals;
-
-		if (user) {
-			await post('/redeem', params, auth(cookies));
-			throw redirect(307, `/${user.username}/payments`);
-		}
-
-		throw redirect(307, '/register');
-	}
-};
diff --git a/src/routes/(app)/fund/[id]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte
deleted file mode 100644
index d2d3079c..00000000
--- a/src/routes/(app)/fund/[id]/+page.svelte
+++ /dev/null
@@ -1,138 +0,0 @@
-<script>
-	import { format } from 'date-fns';
-	import { enhance } from '$app/forms';
-	import { page } from '$app/stores';
-	import { Avatar, Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { t } from '$lib/translations';
-	import { types, copy, f, s, sat, sats } from '$lib/utils';
-	import { loginRedirect } from '$lib/store';
-
-	export let data;
-
-	let { amount, src, payments, rates, user } = data;
-	let { id } = $page.params;
-
-	toast.pop(0);
-
-	let currency = user ? user.currency : 'CAD';
-	let rate = rates[currency];
-
-	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-	$loginRedirect = $page.url.pathname;
-
-	let show;
-	let toggle = () => (show = !show);
-</script>
-
-<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
-	<div class="flex justify-center items-center">
-		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
-			<div class="relative flex justify-center gap-2">
-				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
-				{#if id.split('-').length === 4}
-					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {id}</h1>
-				{:else}
-					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
-					<div class="my-auto">
-						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
-						<h1 class="text-secondary my-auto">{id}</h1>
-					</div>
-				{/if}
-			</div>
-			{#if show}
-				<img {src} class="mx-auto" alt={id} />
-			{/if}
-			<div class="flex justify-center gap-4">
-				<div class="my-auto">
-					<h2 class="text-2xl md:text-3xl font-semibold">
-						{f(amountFiat, currency)}
-					</h2>
-					<h3 class="text-secondary md:text-lg mt-1">
-						{sat(amount)}
-					</h3>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<div class="grow">
-					<a href={`/send/fund/${id}`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="plus" />
-							{$t('payments.addFunds')}
-						</button>
-					</a>
-				</div>
-				<div class="grow">
-					<a href={`/fund/${id}/withdraw`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="minus" style="rotate-180" />
-							{$t('payments.takeFunds')}
-						</button>
-					</a>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={toggle}
-				>
-					<Icon icon="qr" style="invert" />
-					{show ? $t('payments.hide') : $t('payments.show')} QR
-				</button>
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={() => copy($page.url.host + $page.url.pathname)}
-				>
-					<Icon icon="copy" style="w-6" />
-					{$t('payments.copyLink')}
-				</button>
-			</div>
-			<div class="text-base">
-				{#each payments as p}
-					<a href={`/payment/${p.id}`}>
-						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
-							<div class="whitespace-nowrap my-auto">
-								<div class="font-bold" class:text-red-800={p.amount > 0}>
-									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
-									{#if p.tip}
-										<span class="text-sm text-secondary">
-											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
-										</span>
-									{/if}
-								</div>
-
-								<div class="text-secondary">
-									{sat(Math.abs(p.amount) + (p.tip || 0))}
-								</div>
-							</div>
-
-							<div class="flex my-auto">
-								<div class="flex">
-									<div class="my-auto">
-										<Avatar user={p.user} size={16} disabled={true} />
-									</div>
-									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
-								</div>
-							</div>
-
-							<div class="text-secondary text-right text-sm my-auto">
-								<div>
-									{format(new Date(p.created), 'h:mm aaa')}
-								</div>
-								<div>
-									{format(new Date(p.created), 'MMM d')}
-								</div>
-							</div>
-						</div>
-					</a>
-				{:else}
-					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
-				{/each}
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.server.js b/src/routes/(app)/fund/[id]/sweep/+page.server.js
deleted file mode 100644
index 9fd244a3..00000000
--- a/src/routes/(app)/fund/[id]/sweep/+page.server.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { get, auth, post } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
-
-export async function load({ cookies, params, parent }) {
-	let { user } = await parent();
-	let { id } = params;
-	let { amount } = await get(`/fund/${id}`);
-
-
-  if (!amount) throw redirect(307, `/fund/${id}`);
-	if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`);
-	await post('/take', { amount, id }, auth(cookies));
-	return { amount, id };
-}
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte
deleted file mode 100644
index 64bed4dd..00000000
--- a/src/routes/(app)/fund/[id]/sweep/+page.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script>
-	import { scale } from 'svelte/transition';
-	import { fiat, f, s } from '$lib/utils';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-
-	export let data;
-
-	let { amount, id, user, rates } = data;
-	let { currency } = user;
-	$: rate = rates[currency];
-</script>
-
-<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
-	<div class="w-full flex">
-		<a href="/" class="mx-auto">
-			<Icon icon="logo" />
-		</a>
-	</div>
-
-	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
-	<h2 class="text-2xl md:text-3xl font-semibold">
-		{f(fiat(amount, rate), currency)}
-	</h2>
-	<h3 class="text-secondary md:text-lg mb-6 mt-1">
-		⚡️{s(amount)}
-	</h3>
-</div>
-
-<a href={`/${user.username}/payments`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
-</a>
-
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.server.js b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
deleted file mode 100644
index 476149f2..00000000
--- a/src/routes/(app)/fund/[id]/withdraw/+page.server.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { fail, json, redirect } from '@sveltejs/kit';
-import { fd, auth, post } from '$lib/utils';
-
-export async function load({ parent }) {
-	let { user } = await parent();
-	if (!user) throw redirect(307, '/register');
-}
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = await fd(request);
-		try {
-			await post('/take', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
-
-		throw redirect(307, `/fund/${body.id}`);
-	}
-};
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
deleted file mode 100644
index 9cad945a..00000000
--- a/src/routes/(app)/fund/[id]/withdraw/+page.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { rates } = data;
-	let { amount, id } = $page.params;
-	let { currency } = data.user;
-	let loading;
-
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
-		loading = false;
-	};
-
-	$: rate = rates[currency];
-</script>
-
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-{#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
-{/if}
-
-<div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount bind:currency bind:rate {submit} />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="id" value={id} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} 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}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
-</div>
diff --git a/src/routes/(app)/fund/[id]/withdraw/+server.js b/src/routes/(app)/fund/[id]/withdraw/+server.js
deleted file mode 100644
index 0f9a23f3..00000000
--- a/src/routes/(app)/fund/[id]/withdraw/+server.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
-
-export async function POST({ cookies, request }) {
-	return json(await post('/take', await request.json(), auth(cookies)));
-}
diff --git a/src/routes/(app)/funds/[id]/+page.server.js b/src/routes/(app)/funds/[id]/+page.server.js
new file mode 100644
index 00000000..4194deed
--- /dev/null
+++ b/src/routes/(app)/funds/[id]/+page.server.js
@@ -0,0 +1,23 @@
+import { error, redirect } from '@sveltejs/kit';
+import { auth, get, post } from '$lib/utils';
+import Qr from 'qrcode-base64';
+
+export let load = async ({ params: { id }, url }) => {
+	let { amount, payments } = await get(`/fund/${id}`);
+
+	let src = Qr.drawImg(url.href, { size: 300 });
+	return { amount, payments, src };
+};
+
+export const actions = {
+	default: async ({ cookies, locals, params, request }) => {
+		let { user } = locals;
+
+		if (user) {
+			await post('/redeem', params, auth(cookies));
+			throw redirect(307, `/${user.username}/payments`);
+		}
+
+		throw redirect(307, '/register');
+	}
+};
diff --git a/src/routes/(app)/funds/[id]/+page.svelte b/src/routes/(app)/funds/[id]/+page.svelte
new file mode 100644
index 00000000..d2d3079c
--- /dev/null
+++ b/src/routes/(app)/funds/[id]/+page.svelte
@@ -0,0 +1,138 @@
+<script>
+	import { format } from 'date-fns';
+	import { enhance } from '$app/forms';
+	import { page } from '$app/stores';
+	import { Avatar, Icon } from '$comp';
+	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
+	import { types, copy, f, s, sat, sats } from '$lib/utils';
+	import { loginRedirect } from '$lib/store';
+
+	export let data;
+
+	let { amount, src, payments, rates, user } = data;
+	let { id } = $page.params;
+
+	toast.pop(0);
+
+	let currency = user ? user.currency : 'CAD';
+	let rate = rates[currency];
+
+	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+	$loginRedirect = $page.url.pathname;
+
+	let show;
+	let toggle = () => (show = !show);
+</script>
+
+<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
+	<div class="flex justify-center items-center">
+		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
+			<div class="relative flex justify-center gap-2">
+				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
+				{#if id.split('-').length === 4}
+					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {id}</h1>
+				{:else}
+					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
+					<div class="my-auto">
+						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
+						<h1 class="text-secondary my-auto">{id}</h1>
+					</div>
+				{/if}
+			</div>
+			{#if show}
+				<img {src} class="mx-auto" alt={id} />
+			{/if}
+			<div class="flex justify-center gap-4">
+				<div class="my-auto">
+					<h2 class="text-2xl md:text-3xl font-semibold">
+						{f(amountFiat, currency)}
+					</h2>
+					<h3 class="text-secondary md:text-lg mt-1">
+						{sat(amount)}
+					</h3>
+				</div>
+			</div>
+			<div class="flex gap-2" data-sveltekit-prefetch="off">
+				<div class="grow">
+					<a href={`/send/fund/${id}`}>
+						<button
+							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+						>
+							<Icon icon="plus" />
+							{$t('payments.addFunds')}
+						</button>
+					</a>
+				</div>
+				<div class="grow">
+					<a href={`/fund/${id}/withdraw`}>
+						<button
+							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+						>
+							<Icon icon="minus" style="rotate-180" />
+							{$t('payments.takeFunds')}
+						</button>
+					</a>
+				</div>
+			</div>
+			<div class="flex gap-2" data-sveltekit-prefetch="off">
+				<button
+					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+					on:click={toggle}
+				>
+					<Icon icon="qr" style="invert" />
+					{show ? $t('payments.hide') : $t('payments.show')} QR
+				</button>
+				<button
+					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+					on:click={() => copy($page.url.host + $page.url.pathname)}
+				>
+					<Icon icon="copy" style="w-6" />
+					{$t('payments.copyLink')}
+				</button>
+			</div>
+			<div class="text-base">
+				{#each payments as p}
+					<a href={`/payment/${p.id}`}>
+						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
+							<div class="whitespace-nowrap my-auto">
+								<div class="font-bold" class:text-red-800={p.amount > 0}>
+									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+									{#if p.tip}
+										<span class="text-sm text-secondary">
+											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
+										</span>
+									{/if}
+								</div>
+
+								<div class="text-secondary">
+									{sat(Math.abs(p.amount) + (p.tip || 0))}
+								</div>
+							</div>
+
+							<div class="flex my-auto">
+								<div class="flex">
+									<div class="my-auto">
+										<Avatar user={p.user} size={16} disabled={true} />
+									</div>
+									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
+								</div>
+							</div>
+
+							<div class="text-secondary text-right text-sm my-auto">
+								<div>
+									{format(new Date(p.created), 'h:mm aaa')}
+								</div>
+								<div>
+									{format(new Date(p.created), 'MMM d')}
+								</div>
+							</div>
+						</div>
+					</a>
+				{:else}
+					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
+				{/each}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/routes/(app)/funds/[id]/sweep/+page.server.js b/src/routes/(app)/funds/[id]/sweep/+page.server.js
new file mode 100644
index 00000000..9fd244a3
--- /dev/null
+++ b/src/routes/(app)/funds/[id]/sweep/+page.server.js
@@ -0,0 +1,14 @@
+import { get, auth, post } from '$lib/utils';
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ cookies, params, parent }) {
+	let { user } = await parent();
+	let { id } = params;
+	let { amount } = await get(`/fund/${id}`);
+
+
+  if (!amount) throw redirect(307, `/fund/${id}`);
+	if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`);
+	await post('/take', { amount, id }, auth(cookies));
+	return { amount, id };
+}
diff --git a/src/routes/(app)/funds/[id]/sweep/+page.svelte b/src/routes/(app)/funds/[id]/sweep/+page.svelte
new file mode 100644
index 00000000..64bed4dd
--- /dev/null
+++ b/src/routes/(app)/funds/[id]/sweep/+page.svelte
@@ -0,0 +1,37 @@
+<script>
+	import { scale } from 'svelte/transition';
+	import { fiat, f, s } from '$lib/utils';
+	import { Icon } from '$comp';
+	import { t } from '$lib/translations';
+
+	export let data;
+
+	let { amount, id, user, rates } = data;
+	let { currency } = user;
+	$: rate = rates[currency];
+</script>
+
+<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
+	<div class="w-full flex">
+		<a href="/" class="mx-auto">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
+		<Icon icon="check" style="mx-auto" />
+	</div>
+	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
+	<h2 class="text-2xl md:text-3xl font-semibold">
+		{f(fiat(amount, rate), currency)}
+	</h2>
+	<h3 class="text-secondary md:text-lg mb-6 mt-1">
+		⚡️{s(amount)}
+	</h3>
+</div>
+
+<a href={`/${user.username}/payments`}>
+	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
+
+<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/funds/[id]/withdraw/+page.server.js b/src/routes/(app)/funds/[id]/withdraw/+page.server.js
new file mode 100644
index 00000000..476149f2
--- /dev/null
+++ b/src/routes/(app)/funds/[id]/withdraw/+page.server.js
@@ -0,0 +1,20 @@
+import { fail, json, redirect } from '@sveltejs/kit';
+import { fd, auth, post } from '$lib/utils';
+
+export async function load({ parent }) {
+	let { user } = await parent();
+	if (!user) throw redirect(307, '/register');
+}
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let body = await fd(request);
+		try {
+			await post('/take', body, auth(cookies));
+		} catch (e) {
+			return fail(400, { message: e.message });
+		}
+
+		throw redirect(307, `/fund/${body.id}`);
+	}
+};
diff --git a/src/routes/(app)/funds/[id]/withdraw/+page.svelte b/src/routes/(app)/funds/[id]/withdraw/+page.svelte
new file mode 100644
index 00000000..9cad945a
--- /dev/null
+++ b/src/routes/(app)/funds/[id]/withdraw/+page.svelte
@@ -0,0 +1,58 @@
+<script>
+	import { t } from '$lib/translations';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
+	import { page } from '$app/stores';
+	import { back } from '$lib/utils';
+	import { pin } from '$lib/store';
+
+	export let data;
+	export let form;
+
+	let { rates } = data;
+	let { amount, id } = $page.params;
+	let { currency } = data.user;
+	let loading;
+
+	let submit = () => (loading = true);
+	$: update(form);
+	let update = () => {
+		if (form?.message.includes('pin')) $pin = undefined;
+		loading = false;
+	};
+
+	$: rate = rates[currency];
+</script>
+
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
+	<Icon icon="arrow-left" style="w-10" />
+</button>
+
+{#if form?.message}
+	<div class="text-red-600 text-center">
+		{form.message}
+	</div>
+{/if}
+
+<div class="container px-4 mt-20 max-w-xl mx-auto">
+	<Numpad bind:amount bind:currency bind:rate {submit} />
+
+	<form method="POST" use:enhance on:submit={submit}>
+		<input name="id" value={id} type="hidden" />
+		<input name="amount" value={amount} type="hidden" />
+		<input name="pin" value={$pin} 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}
+					{$t('payments.send')}
+				{/if}
+			</button>
+		</div>
+	</form>
+</div>
diff --git a/src/routes/(app)/funds/[id]/withdraw/+server.js b/src/routes/(app)/funds/[id]/withdraw/+server.js
new file mode 100644
index 00000000..0f9a23f3
--- /dev/null
+++ b/src/routes/(app)/funds/[id]/withdraw/+server.js
@@ -0,0 +1,6 @@
+import { json } from '@sveltejs/kit';
+import { auth, post } from '$lib/utils';
+
+export async function POST({ cookies, request }) {
+	return json(await post('/take', await request.json(), auth(cookies)));
+}
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index c246f811..de84c287 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -35,6 +35,14 @@
 	</h1>
 
 	<form method="POST" use:enhance>
+		{#if form?.error}
+			<div class="mb-5">
+				<div class="text-red-600">
+					{$t('error.unrecognizedInput')}
+				</div>
+			</div>
+		{/if}
+
 		<div class="mb-2">
 			<input type="hidden" name="text" bind:value={text} />
 
diff --git a/static/icons/fund.svg b/static/icons/fund.svg
new file mode 100644
index 00000000..93bd87f5
--- /dev/null
+++ b/static/icons/fund.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg height="800px" width="800px" version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 viewBox="0 0 512 512"  xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#000000;}
+</style>
+<g>
+	<path class="st0" d="M326.27,86.016l57.667,15.304c1.504,0.307,2.726,1.536,3.072,3.049l15.203,57.667
+		c0.41,1.693,1.899,2.883,3.631,2.883c1.749,0,3.222-1.19,3.615-2.883l15.226-57.667c0.323-1.512,1.552-2.742,3.056-3.049
+		l57.675-15.304c1.686-0.316,2.884-1.82,2.884-3.553c0-1.749-1.198-3.222-2.884-3.56L427.74,63.606
+		c-1.504-0.322-2.733-1.536-3.056-3.048L409.458,2.891C409.064,1.213,407.591,0,405.843,0c-1.732,0-3.222,1.213-3.631,2.891
+		l-15.203,57.667c-0.346,1.512-1.567,2.726-3.072,3.048L326.27,78.903c-1.702,0.339-2.883,1.812-2.883,3.56
+		C323.387,84.196,324.569,85.701,326.27,86.016z"/>
+	<path class="st0" d="M385.253,326.53l-26.176-6.939c-0.685-0.158-1.244-0.694-1.394-1.386l-6.9-26.175
+		c-0.181-0.764-0.851-1.308-1.646-1.308c-0.78,0-1.457,0.544-1.646,1.308l-6.9,26.175c-0.158,0.693-0.709,1.228-1.394,1.386
+		l-26.167,6.939c-0.772,0.15-1.316,0.828-1.316,1.615c0,0.788,0.544,1.466,1.316,1.623l26.167,6.932
+		c0.685,0.141,1.236,0.709,1.394,1.402l6.9,26.159c0.189,0.764,0.866,1.308,1.646,1.308c0.796,0,1.465-0.544,1.646-1.308l6.9-26.159
+		c0.15-0.693,0.709-1.261,1.394-1.402l26.176-6.932c0.756-0.157,1.308-0.835,1.308-1.623
+		C386.56,327.357,386.009,326.68,385.253,326.53z"/>
+	<path class="st0" d="M37.841,140.075l41.204,10.917c1.086,0.229,1.946,1.104,2.205,2.19l10.854,41.204
+		c0.299,1.221,1.363,2.064,2.6,2.064c1.244,0,2.3-0.843,2.592-2.064l10.862-41.204c0.229-1.086,1.119-1.961,2.198-2.19
+		l41.212-10.917c1.205-0.252,2.063-1.339,2.063-2.568c0-1.229-0.858-2.284-2.063-2.536l-41.212-10.934
+		c-1.079-0.236-1.969-1.086-2.198-2.174L97.296,80.636c-0.292-1.198-1.347-2.048-2.592-2.048c-1.236,0-2.3,0.85-2.6,2.048
+		l-10.854,41.228c-0.26,1.087-1.119,1.937-2.205,2.174l-41.204,10.934c-1.229,0.252-2.072,1.307-2.072,2.536
+		C35.769,138.736,36.612,139.824,37.841,140.075z"/>
+	<path class="st0" d="M396.595,276.897c-7.877-9.216-19.133-17.392-33.012-24.245h0.016c-27.68-13.706-65.638-22.094-107.583-22.118
+		l-0.118,0.007v-0.007c-27.546,0.007-53.398,3.623-75.745,9.988c-22.347,6.365-41.156,15.439-54.705,26.467l0.023-0.016
+		c-9.05,7.357-15.706,15.565-19.4,24.49c-2.112,5.065-3.222,10.405-3.214,15.816c0,4.451,3.608,8.066,8.066,8.066
+		c4.459,0,8.066-3.615,8.066-8.066c0.008-3.253,0.623-6.348,1.985-9.657c2.355-5.734,7.168-12.051,14.659-18.117l0.023-0.016
+		c11.154-9.137,28.184-17.581,48.916-23.449c20.732-5.916,45.198-9.374,71.326-9.366h0.425c39.629,0.008,75.429,8.145,100.1,20.433
+		l0.024,0.008c12.382,6.097,21.937,13.264,27.884,20.259c2.994,3.506,5.12,6.948,6.483,10.248c1.702,4.12,6.412,6.074,10.532,4.372
+		c4.12-1.701,6.073-6.412,4.372-10.531C403.613,286.373,400.542,281.497,396.595,276.897z"/>
+	<path class="st0" d="M485.912,271.966c-3.403-8.208-8.058-15.84-13.675-22.89c-5.616-7.042-12.185-13.517-19.496-19.472
+		l-0.448-0.362l0.433,0.362c-21.961-17.849-50.862-31.492-84.338-41.07h-0.008c-33.508-9.523-71.735-14.84-112.38-14.84
+		c-30.972,0-60.527,3.088-87.67,8.767c-27.144,5.68-51.877,13.95-73.208,24.489l-0.016,0.008
+		c-21.307,10.571-39.424,23.442-52.87,39.14l0.244-0.3l-0.252,0.3c-6.711,7.862-12.256,16.487-16.14,25.868
+		c-3.891,9.389-6.057,19.511-6.05,29.932v81.873c-0.007,10.43,2.159,20.559,6.05,29.948c3.403,8.208,8.059,15.832,13.675,22.882
+		c5.624,7.05,12.185,13.517,19.494,19.472l0.016,0.008c21.961,17.833,50.853,31.507,84.33,41.069l0.18,0.04
+		C177.255,506.683,215.418,511.992,256,512h0.008c30.964-0.008,60.518-3.096,87.662-8.775c27.144-5.68,51.877-13.958,73.208-24.49
+		l0.015-0.015c21.307-10.572,39.416-23.45,52.87-39.133l0.008-0.015c6.711-7.846,12.248-16.462,16.132-25.852l-0.244,0.575
+		l0.252-0.575c3.883-9.39,6.05-19.519,6.05-29.948v-81.873C491.961,291.477,489.795,281.355,485.912,271.966z M72.838,426.409
+		c-2.481-2.339-4.797-4.718-6.86-7.121c-4.892-5.734-8.563-11.602-11.013-17.51c-2.45-5.923-3.678-11.886-3.678-18.006v-37.116
+		c4.781,5.9,10.429,11.469,16.817,16.684c1.537,1.236,3.112,2.458,4.734,3.671V426.409z M118.083,454.932
+		c-3.111-1.355-6.175-2.742-9.114-4.206c-6.845-3.387-13.147-7.003-18.896-10.775v-61.676c8.578,4.923,17.951,9.436,28.01,13.501
+		V454.932z M174.111,472.505c-14.194-3.002-27.514-6.759-39.794-11.146h1.016v-63.29c3.946,1.307,7.995,2.544,12.122,3.726
+		c8.539,2.426,17.456,4.552,26.656,6.404V472.505z M247.375,480.657c-19.519-0.394-38.282-2.174-56.021-5.041v-64.401
+		c17.841,2.756,36.604,4.371,56.021,4.75V480.657z M322.804,475.23c-18.369,3.064-37.856,4.986-58.179,5.38v-64.607
+		c20.196-0.394,39.708-2.15,58.179-5.081V475.23z M378.833,460.965c-6.081,2.206-12.414,4.254-19.008,6.128
+		c-6.364,1.812-12.996,3.426-19.786,4.907v-64.228c13.651-2.82,26.632-6.333,38.794-10.437V460.965z M424.085,438.484
+		c-8.16,5.593-17.55,10.792-28.018,15.517v-63.125c5.041-2.088,9.933-4.278,14.604-6.585c4.671-2.324,9.137-4.758,13.414-7.279
+		V438.484z M460.713,383.771c0,6.12-1.228,12.084-3.686,18.006c-3.151,7.656-8.436,15.274-15.707,22.576v-58.242h-1.024
+		c7.152-5.459,13.493-11.28,18.826-17.51c0.543-0.638,1.063-1.284,1.59-1.93V383.771z M457.027,319.89
+		c-4.253,10.334-12.367,20.59-24.024,30.082c-17.448,14.241-42.756,26.593-73.177,35.233
+		c-30.412,8.665-65.922,13.667-103.825,13.667c-57.746,0.024-109.978-11.658-147.031-30.035
+		c-18.526-9.16-33.209-19.967-42.992-31.444c-4.892-5.727-8.563-11.595-11.013-17.502c-2.45-5.924-3.678-11.879-3.678-17.991
+		s1.228-12.067,3.678-17.991c4.27-10.342,12.367-20.598,24.033-30.074c17.456-14.25,42.756-26.608,73.177-35.249
+		c30.413-8.656,65.93-13.651,103.826-13.651c57.746-0.032,109.969,11.658,147.023,30.027c18.534,9.153,33.224,19.976,42.992,31.436
+		c4.899,5.727,8.57,11.595,11.012,17.51c2.458,5.924,3.686,11.878,3.686,17.991S459.485,313.966,457.027,319.89z"/>
+</g>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From ae87f1d43c6d2cf34bd2ea6fd7b4d28af6d2aa91 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 10 Nov 2023 21:33:49 -0800
Subject: nav update

---
 src/components/AppHeader.svelte                    |   9 +-
 src/locales/en.json                                |  30 ++---
 .../(app)/[username]/(profile)/+layout.svelte      |  32 ++---
 src/routes/(app)/[username]/(profile)/+page.svelte |  20 ++-
 src/routes/(app)/[username]/funds/+page.server.js  |   0
 src/routes/(app)/[username]/funds/+page.svelte     |  56 +++++++++
 src/routes/(app)/fund/[id]/+page.server.js         |  23 ++++
 src/routes/(app)/fund/[id]/+page.svelte            | 138 +++++++++++++++++++++
 src/routes/(app)/fund/[id]/sweep/+page.server.js   |  14 +++
 src/routes/(app)/fund/[id]/sweep/+page.svelte      |  37 ++++++
 .../(app)/fund/[id]/withdraw/+page.server.js       |  20 +++
 src/routes/(app)/fund/[id]/withdraw/+page.svelte   |  58 +++++++++
 src/routes/(app)/fund/[id]/withdraw/+server.js     |   6 +
 src/routes/(app)/funds/[id]/+page.server.js        |  23 ----
 src/routes/(app)/funds/[id]/+page.svelte           | 138 ---------------------
 src/routes/(app)/funds/[id]/sweep/+page.server.js  |  14 ---
 src/routes/(app)/funds/[id]/sweep/+page.svelte     |  37 ------
 .../(app)/funds/[id]/withdraw/+page.server.js      |  20 ---
 src/routes/(app)/funds/[id]/withdraw/+page.svelte  |  58 ---------
 src/routes/(app)/funds/[id]/withdraw/+server.js    |   6 -
 src/routes/(app)/send/[...text]/+page.svelte       |   2 +-
 src/routes/+page.svelte                            |   2 +-
 static/icons/about.svg                             |  12 ++
 static/icons/book.svg                              |   4 +
 static/icons/camera.svg                            |  54 +-------
 static/icons/fund.svg                              |  65 +---------
 static/icons/funds.svg                             |  52 ++++++++
 static/icons/home.svg                              |  46 +------
 static/icons/message.svg                           |   3 +
 static/icons/receive.svg                           |  16 +++
 static/icons/shop.svg                              |   2 +
 static/icons/support.svg                           |   5 +-
 32 files changed, 491 insertions(+), 511 deletions(-)
 create mode 100644 src/routes/(app)/[username]/funds/+page.server.js
 create mode 100644 src/routes/(app)/[username]/funds/+page.svelte
 create mode 100644 src/routes/(app)/fund/[id]/+page.server.js
 create mode 100644 src/routes/(app)/fund/[id]/+page.svelte
 create mode 100644 src/routes/(app)/fund/[id]/sweep/+page.server.js
 create mode 100644 src/routes/(app)/fund/[id]/sweep/+page.svelte
 create mode 100644 src/routes/(app)/fund/[id]/withdraw/+page.server.js
 create mode 100644 src/routes/(app)/fund/[id]/withdraw/+page.svelte
 create mode 100644 src/routes/(app)/fund/[id]/withdraw/+server.js
 delete mode 100644 src/routes/(app)/funds/[id]/+page.server.js
 delete mode 100644 src/routes/(app)/funds/[id]/+page.svelte
 delete mode 100644 src/routes/(app)/funds/[id]/sweep/+page.server.js
 delete mode 100644 src/routes/(app)/funds/[id]/sweep/+page.svelte
 delete mode 100644 src/routes/(app)/funds/[id]/withdraw/+page.server.js
 delete mode 100644 src/routes/(app)/funds/[id]/withdraw/+page.svelte
 delete mode 100644 src/routes/(app)/funds/[id]/withdraw/+server.js
 create mode 100644 static/icons/about.svg
 create mode 100644 static/icons/book.svg
 create mode 100644 static/icons/funds.svg
 create mode 100644 static/icons/message.svg
 create mode 100644 static/icons/receive.svg
 create mode 100644 static/icons/shop.svg

(limited to 'src')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 4ee0c4a7..4ccd2d03 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -17,10 +17,7 @@
 		menuButtons = [
 			{ key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` },
 			{ key: 'nav.support', icon: 'support', href: `/support` },
-			{ key: 'nav.funds', icon: 'fund', href: `/${user.username}/funds` },
-			{ key: 'nav.map', icon: 'map', href: `/${user.username}/map` },
-			{ key: 'nav.merch', icon: 'shirt', href: `https://coinosmerch.com` },
-			{ key: 'nav.signOut', icon: 'logout', href: `/logout` }
+			{ key: 'nav.signOut', icon: 'logout', href: `/logout` },
 		];
 
 	let showMenu = false;
@@ -56,7 +53,7 @@
 						.url.pathname === `/${user.username}/receive`
 						? 'opacity-100'
 						: 'opacity-70 hover:opacity-80'}"
-					><Icon icon="numpad" style="mx-auto w-6 md:w-8" />
+					><Icon icon="receive" style="mx-auto w-6 md:w-8" />
 				</button>
 			</a>
 			<a href={`/${user.username}/payments`}>
@@ -116,8 +113,6 @@
 								</li>
 							{/each}
 						</ul>
-						<hr class="my-4" />
-						<a href="/"><img src="/images/logo.svg" alt="Coinos" class="w-32" /></a>
 					</div>
 				</OutClick>
 			</div>
diff --git a/src/locales/en.json b/src/locales/en.json
index 7aa157d1..9ecd3702 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -31,21 +31,13 @@
 	},
 	"faq": {
 		"header": "FAQ",
-		"why": {
-			"question": "Why accept Bitcoin?",
-			"answer": "With Bitcoin, merchants save on fees, consumers gain privacy and savers gain purchasing power. We'll promote your business to an enthusiastic community that prefers to shop at places that take Bitcoin."
-    },
 		"cost": {
 			"question": "What does it cost?",
-			"answer": "Receiving payments into your account is free. Withdrawals to external wallets incur a small fee that varies depending on network conditions. We charge 0.1% to convert between lightning and on-chain Bitcoin. Sending to other Coinos accounts is free."
-		},
-		"individuals": {
-			"question": "Who can use it?",
-			"answer": "Anyone, anywhere in the world. Coinos is suitable for individuals and businesses."
+			"answer": "Receiving payments into your account is free. Withdrawals to external wallets incur a small fee that varies depending on network conditions."
 		},
 		"compatibility": {
 			"question": "Do I need any special device or software?",
-			"answer": "No, Coinos is a web app that works anywhere that has Internet. Merchants might use it on a tablet or put up a QR code for customers to scan with their phone."
+			"answer": "No, Coinos works anywhere that has Internet. Merchants might use it on a tablet or put up a QR code for customers to scan with their phone."
 		},
 		"safety": {
 			"question": "When do my funds settle?",
@@ -55,14 +47,6 @@
       "question": "Can Coinos integrate with my existing PoS?",
       "answer": "We recommend entering sales into your existing PoS as cash transactions."
     },
-    "accounting": {
-      "question": "What about accounting?",
-      "answer": "We display all payments in terms of your local currency and let you filter by date so you can report your income as normal. You can export your account history to a csv file. If you sell Bitcoin for a profit you may wish to report capital gains."
-    },
-    "offramp": {
-      "question": "Can I convert the Bitcoin I receive to my local currency?",
-      "answer": "You can withdraw your funds at any time to an exchange or brokerage to sell your Bitcoin and receive a bank transfer. We may be willing to provide direct settlement via e-transfer to select Canadian merchants."
-    },
     "bitcoin": {
       "question": "What can I do with Bitcoin?",
       "answer": "Spend it at other merchants or pay your expenses with it by getting your staff, suppliers and landlord to take it."
@@ -146,14 +130,17 @@
 		"failed": "Login failed"
 	},
 	"nav": {
+    "about": "About",
+    "docs": "Docs",
+    "messages": "Messages",
     "funds": "Funds",
     "map": "Map",
-    "merch": "Merch",
+    "merch": "Shop",
 		"profile": "Profile",
 		"startInSeconds": "Start in Seconds",
 		"account": "Account",
 		"signIn": "Sign In",
-		"signOut": "Sign Out",
+		"signOut": "Sign out",
 		"dashboard": "Dashboard",
 		"settings": "Settings",
 		"support": "Support"
@@ -203,7 +190,7 @@
 		},
 		"send": {
 			"contacts": "Contacts",
-			"scan": "Scan QR",
+			"scan": "Scan",
 			"paste": "Paste",
 			"next": "Next",
 			"placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
@@ -265,6 +252,7 @@
 		}
 	},
 	"payments": {
+    "create": "Create",
     "fund": "Fund",
     "addFunds": "Add Funds",
     "takeFunds": "Take Funds",
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 35c316bb..8790aaf2 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -17,7 +17,7 @@
 	$: ({ currency, username: n, display } = subject);
 
 	$: username = n.length > 60 ? n.substr(0, 6) : display || n;
-	$: npub = bech32m.encode('npub', toWords(hexToUint8Array(user.pubkey)), 180);
+	$: npub = bech32m.encode('npub', toWords(hexToUint8Array(subject.pubkey)), 180);
 	$: lnaddr = `${n}@${$page.url.host}`;
 	$: profile = `${$page.url.host}/${n}`;
 
@@ -147,7 +147,7 @@
 				{#if following}
 					<div class="w-full flex">
 						<button
-							class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white"
+							class="mx-auto rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white"
 							on:click={unfollow}
 						>
 							<div class="mx-auto flex">
@@ -159,7 +159,7 @@
 				{:else}
 					<div class="w-full flex">
 						<button
-							class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"
+							class="mx-auto rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"
 							on:click={follow}
 						>
 							<div class="mx-auto flex">
@@ -171,29 +171,29 @@
 				{/if}
 			{/if}
 
-			{#if !subject.anon && subject.username !== user?.username}
-				<div class="w-full flex">
-					<a
-						href={user ? `/send/${subject.username}` : `/${subject.username}/receive`}
-						class="mx-auto"
-					>
+			{#if user && user.username !== subject.username && subject.pubkey}
+				<div class="w-full flex mb-4">
+					<a href={`/${subject.username}/messages`} class="mx-auto">
 						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
 							<div class="mx-auto flex">
-								<Icon icon="send" style="mr-2" />
-								<div class="mt-1">{$t('user.pay')}</div>
+								<Icon icon="support" style="mr-2 my-auto" />
+								<div class="mt-1 my-auto">{$t('user.message')}</div>
 							</div>
 						</button>
 					</a>
 				</div>
 			{/if}
 
-			{#if user && user.username !== subject.username && subject.pubkey}
+			{#if !subject.anon && subject.username !== user?.username}
 				<div class="w-full flex">
-					<a href={`/${subject.username}/messages`} class="mx-auto">
+					<a
+						href={user ? `/send/${subject.username}` : `/${subject.username}/receive`}
+						class="mx-auto"
+					>
 						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
 							<div class="mx-auto flex">
-								<Icon icon="support" style="mr-2 my-auto" />
-								<div class="mt-1 my-auto">{$t('user.message')}</div>
+								<Icon icon="send" style="mr-2" />
+								<div class="mt-1">{$t('user.pay')}</div>
 							</div>
 						</button>
 					</a>
@@ -203,7 +203,7 @@
 	</div>
 
 	<div class="w-full">
-		<div class="mx-auto space-y-5 lg:max-w-lg xl:max-w-2xl lg:pl-10">
+		<div class="mx-auto space-y-5 lg:max-w-xl lg:pl-10 xl:max-w-2xl lg:pl-10">
 			<slot />
 		</div>
 	</div>
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 84aa4425..180b12bd 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -96,21 +96,21 @@
 			<div class="flex flex-wrap gap-4 justify-center w-full">
 				<a href={`/${user.username}/receive`} class="w-full md:w-60">
 					<button
-						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full md:w-60"
+						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
 					>
 						<div class="mx-auto flex">
-							<Icon icon="numpad" style="my-auto h-6 mr-2" />
-							<div class="my-auto mt-1">{$t('user.requestPayment')}</div>
+							<Icon icon="receive" style="my-auto h-6 mr-2" />
+							<div class="my-auto mt-1">{$t('user.dashboard.receive')}</div>
 						</div>
 					</button>
 				</a>
-				<a href={`/scan`} class="w-full md:w-60">
+				<a href={`/send`} class="w-full md:w-60">
 					<button
-						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full md:w-60"
+						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
 					>
 						<div class="mx-auto flex">
-							<Icon icon="scan" style="my-auto h-6 mr-2" />
-							<div class="my-auto mt-1">{$t('user.send.scan')}</div>
+							<Icon icon="send" style="my-auto h-6 mr-2" />
+							<div class="my-auto mt-1">{$t('user.dashboard.send')}</div>
 						</div>
 					</button>
 				</a>
@@ -225,9 +225,3 @@
 		</div>
 	{/if}
 </div>
-
-<style>
-	h1 {
-		@apply mb-2;
-	}
-</style>
diff --git a/src/routes/(app)/[username]/funds/+page.server.js b/src/routes/(app)/[username]/funds/+page.server.js
new file mode 100644
index 00000000..e69de29b
diff --git a/src/routes/(app)/[username]/funds/+page.svelte b/src/routes/(app)/[username]/funds/+page.svelte
new file mode 100644
index 00000000..6479fb8b
--- /dev/null
+++ b/src/routes/(app)/[username]/funds/+page.svelte
@@ -0,0 +1,56 @@
+<script>
+	import { Avatar, Icon } from '$comp';
+	import { t } from '$lib/translations';
+
+  export let data;
+
+  let { funds } = data;
+</script>
+
+<div class="mt-24 mb-20">
+	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+		Funds
+	</h1>
+
+	<div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+		<div class="text-base">
+					<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
+						<div class="whitespace-nowrap my-auto">
+
+							<div class="text-secondary">
+								
+							</div>
+						</div>
+
+						<div class="flex my-auto">
+									<div class="text-secondary flex">
+										<div class="my-auto mr-1">
+											<img src="/images/moneypot.png" class="w-12" alt="Pot" />
+										</div>
+
+										<div class="my-auto">Pot</div>
+									</div>
+						</div>
+
+						<div class="text-secondary text-right text-sm my-auto">
+							<div>
+							
+							</div>
+						</div>
+					</div>
+		</div>
+
+		<button
+			class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
+		>
+			<Icon icon="plus" style="opacity-50 mr-2 my-auto" />
+			<div class="my-auto">{$t('payments.create')}</div>
+		</button>
+	</div>
+</div>
+
+<style>
+	.active * {
+		@apply bg-black text-white border-black;
+	}
+</style>
diff --git a/src/routes/(app)/fund/[id]/+page.server.js b/src/routes/(app)/fund/[id]/+page.server.js
new file mode 100644
index 00000000..4194deed
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/+page.server.js
@@ -0,0 +1,23 @@
+import { error, redirect } from '@sveltejs/kit';
+import { auth, get, post } from '$lib/utils';
+import Qr from 'qrcode-base64';
+
+export let load = async ({ params: { id }, url }) => {
+	let { amount, payments } = await get(`/fund/${id}`);
+
+	let src = Qr.drawImg(url.href, { size: 300 });
+	return { amount, payments, src };
+};
+
+export const actions = {
+	default: async ({ cookies, locals, params, request }) => {
+		let { user } = locals;
+
+		if (user) {
+			await post('/redeem', params, auth(cookies));
+			throw redirect(307, `/${user.username}/payments`);
+		}
+
+		throw redirect(307, '/register');
+	}
+};
diff --git a/src/routes/(app)/fund/[id]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte
new file mode 100644
index 00000000..d2d3079c
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/+page.svelte
@@ -0,0 +1,138 @@
+<script>
+	import { format } from 'date-fns';
+	import { enhance } from '$app/forms';
+	import { page } from '$app/stores';
+	import { Avatar, Icon } from '$comp';
+	import { toast } from '@zerodevx/svelte-toast';
+	import { t } from '$lib/translations';
+	import { types, copy, f, s, sat, sats } from '$lib/utils';
+	import { loginRedirect } from '$lib/store';
+
+	export let data;
+
+	let { amount, src, payments, rates, user } = data;
+	let { id } = $page.params;
+
+	toast.pop(0);
+
+	let currency = user ? user.currency : 'CAD';
+	let rate = rates[currency];
+
+	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+	$loginRedirect = $page.url.pathname;
+
+	let show;
+	let toggle = () => (show = !show);
+</script>
+
+<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
+	<div class="flex justify-center items-center">
+		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
+			<div class="relative flex justify-center gap-2">
+				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
+				{#if id.split('-').length === 4}
+					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {id}</h1>
+				{:else}
+					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
+					<div class="my-auto">
+						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
+						<h1 class="text-secondary my-auto">{id}</h1>
+					</div>
+				{/if}
+			</div>
+			{#if show}
+				<img {src} class="mx-auto" alt={id} />
+			{/if}
+			<div class="flex justify-center gap-4">
+				<div class="my-auto">
+					<h2 class="text-2xl md:text-3xl font-semibold">
+						{f(amountFiat, currency)}
+					</h2>
+					<h3 class="text-secondary md:text-lg mt-1">
+						{sat(amount)}
+					</h3>
+				</div>
+			</div>
+			<div class="flex gap-2" data-sveltekit-prefetch="off">
+				<div class="grow">
+					<a href={`/send/fund/${id}`}>
+						<button
+							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+						>
+							<Icon icon="plus" />
+							{$t('payments.addFunds')}
+						</button>
+					</a>
+				</div>
+				<div class="grow">
+					<a href={`/fund/${id}/withdraw`}>
+						<button
+							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+						>
+							<Icon icon="minus" style="rotate-180" />
+							{$t('payments.takeFunds')}
+						</button>
+					</a>
+				</div>
+			</div>
+			<div class="flex gap-2" data-sveltekit-prefetch="off">
+				<button
+					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+					on:click={toggle}
+				>
+					<Icon icon="qr" style="invert" />
+					{show ? $t('payments.hide') : $t('payments.show')} QR
+				</button>
+				<button
+					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+					on:click={() => copy($page.url.host + $page.url.pathname)}
+				>
+					<Icon icon="copy" style="w-6" />
+					{$t('payments.copyLink')}
+				</button>
+			</div>
+			<div class="text-base">
+				{#each payments as p}
+					<a href={`/payment/${p.id}`}>
+						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
+							<div class="whitespace-nowrap my-auto">
+								<div class="font-bold" class:text-red-800={p.amount > 0}>
+									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+									{#if p.tip}
+										<span class="text-sm text-secondary">
+											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
+										</span>
+									{/if}
+								</div>
+
+								<div class="text-secondary">
+									{sat(Math.abs(p.amount) + (p.tip || 0))}
+								</div>
+							</div>
+
+							<div class="flex my-auto">
+								<div class="flex">
+									<div class="my-auto">
+										<Avatar user={p.user} size={16} disabled={true} />
+									</div>
+									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
+								</div>
+							</div>
+
+							<div class="text-secondary text-right text-sm my-auto">
+								<div>
+									{format(new Date(p.created), 'h:mm aaa')}
+								</div>
+								<div>
+									{format(new Date(p.created), 'MMM d')}
+								</div>
+							</div>
+						</div>
+					</a>
+				{:else}
+					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
+				{/each}
+			</div>
+		</div>
+	</div>
+</div>
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.server.js b/src/routes/(app)/fund/[id]/sweep/+page.server.js
new file mode 100644
index 00000000..9fd244a3
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/sweep/+page.server.js
@@ -0,0 +1,14 @@
+import { get, auth, post } from '$lib/utils';
+import { redirect } from '@sveltejs/kit';
+
+export async function load({ cookies, params, parent }) {
+	let { user } = await parent();
+	let { id } = params;
+	let { amount } = await get(`/fund/${id}`);
+
+
+  if (!amount) throw redirect(307, `/fund/${id}`);
+	if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`);
+	await post('/take', { amount, id }, auth(cookies));
+	return { amount, id };
+}
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte
new file mode 100644
index 00000000..64bed4dd
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/sweep/+page.svelte
@@ -0,0 +1,37 @@
+<script>
+	import { scale } from 'svelte/transition';
+	import { fiat, f, s } from '$lib/utils';
+	import { Icon } from '$comp';
+	import { t } from '$lib/translations';
+
+	export let data;
+
+	let { amount, id, user, rates } = data;
+	let { currency } = user;
+	$: rate = rates[currency];
+</script>
+
+<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
+	<div class="w-full flex">
+		<a href="/" class="mx-auto">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
+		<Icon icon="check" style="mx-auto" />
+	</div>
+	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
+	<h2 class="text-2xl md:text-3xl font-semibold">
+		{f(fiat(amount, rate), currency)}
+	</h2>
+	<h3 class="text-secondary md:text-lg mb-6 mt-1">
+		⚡️{s(amount)}
+	</h3>
+</div>
+
+<a href={`/${user.username}/payments`}>
+	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
+
+<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.server.js b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
new file mode 100644
index 00000000..476149f2
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
@@ -0,0 +1,20 @@
+import { fail, json, redirect } from '@sveltejs/kit';
+import { fd, auth, post } from '$lib/utils';
+
+export async function load({ parent }) {
+	let { user } = await parent();
+	if (!user) throw redirect(307, '/register');
+}
+
+export const actions = {
+	default: async ({ cookies, request }) => {
+		let body = await fd(request);
+		try {
+			await post('/take', body, auth(cookies));
+		} catch (e) {
+			return fail(400, { message: e.message });
+		}
+
+		throw redirect(307, `/fund/${body.id}`);
+	}
+};
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
new file mode 100644
index 00000000..9cad945a
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
@@ -0,0 +1,58 @@
+<script>
+	import { t } from '$lib/translations';
+	import { enhance } from '$app/forms';
+	import { Icon, Numpad, Spinner } from '$comp';
+	import { page } from '$app/stores';
+	import { back } from '$lib/utils';
+	import { pin } from '$lib/store';
+
+	export let data;
+	export let form;
+
+	let { rates } = data;
+	let { amount, id } = $page.params;
+	let { currency } = data.user;
+	let loading;
+
+	let submit = () => (loading = true);
+	$: update(form);
+	let update = () => {
+		if (form?.message.includes('pin')) $pin = undefined;
+		loading = false;
+	};
+
+	$: rate = rates[currency];
+</script>
+
+<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
+	<Icon icon="arrow-left" style="w-10" />
+</button>
+
+{#if form?.message}
+	<div class="text-red-600 text-center">
+		{form.message}
+	</div>
+{/if}
+
+<div class="container px-4 mt-20 max-w-xl mx-auto">
+	<Numpad bind:amount bind:currency bind:rate {submit} />
+
+	<form method="POST" use:enhance on:submit={submit}>
+		<input name="id" value={id} type="hidden" />
+		<input name="amount" value={amount} type="hidden" />
+		<input name="pin" value={$pin} 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}
+					{$t('payments.send')}
+				{/if}
+			</button>
+		</div>
+	</form>
+</div>
diff --git a/src/routes/(app)/fund/[id]/withdraw/+server.js b/src/routes/(app)/fund/[id]/withdraw/+server.js
new file mode 100644
index 00000000..0f9a23f3
--- /dev/null
+++ b/src/routes/(app)/fund/[id]/withdraw/+server.js
@@ -0,0 +1,6 @@
+import { json } from '@sveltejs/kit';
+import { auth, post } from '$lib/utils';
+
+export async function POST({ cookies, request }) {
+	return json(await post('/take', await request.json(), auth(cookies)));
+}
diff --git a/src/routes/(app)/funds/[id]/+page.server.js b/src/routes/(app)/funds/[id]/+page.server.js
deleted file mode 100644
index 4194deed..00000000
--- a/src/routes/(app)/funds/[id]/+page.server.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import { error, redirect } from '@sveltejs/kit';
-import { auth, get, post } from '$lib/utils';
-import Qr from 'qrcode-base64';
-
-export let load = async ({ params: { id }, url }) => {
-	let { amount, payments } = await get(`/fund/${id}`);
-
-	let src = Qr.drawImg(url.href, { size: 300 });
-	return { amount, payments, src };
-};
-
-export const actions = {
-	default: async ({ cookies, locals, params, request }) => {
-		let { user } = locals;
-
-		if (user) {
-			await post('/redeem', params, auth(cookies));
-			throw redirect(307, `/${user.username}/payments`);
-		}
-
-		throw redirect(307, '/register');
-	}
-};
diff --git a/src/routes/(app)/funds/[id]/+page.svelte b/src/routes/(app)/funds/[id]/+page.svelte
deleted file mode 100644
index d2d3079c..00000000
--- a/src/routes/(app)/funds/[id]/+page.svelte
+++ /dev/null
@@ -1,138 +0,0 @@
-<script>
-	import { format } from 'date-fns';
-	import { enhance } from '$app/forms';
-	import { page } from '$app/stores';
-	import { Avatar, Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { t } from '$lib/translations';
-	import { types, copy, f, s, sat, sats } from '$lib/utils';
-	import { loginRedirect } from '$lib/store';
-
-	export let data;
-
-	let { amount, src, payments, rates, user } = data;
-	let { id } = $page.params;
-
-	toast.pop(0);
-
-	let currency = user ? user.currency : 'CAD';
-	let rate = rates[currency];
-
-	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-	$loginRedirect = $page.url.pathname;
-
-	let show;
-	let toggle = () => (show = !show);
-</script>
-
-<div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
-	<div class="flex justify-center items-center">
-		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
-			<div class="relative flex justify-center gap-2">
-				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
-				{#if id.split('-').length === 4}
-					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {id}</h1>
-				{:else}
-					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
-					<div class="my-auto">
-						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
-						<h1 class="text-secondary my-auto">{id}</h1>
-					</div>
-				{/if}
-			</div>
-			{#if show}
-				<img {src} class="mx-auto" alt={id} />
-			{/if}
-			<div class="flex justify-center gap-4">
-				<div class="my-auto">
-					<h2 class="text-2xl md:text-3xl font-semibold">
-						{f(amountFiat, currency)}
-					</h2>
-					<h3 class="text-secondary md:text-lg mt-1">
-						{sat(amount)}
-					</h3>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<div class="grow">
-					<a href={`/send/fund/${id}`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="plus" />
-							{$t('payments.addFunds')}
-						</button>
-					</a>
-				</div>
-				<div class="grow">
-					<a href={`/fund/${id}/withdraw`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="minus" style="rotate-180" />
-							{$t('payments.takeFunds')}
-						</button>
-					</a>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={toggle}
-				>
-					<Icon icon="qr" style="invert" />
-					{show ? $t('payments.hide') : $t('payments.show')} QR
-				</button>
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={() => copy($page.url.host + $page.url.pathname)}
-				>
-					<Icon icon="copy" style="w-6" />
-					{$t('payments.copyLink')}
-				</button>
-			</div>
-			<div class="text-base">
-				{#each payments as p}
-					<a href={`/payment/${p.id}`}>
-						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
-							<div class="whitespace-nowrap my-auto">
-								<div class="font-bold" class:text-red-800={p.amount > 0}>
-									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
-									{#if p.tip}
-										<span class="text-sm text-secondary">
-											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
-										</span>
-									{/if}
-								</div>
-
-								<div class="text-secondary">
-									{sat(Math.abs(p.amount) + (p.tip || 0))}
-								</div>
-							</div>
-
-							<div class="flex my-auto">
-								<div class="flex">
-									<div class="my-auto">
-										<Avatar user={p.user} size={16} disabled={true} />
-									</div>
-									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
-								</div>
-							</div>
-
-							<div class="text-secondary text-right text-sm my-auto">
-								<div>
-									{format(new Date(p.created), 'h:mm aaa')}
-								</div>
-								<div>
-									{format(new Date(p.created), 'MMM d')}
-								</div>
-							</div>
-						</div>
-					</a>
-				{:else}
-					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
-				{/each}
-			</div>
-		</div>
-	</div>
-</div>
diff --git a/src/routes/(app)/funds/[id]/sweep/+page.server.js b/src/routes/(app)/funds/[id]/sweep/+page.server.js
deleted file mode 100644
index 9fd244a3..00000000
--- a/src/routes/(app)/funds/[id]/sweep/+page.server.js
+++ /dev/null
@@ -1,14 +0,0 @@
-import { get, auth, post } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
-
-export async function load({ cookies, params, parent }) {
-	let { user } = await parent();
-	let { id } = params;
-	let { amount } = await get(`/fund/${id}`);
-
-
-  if (!amount) throw redirect(307, `/fund/${id}`);
-	if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`);
-	await post('/take', { amount, id }, auth(cookies));
-	return { amount, id };
-}
diff --git a/src/routes/(app)/funds/[id]/sweep/+page.svelte b/src/routes/(app)/funds/[id]/sweep/+page.svelte
deleted file mode 100644
index 64bed4dd..00000000
--- a/src/routes/(app)/funds/[id]/sweep/+page.svelte
+++ /dev/null
@@ -1,37 +0,0 @@
-<script>
-	import { scale } from 'svelte/transition';
-	import { fiat, f, s } from '$lib/utils';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-
-	export let data;
-
-	let { amount, id, user, rates } = data;
-	let { currency } = user;
-	$: rate = rates[currency];
-</script>
-
-<div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
-	<div class="w-full flex">
-		<a href="/" class="mx-auto">
-			<Icon icon="logo" />
-		</a>
-	</div>
-
-	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
-	<h2 class="text-2xl md:text-3xl font-semibold">
-		{f(fiat(amount, rate), currency)}
-	</h2>
-	<h3 class="text-secondary md:text-lg mb-6 mt-1">
-		⚡️{s(amount)}
-	</h3>
-</div>
-
-<a href={`/${user.username}/payments`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
-</a>
-
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
diff --git a/src/routes/(app)/funds/[id]/withdraw/+page.server.js b/src/routes/(app)/funds/[id]/withdraw/+page.server.js
deleted file mode 100644
index 476149f2..00000000
--- a/src/routes/(app)/funds/[id]/withdraw/+page.server.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { fail, json, redirect } from '@sveltejs/kit';
-import { fd, auth, post } from '$lib/utils';
-
-export async function load({ parent }) {
-	let { user } = await parent();
-	if (!user) throw redirect(307, '/register');
-}
-
-export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = await fd(request);
-		try {
-			await post('/take', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
-
-		throw redirect(307, `/fund/${body.id}`);
-	}
-};
diff --git a/src/routes/(app)/funds/[id]/withdraw/+page.svelte b/src/routes/(app)/funds/[id]/withdraw/+page.svelte
deleted file mode 100644
index 9cad945a..00000000
--- a/src/routes/(app)/funds/[id]/withdraw/+page.svelte
+++ /dev/null
@@ -1,58 +0,0 @@
-<script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { rates } = data;
-	let { amount, id } = $page.params;
-	let { currency } = data.user;
-	let loading;
-
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
-		loading = false;
-	};
-
-	$: rate = rates[currency];
-</script>
-
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
-{#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
-{/if}
-
-<div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount bind:currency bind:rate {submit} />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="id" value={id} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} 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}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
-</div>
diff --git a/src/routes/(app)/funds/[id]/withdraw/+server.js b/src/routes/(app)/funds/[id]/withdraw/+server.js
deleted file mode 100644
index 0f9a23f3..00000000
--- a/src/routes/(app)/funds/[id]/withdraw/+server.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
-
-export async function POST({ cookies, request }) {
-	return json(await post('/take', await request.json(), auth(cookies)));
-}
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index de84c287..b2c9616c 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -61,7 +61,7 @@
 					type="button"
 					class="flex border rounded-full px-6 py-2 font-bold hover:opacity-80 mr-1"
 				>
-					<Icon icon="scan" style="mr-2 w-6 my-auto" />
+					<Icon icon="camera" style="mr-2 w-6 my-auto" />
 					<div class="my-auto">{$t('user.send.scan')}</div>
 				</button>
 			</a>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index ec9f55b7..0aaf887d 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -89,7 +89,7 @@
 
 	<div>
 		<div class="space-y-10">
-			<h3 class="text-5xl font-medium text-center">{$t('faq.header')}</h3>
+			<h3 class="text-5xl font-medium text-center pt-40 -mt-40" id="faq">{$t('faq.header')}</h3>
 			{#each Object.keys(faqs).filter((f) => f !== 'header') as faqID}
 				<FaqCard questionID={faqID} />
 			{/each}
diff --git a/static/icons/about.svg b/static/icons/about.svg
new file mode 100644
index 00000000..3222097f
--- /dev/null
+++ b/static/icons/about.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 512 512" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>about</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="about-white" fill="#000000" transform="translate(42.666667, 42.666667)">
+            <path d="M213.333333,3.55271368e-14 C95.51296,3.55271368e-14 3.55271368e-14,95.51168 3.55271368e-14,213.333333 C3.55271368e-14,331.153707 95.51296,426.666667 213.333333,426.666667 C331.154987,426.666667 426.666667,331.153707 426.666667,213.333333 C426.666667,95.51168 331.154987,3.55271368e-14 213.333333,3.55271368e-14 Z M213.333333,384 C119.227947,384 42.6666667,307.43872 42.6666667,213.333333 C42.6666667,119.227947 119.227947,42.6666667 213.333333,42.6666667 C307.44,42.6666667 384,119.227947 384,213.333333 C384,307.43872 307.44,384 213.333333,384 Z M240.04672,128 C240.04672,143.46752 228.785067,154.666667 213.55008,154.666667 C197.698773,154.666667 186.713387,143.46752 186.713387,127.704107 C186.713387,112.5536 197.99616,101.333333 213.55008,101.333333 C228.785067,101.333333 240.04672,112.5536 240.04672,128 Z M192.04672,192 L234.713387,192 L234.713387,320 L192.04672,320 L192.04672,192 Z" id="Shape">
+
+</path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/static/icons/book.svg b/static/icons/book.svg
new file mode 100644
index 00000000..4d7b091d
--- /dev/null
+++ b/static/icons/book.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 10.4V20M12 10.4C12 8.15979 12 7.03969 11.564 6.18404C11.1805 5.43139 10.5686 4.81947 9.81596 4.43597C8.96031 4 7.84021 4 5.6 4H4.6C4.03995 4 3.75992 4 3.54601 4.10899C3.35785 4.20487 3.20487 4.35785 3.10899 4.54601C3 4.75992 3 5.03995 3 5.6V16.4C3 16.9601 3 17.2401 3.10899 17.454C3.20487 17.6422 3.35785 17.7951 3.54601 17.891C3.75992 18 4.03995 18 4.6 18H7.54668C8.08687 18 8.35696 18 8.61814 18.0466C8.84995 18.0879 9.0761 18.1563 9.29191 18.2506C9.53504 18.3567 9.75977 18.5065 10.2092 18.8062L12 20M12 10.4C12 8.15979 12 7.03969 12.436 6.18404C12.8195 5.43139 13.4314 4.81947 14.184 4.43597C15.0397 4 16.1598 4 18.4 4H19.4C19.9601 4 20.2401 4 20.454 4.10899C20.6422 4.20487 20.7951 4.35785 20.891 4.54601C21 4.75992 21 5.03995 21 5.6V16.4C21 16.9601 21 17.2401 20.891 17.454C20.7951 17.6422 20.6422 17.7951 20.454 17.891C20.2401 18 19.9601 18 19.4 18H16.4533C15.9131 18 15.643 18 15.3819 18.0466C15.15 18.0879 14.9239 18.1563 14.7081 18.2506C14.465 18.3567 14.2402 18.5065 13.7908 18.8062L12 20" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
diff --git a/static/icons/camera.svg b/static/icons/camera.svg
index b615c7b5..3568ed14 100644
--- a/static/icons/camera.svg
+++ b/static/icons/camera.svg
@@ -1,49 +1,5 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 490 490" style="enable-background:new 0 0 490 490;" xml:space="preserve">
-<g>
-	<g>
-		<g>
-			<path d="M295,160c-74.439,0-135,60.561-135,135s60.561,135,135,135s135-60.561,135-135S369.439,160,295,160z M295,400
-				c-57.897,0-105-47.103-105-105c0-57.897,47.103-105,105-105c57.897,0,105,47.103,105,105C400,352.897,352.897,400,295,400z"/>
-			<path d="M295,235c-33.084,0-60,26.916-60,60s26.916,60,60,60s60-26.916,60-60S328.084,235,295,235z M295,325
-				c-16.542,0-30-13.458-30-30s13.458-30,30-30s30,13.458,30,30S311.542,325,295,325z"/>
-			<path d="M425,100h-0.076l-42.5-100H207.577l-42.5,100H65c-35.841,0-65,29.159-65,65v260c0,35.841,29.159,65,65,65h360
-				c35.841,0,65-29.159,65-65V165C490,129.159,460.841,100,425,100z M227.423,30h135.153l29.75,70H197.674L227.423,30z M100,460H65
-				c-19.299,0-35-15.701-35-35V190h70V460z M100,160H30.363c2.434-16.938,17.036-30,34.637-30h35V160z M460,425
-				c0,19.299-15.701,35-35,35H130V130h295c19.299,0,35,15.701,35,35V425z"/>
-		</g>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 16C13.6569 16 15 14.6569 15 13C15 11.3431 13.6569 10 12 10C10.3431 10 9 11.3431 9 13C9 14.6569 10.3431 16 12 16Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 16.8V9.2C3 8.0799 3 7.51984 3.21799 7.09202C3.40973 6.71569 3.71569 6.40973 4.09202 6.21799C4.51984 6 5.0799 6 6.2 6H7.25464C7.37758 6 7.43905 6 7.49576 5.9935C7.79166 5.95961 8.05705 5.79559 8.21969 5.54609C8.25086 5.49827 8.27836 5.44328 8.33333 5.33333C8.44329 5.11342 8.49827 5.00346 8.56062 4.90782C8.8859 4.40882 9.41668 4.08078 10.0085 4.01299C10.1219 4 10.2448 4 10.4907 4H13.5093C13.7552 4 13.8781 4 13.9915 4.01299C14.5833 4.08078 15.1141 4.40882 15.4394 4.90782C15.5017 5.00345 15.5567 5.11345 15.6667 5.33333C15.7216 5.44329 15.7491 5.49827 15.7803 5.54609C15.943 5.79559 16.2083 5.95961 16.5042 5.9935C16.561 6 16.6224 6 16.7454 6H17.8C18.9201 6 19.4802 6 19.908 6.21799C20.2843 6.40973 20.5903 6.71569 20.782 7.09202C21 7.51984 21 8.0799 21 9.2V16.8C21 17.9201 21 18.4802 20.782 18.908C20.5903 19.2843 20.2843 19.5903 19.908 19.782C19.4802 20 18.9201 20 17.8 20H6.2C5.0799 20 4.51984 20 4.09202 19.782C3.71569 19.5903 3.40973 19.2843 3.21799 18.908C3 18.4802 3 17.9201 3 16.8Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
diff --git a/static/icons/fund.svg b/static/icons/fund.svg
index 93bd87f5..0ffd17cd 100644
--- a/static/icons/fund.svg
+++ b/static/icons/fund.svg
@@ -1,63 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
-<svg height="800px" width="800px" version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
-	 viewBox="0 0 512 512"  xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#000000;}
-</style>
-<g>
-	<path class="st0" d="M326.27,86.016l57.667,15.304c1.504,0.307,2.726,1.536,3.072,3.049l15.203,57.667
-		c0.41,1.693,1.899,2.883,3.631,2.883c1.749,0,3.222-1.19,3.615-2.883l15.226-57.667c0.323-1.512,1.552-2.742,3.056-3.049
-		l57.675-15.304c1.686-0.316,2.884-1.82,2.884-3.553c0-1.749-1.198-3.222-2.884-3.56L427.74,63.606
-		c-1.504-0.322-2.733-1.536-3.056-3.048L409.458,2.891C409.064,1.213,407.591,0,405.843,0c-1.732,0-3.222,1.213-3.631,2.891
-		l-15.203,57.667c-0.346,1.512-1.567,2.726-3.072,3.048L326.27,78.903c-1.702,0.339-2.883,1.812-2.883,3.56
-		C323.387,84.196,324.569,85.701,326.27,86.016z"/>
-	<path class="st0" d="M385.253,326.53l-26.176-6.939c-0.685-0.158-1.244-0.694-1.394-1.386l-6.9-26.175
-		c-0.181-0.764-0.851-1.308-1.646-1.308c-0.78,0-1.457,0.544-1.646,1.308l-6.9,26.175c-0.158,0.693-0.709,1.228-1.394,1.386
-		l-26.167,6.939c-0.772,0.15-1.316,0.828-1.316,1.615c0,0.788,0.544,1.466,1.316,1.623l26.167,6.932
-		c0.685,0.141,1.236,0.709,1.394,1.402l6.9,26.159c0.189,0.764,0.866,1.308,1.646,1.308c0.796,0,1.465-0.544,1.646-1.308l6.9-26.159
-		c0.15-0.693,0.709-1.261,1.394-1.402l26.176-6.932c0.756-0.157,1.308-0.835,1.308-1.623
-		C386.56,327.357,386.009,326.68,385.253,326.53z"/>
-	<path class="st0" d="M37.841,140.075l41.204,10.917c1.086,0.229,1.946,1.104,2.205,2.19l10.854,41.204
-		c0.299,1.221,1.363,2.064,2.6,2.064c1.244,0,2.3-0.843,2.592-2.064l10.862-41.204c0.229-1.086,1.119-1.961,2.198-2.19
-		l41.212-10.917c1.205-0.252,2.063-1.339,2.063-2.568c0-1.229-0.858-2.284-2.063-2.536l-41.212-10.934
-		c-1.079-0.236-1.969-1.086-2.198-2.174L97.296,80.636c-0.292-1.198-1.347-2.048-2.592-2.048c-1.236,0-2.3,0.85-2.6,2.048
-		l-10.854,41.228c-0.26,1.087-1.119,1.937-2.205,2.174l-41.204,10.934c-1.229,0.252-2.072,1.307-2.072,2.536
-		C35.769,138.736,36.612,139.824,37.841,140.075z"/>
-	<path class="st0" d="M396.595,276.897c-7.877-9.216-19.133-17.392-33.012-24.245h0.016c-27.68-13.706-65.638-22.094-107.583-22.118
-		l-0.118,0.007v-0.007c-27.546,0.007-53.398,3.623-75.745,9.988c-22.347,6.365-41.156,15.439-54.705,26.467l0.023-0.016
-		c-9.05,7.357-15.706,15.565-19.4,24.49c-2.112,5.065-3.222,10.405-3.214,15.816c0,4.451,3.608,8.066,8.066,8.066
-		c4.459,0,8.066-3.615,8.066-8.066c0.008-3.253,0.623-6.348,1.985-9.657c2.355-5.734,7.168-12.051,14.659-18.117l0.023-0.016
-		c11.154-9.137,28.184-17.581,48.916-23.449c20.732-5.916,45.198-9.374,71.326-9.366h0.425c39.629,0.008,75.429,8.145,100.1,20.433
-		l0.024,0.008c12.382,6.097,21.937,13.264,27.884,20.259c2.994,3.506,5.12,6.948,6.483,10.248c1.702,4.12,6.412,6.074,10.532,4.372
-		c4.12-1.701,6.073-6.412,4.372-10.531C403.613,286.373,400.542,281.497,396.595,276.897z"/>
-	<path class="st0" d="M485.912,271.966c-3.403-8.208-8.058-15.84-13.675-22.89c-5.616-7.042-12.185-13.517-19.496-19.472
-		l-0.448-0.362l0.433,0.362c-21.961-17.849-50.862-31.492-84.338-41.07h-0.008c-33.508-9.523-71.735-14.84-112.38-14.84
-		c-30.972,0-60.527,3.088-87.67,8.767c-27.144,5.68-51.877,13.95-73.208,24.489l-0.016,0.008
-		c-21.307,10.571-39.424,23.442-52.87,39.14l0.244-0.3l-0.252,0.3c-6.711,7.862-12.256,16.487-16.14,25.868
-		c-3.891,9.389-6.057,19.511-6.05,29.932v81.873c-0.007,10.43,2.159,20.559,6.05,29.948c3.403,8.208,8.059,15.832,13.675,22.882
-		c5.624,7.05,12.185,13.517,19.494,19.472l0.016,0.008c21.961,17.833,50.853,31.507,84.33,41.069l0.18,0.04
-		C177.255,506.683,215.418,511.992,256,512h0.008c30.964-0.008,60.518-3.096,87.662-8.775c27.144-5.68,51.877-13.958,73.208-24.49
-		l0.015-0.015c21.307-10.572,39.416-23.45,52.87-39.133l0.008-0.015c6.711-7.846,12.248-16.462,16.132-25.852l-0.244,0.575
-		l0.252-0.575c3.883-9.39,6.05-19.519,6.05-29.948v-81.873C491.961,291.477,489.795,281.355,485.912,271.966z M72.838,426.409
-		c-2.481-2.339-4.797-4.718-6.86-7.121c-4.892-5.734-8.563-11.602-11.013-17.51c-2.45-5.923-3.678-11.886-3.678-18.006v-37.116
-		c4.781,5.9,10.429,11.469,16.817,16.684c1.537,1.236,3.112,2.458,4.734,3.671V426.409z M118.083,454.932
-		c-3.111-1.355-6.175-2.742-9.114-4.206c-6.845-3.387-13.147-7.003-18.896-10.775v-61.676c8.578,4.923,17.951,9.436,28.01,13.501
-		V454.932z M174.111,472.505c-14.194-3.002-27.514-6.759-39.794-11.146h1.016v-63.29c3.946,1.307,7.995,2.544,12.122,3.726
-		c8.539,2.426,17.456,4.552,26.656,6.404V472.505z M247.375,480.657c-19.519-0.394-38.282-2.174-56.021-5.041v-64.401
-		c17.841,2.756,36.604,4.371,56.021,4.75V480.657z M322.804,475.23c-18.369,3.064-37.856,4.986-58.179,5.38v-64.607
-		c20.196-0.394,39.708-2.15,58.179-5.081V475.23z M378.833,460.965c-6.081,2.206-12.414,4.254-19.008,6.128
-		c-6.364,1.812-12.996,3.426-19.786,4.907v-64.228c13.651-2.82,26.632-6.333,38.794-10.437V460.965z M424.085,438.484
-		c-8.16,5.593-17.55,10.792-28.018,15.517v-63.125c5.041-2.088,9.933-4.278,14.604-6.585c4.671-2.324,9.137-4.758,13.414-7.279
-		V438.484z M460.713,383.771c0,6.12-1.228,12.084-3.686,18.006c-3.151,7.656-8.436,15.274-15.707,22.576v-58.242h-1.024
-		c7.152-5.459,13.493-11.28,18.826-17.51c0.543-0.638,1.063-1.284,1.59-1.93V383.771z M457.027,319.89
-		c-4.253,10.334-12.367,20.59-24.024,30.082c-17.448,14.241-42.756,26.593-73.177,35.233
-		c-30.412,8.665-65.922,13.667-103.825,13.667c-57.746,0.024-109.978-11.658-147.031-30.035
-		c-18.526-9.16-33.209-19.967-42.992-31.444c-4.892-5.727-8.563-11.595-11.013-17.502c-2.45-5.924-3.678-11.879-3.678-17.991
-		s1.228-12.067,3.678-17.991c4.27-10.342,12.367-20.598,24.033-30.074c17.456-14.25,42.756-26.608,73.177-35.249
-		c30.413-8.656,65.93-13.651,103.826-13.651c57.746-0.032,109.969,11.658,147.023,30.027c18.534,9.153,33.224,19.976,42.992,31.436
-		c4.899,5.727,8.57,11.595,11.012,17.51c2.458,5.924,3.686,11.878,3.686,17.991S459.485,313.966,457.027,319.89z"/>
-</g>
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.99993 13C4.99993 9.68629 7.68622 7 10.9999 7M4.99993 13C4.99993 14.6484 5.66466 16.1415 6.74067 17.226C6.84445 17.3305 6.89633 17.3828 6.92696 17.4331C6.95619 17.4811 6.9732 17.5224 6.98625 17.5771C6.99993 17.6343 6.99993 17.6995 6.99993 17.8298V20.2C6.99993 20.48 6.99993 20.62 7.05443 20.727C7.10236 20.8211 7.17885 20.8976 7.27293 20.9455C7.37989 21 7.5199 21 7.79993 21H9.69993C9.97996 21 10.12 21 10.2269 20.9455C10.321 20.8976 10.3975 20.8211 10.4454 20.727C10.4999 20.62 10.4999 20.48 10.4999 20.2V19.8C10.4999 19.52 10.4999 19.38 10.5544 19.273C10.6024 19.1789 10.6789 19.1024 10.7729 19.0545C10.8799 19 11.0199 19 11.2999 19H12.6999C12.98 19 13.12 19 13.2269 19.0545C13.321 19.1024 13.3975 19.1789 13.4454 19.273C13.4999 19.38 13.4999 19.52 13.4999 19.8V20.2C13.4999 20.48 13.4999 20.62 13.5544 20.727C13.6024 20.8211 13.6789 20.8976 13.7729 20.9455C13.8799 21 14.0199 21 14.2999 21H16.2C16.48 21 16.62 21 16.727 20.9455C16.8211 20.8976 16.8976 20.8211 16.9455 20.727C17 20.62 17 20.48 17 20.2V19.2243C17 19.0223 17 18.9212 17.0288 18.8401C17.0563 18.7624 17.0911 18.708 17.15 18.6502C17.2114 18.59 17.3155 18.5417 17.5237 18.445C18.5059 17.989 19.344 17.2751 19.9511 16.3902C20.0579 16.2346 20.1112 16.1568 20.1683 16.1108C20.2228 16.0668 20.2717 16.0411 20.3387 16.021C20.4089 16 20.4922 16 20.6587 16H21.2C21.48 16 21.62 16 21.727 15.9455C21.8211 15.8976 21.8976 15.8211 21.9455 15.727C22 15.62 22 15.48 22 15.2V11.7857C22 11.5192 22 11.3859 21.9505 11.283C21.9013 11.181 21.819 11.0987 21.717 11.0495C21.6141 11 21.4808 11 21.2143 11C21.0213 11 20.9248 11 20.8471 10.9738C20.7633 10.9456 20.7045 10.908 20.6437 10.8438C20.5874 10.7842 20.5413 10.6846 20.4493 10.4855C20.1538 9.84622 19.7492 9.26777 19.2593 8.77404C19.1555 8.66945 19.1036 8.61716 19.073 8.56687C19.0437 8.51889 19.0267 8.47759 19.0137 8.42294C19 8.36567 19 8.30051 19 8.17018V7.06058C19 6.70053 19 6.52051 18.925 6.39951C18.8593 6.29351 18.7564 6.21588 18.6365 6.18184C18.4995 6.14299 18.3264 6.19245 17.9802 6.29136L15.6077 6.96922C15.5673 6.98074 15.5472 6.9865 15.5267 6.99054C15.5085 6.99414 15.4901 6.99671 15.4716 6.99826C15.4508 7 15.4297 7 15.3874 7H10.9999M4.99993 13H4C2.89543 13 2 12.1046 2 11C2 10.2597 2.4022 9.61337 3 9.26756M10.9999 7H14.9646C14.9879 6.8367 15 6.66976 15 6.5C15 4.567 13.433 3 11.5 3C9.567 3 8 4.567 8 6.5C8 6.9172 8.073 7.31736 8.20692 7.68839C9.04114 7.24881 9.99144 7 10.9999 7Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
\ No newline at end of file
diff --git a/static/icons/funds.svg b/static/icons/funds.svg
new file mode 100644
index 00000000..f3d0c5a0
--- /dev/null
+++ b/static/icons/funds.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg version="1.1" id="_x32_" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" 
+	 width="800px" height="800px" viewBox="0 0 512 512"  xml:space="preserve">
+<style type="text/css">
+<![CDATA[
+	.st0{fill:#000000;}
+]]>
+</style>
+<g>
+	<path class="st0" d="M274.179,250.036c-1.563-1.188-3.563-2.109-6.016-2.75s-5.422-0.953-8.891-0.953h-16.297v28.969h16.375
+		c3.656,0,6.75-0.422,9.219-1.234s4.453-1.906,5.953-3.281c1.5-1.359,2.563-2.953,3.234-4.781c0.656-1.813,0.984-3.75,0.984-5.813
+		c0-2.125-0.359-4.063-1.094-5.781C276.913,252.739,275.772,251.27,274.179,250.036z"/>
+	<path class="st0" d="M269.241,217.77c3.484-2.281,5.219-5.906,5.219-10.859c0-5.156-1.563-8.828-4.703-11
+		c-3.141-2.188-8.031-3.297-14.688-3.297h-12.656v28.578h11.531C260.663,221.192,265.757,220.051,269.241,217.77z"/>
+	<path class="st0" d="M485.304,184.395c-28.297-5.25-48.703-18.906-72.391-36.531c5.156-31.578,29.156-53.203,12.359-69.984
+		c-13.781-13.781-63.375-3.781-76.578,25.031c-7.5-4.516-15.484-9.078-24.141-13.609C235.6,42.708,129.631,72.551,83.6,146.895
+		c-9.844-3.141-19.188-7.813-25.906-13.375c-0.266-0.219-0.516-0.453-0.781-0.672c4.375-1.063,8.469-2.781,12.141-5.016
+		c6.313-3.844,11.469-9.109,14.781-15.344c2.172-4.156,3.531-8.797,3.531-13.656c0-1.531-0.141-3.063-0.406-4.594
+		c-0.609-3.313-1.859-6.375-3.594-9.031c-1.719-2.641-3.906-4.875-6.344-6.688c-4.891-3.609-10.844-5.516-16.969-5.531
+		c-5.594,0-11.406,1.656-16.422,5.281s-9.047,9.172-11.313,16.156c-1.531,4.688-2.328,9.984-2.344,15.969
+		c0,0.219,0.016,0.453,0.016,0.688c-2.375-2.109-4.766-4.781-7.063-8.203c-2.656-3.922-5.188-8.813-7.438-14.797
+		c-1.563-4.141-6.172-6.234-10.313-4.672c-4.125,1.563-6.219,6.172-4.656,10.297c3.953,10.484,8.875,18.781,14.547,25.078
+		c5.672,6.313,12.141,10.609,18.797,12.969c0.563,0.203,1.141,0.344,1.703,0.516c0.328,0.547,0.656,1.109,1.016,1.641
+		c3.547,5.406,8.234,10.031,13.531,14c7.578,5.641,16.438,9.984,25.656,13.219c-2.75,5.703-5.172,11.641-7.219,17.781
+		c-14.984,44.703-10.75,96.719,13.859,139.531l59.734,119.062c2.297,4.609,7.016,7.5,12.156,7.5H190.1
+		c7.516,0,13.609-6.094,13.609-13.609V385.02h113.594v46.375c0,7.516,6.094,13.609,13.609,13.609h34.25
+		c5.938,0,11.172-3.828,12.984-9.469l22.969-72.062c22.844-12.844,50.391-42.875,63.875-50.344
+		c9.484-5.25,36.281-20.734,36.281-20.734l9.5-75.172C515.101,194.77,508.257,188.676,485.304,184.395z M47.209,118.051
+		c-0.156,0-0.313-0.016-0.469-0.016c-0.313-1.203-0.516-2.438-0.609-3.703c-0.094-1.375-0.141-2.703-0.141-3.938
+		c0-5.109,0.766-9.047,1.891-11.984c1.125-2.953,2.563-4.938,4.094-6.328c1.031-0.922,2.125-1.609,3.25-2.109
+		c1.516-0.656,3.156-0.984,4.828-0.984c2.031,0,4.109,0.516,5.844,1.406c1.75,0.891,3.141,2.141,4.063,3.547
+		c0.609,0.938,1.031,1.969,1.25,3.172c0.094,0.547,0.156,1.125,0.156,1.719c0,1.406-0.297,2.938-0.938,4.563
+		s-1.641,3.328-2.953,4.938c-2.609,3.266-6.516,6.188-10.938,7.906C53.584,117.411,50.428,118.051,47.209,118.051z M147.069,151.02
+		c-7.641,6.344-16.563,17.594-23.531,31.281c-7.016,13.719-12.188,29.891-13.375,46.281c-0.438,6.016-5.672,10.547-11.688,10.094
+		c-6.031-0.438-10.547-5.672-10.125-11.688c1.469-19.875,7.563-38.641,15.719-54.625c8.203-16,18.375-29.203,28.984-38.125
+		c4.641-3.859,11.531-3.25,15.406,1.391C152.319,140.27,151.709,147.161,147.069,151.02z M188.928,118.629
+		c-3.797,1.859-7.234,4.078-9.688,6.094c-4.672,3.828-11.547,3.156-15.391-1.5s-3.172-11.547,1.484-15.375
+		c4.078-3.359,8.797-6.297,13.906-8.813c5.406-2.688,11.969-0.469,14.641,4.953S194.334,115.958,188.928,118.629z M312.054,275.645
+		c-2.234,4.609-5.469,8.609-9.75,11.953c-4.25,3.344-7.891,5.953-14.141,7.859c-4.938,1.484-11.109,2.391-16.891,2.688v17.438
+		h-15.594v-17.281h-14.125v17.281h-15.594v-17.281h-12.375h-16v-15.813c0-3.078-0.234-4.938,2.953-5.578
+		c0.297-0.031,0.688-0.109,1.203-0.203c0.531-0.078,6.766-0.453,8.156-0.453c2.516,0,3.688-2.391,3.688-4.766v-76.891
+		c0-2.906-1.547-4.016-3.688-4.328c-1.375-0.188-7.625-0.391-8.156-0.469c-0.516-0.094-0.922-0.156-1.203-0.203
+		c-3.188-0.641-2.953-2.5-2.953-5.563v-14.156h16h12.375v-17.734h15.594v17.766l14.125,0.031v-17.797h15.594v18.063
+		c8.422,0.703,18.813,3.359,25.969,8.906c4,3.094,7.109,6.531,9.031,10.734c1.906,4.203,2.859,8.953,2.859,14.219
+		c0,3.016-0.484,5.891-1.438,8.656c-0.953,2.75-2.438,5.313-4.438,7.719s-8.703,9.172-14.719,11.516
+		c18.313,3.172,26.859,13.484,26.859,28.594C315.397,265.989,314.288,271.036,312.054,275.645z M393.351,233.52
+		c-9.391,0-17-7.625-17-17.016s7.609-17.016,17-17.016c9.406,0,17.016,7.625,17.016,17.016S402.757,233.52,393.351,233.52z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/static/icons/home.svg b/static/icons/home.svg
index 2aa2cbed..c3482cdd 100644
--- a/static/icons/home.svg
+++ b/static/icons/home.svg
@@ -1,42 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 489.075 489.075" style="enable-background:new 0 0 489.075 489.075;" xml:space="preserve">
-<g>
-	<path d="M482.453,220.775l-115.5-111.2v-88.5c0-11.4-9.4-20.8-20.8-20.8s-20.8,9.4-20.8,20.8v48.5l-66.6-64.1
-		c-7.3-7.3-19.8-7.3-28.1,0l-223.6,215.3c-8.3,8.3-9.4,20.8-1,29.1c8.4,8.3,20.8,9.4,29.1,1l3.1-3v220.4c0,11.4,9.4,20.8,20.8,20.8
-		h372.4c11.4,0,19.8-9.4,20.8-19.8v-219.3l2.1,2c15.2,10.5,26,3.1,29.1-2.1C490.753,241.575,490.753,228.075,482.453,220.775z
-		 M281.653,448.575h-72.8v-111.3h72.8V448.575z M410.653,448.575h-88.4v-132.1c0-11.4-9.4-20.8-20.8-20.8h-113.4
-		c-11.4,0-20.8,9.4-20.8,20.8v132.1h-87.4v-203.9h330.8V448.575L410.653,448.575z M83.853,204.175l161.4-155l159.8,155H83.853z"/>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.3103 1.77586C11.6966 1.40805 12.3034 1.40805 12.6897 1.77586L20.6897 9.39491L23.1897 11.7759C23.5896 12.1567 23.605 12.7897 23.2241 13.1897C22.8433 13.5896 22.2103 13.605 21.8103 13.2241L21 12.4524V20C21 21.1046 20.1046 22 19 22H14H10H5C3.89543 22 3 21.1046 3 20V12.4524L2.18966 13.2241C1.78972 13.605 1.15675 13.5896 0.775862 13.1897C0.394976 12.7897 0.410414 12.1567 0.810345 11.7759L3.31034 9.39491L11.3103 1.77586ZM5 10.5476V20H9V15C9 13.3431 10.3431 12 12 12C13.6569 12 15 13.3431 15 15V20H19V10.5476L12 3.88095L5 10.5476ZM13 20V15C13 14.4477 12.5523 14 12 14C11.4477 14 11 14.4477 11 15V20H13Z" fill="#000000"/>
+</svg>
\ No newline at end of file
diff --git a/static/icons/message.svg b/static/icons/message.svg
new file mode 100644
index 00000000..47b935b5
--- /dev/null
+++ b/static/icons/message.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7 8H17M7 12H11M12 20L8 16H5C3.89543 16 3 15.1046 3 14V6C3 4.89543 3.89543 4 5 4H19C20.1046 4 21 4.89543 21 6V14C21 15.1046 20.1046 16 19 16H16L12 20Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/static/icons/receive.svg b/static/icons/receive.svg
new file mode 100644
index 00000000..143ae144
--- /dev/null
+++ b/static/icons/receive.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" >
+
<path d="M0 0h48v48H0z" fill="none"/>
+<g id="Shopicon">
+	<path d="M25.662,19.651C26.402,19.877,27.187,20,28,20c4.418,0,8-3.582,8-8s-3.582-8-8-8c-2.212,0-4.214,0.898-5.662,2.349
+		C21.598,6.123,20.814,6,20,6c-4.418,0-8,3.582-8,8s3.582,8,8,8C22.212,22,24.214,21.102,25.662,19.651z M28,8c2.206,0,4,1.794,4,4
+		s-1.794,4-4,4c-2.206,0-4-1.794-4-4S25.795,8,28,8z M16,14c0-2.206,1.794-4,4-4c0.088,0,0.169,0.02,0.256,0.026
+		C20.095,10.658,20,11.317,20,12c0,2.079,0.8,3.967,2.1,5.389C21.488,17.77,20.773,18,20,18C17.795,18,16,16.206,16,14z"/>
+	<path d="M30,24c-5.952,0-10.813,1.913-12.9,4.777c-1.05-0.914-1.862-1.813-2.3-2.379c-1.986-2.643-5.754-3.181-8.4-1.198
+		c-2.646,1.984-3.185,5.753-1.199,8.4C5.519,34.025,13.131,44,24,44h20V32C44,27.439,37.981,24,30,24z M8.4,31.2
+		c-0.662-0.882-0.482-2.139,0.397-2.8c0.36-0.27,0.783-0.399,1.201-0.399c0.608,0,1.207,0.274,1.596,0.791
+		C11.647,28.864,17.026,36,24,36h8v-2l0,0v-2h-8c-1.229,0-2.46-0.385-3.61-0.962C21.518,29.573,25.025,28,30,28
+		c6.104,0,10,2.369,10,4v8h-2H24C15.107,40,8.669,31.559,8.4,31.2z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/static/icons/shop.svg b/static/icons/shop.svg
new file mode 100644
index 00000000..15b2918c
--- /dev/null
+++ b/static/icons/shop.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" ?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 200 200" data-name="Layer 1" id="Layer_1" xmlns="http://www.w3.org/2000/svg"><title/><path d="M181.75,42.5c-3-13-15-22.5-29-22.5h-105a30.6,30.6,0,0,0-29.5,22.5l-10.5,40c-2,7,1,14,7,18l2,1.5c3,1.5,5.5,3,8.5,3.5V160a20.06,20.06,0,0,0,20,20h23.5a20.06,20.06,0,0,0,20-20V140h27.5v20a20.06,20.06,0,0,0,20,20h19a20.06,20.06,0,0,0,20-20V105.5a22.09,22.09,0,0,0,8-3l2-1.5a16.87,16.87,0,0,0,7-18.5ZM156.25,160h-20V140a20.06,20.06,0,0,0-20-20H88.75a20.06,20.06,0,0,0-20,20v20H45.25V100c6.5-2.5,13.5-1.5,19.5,2a21.07,21.07,0,0,0,24,0,21.07,21.07,0,0,1,24,0,21.07,21.07,0,0,0,24,0,20.87,20.87,0,0,1,19.5-2Zm14.5-74.5a40.69,40.69,0,0,0-46,0,.94.94,0,0,1-1.5,0,40.69,40.69,0,0,0-46,0,.94.94,0,0,1-1.5,0,40.69,40.69,0,0,0-46,0,.94.94,0,0,1-1.5,0l9.5-38c1-4.5,5-7.5,10-7.5h105.5a9.64,9.64,0,0,1,9.5,7.5l9.5,38S171.25,86,170.75,85.5Z"/></svg>
\ No newline at end of file
diff --git a/static/icons/support.svg b/static/icons/support.svg
index 47b935b5..f9265ed8 100644
--- a/static/icons/support.svg
+++ b/static/icons/support.svg
@@ -1,3 +1,2 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M7 8H17M7 12H11M12 20L8 16H5C3.89543 16 3 15.1046 3 14V6C3 4.89543 3.89543 4 5 4H19C20.1046 4 21 4.89543 21 6V14C21 15.1046 20.1046 16 19 16H16L12 20Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"><path fill="#000000" d="m759.936 805.248-90.944-91.008A254.912 254.912 0 0 1 512 768a254.912 254.912 0 0 1-156.992-53.76l-90.944 91.008A382.464 382.464 0 0 0 512 896c94.528 0 181.12-34.176 247.936-90.752zm45.312-45.312A382.464 382.464 0 0 0 896 512c0-94.528-34.176-181.12-90.752-247.936l-91.008 90.944C747.904 398.4 768 452.864 768 512c0 59.136-20.096 113.6-53.76 156.992l91.008 90.944zm-45.312-541.184A382.464 382.464 0 0 0 512 128c-94.528 0-181.12 34.176-247.936 90.752l90.944 91.008A254.912 254.912 0 0 1 512 256c59.136 0 113.6 20.096 156.992 53.76l90.944-91.008zm-541.184 45.312A382.464 382.464 0 0 0 128 512c0 94.528 34.176 181.12 90.752 247.936l91.008-90.944A254.912 254.912 0 0 1 256 512c0-59.136 20.096-113.6 53.76-156.992l-91.008-90.944zm417.28 394.496a194.56 194.56 0 0 0 22.528-22.528C686.912 602.56 704 559.232 704 512a191.232 191.232 0 0 0-67.968-146.56A191.296 191.296 0 0 0 512 320a191.232 191.232 0 0 0-146.56 67.968C337.088 421.44 320 464.768 320 512a191.232 191.232 0 0 0 67.968 146.56C421.44 686.912 464.768 704 512 704c47.296 0 90.56-17.088 124.032-45.44zM512 960a448 448 0 1 1 0-896 448 448 0 0 1 0 896z"/></svg>
\ No newline at end of file
-- 
cgit v1.2.3


From 8e278fadaf0d8a735e259d4d6c59ade581150692 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 11 Nov 2023 00:04:17 -0800
Subject: map animation and list

---
 src/components/AppHeader.svelte                    |   4 +-
 src/components/LocationsMap.svelte                 | 147 ++++++++++++++++++---
 src/locales/en.json                                |   2 +-
 src/routes/(app)/[username]/(profile)/+page.svelte |   2 +-
 static/icons/pause.svg                             |   2 +
 static/icons/play.svg                              |  17 +++
 6 files changed, 155 insertions(+), 19 deletions(-)
 create mode 100644 static/icons/pause.svg
 create mode 100644 static/icons/play.svg

(limited to 'src')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 4ccd2d03..3bf1e893 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -17,6 +17,8 @@
 		menuButtons = [
 			{ key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` },
 			{ key: 'nav.support', icon: 'support', href: `/support` },
+			{ key: 'nav.map', icon: 'map', href: `/${user.username}/map` },
+			{ key: 'nav.merch', icon: 'shop', href: `https://coinosmerch.com` },
 			{ key: 'nav.signOut', icon: 'logout', href: `/logout` },
 		];
 
@@ -53,7 +55,7 @@
 						.url.pathname === `/${user.username}/receive`
 						? 'opacity-100'
 						: 'opacity-70 hover:opacity-80'}"
-					><Icon icon="receive" style="mx-auto w-6 md:w-8" />
+					><Icon icon="numpad" style="mx-auto w-6 md:w-8" />
 				</button>
 			</a>
 			<a href={`/${user.username}/payments`}>
diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index 7876659a..edd20632 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -2,6 +2,7 @@
 	import { onMount, onDestroy } from 'svelte';
 	import { browser } from '$app/environment';
 	import html2canvas from 'html2canvas';
+	import { Icon } from '$comp';
 
 	import 'maplibre-gl/dist/maplibre-gl.css';
 
@@ -10,6 +11,71 @@
 	let mapContainer;
 	let markers = [];
 
+	let currentIndex = -1;
+	let timeout;
+
+	function select(m) {
+		stopFlying();
+		currentIndex = inview.indexOf(m);
+		flyToMarker(m);
+	}
+
+	async function flyToMarker(marker) {
+		marker.getElement().click();
+
+		map.flyTo({
+			zoom: 14,
+			center: marker.getLngLat(),
+			essential: true,
+			easing: function (t) {
+				return 1 - Math.pow(1 - t, 3);
+			},
+			duration: 5000
+		});
+
+		await new Promise((r) => setTimeout(r, 5000));
+
+		if (!timeout) return;
+
+		map.flyTo({
+			zoom: 10.5,
+			center: marker.getLngLat(),
+			essential: true,
+			easing: function (t) {
+				return 1 - Math.pow(1 - t, 3);
+			},
+			duration: 2000
+		});
+	}
+
+	let toggle = () => {
+		if (timeout) stopFlying();
+		else startFlying();
+	};
+
+	let currentPopup;
+	function startFlying() {
+		currentIndex++;
+
+		for (let p in popups) popups[p].remove();
+		if (currentIndex >= inview.length) currentIndex = 0;
+		flyToMarker(inview[currentIndex]);
+
+		timeout = setTimeout(startFlying, 7000);
+	}
+
+	function stopFlying() {
+		if (!timeout) return;
+		timeout = clearTimeout(timeout);
+
+		if (currentPopup) {
+			currentPopup.remove();
+		}
+
+		map.jumpTo({ center: map.getCenter(), zoom: map.getZoom() });
+		map.off('moveend'); // Remove moveend listener if set
+	}
+
 	let checkAddress = (location) => {
 		if (location['addr:housenumber'] && location['addr:street'] && location['addr:city']) {
 			return `${
@@ -24,23 +90,24 @@
 		}
 	};
 
+	let inview = [];
+
 	function updateLabelVisibility() {
+		inview = [];
 		if (!map) return;
 		let zoom = map.getZoom();
 		let bounds = map.getBounds();
 
 		for (let marker of markers) {
 			let isInView = bounds.contains(marker.getLngLat());
-			let popup = marker.getPopup();
 			let { tags } = marker;
 
-			if (zoom > 13 && isInView) {
-				popup.setHTML(`<span class='block font-bold'>${tags.name}</span>`).addTo(map);
-			} else {
-				popup.remove();
-				popup.setHTML(html(tags));
+			if (isInView) {
+				inview.push(marker);
 			}
 		}
+
+		inview = inview.sort((a, b) => a.tags.name.localeCompare(b.tags.name));
 	}
 
 	let html = (tags) => `${
@@ -53,10 +120,13 @@
 
   ${
 		tags && tags.website
-			? `<a href=${tags.website} target="_blank" rel="noreferrer" class='block text-blue-400'>${tags.website}</a>`
+			? `<a href=${tags.website} target="_blank" rel="noreferrer" class='block text-blue-400 break-all'>${tags.website}</a>`
 			: ''
 	}`;
 
+	let popups = {};
+	let counter = 0;
+
 	onMount(() => {
 		if (browser) {
 			import('maplibre-gl').then(({ default: maplibre }) => {
@@ -82,10 +152,16 @@
 							.setPopup(new maplibre.Popup().setHTML(html(tags)))
 							.addTo(map);
 
+						marker.id = counter++;
+
 						marker.getElement().addEventListener('click', () => {
 							let h = html(marker.tags);
-							let popup = marker.getPopup();
-							popup.setHTML(h);
+							let p = marker.getPopup();
+							popups[marker.id] = p;
+							p.setHTML(h);
+							p.on('close', () => {
+								delete popups[marker.id];
+							});
 						});
 
 						marker.tags = tags;
@@ -93,18 +169,31 @@
 						markers.push(marker);
 					});
 
-					// updateLabelVisibility();
-					// map.on('moveend', updateLabelVisibility);
-					// map.on('zoomend', updateLabelVisibility);
+					updateLabelVisibility();
+
+					let observer = new IntersectionObserver(
+						(entries, observer) => {
+							entries.forEach((entry) => {
+								if (entry.isIntersecting) startFlying();
+								else stopFlying();
+							});
+						},
+						{ threshold: 0.5 }
+					);
+
+					observer.observe(mapContainer);
 				});
+
+				map.on('mousedown', stopFlying);
+				map.on('touchstart', stopFlying);
+				map.on('wheel', stopFlying);
+				map.on('dragstart', stopFlying);
 			});
 		}
 	});
 
 	onDestroy(() => {
 		if (map) {
-			// map.off('moveend', updateLabelVisibility);
-			// map.off('zoomend', updateLabelVisibility);
 			map.remove();
 		}
 	});
@@ -113,12 +202,37 @@
 <div class="container mx-auto max-w-4xl">
 	<div class="flex w-full">
 		<div class="mx-auto h-[550px] w-full z-0" bind:this={mapContainer} />
+		<div class="relative">
+			<button
+				class="absolute flex top-2 right-2 rounded-full border-2 border-black bg-white w-10 h-10"
+				on:click={toggle}
+			>
+				{#if timeout}
+					<Icon icon="pause" style="w-4 m-auto" />
+				{:else}
+					<Icon icon="play" style="w-4 m-auto" />
+				{/if}
+			</button>
+
+			<div class="absolute bottom-2 right-2 w-60 h-60 bg-white overflow-y-scroll p-4 bg-opacity-80">
+				{#each inview as m}
+					<button
+						on:click={() => select(m)}
+						class="text-left"
+						class:font-bold={m.id === inview[currentIndex]?.id}
+						id={`marker-${m.id}`}>{m.tags.name}</button
+					>
+				{/each}
+			</div>
+		</div>
 	</div>
+
+	{inview.length}
 </div>
 
 <style>
 	:global(.maplibregl-popup-close-button) {
-		font-size: 18px;
+		font-size: 24px;
 		padding: 8px;
 	}
 
@@ -131,11 +245,12 @@
 	}
 
 	:global(.maplibregl-popup-content) {
-		padding: 0.5em 1em;
+		padding: 1em 2em;
 		border-radius: 4px;
 		font-size: 14px;
 		color: black;
 		background-color: white;
 		overflow: hidden;
+		width: 280px;
 	}
 </style>
diff --git a/src/locales/en.json b/src/locales/en.json
index 9ecd3702..2f629675 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -135,7 +135,7 @@
     "messages": "Messages",
     "funds": "Funds",
     "map": "Map",
-    "merch": "Shop",
+    "merch": "Swag",
 		"profile": "Profile",
 		"startInSeconds": "Start in Seconds",
 		"account": "Account",
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 180b12bd..e3150ff2 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -99,7 +99,7 @@
 						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
 					>
 						<div class="mx-auto flex">
-							<Icon icon="receive" style="my-auto h-6 mr-2" />
+							<Icon icon="numpad" style="my-auto h-6 mr-2" />
 							<div class="my-auto mt-1">{$t('user.dashboard.receive')}</div>
 						</div>
 					</button>
diff --git a/static/icons/pause.svg b/static/icons/pause.svg
new file mode 100644
index 00000000..81f4ea44
--- /dev/null
+++ b/static/icons/pause.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path fill="#000000" d="M120.16 45A20.162 20.162 0 0 0 100 65.16v381.68A20.162 20.162 0 0 0 120.16 467h65.68A20.162 20.162 0 0 0 206 446.84V65.16A20.162 20.162 0 0 0 185.84 45h-65.68zm206 0A20.162 20.162 0 0 0 306 65.16v381.68A20.162 20.162 0 0 0 326.16 467h65.68A20.162 20.162 0 0 0 412 446.84V65.16A20.162 20.162 0 0 0 391.84 45h-65.68z"/></svg>
\ No newline at end of file
diff --git a/static/icons/play.svg b/static/icons/play.svg
new file mode 100644
index 00000000..144f8219
--- /dev/null
+++ b/static/icons/play.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="-3 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+    
+    <title>play</title>
+    <desc>Created with Sketch Beta.</desc>
+    <defs>
+
+</defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="Icon-Set-Filled" sketch:type="MSLayerGroup" transform="translate(-419.000000, -571.000000)" fill="#000000">
+            <path d="M440.415,583.554 L421.418,571.311 C420.291,570.704 419,570.767 419,572.946 L419,597.054 C419,599.046 420.385,599.36 421.418,598.689 L440.415,586.446 C441.197,585.647 441.197,584.353 440.415,583.554" id="play" sketch:type="MSShapeGroup">
+
+</path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From a27cde8cea5a6266ed58a3fcc0be3e187e726c86 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 11 Nov 2023 00:17:22 -0800
Subject: restore coinos link

---
 src/components/AppHeader.svelte | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 3bf1e893..a37a834e 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -19,7 +19,7 @@
 			{ key: 'nav.support', icon: 'support', href: `/support` },
 			{ key: 'nav.map', icon: 'map', href: `/${user.username}/map` },
 			{ key: 'nav.merch', icon: 'shop', href: `https://coinosmerch.com` },
-			{ key: 'nav.signOut', icon: 'logout', href: `/logout` },
+			{ key: 'nav.signOut', icon: 'logout', href: `/logout` }
 		];
 
 	let showMenu = false;
@@ -115,6 +115,8 @@
 								</li>
 							{/each}
 						</ul>
+						<hr class="my-4" />
+						<a href="/"><img src="/images/logo.svg" alt="Coinos" class="w-32" /></a>
 					</div>
 				</OutClick>
 			</div>
-- 
cgit v1.2.3


From aa25ec9c28110ce32aa6797cf229755a9fde055a Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 11 Nov 2023 08:39:29 -0800
Subject: map fullscreen button

---
 src/components/LocationsMap.svelte | 84 ++++++++++++++++++++++++++++++--------
 static/icons/full.svg              |  7 ++++
 2 files changed, 74 insertions(+), 17 deletions(-)
 create mode 100644 static/icons/full.svg

(limited to 'src')

diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index edd20632..3904fffa 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -8,12 +8,44 @@
 
 	export let locations;
 	let map;
-	let mapContainer;
+	let mapContainer, mapWrapper;
 	let markers = [];
 
 	let currentIndex = -1;
 	let timeout;
 
+	let full = () => {
+		if (!document.fullscreenElement) {
+			if (mapWrapper.requestFullscreen) {
+				mapWrapper.requestFullscreen();
+			} else if (mapWrapper.mozRequestFullScreen) {
+				/* Firefox */
+				mapWrapper.mozRequestFullScreen();
+			} else if (mapWrapper.webkitRequestFullscreen) {
+				/* Chrome, Safari & Opera */
+				mapWrapper.webkitRequestFullscreen();
+			} else if (mapWrapper.msRequestFullscreen) {
+				/* IE/Edge */
+				mapWrapper.msRequestFullscreen();
+			}
+
+      map.resize();
+		} else {
+			if (document.exitFullscreen) {
+				document.exitFullscreen();
+			} else if (document.mozCancelFullScreen) {
+				/* Firefox */
+				document.mozCancelFullScreen();
+			} else if (document.webkitExitFullscreen) {
+				/* Chrome, Safari and Opera */
+				document.webkitExitFullscreen();
+			} else if (document.msExitFullscreen) {
+				/* IE/Edge */
+				document.msExitFullscreen();
+			}
+		}
+	};
+
 	function select(m) {
 		stopFlying();
 		currentIndex = inview.indexOf(m);
@@ -188,6 +220,18 @@
 				map.on('touchstart', stopFlying);
 				map.on('wheel', stopFlying);
 				map.on('dragstart', stopFlying);
+
+				document.addEventListener('fullscreenchange', onFullScreenChange, false);
+				document.addEventListener('webkitfullscreenchange', onFullScreenChange, false);
+				document.addEventListener('mozfullscreenchange', onFullScreenChange, false);
+				document.addEventListener('MSFullscreenChange', onFullScreenChange, false);
+
+				function onFullScreenChange() {
+          console.log("resizing")
+					if (map) {
+						map.resize(); // This will adjust the map size to fit the new container size
+					}
+				}
 			});
 		}
 	});
@@ -200,21 +244,23 @@
 </script>
 
 <div class="container mx-auto max-w-4xl">
-	<div class="flex w-full">
-		<div class="mx-auto h-[550px] w-full z-0" bind:this={mapContainer} />
+	<div class="flex w-full h-[350px]" id="map" bind:this={mapWrapper}>
+		<div id="map-container" class="mx-auto h-full w-full z-0" bind:this={mapContainer} />
 		<div class="relative">
-			<button
-				class="absolute flex top-2 right-2 rounded-full border-2 border-black bg-white w-10 h-10"
-				on:click={toggle}
-			>
-				{#if timeout}
-					<Icon icon="pause" style="w-4 m-auto" />
-				{:else}
-					<Icon icon="play" style="w-4 m-auto" />
-				{/if}
-			</button>
-
-			<div class="absolute bottom-2 right-2 w-60 h-60 bg-white overflow-y-scroll p-4 bg-opacity-80">
+			<div class="flex absolute flex top-2 right-2 gap-2">
+				<button class="rounded-full border-2 border-black bg-white w-10 h-10" on:click={toggle}>
+					{#if timeout}
+						<Icon icon="pause" style="w-4 m-auto" />
+					{:else}
+						<Icon icon="play" style="w-4 m-auto" />
+					{/if}
+				</button>
+				<button class="rounded-full border-2 border-black bg-white w-10 h-10" on:click={full}>
+					<Icon icon="full" style="w-4 m-auto" />
+				</button>
+			</div>
+
+			<div class="absolute bottom-2 right-2 w-60 h-28 bg-white overflow-y-scroll p-4 bg-opacity-80">
 				{#each inview as m}
 					<button
 						on:click={() => select(m)}
@@ -226,11 +272,15 @@
 			</div>
 		</div>
 	</div>
-
-	{inview.length}
 </div>
 
 <style>
+	#map:fullscreen,
+	#map-container:fullscreen {
+		width: 100% !important;
+		height: 100% !important;
+	}
+
 	:global(.maplibregl-popup-close-button) {
 		font-size: 24px;
 		padding: 8px;
diff --git a/static/icons/full.svg b/static/icons/full.svg
new file mode 100644
index 00000000..db8c33e9
--- /dev/null
+++ b/static/icons/full.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M23 4C23 2.34315 21.6569 1 20 1H16C15.4477 1 15 1.44772 15 2C15 2.55228 15.4477 3 16 3H20C20.5523 3 21 3.44772 21 4V8C21 8.55228 21.4477 9 22 9C22.5523 9 23 8.55228 23 8V4Z" fill="#0F0F0F"/>
+<path d="M23 16C23 15.4477 22.5523 15 22 15C21.4477 15 21 15.4477 21 16V20C21 20.5523 20.5523 21 20 21H16C15.4477 21 15 21.4477 15 22C15 22.5523 15.4477 23 16 23H20C21.6569 23 23 21.6569 23 20V16Z" fill="#0F0F0F"/>
+<path d="M4 21H8C8.55228 21 9 21.4477 9 22C9 22.5523 8.55228 23 8 23H4C2.34315 23 1 21.6569 1 20V16C1 15.4477 1.44772 15 2 15C2.55228 15 3 15.4477 3 16V20C3 20.5523 3.44772 21 4 21Z" fill="#0F0F0F"/>
+<path d="M1 8C1 8.55228 1.44772 9 2 9C2.55228 9 3 8.55228 3 8L3 4C3 3.44772 3.44772 3 4 3H8C8.55228 3 9 2.55228 9 2C9 1.44772 8.55228 1 8 1H4C2.34315 1 1 2.34315 1 4V8Z" fill="#0F0F0F"/>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From 49b718086fcec26fb5334ba693f2c8d1e2a52e3d Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 11 Nov 2023 08:41:14 -0800
Subject: adjust map height

---
 src/components/LocationsMap.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index 3904fffa..4b1b1b82 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -244,7 +244,7 @@
 </script>
 
 <div class="container mx-auto max-w-4xl">
-	<div class="flex w-full h-[350px]" id="map" bind:this={mapWrapper}>
+	<div class="flex w-full h-[400px]" id="map" bind:this={mapWrapper}>
 		<div id="map-container" class="mx-auto h-full w-full z-0" bind:this={mapContainer} />
 		<div class="relative">
 			<div class="flex absolute flex top-2 right-2 gap-2">
@@ -260,7 +260,7 @@
 				</button>
 			</div>
 
-			<div class="absolute bottom-2 right-2 w-60 h-28 bg-white overflow-y-scroll p-4 bg-opacity-80">
+			<div class="absolute bottom-2 right-2 w-60 h-24 bg-white overflow-y-scroll p-4 bg-opacity-80">
 				{#each inview as m}
 					<button
 						on:click={() => select(m)}
-- 
cgit v1.2.3


From 6d8eb8a609ebb6c1781c463a837bf9e19a6d3d4b Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 13 Nov 2023 10:23:34 -0800
Subject: fix message icon

---
 src/routes/(app)/[username]/(profile)/+layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 8790aaf2..1b99c4b4 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -176,7 +176,7 @@
 					<a href={`/${subject.username}/messages`} class="mx-auto">
 						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
 							<div class="mx-auto flex">
-								<Icon icon="support" style="mr-2 my-auto" />
+								<Icon icon="message" style="mr-2 my-auto" />
 								<div class="mt-1 my-auto">{$t('user.message')}</div>
 							</div>
 						</button>
-- 
cgit v1.2.3


From b466b3d39c3b9ec792ef924c7f4750fb70b6a016 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Nov 2023 23:02:29 -0800
Subject: prefill register page

---
 package.json                                       |   4 +-
 pnpm-lock.yaml                                     |  16 ++
 src/components/AppHeader.svelte                    | 193 ++++++++--------
 src/components/Avatar.svelte                       |   2 +-
 src/lib/punks.js                                   |  66 ++++++
 src/lib/upload.js                                  |   3 +-
 src/locales/en.json                                |   2 +-
 src/routes/(app)/+layout.svelte                    |   2 +-
 .../(app)/[username]/(profile)/+layout.svelte      |  36 +--
 src/routes/(app)/[username]/(profile)/+page.svelte |   8 +-
 .../[username]/settings/[...tab]/+page.svelte      |  28 ++-
 .../[username]/settings/[...tab]/_account.svelte   |   6 +-
 .../(app)/[username]/settings/[...tab]/_pos.svelte |   4 +-
 .../[username]/settings/[...tab]/_security.svelte  |   2 +-
 src/routes/(app)/register/+page.server.js          |  29 ++-
 src/routes/(app)/register/+page.svelte             | 245 ++++++++++++++++++++-
 src/routes/+layout.svelte                          |   3 +
 src/routes/+page.server.js                         |   1 +
 src/routes/+page.svelte                            | 109 ++++-----
 static/icons/upload.svg                            |   4 +
 20 files changed, 576 insertions(+), 187 deletions(-)
 create mode 100644 src/lib/punks.js
 create mode 100644 static/icons/upload.svg

(limited to 'src')

diff --git a/package.json b/package.json
index 2063fb63..911e287f 100644
--- a/package.json
+++ b/package.json
@@ -52,10 +52,12 @@
 	},
 	"type": "module",
 	"dependencies": {
+		"@faker-js/faker": "^8.2.0",
 		"@scure/bip39": "^1.2.1",
 		"html2canvas": "^1.4.1",
 		"leaflet-tooltip-layout": "^0.1.2",
 		"maplibre-gl": "^3.3.1",
-		"uint8array-extras": "^0.5.0"
+		"uint8array-extras": "^0.5.0",
+		"unique-names-generator": "^4.7.1"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c6490728..1463027a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,9 @@ settings:
   excludeLinksFromLockfile: false
 
 dependencies:
+  '@faker-js/faker':
+    specifier: ^8.2.0
+    version: 8.2.0
   '@scure/bip39':
     specifier: ^1.2.1
     version: 1.2.1
@@ -20,6 +23,9 @@ dependencies:
   uint8array-extras:
     specifier: ^0.5.0
     version: 0.5.0
+  unique-names-generator:
+    specifier: ^4.7.1
+    version: 4.7.1
 
 devDependencies:
   '@scure/base':
@@ -319,6 +325,11 @@ packages:
     dev: true
     optional: true
 
+  /@faker-js/faker@8.2.0:
+    resolution: {integrity: sha512-VacmzZqVxdWdf9y64lDOMZNDMM/FQdtM9IsaOPKOm2suYwEatb8VkdHqOzXcDnZbk7YDE2BmsJmy/2Hmkn563g==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'}
+    dev: false
+
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
     dev: true
@@ -2011,6 +2022,11 @@ packages:
       set-value: 2.0.1
     dev: false
 
+  /unique-names-generator@4.7.1:
+    resolution: {integrity: sha512-lMx9dX+KRmG8sq6gulYYpKWZc9RlGsgBR6aoO8Qsm3qvkSJ+3rAymr+TnV8EDMrIrwuFJ4kruzMWM/OpYzPoow==}
+    engines: {node: '>=8'}
+    dev: false
+
   /update-browserslist-db@1.0.10(browserslist@4.21.4):
     resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
     hasBin: true
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index a37a834e..123606e1 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -3,7 +3,7 @@
 	import { banner, newPayment, colorTheme } from '$lib/store';
 	import { goto } from '$app/navigation';
 	import { Avatar, Icon } from '$comp';
-	import { t } from '$lib/translations';
+	import { loading, t } from '$lib/translations';
 	import { page } from '$app/stores';
 
 	export let data;
@@ -28,112 +28,115 @@
 		$banner?.id && $banner.id === subject.id
 			? `url(${$banner.src})`
 			: subject?.banner
-			? `url(/api/public/${subject.id}-banner.webp)`
+			? `url(/api/public/${subject.banner}.webp)`
 			: undefined;
 
 	$: $page && (showMenu = false);
 </script>
 
-<header
-	class="bg-gradient-to-r {$colorTheme} h-[175px] w-full relative bg-cover mb-20"
-	style:background-image={bg}
->
-	<nav class="flex justify-end items-center space-x-4 p-5">
-		{#if user}
-			<a href={`/${user.username}`}>
-				<button
-					class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-						.url.pathname === `/${user.username}`
-						? 'opacity-100'
-						: 'opacity-70 hover:opacity-80'}"
-					><Icon icon="home" style="mx-auto w-6 md:w-8" />
-				</button>
-			</a>
-			<a href={`/${user.username}/receive`}>
-				<button
-					class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-						.url.pathname === `/${user.username}/receive`
-						? 'opacity-100'
-						: 'opacity-70 hover:opacity-80'}"
-					><Icon icon="numpad" style="mx-auto w-6 md:w-8" />
-				</button>
-			</a>
-			<a href={`/${user.username}/payments`}>
-				<button
-					class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-						.url.pathname === `/${user.username}/payments`
-						? 'opacity-100'
-						: 'opacity-70 hover:opacity-80'} relative"
-					><Icon icon="clock" style="mx-auto w-6 md:w-8" />
-					{#if $newPayment}
-						<span class="absolute top-0 right-0">
-							<span class="flex h-3 w-3">
-								<span
-									class="animate-ping absolute inline-flex h-full w-full rounded-full bg-[#F7931A] opacity-75"
-								/>
-								<span class="relative inline-flex rounded-full h-3 w-3 bg-[#F7931A]" />
+{#if !$loading}
+	<header
+		class="bg-gradient-to-r {$colorTheme} h-[175px] w-full relative bg-cover mb-20"
+		style:background-image={bg}
+	>
+		<nav class="flex justify-end items-center space-x-4 p-5">
+			{#if user}
+				<a href={`/${user.username}`}>
+					<button
+						class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+							.url.pathname === `/${user.username}`
+							? 'opacity-100'
+							: 'opacity-70 hover:opacity-80'}"
+						><Icon icon="home" style="mx-auto w-6 md:w-8" />
+					</button>
+				</a>
+				<a href={`/${user.username}/receive`}>
+					<button
+						class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+							.url.pathname === `/${user.username}/receive`
+							? 'opacity-100'
+							: 'opacity-70 hover:opacity-80'}"
+						><Icon icon="numpad" style="mx-auto w-6 md:w-8" />
+					</button>
+				</a>
+				<a href={`/${user.username}/payments`}>
+					<button
+						class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+							.url.pathname === `/${user.username}/payments`
+							? 'opacity-100'
+							: 'opacity-70 hover:opacity-80'} relative"
+						><Icon icon="clock" style="mx-auto w-6 md:w-8" />
+						{#if $newPayment}
+							<span class="absolute top-0 right-0">
+								<span class="flex h-3 w-3">
+									<span
+										class="animate-ping absolute inline-flex h-full w-full rounded-full bg-[#F7931A] opacity-75"
+									/>
+									<span class="relative inline-flex rounded-full h-3 w-3 bg-[#F7931A]" />
+								</span>
 							</span>
-						</span>
-					{/if}
-				</button>
-			</a>
-			<a href={`/send`}>
-				<button
-					class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-						.url.pathname === `/send`
-						? 'opacity-100'
-						: 'opacity-70 hover:opacity-80'}"
-					><Icon icon="send" style="mx-auto w-6 md:w-8" />
-				</button>
-			</a>
-			<div class="relative">
-				<OutClick on:outclick={() => (showMenu = false)}>
+						{/if}
+					</button>
+				</a>
+				<a href={`/send`}>
 					<button
 						class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-							.url.pathname === `/${user.username}` ||
-						$page.url.pathname === `/${user.username}/settings` ||
-						$page.url.pathname === `/support`
+							.url.pathname === `/send`
 							? 'opacity-100'
-							: `opacity-70 hover:opacity-80 ${showMenu ? 'opacity-80' : ''}`}"
-						on:click={() => (showMenu = !showMenu)}
-						><Icon icon="menu" style="mx-auto w-6 md:w-8" />
+							: 'opacity-70 hover:opacity-80'}"
+						><Icon icon="send" style="mx-auto w-6 md:w-8" />
 					</button>
+				</a>
+				<div class="relative">
+					<OutClick on:outclick={() => (showMenu = false)}>
+						<button
+							class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+								.url.pathname === `/${user.username}` ||
+							$page.url.pathname === `/${user.username}/settings` ||
+							$page.url.pathname === `/support`
+								? 'opacity-100'
+								: `opacity-70 hover:opacity-80 ${showMenu ? 'opacity-80' : ''}`}"
+							on:click={() => (showMenu = !showMenu)}
+							><Icon icon="menu" style="mx-auto w-6 md:w-8" />
+						</button>
 
-					<div
-						class="{showMenu
-							? 'block'
-							: 'hidden'} absolute top-14 right-0 bg-white rounded-3xl p-8 shadow-xl z"
+						<div
+							class="{showMenu
+								? 'block'
+								: 'hidden'} absolute top-14 right-0 bg-white rounded-3xl p-8 shadow-xl z"
+						>
+							<ul class="space-y-5 w-48">
+								{#each menuButtons as { href, icon, key }}
+									<li>
+										<a {href} data-sveltekit-prefetch="off">
+											<button
+												class="flex justify-center items-center font-semibold hover:opacity-80"
+												><Icon {icon} style="mr-2 w-6 md:w-8" /> {$t(key)}
+											</button>
+										</a>
+									</li>
+								{/each}
+							</ul>
+							<hr class="my-4" />
+							<a href="/"><img src="/images/logo.svg" alt="Coinos" class="w-32" /></a>
+						</div>
+					</OutClick>
+				</div>
+			{:else}
+				<a href={`/login?redirect=${$page.url.pathname}`}>
+					<button class="bg-white px-5 py-2 rounded-xl font-semibold text-sm"
+						>{$t('nav.signIn')}</button
 					>
-						<ul class="space-y-5 w-48">
-							{#each menuButtons as { href, icon, key }}
-								<li>
-									<a {href} data-sveltekit-prefetch="off">
-										<button class="flex justify-center items-center font-semibold hover:opacity-80"
-											><Icon {icon} style="mr-2 w-6 md:w-8" /> {$t(key)}
-										</button>
-									</a>
-								</li>
-							{/each}
-						</ul>
-						<hr class="my-4" />
-						<a href="/"><img src="/images/logo.svg" alt="Coinos" class="w-32" /></a>
-					</div>
-				</OutClick>
-			</div>
-		{:else}
-			<a href={`/login?redirect=${$page.url.pathname}`}>
-				<button class="bg-white px-5 py-2 rounded-xl font-semibold text-sm"
-					>{$t('nav.signIn')}</button
-				>
-			</a>
-		{/if}
-	</nav>
-	<div
-		class="absolute md:w-[64px] md:mx-auto lg:left-[138px] left-[calc(50vw-64px)] -bottom-[64px] z-30"
-	>
-		<Avatar user={subject} />
-	</div>
-</header>
+				</a>
+			{/if}
+		</nav>
+		<div
+			class="absolute md:w-[64px] md:mx-auto lg:left-[164px] left-[calc(50vw-64px)] -bottom-[64px] z-30"
+		>
+			<Avatar user={subject} />
+		</div>
+	</header>
+{/if}
 
 <style>
 	.z {
diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte
index ac2dfdda..d39dd8ba 100644
--- a/src/components/Avatar.svelte
+++ b/src/components/Avatar.svelte
@@ -13,7 +13,7 @@
 	$: src =
 		($avatar?.id && $avatar.id === user.id && $avatar.src) ||
 		'/api/public/' +
-			(user.profile ? user.id + '-profile.webp' : 'punks/' + punk(user.pubkey || user.id || 'aa'));
+			(user.profile + '.webp' || 'punks/' + punk(user.pubkey || user.id || 'aa'));
 </script>
 
 <a href={link} class:pointer-events-none={disabled}>
diff --git a/src/lib/punks.js b/src/lib/punks.js
new file mode 100644
index 00000000..4d9f2e60
--- /dev/null
+++ b/src/lib/punks.js
@@ -0,0 +1,66 @@
+export default [
+	'5211890e4128d8d730802cc75ee105867e8878581d5e72ffc98a0d60027a5398',
+	'd1ca262272613d7386fecce7f1ad268188940b59ea83fdd1f8d7ab85771e3f43',
+	'62a55d4d6e4b6f992a1c1840f041585c957affcdbf875202cf9e1db9def05aeb',
+	'd3018e45c66dd485697f738ad191af98267e6255d562496dd06b1a662e0c7a88',
+	'7354f3829dd05c838aa16d66b00316f7994797927a4d3b594c8af04a2b4ae86a',
+	'9018be885177c675baf9b36978428d841ca30a9185e11de1a31238a08e3ec1af',
+	'11701e76233395ebdba8d1d50334d1a0cc3a158f3452260c9a7b9a067b78d753',
+	'0ec2e8d07e053d686140857493ece653cde52764a60aa1d25651d81811d44a3d',
+	'c1dececcbd7b623bfaa726392512e6ea110db93a0649dd01bf9e559318514f7c',
+	'01aa9348244c4b65de3df758d49c98076e17a109aef04bc211abc77cf42dc51d',
+	'a80951fc593035abb2dda045a2076d29a30f5cc470e0a20db39c3ec588ed61d8',
+	'ba8dd5a7070aee7102d4f8bc83ac497091e2e473a0f448a1c513569167dd0791',
+	'3f8f861e663accee51e68b987705ce647a7446b7f118abc94c632e158acbb44f',
+	'777c5715de7423597fea6c03c496ea46414f0508cd96e119261f002965beb805',
+	'e19eb1eeabdeffa04ccd792eb09776690cf2121887b26a7c5d20d66e3e8fd0fb',
+	'db5fe28b8ddb9ae5e4f5e0e757ee60bc938bffbdfdd38de807939e212d3c5066',
+	'914813583b901044970b9c7d6dcdfde4344339325f5988d0dd681d377f1243fb',
+	'8c18c036b257d7b9c5a970a786efa04c320f3cf5afa73fa310a6603744d1ee3a',
+	'2aaba839e8546a8cb6d04a81ff5be83ac4e700ca4491607a16ebd60dc4995750',
+	'b742b7509a97c2b346ea762f0510e8475b30dc988417f0f146ae00a800c6dd56',
+	'836d72150b6f3033b6220d15ac9d49457d81041a700d12898bd3b8e737b4d265',
+	'8ba4736edc68da8e5b21c23af4de1f9131f47778c2a5b2a970a799223a9380b3',
+	'4f07e1da3685a858970a9f39300564971e97257f5d37b55a6d9882014aecc421',
+	'698a2ca7a09e88fa6594801da037f4dbce6ae841d1d33736aebcf8f6fe104e01',
+	'd5b5b2167602f7277cdac76cfda8bdad0befcb8ff12df495dfabf40c91d1120c',
+	'50c7c2e8e8c7f4aabffb195187a1ac1105f5712859f02d491d794ba2d8498e08',
+	'6e1f1626a9308abd0b7732fecbc7d49366ced46dead63ef3603fb0f4ec7aa53d',
+	'85cb7cf0245613d08b3027f879f58a6db645bf0db107242beb856b340ee49ee8',
+	'd6dbb18d5df5e92c8c74ee59aa86d19dff25a5d0f9d030e84285a686f86804d7',
+	'eccc90741370ba4acc70bc65f4ccc38fddb1327d977c366156018974bc52fe4a',
+	'78ae0118856a1f17c13f292628fcf3dccc150c7278578caaceb9f35ca8bc9f55',
+	'43ce93c9835e983403a01329918d184832c5516e1b0ea4e0878b4c4def042777',
+	'5f88f7f579ce50d7bcf60d6e9556f77acf361ba54caf3eb61dc4f2ca9c94c6a2',
+	'43bab95a047112dca6705506f916a97252363a20da4a4c0a5ab7b676e11083fc',
+	'08ce4840184f63a779bcd1f91bbcb56a2e8cba75c3ba2dbd290a559a57e4238e',
+	'4595bb092682af7177799464364c047fbfa7ede767336734949bce5d085fce15',
+	'c84724a398bda8d20436fb0663d059c196628fa71192bb720fa5adf6137bed9b',
+	'65309f82cd9f9926a578d09e1ad13909f68a06d02b853760731a4225f7aecef4',
+	'433519d13f2b64fe82a90cd054797d4779507fea93c1054bd51c35ba846a0f7f',
+	'4d8ad7a761d068b7ef9b058fb4ba924b276e7a45a3ad47a79b767e08e821e038',
+	'2cc94821f56d21918ba4f2770d97f280e06fd99f4199167e2f4ddc780f404c8a',
+	'7849ac0f31056265efb0110038f86e61effe17b7db836377d88433b73312e65a',
+	'2155224ef35cfb4bbdb06d982b42bb9b93d97b2bc691c22c804e1759a0a04882',
+	'9d9a9a40c490f05d7dbafde8bf60d68aab7dcb79a7976eef62d1448a4549816b',
+	'5f6549ad9dd15dd57c204b1a9b60c68c376e77d7d114cfa13219e6a1a71f901f',
+	'f46310b2e60727af071d09e759814f52f933688a0ff0995c7da373b381e70005',
+	'f307620a90a36045fa550316d61be4755c1f6c7f3fc81c95fc4d590ac568b2c4',
+	'6f2618272bb0164247e9b0f40b19f020c1c9253510dc658a3cc078d079ef01bf',
+	'6dbec748ea87e959390b0df429c005fccffe9e672864f555c14c7a407b940870',
+	'a7a6187e54e83acdb893d456c8b4ad6877e4738ea9e0d47c9b2070bf2c98a35f',
+	'3759946d9e875ac2fc5c51ed850686193bb1e0716219e42efd52f3965993b275',
+	'f6017bec50563dbbb24b979214ae225f96b01dea5b090b174038ff2842a1c6b1',
+	'fd502d5007bfc62a91eb7a34c1ae23b9de4a20cf5e1bbd86dadc421d7083099c',
+	'e3d1c40538a8aed282a430647e3ff16ff94b64b8ed0a7cf427e8b0e2780a9b2a',
+	'27caa38c14a85ad64b4c4469a34e61a3965a1cbc4cad9a85707da374301c830d',
+	'080574eb9e0613926e0e5d9b667c132e12965a1b1d47218a0b290a2d55c55d2f',
+	'14d254333c6240fbdacbbbe261f7ae15be2e83bffcf084f4f59f459bae0a4571',
+	'82390020b2bca461204cc49b20ee6fec1b93dad476726f377785d04040a4d6c3',
+	'7af3029a826e6dfba23ad502901a3632ef4ee047bd45d618b1f106717b0af7ea',
+	'6bc2990699be7f610c9f6a49bc7a19b034040727bc3de63fee89a1573fe00673',
+	'96ea95735b61c48c6f465db8ca0246a62539f34c3a977be6338770d92461da89',
+	'4f1b39906714266a7a1936bfa8e08c5d891285dd2b188b4bcd4afb0107671004',
+	'6524936709e0719f9e28bf1caac91f86f323d1a79f10ab65a03fa9ea2e6b3270',
+	'5d1d3769cd141603ce907df5dca159e389ca4d75338eddbe1b7db1c0766cbfd6'
+];
diff --git a/src/lib/upload.js b/src/lib/upload.js
index d8b27061..92f5290f 100644
--- a/src/lib/upload.js
+++ b/src/lib/upload.js
@@ -1,5 +1,4 @@
 export const upload = async (file, type, progress, token) => {
-	console.log('TYPE', type);
 	let url = `/api/upload/${type}`;
 	let formData = new FormData();
 	formData.append('file', file);
@@ -14,7 +13,7 @@ export const upload = async (file, type, progress, token) => {
 		});
 		ajax.upload.addEventListener('progress', progress, false);
 		ajax.open('POST', url);
-		ajax.setRequestHeader('Authorization', `Bearer ${token}`);
+		//	ajax.setRequestHeader('Authorization', `Bearer ${token}`);
 		ajax.send(formData);
 	});
 };
diff --git a/src/locales/en.json b/src/locales/en.json
index 2f629675..36cb3518 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -121,7 +121,7 @@
 		"username": "Username",
 		"password": "Password",
 		"email": "Email",
-		"passwordRecommendation": "We recommend a long, random password generated with a password manager.",
+		"passwordRecommendation": "Change to a longer random password if you intend to keep significant funds in the account.",
 		"forgotUserOrPassword": "Forgot Username or Password?",
 		"haveAccount": "Already have an account?",
 		"noAccount": "Don't have an account?",
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index bcff6ef6..012dd957 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -98,7 +98,7 @@
 	{/if}
 
 	{#if subject?.profile}
-		<meta name="og:image" content={`/api/public/${subject.uuid}-profile.webp`} />
+		<meta name="og:image" content={`/api/public/${subject.profile}.webp`} />
 	{:else}
 		<meta property="og:image" content="/icons/logo.svg" />
 	{/if}
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 1b99c4b4..bd2bf0d3 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -61,58 +61,66 @@
 <div class="container mx-auto w-full px-4 mb-4 flex flex-wrap lg:flex-nowrap space-y-5">
 	<div class="hidden lg:block lg:w-[300px]" />
 	<div class="lg:w-[300px] lg:absolute space-y-5 left-20 mx-auto max-w-md">
-		<div
-			class="flex text-3xl font-bold text-center mx-auto justify-center gap-2"
-			on:click={toggleDetails}
-		>
+		<div class="flex text-3xl font-bold text-center mx-auto justify-center gap-2">
 			<div class="my-auto">{display || username}</div>
-			<Icon icon="stats" style="w-12 rounded cursor-pointer" />
+			<button on:click={toggleDetails}>
+				<Icon icon="stats" style="w-12" />
+			</button>
 		</div>
 
 		{#if showDetails}
 			<div>
-        <div class="font-bold">{$t('user.profilePage')}</div>
+				<div class="font-bold">{$t('user.profilePage')}</div>
 				<div class="flex gap-2">
 					<div class="break-all grow text-secondary text-lg">
 						{profile}
 					</div>
 					<div class="flex mb-auto gap-1">
-						<button class="my-auto opacity-60 hover:opacity-100" on:click={() => copy(profile)}
+						<button class="my-auto" on:click={() => copy(profile)}
 							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
 						>
-						<a href={`/qr/${encodeURIComponent(profile)}`} class="my-auto opacity-60 hover:opacity-100">
+						<a
+							href={`/qr/${encodeURIComponent(profile)}`}
+							class="my-auto"
+						>
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
 				</div>
 			</div>
 			<div>
-        <div class="font-bold">{$t('user.lightningAddress')}</div>
+				<div class="font-bold">{$t('user.lightningAddress')}</div>
 				<div class="flex gap-2">
 					<div class="break-all grow text-secondary text-lg">
 						{lnaddr}
 					</div>
 					<div class="flex mb-auto gap-1">
-						<button class="my-auto opacity-60 hover:opacity-100" on:click={() => copy(lnaddr)}
+						<button class="my-auto" on:click={() => copy(lnaddr)}
 							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
 						>
-						<a href={`/qr/${encodeURIComponent(lnaddr)}`} class="my-auto opacity-60 hover:opacity-100">
+						<a
+							href={`/qr/${encodeURIComponent(lnaddr)}`}
+							class="my-auto"
+						>
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
 				</div>
 			</div>
 			<div>
-        <div class="font-bold">{$t('user.nostrPubkey')}</div>
+				<div class="font-bold">{$t('user.nostrPubkey')}</div>
 				<div class="flex gap-2">
 					<div class="break-all grow text-secondary text-lg">
 						{npub}
 					</div>
 					<div class="flex my-auto gap-1">
-						<button class="my-auto opacity-60 hover:opacity-100" on:click={() => copy(npub)}
+						<button class="my-auto" on:click={() => copy(npub)}
 							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
 						>
-						<a href={`/qr/${encodeURIComponent(npub)}`} class="my-auto opacity-60 hover:opacity-100">
+						<a
+							href={`/qr/${encodeURIComponent(npub)}`}
+							class="my-auto"
+						>
 							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
 						</a>
 					</div>
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index e3150ff2..42cf9527 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -96,20 +96,20 @@
 			<div class="flex flex-wrap gap-4 justify-center w-full">
 				<a href={`/${user.username}/receive`} class="w-full md:w-60">
 					<button
-						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
+						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full bg-black text-white"
 					>
 						<div class="mx-auto flex">
-							<Icon icon="numpad" style="my-auto h-6 mr-2" />
+							<Icon icon="numpad" style="my-auto h-6 mr-2 invert" />
 							<div class="my-auto mt-1">{$t('user.dashboard.receive')}</div>
 						</div>
 					</button>
 				</a>
 				<a href={`/send`} class="w-full md:w-60">
 					<button
-						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
+						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full bg-black text-white"
 					>
 						<div class="mx-auto flex">
-							<Icon icon="send" style="my-auto h-6 mr-2" />
+							<Icon icon="send" style="my-auto h-6 mr-2 invert" />
 							<div class="my-auto mt-1">{$t('user.dashboard.send')}</div>
 						</div>
 					</button>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 762e836e..087c9450 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -68,13 +68,31 @@
 			}
 
 			if ($avatar) {
-				await upload($avatar.file, $avatar.type, $avatar.progress, token);
-				await fetch(`/api/public/${id}-profile.webp`, { cache: 'reload', mode: 'no-cors' });
+				try {
+					let { hash } = JSON.parse(
+						await upload($avatar.file, $avatar.type, $avatar.progress, token)
+					);
+
+					data.set('profile', hash);
+
+					await fetch(`/api/public/${hash}.webp`, { cache: 'reload', mode: 'no-cors' });
+				} catch (e) {
+					console.log('problem uploading avatar', e);
+				}
 			}
 
 			if ($banner) {
-				await upload($banner.file, $banner.type, $banner.progress, token);
-				await fetch(`/api/public/${id}-banner.webp`, { cache: 'reload', mode: 'no-cors' });
+				try {
+					let { hash } = JSON.parse(
+						await upload($banner.file, $banner.type, $banner.progress, token)
+					);
+
+					data.set('banner', hash);
+
+					await fetch(`/api/public/${hash}.webp`, { cache: 'reload', mode: 'no-cors' });
+				} catch (e) {
+					console.log('problem uploading banner', e);
+				}
 			}
 
 			let event = {
@@ -84,7 +102,7 @@
 				content: JSON.stringify({
 					name: user.username,
 					about: user.address,
-					picture: `${PUBLIC_COINOS_URL}/public/${user.id}-profile.webp`
+					picture: `${PUBLIC_COINOS_URL}/public/${user.profile}.webp`
 				}),
 				tags: []
 			};
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
index 26c327c0..15d286c8 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
@@ -5,7 +5,7 @@
 	import { t } from '$lib/translations';
 	import { page } from '$app/stores';
 
-	export let user;
+	export let user, rates, submit;
 	let { id } = user;
 
 	let selectedTheme = 1;
@@ -95,7 +95,7 @@
 				on:keydown={selectAvatar}
 			>
 				<img
-					src={$avatar?.src || `/api/public/${user.id}-profile.webp`}
+					src={$avatar?.src || `/api/public/${user.profile}.webp`}
 					class="absolute w-full h-full object-cover object-center visible overflow-hidden"
 					alt={user.username}
 				/>
@@ -138,7 +138,7 @@
 
 	{#if $banner || user.banner}
 		<img
-			src={$banner ? $banner.src : `/api/public/${user.id}-banner.webp`}
+			src={$banner ? $banner.src : `/api/public/${user.banner}.webp`}
 			class="w-full object-cover object-center visible overflow-hidden h-48 mb-4 hover:opacity-80"
 			on:click={selectBanner}
 			on:keydown={selectBanner}
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index 057d8c20..a96528a0 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -4,7 +4,7 @@
 	import { success, fail } from '$lib/utils';
 	import { page } from '$app/stores';
 
-	export let user, rates;
+	export let user, rates, submit;
 	let fiats = Object.keys(rates);
 </script>
 
@@ -25,7 +25,7 @@
 <div>
 	<div class="flex justify-between items-center">
 		<span class="font-bold">{$t('user.settings.tipPrompt')}</span>
-		<Toggle id="prompt" checked={user.prompt} bind:value={user.prompt} />
+		<Toggle id="prompt" bind:value={user.prompt} />
 	</div>
 	<p class="text-secondary mt-1 w-9/12">
 		{$t('user.settings.tipPromptDescription')}
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index 85f461ad..170df744 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -8,7 +8,7 @@
 	import { invalidate } from '$app/navigation';
 	import { page } from '$app/stores';
 
-	export let user, submit;
+	export let user, rates, submit;
 
 	let confirming2fa,
 		disabling2fa,
diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js
index c90d4ee3..f2b49e3f 100644
--- a/src/routes/(app)/register/+page.server.js
+++ b/src/routes/(app)/register/+page.server.js
@@ -1,9 +1,32 @@
+import {
+	NumberDictionary,
+	uniqueNamesGenerator,
+	colors,
+	adjectives,
+	animals
+} from 'unique-names-generator';
 import { fail, redirect } from '@sveltejs/kit';
 import { fd, post, login } from '$lib/utils';
 
 export const load = async ({ parent }) => {
 	let { user } = await parent();
 	if (user) throw redirect(307, `/${user.username}`);
+
+	let username = uniqueNamesGenerator({
+		dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })],
+		length: 2,
+		separator: ''
+	});
+
+	let password = uniqueNamesGenerator({
+		dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })],
+		length: 2,
+    separator: ''
+	});
+
+	let index = Math.floor(Math.random() * 64) + 1;
+
+	return { index, username, password };
 };
 
 export const actions = {
@@ -11,8 +34,8 @@ export const actions = {
 		let ip = request.headers.get('cf-connecting-ip');
 
 		let form = await fd(request);
-		let { username, password, cipher, salt, pubkey, loginRedirect } = form;
-		let user = { username, password, cipher, salt, pubkey };
+		let { profile, username, password, cipher, salt, pubkey, loginRedirect } = form;
+		let user = { profile, username, password, cipher, salt, pubkey };
 		let error;
 
 		if (loginRedirect === 'undefined') loginRedirect = undefined;
@@ -20,7 +43,7 @@ export const actions = {
 		try {
 			await post('/register', { user }, { 'cf-connecting-ip': ip });
 		} catch (e) {
-      console.log(e)
+			console.log(e);
 			if (e.message.includes('taken')) error = e.message;
 		}
 
diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index fd9e4417..37ff67c8 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -1,7 +1,33 @@
 <script>
+	import punks from '$lib/punks';
+	import { upload } from '$lib/upload';
 	import { afterNavigate, invalidateAll } from '$app/navigation';
-	import { RegisterOrLogin } from '$comp';
+	import { applyAction, deserialize } from '$app/forms';
+	import { tick } from 'svelte';
+	import { fly } from 'svelte/transition';
+	import { enhance } from '$app/forms';
+	import { Pin, Icon, Spinner } from '$comp';
+	import { focus, fail } from '$lib/utils';
+	import { avatar, password, loginRedirect } from '$lib/store';
+	import { t } from '$lib/translations';
+	import { page } from '$app/stores';
+	import { generate } from '$lib/nostr';
+
 	export let form;
+	export let data;
+
+	let cleared;
+	let clear = () => {
+		if (!cleared) {
+			cleared = true;
+			username = '';
+			$password = '';
+			revealPassword = false;
+		}
+	};
+
+	let { index, username } = data;
+	$password = data.password;
 
 	afterNavigate(async () => {
 		try {
@@ -10,6 +36,221 @@
 			console.log(e);
 		}
 	});
+
+	let token, formElement;
+	let code = [];
+	let redirect;
+
+	$: need2fa = form?.message === '2fa';
+	let cancel = () => (need2fa = false);
+	$: if (form?.message === '2fa' && form.token === token) token = '';
+
+	let email, btn;
+
+	$: update(form);
+	let update = (form) => form && ({ username, password: $password } = form);
+
+	$: token && token?.length === 6 && tick().then(() => btn.click());
+
+	let revealPassword = true;
+
+	let loading;
+	async function handleSubmit(e) {
+		loading = true;
+
+		let data = new FormData(this);
+		let user = Object.fromEntries(data);
+		await generate(user);
+
+		for (let k in user) {
+			data.set(k, user[k]);
+		}
+
+		data.set('profile', punks[index]);
+		if ($avatar) {
+			try {
+				let { hash } = JSON.parse(
+					await upload($avatar.file, $avatar.type, $avatar.progress, token)
+				);
+
+				data.set('profile', hash);
+				await fetch(`/api/public/${hash}.webp`, { cache: 'reload', mode: 'no-cors' });
+			} catch (e) {
+				console.log('problem uploading avatar', e);
+			}
+		}
+
+		const response = await fetch('/register', {
+			method: 'POST',
+			body: data
+		});
+
+		const result = deserialize(await response.text());
+
+		if (result.type === 'success') {
+			await invalidateAll();
+		}
+
+		applyAction(result);
+		loading = false;
+	}
+
+	let avatarInput;
+	$: src = `/api/public/${punks[index]}.webp`;
+	let decr = () => (index = index <= 1 ? 64 : index - 1);
+	let incr = () => (index = index >= 64 ? 1 : index + 1);
+	let selectAvatar = () => avatarInput.click();
+
+	let progress;
+	let handleFile = async ({ target }) => {
+		let type = 'profile';
+		let file = target.files[0];
+		if (!file) return;
+
+		if (file.size > 10000000) form.error = 'File too large';
+		$avatar = { file, type, progress };
+
+		var reader = new FileReader();
+		reader.onload = async (e) => {
+			src = e.target.result;
+		};
+
+		reader.readAsDataURL(file);
+	};
 </script>
 
-<RegisterOrLogin pageID="register" bind:form />
+{#if need2fa}
+	<Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
+{/if}
+
+<div class="pt-10">
+	<div class="w-[243px] mx-auto mb-10">
+		<a href="/">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex justify-center items-center">
+		<div class="shadow-xl rounded-3xl p-10 pb-12 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]">
+			<h1 class="text-2xl font-bold text-center">{$t('login.register')}</h1>
+
+			<input
+				type="file"
+				class="hidden"
+				bind:this={avatarInput}
+				on:change={(e) => handleFile(e, 'profile')}
+			/>
+
+			<div class="relative">
+				<button class="absolute w-8 h-12 left-8 bg-white rounded top-12" on:click={decr}>
+					<Icon icon="chevron-left" style="w-8 " />
+				</button>
+				<div class="relative w-36 mx-auto" on:click={selectAvatar}>
+					<button
+						class="w-36 h-36 rounded-full border-4 border-white overflow-hidden flex mx-auto relative"
+					>
+						<img
+							{src}
+							class="w-full h-full object-cover object-center overflow-hidden"
+							alt={username}
+						/>
+					</button>
+					<button
+						class="absolute bg-white rounded-full p-2 mx-auto right-0 bottom-0 z-10 bg-opacity-80"
+					>
+						<Icon icon="upload" style="w-8" />
+					</button>
+				</div>
+				<button class="absolute w-8 h-12 right-8 bg-white rounded top-12" on:click={incr}>
+					<Icon icon="chevron-left" style="w-8 rotate-180" />
+				</button>
+			</div>
+
+			{#if form?.error}
+				<div class="text-red-600 text-center" in:fly>
+					{form.error}
+				</div>
+			{/if}
+
+			<form class="space-y-5" on:submit|preventDefault={handleSubmit} method="POST">
+				<input
+					type="hidden"
+					name="loginRedirect"
+					value={$loginRedirect || $page.url.searchParams.get('redirect')}
+				/>
+				<input type="hidden" name="token" value={token} />
+
+				<div>
+					<label for="username" class="font-semibold">{$t('login.username')}</label>
+					<input
+						name="username"
+						type="text"
+						required
+						class="bg-primary"
+						bind:value={username}
+						on:focus={clear}
+						autocapitalize="none"
+					/>
+				</div>
+
+				<div class="relative">
+					<label for="password" class="block font-semibold">{$t('login.password')}</label>
+					{#if revealPassword}
+						<input
+							name="password"
+							type="text"
+							required
+							class="bg-primary"
+							bind:value={$password}
+							autocapitalize="none"
+						/>
+					{:else}
+						<input
+							name="password"
+							type="password"
+							required
+							class="bg-primary"
+							bind:value={$password}
+							autocapitalize="none"
+							on:focus={clear}
+						/>
+					{/if}
+					<button
+						type="button"
+						on:click={() => (revealPassword = !revealPassword)}
+						class="absolute right-5 top-10"
+					>
+						<Icon icon={revealPassword ? 'eye' : 'eye-off'} />
+					</button>
+				</div>
+
+				<p class="text-secondary text-sm">
+					{$t('login.passwordRecommendation')}
+				</p>
+
+				<button
+					type="submit"
+					class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
+					disabled={loading}
+					bind:this={btn}
+				>
+					{#if loading}
+						<Spinner />
+					{:else}
+						{$t('login.register')}
+					{/if}
+				</button>
+			</form>
+
+			<p class="text-secondary text-center font-medium">
+				{$t('login.haveAccount')}
+				<a
+					href={'/login'}
+					class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
+				>
+					{$t('login.signIn')}
+				</a>
+			</p>
+		</div>
+	</div>
+</div>
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 7e9cb755..2cd0c473 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,5 +1,6 @@
 <script>
 	import '../app.css';
+	import { loading, t } from '$lib/translations';
 
 	export let data;
 	let { host, pathname } = data;
@@ -26,7 +27,9 @@
 	<meta name="twitter:creator" content="@coinoswallet" />
 </svelte:head>
 
+{#if !$loading}
 <slot />
+{/if}
 
 <style global>
 	:root {
diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js
index 7936e88b..9e4b62e2 100644
--- a/src/routes/+page.server.js
+++ b/src/routes/+page.server.js
@@ -8,5 +8,6 @@ export let load = async () => {
 		data = await get('/locations');
 	} catch (e) {}
 
+    data.faqs = ['cost', 'compatibility', 'safety', 'pos', 'bitcoin'];
 	return data;
 };
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 0aaf887d..9d2ba213 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -12,11 +12,11 @@
 
 	import { t } from '$lib/translations';
 	import { close } from '$lib/socket';
-	import { onMount } from 'svelte';
+	import { onDestroy, onMount } from 'svelte';
 
 	export let data;
-	let { locations, user } = data;
-	let update = (data) => ({ locations, user } = data);
+	let { faqs, locations, user } = data;
+	let update = (data) => ({ faqs, locations, user } = data);
 	$: update(data);
 
 	let howItWorks;
@@ -24,7 +24,6 @@
 	let about;
 
 	let log = console.log;
-	let faqs = {};
 
 	const howItWorksSteps = [
 		{ image: 'hand', stepID: 'step1' },
@@ -32,9 +31,9 @@
 		{ image: 'smile', stepID: 'step3' }
 	];
 
-	onMount(async () => {
-		faqs = (await import('../locales/en.json')).default.faq;
+	let loaded;
 
+	onMount(async () => {
 		close();
 
 		try {
@@ -42,62 +41,68 @@
 		} catch (e) {
 			console.log(e);
 		}
+
+		loaded = true;
 	});
+
+	onDestroy(() => (loaded = false));
 </script>
 
 <svelte:head>
 	<script src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js"></script>
 </svelte:head>
 
-<LandingHeader {howItWorks} {faq} {about} {user} />
-
-<main class="space-y-40 py-20 md:py-32 lg:py-36 xl:py-40 px-5 md:px-0">
-	<LandingHero {user} />
-	<LandingInfoCard
-		image="lightning-qr"
-		title={$t('landing.info1.title')}
-		description={$t('landing.info1.description')}
-	/>
-
-	<LandingInfoCard image="phone-checkout" title={$t('landing.info2.title')} order="reverse">
-		{$t('landing.info2.description1')}
-		<br /><br />
-		{$t('landing.info2.description2')}
-		<br /><br />
-		{@html $t('landing.info2.description3')}
-	</LandingInfoCard>
-
-	<div>
+{#if loaded}
+	<LandingHeader {howItWorks} {faq} {about} {user} />
+
+	<main class="space-y-40 py-20 md:py-32 lg:py-36 xl:py-40 px-5 md:px-0">
+		<LandingHero {user} />
 		<LandingInfoCard
-			image="customize"
-			title={$t('landing.info3.title')}
-			description={$t('landing.info3.description')}
+			image="lightning-qr"
+			title={$t('landing.info1.title')}
+			description={$t('landing.info1.description')}
 		/>
-		<div bind:this={howItWorks} />
-		<div id="about" />
-	</div>
-
-	<div>
-		<h3 class="text-5xl font-medium mb-10 text-center">{$t('howItWorks.header')}</h3>
-		<div class="grid lg:grid-cols-3 space-y-10 lg:space-y-0 text-center">
-			{#each howItWorksSteps as step}
-				<HowItWorksCard image={step.image} stepID={step.stepID} />
-			{/each}
+
+		<LandingInfoCard image="phone-checkout" title={$t('landing.info2.title')} order="reverse">
+			{$t('landing.info2.description1')}
+			<br /><br />
+			{$t('landing.info2.description2')}
+			<br /><br />
+			{@html $t('landing.info2.description3')}
+		</LandingInfoCard>
+
+		<div>
+			<LandingInfoCard
+				image="customize"
+				title={$t('landing.info3.title')}
+				description={$t('landing.info3.description')}
+			/>
+			<div bind:this={howItWorks} />
+			<div id="about" />
+		</div>
+
+		<div>
+			<h3 class="text-5xl font-medium mb-10 text-center">{$t('howItWorks.header')}</h3>
+			<div class="grid lg:grid-cols-3 space-y-10 lg:space-y-0 text-center">
+				{#each howItWorksSteps as step}
+					<HowItWorksCard image={step.image} stepID={step.stepID} />
+				{/each}
+			</div>
+			<div bind:this={faq} />
 		</div>
-		<div bind:this={faq} />
-	</div>
-
-	<div>
-		<div class="space-y-10">
-			<h3 class="text-5xl font-medium text-center pt-40 -mt-40" id="faq">{$t('faq.header')}</h3>
-			{#each Object.keys(faqs).filter((f) => f !== 'header') as faqID}
-				<FaqCard questionID={faqID} />
-			{/each}
+
+		<div>
+			<div class="space-y-10">
+				<h3 class="text-5xl font-medium text-center pt-40 -mt-40" id="faq">{$t('faq.header')}</h3>
+				{#each faqs as f}
+					<FaqCard questionID={f} />
+				{/each}
+			</div>
+			<div bind:this={about} />
 		</div>
-		<div bind:this={about} />
-	</div>
 
-	<About {locations} />
-</main>
+		<About {locations} />
+	</main>
 
-<Footer />
+	<Footer />
+{/if}
diff --git a/static/icons/upload.svg b/static/icons/upload.svg
new file mode 100644
index 00000000..b11b621a
--- /dev/null
+++ b/static/icons/upload.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 10V16M12 10L10 12M12 10L14 12M12.0627 6.06274L11.9373 5.93726C11.5914 5.59135 11.4184 5.4184 11.2166 5.29472C11.0376 5.18506 10.8425 5.10425 10.6385 5.05526C10.4083 5 10.1637 5 9.67452 5H6.2C5.0799 5 4.51984 5 4.09202 5.21799C3.71569 5.40973 3.40973 5.71569 3.21799 6.09202C3 6.51984 3 7.07989 3 8.2V15.8C3 16.9201 3 17.4802 3.21799 17.908C3.40973 18.2843 3.71569 18.5903 4.09202 18.782C4.51984 19 5.07989 19 6.2 19H17.8C18.9201 19 19.4802 19 19.908 18.782C20.2843 18.5903 20.5903 18.2843 20.782 17.908C21 17.4802 21 16.9201 21 15.8V10.2C21 9.0799 21 8.51984 20.782 8.09202C20.5903 7.71569 20.2843 7.40973 19.908 7.21799C19.4802 7 18.9201 7 17.8 7H14.3255C13.8363 7 13.5917 7 13.3615 6.94474C13.1575 6.89575 12.9624 6.81494 12.7834 6.70528C12.5816 6.5816 12.4086 6.40865 12.0627 6.06274Z" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From 62717aa144bba98f981d062d724f2e73406be6ac Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 15 Nov 2023 23:48:46 -0800
Subject: fix avatar fallback

---
 src/components/Avatar.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte
index d39dd8ba..b258a0e8 100644
--- a/src/components/Avatar.svelte
+++ b/src/components/Avatar.svelte
@@ -13,7 +13,7 @@
 	$: src =
 		($avatar?.id && $avatar.id === user.id && $avatar.src) ||
 		'/api/public/' +
-			(user.profile + '.webp' || 'punks/' + punk(user.pubkey || user.id || 'aa'));
+			(user.profile ? user.profile + '.webp' : 'punks/' + punk(user.pubkey || user.id || 'aa'));
 </script>
 
 <a href={link} class:pointer-events-none={disabled}>
-- 
cgit v1.2.3


From 96c67006bde6fa5a9d92edcb84e48744e0a36cf5 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 00:08:03 -0800
Subject: clear avatar on register

---
 src/routes/(app)/register/+page.svelte | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index 37ff67c8..82b40e9e 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -16,6 +16,8 @@
 	export let form;
 	export let data;
 
+  $: data && ($avatar = undefined);
+
 	let cleared;
 	let clear = () => {
 		if (!cleared) {
-- 
cgit v1.2.3


From 5a13331a525fa298c1b7435db5e468138ba8572e Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 00:21:08 -0800
Subject: ui tweaks

---
 src/routes/(app)/[username]/(profile)/+layout.svelte | 12 ++++++------
 src/routes/(app)/[username]/(profile)/+page.svelte   | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index bd2bf0d3..9e7a47bb 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -58,9 +58,9 @@
 	let toggleDetails = () => (showDetails = !showDetails);
 </script>
 
-<div class="container mx-auto w-full px-4 mb-4 flex flex-wrap lg:flex-nowrap space-y-5">
+<div class="container mx-auto w-full px-4 flex flex-wrap lg:flex-nowrap">
 	<div class="hidden lg:block lg:w-[300px]" />
-	<div class="lg:w-[300px] lg:absolute space-y-5 left-20 mx-auto max-w-md">
+	<div class="lg:w-[300px] lg:absolute space-y-5 left-20 mx-auto max-w-sm">
 		<div class="flex text-3xl font-bold text-center mx-auto justify-center gap-2">
 			<div class="my-auto">{display || username}</div>
 			<button on:click={toggleDetails}>
@@ -71,7 +71,7 @@
 		{#if showDetails}
 			<div>
 				<div class="font-bold">{$t('user.profilePage')}</div>
-				<div class="flex gap-2">
+				<div class="flex gap-4">
 					<div class="break-all grow text-secondary text-lg">
 						{profile}
 					</div>
@@ -90,7 +90,7 @@
 			</div>
 			<div>
 				<div class="font-bold">{$t('user.lightningAddress')}</div>
-				<div class="flex gap-2">
+				<div class="flex gap-4">
 					<div class="break-all grow text-secondary text-lg">
 						{lnaddr}
 					</div>
@@ -109,7 +109,7 @@
 			</div>
 			<div>
 				<div class="font-bold">{$t('user.nostrPubkey')}</div>
-				<div class="flex gap-2">
+				<div class="flex gap-4">
 					<div class="break-all grow text-secondary text-lg">
 						{npub}
 					</div>
@@ -139,7 +139,7 @@
 			</div>
 		{/if}
 
-		<div class="flex justify-center gap-4">
+		<div class="flex justify-center gap-2">
 			<a href={`/${subject.pubkey}/follows`}
 				><b>{subject.follows.length}</b>
 				<span class="text-secondary">{$t('user.following')}</span></a
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 42cf9527..32a1f2cb 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -78,10 +78,10 @@
 	});
 </script>
 
-<div class="space-y-8">
+<div class="space-y-5">
 	{#if user?.id === subject.id}
-		<div>
-			<div class="flex justify-center lg:justify-start mb-8">
+		<div class="space-y-5">
+			<div class="flex justify-center lg:justify-start">
 				<Balance {user} />
 			</div>
 
@@ -93,24 +93,24 @@
 				</div>
 			{/if}
 
-			<div class="flex flex-wrap gap-4 justify-center w-full">
+			<div class="flex flex-wrap gap-2 justify-center w-full">
 				<a href={`/${user.username}/receive`} class="w-full md:w-60">
 					<button
-						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full bg-black text-white"
+						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
 					>
 						<div class="mx-auto flex">
-							<Icon icon="numpad" style="my-auto h-6 mr-2 invert" />
-							<div class="my-auto mt-1">{$t('user.dashboard.receive')}</div>
+							<Icon icon="numpad" style="my-auto h-6 mr-2" />
+							<div class="my-auto">{$t('user.dashboard.receive')}</div>
 						</div>
 					</button>
 				</a>
 				<a href={`/send`} class="w-full md:w-60">
 					<button
-						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full bg-black text-white"
+						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
 					>
 						<div class="mx-auto flex">
-							<Icon icon="send" style="my-auto h-6 mr-2 invert" />
-							<div class="my-auto mt-1">{$t('user.dashboard.send')}</div>
+							<Icon icon="send" style="my-auto h-6 mr-2" />
+							<div class="my-auto">{$t('user.dashboard.send')}</div>
 						</div>
 					</button>
 				</a>
-- 
cgit v1.2.3


From e1d10ac92119c9a0aa841ec72325d722df99bbe6 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 00:23:44 -0800
Subject: hide bio for self on homepage

---
 src/routes/(app)/[username]/(profile)/+layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 9e7a47bb..86fe3361 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -128,7 +128,7 @@
 			</div>
 		{/if}
 
-		{#if subject.address}
+		{#if subject.address && subject.id !== user?.id}
 			<div
 				class="text-secondary mx-auto text-center lg:text-left lg:mx-0"
 				class:line-clamp-3={showBio}
-- 
cgit v1.2.3


From ea2f0df7e81f16e10af26eb5bd156c38d0f1ce31 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 00:25:43 -0800
Subject: extra padding on footer

---
 src/routes/(app)/[username]/(profile)/+layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 86fe3361..46c082f0 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -218,7 +218,7 @@
 </div>
 
 {#if currency && !isNaN($animatedRate)}
-	<div class="flex fixed w-full px-4 bg-white py-2 bottom-0 bg-opacity-90 tabular-nums">
+	<div class="flex fixed w-full px-4 bg-white py-2 pb-3 bottom-0 bg-opacity-90 tabular-nums">
 		<div class="text-secondary flex mr-auto">
 			<div class="flex mr-1">
 				<div class="my-auto mr-1">1</div>
-- 
cgit v1.2.3


From 0581e2a0b080120a9f7445c3f97805ff6a0dc272 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 00:43:10 -0800
Subject: fix off by one error

---
 src/routes/(app)/register/+page.svelte | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index 82b40e9e..e7aa475f 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -99,8 +99,8 @@
 
 	let avatarInput;
 	$: src = `/api/public/${punks[index]}.webp`;
-	let decr = () => (index = index <= 1 ? 64 : index - 1);
-	let incr = () => (index = index >= 64 ? 1 : index + 1);
+	let decr = () => (index = index <= 0 ? 63 : index - 1);
+	let incr = () => (index = index >= 63 ? 0 : index + 1);
 	let selectAvatar = () => avatarInput.click();
 
 	let progress;
-- 
cgit v1.2.3


From 46520607897855f02f03b53c5e4ab09c0de162d9 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 07:41:21 -0800
Subject: tighten up register page

---
 src/routes/(app)/register/+page.svelte | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index e7aa475f..215c93d6 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -125,18 +125,16 @@
 	<Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
 {/if}
 
-<div class="pt-10">
-	<div class="w-[243px] mx-auto mb-10">
+<div class="pt-4">
+	<div class="w-[243px] mx-auto">
 		<a href="/">
 			<Icon icon="logo" />
 		</a>
 	</div>
 
 	<div class="flex justify-center items-center">
-		<div class="shadow-xl rounded-3xl p-10 pb-12 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]">
-			<h1 class="text-2xl font-bold text-center">{$t('login.register')}</h1>
-
-			<input
+		<div class="shadow-xl rounded-3xl p-4 pt-0 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]">
+			<inpue
 				type="file"
 				class="hidden"
 				bind:this={avatarInput}
@@ -144,12 +142,12 @@
 			/>
 
 			<div class="relative">
-				<button class="absolute w-8 h-12 left-8 bg-white rounded top-12" on:click={decr}>
+				<button class="absolute w-8 h-12 left-12 bg-white rounded top-12" on:click={decr}>
 					<Icon icon="chevron-left" style="w-8 " />
 				</button>
-				<div class="relative w-36 mx-auto" on:click={selectAvatar}>
+				<div class="relative w-32 mx-auto" on:click={selectAvatar}>
 					<button
-						class="w-36 h-36 rounded-full border-4 border-white overflow-hidden flex mx-auto relative"
+						class="w-32 h-32 rounded-full border-4 border-white overflow-hidden flex mx-auto relative"
 					>
 						<img
 							{src}
@@ -163,7 +161,7 @@
 						<Icon icon="upload" style="w-8" />
 					</button>
 				</div>
-				<button class="absolute w-8 h-12 right-8 bg-white rounded top-12" on:click={incr}>
+				<button class="absolute w-8 h-12 right-12 bg-white rounded top-12" on:click={incr}>
 					<Icon icon="chevron-left" style="w-8 rotate-180" />
 				</button>
 			</div>
-- 
cgit v1.2.3


From 7a215961c3b91400a6c955195a4369ff936a00c3 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 09:23:04 -0800
Subject: refresh usernames

---
 src/locales/en.json                    |  2 +-
 src/routes/(app)/register/+page.svelte | 20 ++++++++++++++++----
 static/icons/refresh.svg               |  4 ++++
 3 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 static/icons/refresh.svg

(limited to 'src')

diff --git a/src/locales/en.json b/src/locales/en.json
index 36cb3518..f10a4db7 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -121,7 +121,7 @@
 		"username": "Username",
 		"password": "Password",
 		"email": "Email",
-		"passwordRecommendation": "Change to a longer random password if you intend to keep significant funds in the account.",
+		"passwordRecommendation": "We recommend using a long, random password if you intend to keep funds in your account.",
 		"forgotUserOrPassword": "Forgot Username or Password?",
 		"haveAccount": "Already have an account?",
 		"noAccount": "Don't have an account?",
diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index 215c93d6..16dea024 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -16,7 +16,7 @@
 	export let form;
 	export let data;
 
-  $: data && ($avatar = undefined);
+	$: data && ($avatar = undefined);
 
 	let cleared;
 	let clear = () => {
@@ -28,9 +28,18 @@
 		}
 	};
 
-	let { index, username } = data;
+	let refresh = async () => {
+		await invalidateAll();
+		await tick();
+		username = data.username;
+		$password = data.password;
+	};
+
+	let username = data.username;
 	$password = data.password;
 
+	let { index } = data;
+
 	afterNavigate(async () => {
 		try {
 			await invalidateAll();
@@ -134,7 +143,7 @@
 
 	<div class="flex justify-center items-center">
 		<div class="shadow-xl rounded-3xl p-4 pt-0 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]">
-			<inpue
+			<input
 				type="file"
 				class="hidden"
 				bind:this={avatarInput}
@@ -180,7 +189,7 @@
 				/>
 				<input type="hidden" name="token" value={token} />
 
-				<div>
+				<div class="relative">
 					<label for="username" class="font-semibold">{$t('login.username')}</label>
 					<input
 						name="username"
@@ -191,6 +200,9 @@
 						on:focus={clear}
 						autocapitalize="none"
 					/>
+					<button type="button" on:click={refresh} class="absolute right-5 top-10">
+						<Icon icon="refresh" style="w-6" />
+					</button>
 				</div>
 
 				<div class="relative">
diff --git a/static/icons/refresh.svg b/static/icons/refresh.svg
new file mode 100644
index 00000000..061c5ab1
--- /dev/null
+++ b/static/icons/refresh.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M21 12C21 16.9706 16.9706 21 12 21C9.69494 21 7.59227 20.1334 6 18.7083L3 16M3 12C3 7.02944 7.02944 3 12 3C14.3051 3 16.4077 3.86656 18 5.29168L21 8M3 21V16M3 16H8M21 3V8M21 8H16" stroke="#000000" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From 1b71ef372a7b29d06756d8894b3ab969d98df69a Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 09:30:52 -0800
Subject: button margins

---
 src/routes/(app)/register/+page.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index 16dea024..573de4d0 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -200,8 +200,8 @@
 						on:focus={clear}
 						autocapitalize="none"
 					/>
-					<button type="button" on:click={refresh} class="absolute right-5 top-10">
-						<Icon icon="refresh" style="w-6" />
+					<button type="button" on:click={refresh} class="absolute right-0 top-4">
+						<Icon icon="refresh" style="w-6 m-6" />
 					</button>
 				</div>
 
@@ -230,9 +230,9 @@
 					<button
 						type="button"
 						on:click={() => (revealPassword = !revealPassword)}
-						class="absolute right-5 top-10"
+						class="absolute right-0 top-4"
 					>
-						<Icon icon={revealPassword ? 'eye' : 'eye-off'} />
+						<Icon icon={revealPassword ? 'eye' : 'eye-off'} style="m-6" />
 					</button>
 				</div>
 
-- 
cgit v1.2.3


From 7ccd15adef0721f7ddd79a505b438422365989fa Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 16 Nov 2023 10:45:48 -0800
Subject: update cole's title

---
 src/locales/en.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/locales/en.json b/src/locales/en.json
index f10a4db7..c68b5b91 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -14,7 +14,7 @@
 			},
 			"cole": {
 				"name": "Cole",
-				"position": "Certified Bitcoin Professional",
+				"position": "Business Development",
 				"bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible."
 			}
 		},
-- 
cgit v1.2.3


From 48f1b499a1bcbb9dfb604e5be09ff587211f2a22 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Nov 2023 00:30:07 -0800
Subject: add avatars to map

---
 src/components/LocationsMap.svelte | 87 +++++++++++++-------------------------
 src/components/Popup.svelte        | 40 ++++++++++++++++++
 src/components/index.js            |  1 +
 3 files changed, 70 insertions(+), 58 deletions(-)
 create mode 100644 src/components/Popup.svelte

(limited to 'src')

diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index 4b1b1b82..ebbf8df4 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -1,8 +1,8 @@
 <script>
-	import { onMount, onDestroy } from 'svelte';
+	import { tick, onMount, onDestroy } from 'svelte';
 	import { browser } from '$app/environment';
 	import html2canvas from 'html2canvas';
-	import { Icon } from '$comp';
+	import { Icon, Popup } from '$comp';
 
 	import 'maplibre-gl/dist/maplibre-gl.css';
 
@@ -29,7 +29,7 @@
 				mapWrapper.msRequestFullscreen();
 			}
 
-      map.resize();
+			map.resize();
 		} else {
 			if (document.exitFullscreen) {
 				document.exitFullscreen();
@@ -53,19 +53,19 @@
 	}
 
 	async function flyToMarker(marker) {
-		marker.getElement().click();
-
 		map.flyTo({
-			zoom: 14,
+			zoom: 12,
 			center: marker.getLngLat(),
 			essential: true,
 			easing: function (t) {
 				return 1 - Math.pow(1 - t, 3);
 			},
-			duration: 5000
+			duration: 3000
 		});
 
-		await new Promise((r) => setTimeout(r, 5000));
+		await new Promise((r) => setTimeout(r, 3000));
+		marker.getElement().click();
+		await new Promise((r) => setTimeout(r, 1500));
 
 		if (!timeout) return;
 
@@ -76,7 +76,7 @@
 			easing: function (t) {
 				return 1 - Math.pow(1 - t, 3);
 			},
-			duration: 2000
+			duration: 1500
 		});
 	}
 
@@ -93,7 +93,7 @@
 		if (currentIndex >= inview.length) currentIndex = 0;
 		flyToMarker(inview[currentIndex]);
 
-		timeout = setTimeout(startFlying, 7000);
+		timeout = setTimeout(startFlying, 6000);
 	}
 
 	function stopFlying() {
@@ -108,20 +108,6 @@
 		map.off('moveend'); // Remove moveend listener if set
 	}
 
-	let checkAddress = (location) => {
-		if (location['addr:housenumber'] && location['addr:street'] && location['addr:city']) {
-			return `${
-				location['addr:housenumber'] + ' ' + location['addr:street'] + ', ' + location['addr:city']
-			}`;
-		} else if (location['addr:street'] && location['addr:city']) {
-			return `${location['addr:street'] + ', ' + location['addr:city']}`;
-		} else if (location['addr:city']) {
-			return `${location['addr:city']}`;
-		} else {
-			return '';
-		}
-	};
-
 	let inview = [];
 
 	function updateLabelVisibility() {
@@ -142,20 +128,6 @@
 		inview = inview.sort((a, b) => a.tags.name.localeCompare(b.tags.name));
 	}
 
-	let html = (tags) => `${
-		tags && tags.name ? `<span class='block font-bold'>${tags.name}</span>` : ''
-	}
-
-  <span class='block'>${tags && checkAddress(tags)}</span>
-
-  ${tags && tags.phone ? `<a href='tel:${tags.phone}' class='block'>${tags.phone}</a>` : ''}
-
-  ${
-		tags && tags.website
-			? `<a href=${tags.website} target="_blank" rel="noreferrer" class='block text-blue-400 break-all'>${tags.website}</a>`
-			: ''
-	}`;
-
 	let popups = {};
 	let counter = 0;
 
@@ -179,18 +151,26 @@
 						let element = document.createElement('div');
 						element.className = 'marker';
 
+						let popupContainer = document.createElement('div');
+
+						let popup = new Popup({
+							target: popupContainer,
+							props: { tags }
+						});
+
+            if (tags.name?.startsWith("Cord")) console.log(location)
+
 						let marker = new maplibre.Marker({ color: '#F7931A' })
 							.setLngLat([lon, lat])
-							.setPopup(new maplibre.Popup().setHTML(html(tags)))
+							.setPopup(new maplibre.Popup().setDOMContent(popupContainer))
 							.addTo(map);
 
 						marker.id = counter++;
 
 						marker.getElement().addEventListener('click', () => {
-							let h = html(marker.tags);
 							let p = marker.getPopup();
 							popups[marker.id] = p;
-							p.setHTML(h);
+							p.setDOMContent(popupContainer);
 							p.on('close', () => {
 								delete popups[marker.id];
 							});
@@ -221,26 +201,17 @@
 				map.on('wheel', stopFlying);
 				map.on('dragstart', stopFlying);
 
-				document.addEventListener('fullscreenchange', onFullScreenChange, false);
-				document.addEventListener('webkitfullscreenchange', onFullScreenChange, false);
-				document.addEventListener('mozfullscreenchange', onFullScreenChange, false);
-				document.addEventListener('MSFullscreenChange', onFullScreenChange, false);
-
-				function onFullScreenChange() {
-          console.log("resizing")
-					if (map) {
-						map.resize(); // This will adjust the map size to fit the new container size
-					}
-				}
+				let resize = () => map && map.resize();
+
+				document.addEventListener('fullscreenchange', resize, false);
+				document.addEventListener('webkitfullscreenchange', resize, false);
+				document.addEventListener('mozfullscreenchange', resize, false);
+				document.addEventListener('MSFullscreenChange', resize, false);
 			});
 		}
 	});
 
-	onDestroy(() => {
-		if (map) {
-			map.remove();
-		}
-	});
+	onDestroy(() => map && map.remove());
 </script>
 
 <div class="container mx-auto max-w-4xl">
@@ -301,6 +272,6 @@
 		color: black;
 		background-color: white;
 		overflow: hidden;
-		width: 280px;
+		width: 260px;
 	}
 </style>
diff --git a/src/components/Popup.svelte b/src/components/Popup.svelte
new file mode 100644
index 00000000..e0cec12e
--- /dev/null
+++ b/src/components/Popup.svelte
@@ -0,0 +1,40 @@
+<script>
+	import { Avatar } from '$comp';
+	export let tags;
+
+	let addr = (tags) => {
+		let { 'addr:housenumber': house, 'addr:street': street, 'addr:city': city } = tags;
+		if (house) return `${house} ${street}, ${city}`;
+		if (street) return `${street}, ${city}`;
+		if (city) return city;
+		return '';
+	};
+</script>
+
+{#if tags}
+	<span class="block font-bold">{tags.name}</span>
+
+	<span class="block">{addr(tags)}</span>
+
+	{#if tags.phone}
+		<a href="tel:${tags.phone}" class="block">{tags.phone}</a>
+	{/if}
+
+	{#if tags.website}
+		<a href="${tags.website}" target="_blank" rel="noreferrer" class="block text-blue-400 break-all"
+			>{tags.website}</a
+		>
+	{/if}
+
+	{#if tags.user}
+    <a href={`/${tags.user.username}`}>
+		<div class="flex gap-1">
+			<Avatar user={tags.user} size={16} />
+			<div class="my-auto">
+				{tags.user.username}
+			</div>
+		</div>
+    </a>
+	{/if}
+
+{/if}
diff --git a/src/components/index.js b/src/components/index.js
index 1853e7c9..53838581 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,3 +1,4 @@
+export { default as Popup } from './Popup.svelte';
 export { default as Code } from './Code.svelte';
 export { default as Slider } from './Slider.svelte';
 export { default as Pinpad } from './Pinpad.svelte';
-- 
cgit v1.2.3


From 9f42d4e4e7e7baf3697aef0c43393a5a443c3b39 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Nov 2023 00:46:59 -0800
Subject: add logo to map page

---
 src/routes/map/+page.svelte | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/routes/map/+page.svelte b/src/routes/map/+page.svelte
index 99c822d3..c602ac1d 100644
--- a/src/routes/map/+page.svelte
+++ b/src/routes/map/+page.svelte
@@ -1,8 +1,18 @@
 <script>
-	import { LocationsMap } from '$comp';
+	import { Icon, LocationsMap } from '$comp';
 	export let data;
 
 	let { locations } = data;
 </script>
 
-<LocationsMap {locations} />
+<div class="pt-4">
+	<div class="w-[243px] mx-auto mb-10">
+		<a href="/">
+			<Icon icon="logo" />
+		</a>
+	</div>
+
+	<div class="flex justify-center items-center">
+		<LocationsMap {locations} />
+	</div>
+</div>
-- 
cgit v1.2.3


From 88a466fe9863919e8f5d10d117b561f91bb2964e Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Nov 2023 10:18:24 -0800
Subject: map styles

---
 src/components/LocationsMap.svelte | 28 +++++++++++++---------------
 src/routes/map/+page.svelte        |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index ebbf8df4..07669a42 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -158,8 +158,6 @@
 							props: { tags }
 						});
 
-            if (tags.name?.startsWith("Cord")) console.log(location)
-
 						let marker = new maplibre.Marker({ color: '#F7931A' })
 							.setLngLat([lon, lat])
 							.setPopup(new maplibre.Popup().setDOMContent(popupContainer))
@@ -214,8 +212,8 @@
 	onDestroy(() => map && map.remove());
 </script>
 
-<div class="container mx-auto max-w-4xl">
-	<div class="flex w-full h-[400px]" id="map" bind:this={mapWrapper}>
+<div class="container mx-auto p-2 space-y-5">
+	<div class="flex w-full h-[60vh]" id="map" bind:this={mapWrapper}>
 		<div id="map-container" class="mx-auto h-full w-full z-0" bind:this={mapContainer} />
 		<div class="relative">
 			<div class="flex absolute flex top-2 right-2 gap-2">
@@ -230,19 +228,19 @@
 					<Icon icon="full" style="w-4 m-auto" />
 				</button>
 			</div>
-
-			<div class="absolute bottom-2 right-2 w-60 h-24 bg-white overflow-y-scroll p-4 bg-opacity-80">
-				{#each inview as m}
-					<button
-						on:click={() => select(m)}
-						class="text-left"
-						class:font-bold={m.id === inview[currentIndex]?.id}
-						id={`marker-${m.id}`}>{m.tags.name}</button
-					>
-				{/each}
-			</div>
 		</div>
 	</div>
+
+	<div class="hidden lg:grid grid-cols-3 justify-items-center">
+		{#each inview as m}
+			<button
+				on:click={() => select(m)}
+				class="text-left"
+				class:font-bold={m.id === inview[currentIndex]?.id}
+				id={`marker-${m.id}`}>{m.tags.name}</button
+			>
+		{/each}
+	</div>
 </div>
 
 <style>
diff --git a/src/routes/map/+page.svelte b/src/routes/map/+page.svelte
index c602ac1d..baf067d7 100644
--- a/src/routes/map/+page.svelte
+++ b/src/routes/map/+page.svelte
@@ -6,7 +6,7 @@
 </script>
 
 <div class="pt-4">
-	<div class="w-[243px] mx-auto mb-10">
+	<div class="w-[243px] mx-auto mb-4">
 		<a href="/">
 			<Icon icon="logo" />
 		</a>
-- 
cgit v1.2.3


From 2daee6140cf45493312165569bc7f2dd492555a9 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Nov 2023 10:25:21 -0800
Subject: map styles

---
 src/components/Popup.svelte | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

(limited to 'src')

diff --git a/src/components/Popup.svelte b/src/components/Popup.svelte
index e0cec12e..1f6a2cf6 100644
--- a/src/components/Popup.svelte
+++ b/src/components/Popup.svelte
@@ -4,37 +4,32 @@
 
 	let addr = (tags) => {
 		let { 'addr:housenumber': house, 'addr:street': street, 'addr:city': city } = tags;
-		if (house) return `${house} ${street}, ${city}`;
-		if (street) return `${street}, ${city}`;
-		if (city) return city;
+		if (house) return `${house} ${street}`;
 		return '';
 	};
 </script>
 
 {#if tags}
-	<span class="block font-bold">{tags.name}</span>
-
-	<span class="block">{addr(tags)}</span>
-
-	{#if tags.phone}
-		<a href="tel:${tags.phone}" class="block">{tags.phone}</a>
-	{/if}
-
-	{#if tags.website}
-		<a href="${tags.website}" target="_blank" rel="noreferrer" class="block text-blue-400 break-all"
-			>{tags.website}</a
-		>
-	{/if}
-
 	{#if tags.user}
-    <a href={`/${tags.user.username}`}>
-		<div class="flex gap-1">
-			<Avatar user={tags.user} size={16} />
-			<div class="my-auto">
-				{tags.user.username}
-			</div>
-		</div>
+		<a href={`/${tags.user.username}`}>
+			<div class="space-y-5">
+				<div>
+					<span class="block font-bold">{tags.name}</span>
+					<span class="block">{addr(tags)}</span>
+				</div>
+
+				<div class="flex w-full">
+					<div class="flex gap-1 mx-auto">
+						<Avatar user={tags.user} size={16} />
+						<div class="my-auto">
+							{tags.user.username.toLowerCase()}
+						</div>
+					</div>
+				</div>
+      </div>
     </a>
+	{:else}
+		<span class="block font-bold">{tags.name}</span>
+		<span class="block">{addr(tags)}</span>
 	{/if}
-
 {/if}
-- 
cgit v1.2.3


From cf2e60ad3d0781516d32ab00f76c0259a2d66bef Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Nov 2023 10:35:33 -0800
Subject: map styles

---
 src/components/LocationsMap.svelte |  2 +-
 src/components/Popup.svelte        | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index 07669a42..a06c993b 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -270,6 +270,6 @@
 		color: black;
 		background-color: white;
 		overflow: hidden;
-		width: 260px;
+		width: 280px;
 	}
 </style>
diff --git a/src/components/Popup.svelte b/src/components/Popup.svelte
index 1f6a2cf6..9c48b76b 100644
--- a/src/components/Popup.svelte
+++ b/src/components/Popup.svelte
@@ -1,4 +1,5 @@
 <script>
+	import { page } from '$app/stores';
 	import { Avatar } from '$comp';
 	export let tags;
 
@@ -18,16 +19,18 @@
 					<span class="block">{addr(tags)}</span>
 				</div>
 
+        <div>
 				<div class="flex w-full">
-					<div class="flex gap-1 mx-auto">
+					<div class="mx-auto">
 						<Avatar user={tags.user} size={16} />
-						<div class="my-auto">
-							{tags.user.username.toLowerCase()}
-						</div>
 					</div>
 				</div>
-      </div>
-    </a>
+				<div class="break-all font-bold text-center">
+					{$page.url.host}/{tags.user.username.toLowerCase()}
+				</div>
+        </div>
+			</div>
+		</a>
 	{:else}
 		<span class="block font-bold">{tags.name}</span>
 		<span class="block">{addr(tags)}</span>
-- 
cgit v1.2.3


From a858da2aff7c65693be9ce217b18e356d5ac191c Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Nov 2023 10:36:22 -0800
Subject: remove button margin

---
 src/routes/(app)/[username]/(profile)/+layout.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 46c082f0..55c22bdb 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -180,7 +180,7 @@
 			{/if}
 
 			{#if user && user.username !== subject.username && subject.pubkey}
-				<div class="w-full flex mb-4">
+				<div class="w-full flex">
 					<a href={`/${subject.username}/messages`} class="mx-auto">
 						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
 							<div class="mx-auto flex">
-- 
cgit v1.2.3


From 45edc62402e4bd0c1e7d2c1966d5d8a360efdf06 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 17 Nov 2023 10:37:06 -0800
Subject: rm bold

---
 src/components/Popup.svelte | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/components/Popup.svelte b/src/components/Popup.svelte
index 9c48b76b..8fe1d160 100644
--- a/src/components/Popup.svelte
+++ b/src/components/Popup.svelte
@@ -19,16 +19,16 @@
 					<span class="block">{addr(tags)}</span>
 				</div>
 
-        <div>
-				<div class="flex w-full">
-					<div class="mx-auto">
-						<Avatar user={tags.user} size={16} />
+				<div>
+					<div class="flex w-full">
+						<div class="mx-auto">
+							<Avatar user={tags.user} size={16} />
+						</div>
+					</div>
+					<div class="break-all text-center">
+						{$page.url.host}/{tags.user.username.toLowerCase()}
 					</div>
 				</div>
-				<div class="break-all font-bold text-center">
-					{$page.url.host}/{tags.user.username.toLowerCase()}
-				</div>
-        </div>
 			</div>
 		</a>
 	{:else}
-- 
cgit v1.2.3


From 8daf9228c5ef0834611c5ee75c60daac034f3b44 Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <adrien.p.hopkins@gmail.com>
Date: Sat, 18 Nov 2023 08:00:23 -0500
Subject: Met en jour la traduction française
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/fr.json | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/locales/fr.json b/src/locales/fr.json
index b3f25bb8..2bd20c63 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -26,7 +26,8 @@
 	"error": {
 		"header": "Erreur",
 		"message": "S'il vous plait réessayez ou contactez l'assistance.",
-		"signIn": "Vous devez connecter pour continuer."
+		"signIn": "Vous devez connecter pour continuer.",
+		"unrecognizedInput": "Donnée non reconnu"
 	},
 	"faq": {
 		"header": "FAQ",
@@ -137,7 +138,11 @@
 		"support": "Assistance",
 		"profile": "Profil",
 		"map": "Carte",
-		"merch": "Marchandise"
+		"merch": "Marchandise",
+		"about": "À Propos",
+		"docs": "Documents",
+		"messages": "Messages",
+		"funds": "Fonds"
 	},
 	"invoice": {
 		"addTip": "Ajoutez un pourboire",
@@ -220,7 +225,9 @@
 			"displayName": "Nom d'Utilisateur",
 			"minutes": "minutes",
 			"hour": "heure",
-			"hours": "heures"
+			"hours": "heures",
+			"hideSeed": "Cache phrase mnémotechnique",
+			"revealSeed": "Montre phrase mnémotechnique"
 		},
 		"support": {
 			"header": "Assistance",
@@ -252,7 +259,9 @@
 		"messages": "Messages",
 		"feed": "Flux",
 		"notes": "Notes",
-		"pay": "Payer"
+		"pay": "Payer",
+		"profilePage": "Page de profil",
+		"nostrPubkey": "Clé publique nostr"
 	},
 	"news": {
 		"header": "Nouvelles",
@@ -312,6 +321,8 @@
 		"redeemedBy": "Racheté par",
 		"sendMessage": "Écrire une message...",
 		"fundsClaimed": "Les fonds sont réclamés!",
-		"print": "Imprime"
+		"print": "Imprime",
+		"create": "Crée",
+		"fund": "Finance"
 	}
 }
-- 
cgit v1.2.3


From ee8d15697a3b758b8f26d7074edf017b3db6d480 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 20 Nov 2023 09:17:24 -0800
Subject: randomize locations

---
 src/components/LocationsMap.svelte | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index a06c993b..6f84408e 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -126,8 +126,16 @@
 		}
 
 		inview = inview.sort((a, b) => a.tags.name.localeCompare(b.tags.name));
+      shuffleArray(inview);
 	}
 
+function shuffleArray(array) {
+    for (let i = array.length - 1; i > 0; i--) {
+        const j = Math.floor(Math.random() * (i + 1));
+        [array[i], array[j]] = [array[j], array[i]];
+    }
+}
+
 	let popups = {};
 	let counter = 0;
 
@@ -231,16 +239,16 @@
 		</div>
 	</div>
 
-	<div class="hidden lg:grid grid-cols-3 justify-items-center">
-		{#each inview as m}
-			<button
-				on:click={() => select(m)}
-				class="text-left"
-				class:font-bold={m.id === inview[currentIndex]?.id}
-				id={`marker-${m.id}`}>{m.tags.name}</button
-			>
-		{/each}
-	</div>
+	<!-- <div class="hidden lg:grid grid-cols-3 justify-items-center"> -->
+	<!-- 	{#each inview as m} -->
+	<!-- 		<button -->
+	<!-- 			on:click={() => select(m)} -->
+	<!-- 			class="text-left" -->
+	<!-- 			class:font-bold={m.id === inview[currentIndex]?.id} -->
+	<!-- 			id={`marker-${m.id}`}>{m.tags.name}</button -->
+	<!-- 		> -->
+	<!-- 	{/each} -->
+	<!-- </div> -->
 </div>
 
 <style>
-- 
cgit v1.2.3


From 3a5d21db11a2f128e5f51df9c123b7abc367c778 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 20 Nov 2023 09:26:06 -0800
Subject: randomize avatars

---
 src/components/LocationsMap.svelte |   8 +--
 src/lib/punks.js                   | 102 ++++++++++++++++++-------------------
 src/lib/utils.js                   |   8 +++
 3 files changed, 60 insertions(+), 58 deletions(-)

(limited to 'src')

diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index 6f84408e..d5caba0d 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -3,6 +3,7 @@
 	import { browser } from '$app/environment';
 	import html2canvas from 'html2canvas';
 	import { Icon, Popup } from '$comp';
+    import { shuffleArray } from "$lib/utils";
 
 	import 'maplibre-gl/dist/maplibre-gl.css';
 
@@ -129,13 +130,6 @@
       shuffleArray(inview);
 	}
 
-function shuffleArray(array) {
-    for (let i = array.length - 1; i > 0; i--) {
-        const j = Math.floor(Math.random() * (i + 1));
-        [array[i], array[j]] = [array[j], array[i]];
-    }
-}
-
 	let popups = {};
 	let counter = 0;
 
diff --git a/src/lib/punks.js b/src/lib/punks.js
index 4d9f2e60..a87feb1f 100644
--- a/src/lib/punks.js
+++ b/src/lib/punks.js
@@ -1,66 +1,66 @@
 export default [
-	'5211890e4128d8d730802cc75ee105867e8878581d5e72ffc98a0d60027a5398',
-	'd1ca262272613d7386fecce7f1ad268188940b59ea83fdd1f8d7ab85771e3f43',
-	'62a55d4d6e4b6f992a1c1840f041585c957affcdbf875202cf9e1db9def05aeb',
-	'd3018e45c66dd485697f738ad191af98267e6255d562496dd06b1a662e0c7a88',
-	'7354f3829dd05c838aa16d66b00316f7994797927a4d3b594c8af04a2b4ae86a',
-	'9018be885177c675baf9b36978428d841ca30a9185e11de1a31238a08e3ec1af',
-	'11701e76233395ebdba8d1d50334d1a0cc3a158f3452260c9a7b9a067b78d753',
-	'0ec2e8d07e053d686140857493ece653cde52764a60aa1d25651d81811d44a3d',
-	'c1dececcbd7b623bfaa726392512e6ea110db93a0649dd01bf9e559318514f7c',
-	'01aa9348244c4b65de3df758d49c98076e17a109aef04bc211abc77cf42dc51d',
-	'a80951fc593035abb2dda045a2076d29a30f5cc470e0a20db39c3ec588ed61d8',
-	'ba8dd5a7070aee7102d4f8bc83ac497091e2e473a0f448a1c513569167dd0791',
-	'3f8f861e663accee51e68b987705ce647a7446b7f118abc94c632e158acbb44f',
-	'777c5715de7423597fea6c03c496ea46414f0508cd96e119261f002965beb805',
-	'e19eb1eeabdeffa04ccd792eb09776690cf2121887b26a7c5d20d66e3e8fd0fb',
-	'db5fe28b8ddb9ae5e4f5e0e757ee60bc938bffbdfdd38de807939e212d3c5066',
-	'914813583b901044970b9c7d6dcdfde4344339325f5988d0dd681d377f1243fb',
+	'6e1f1626a9308abd0b7732fecbc7d49366ced46dead63ef3603fb0f4ec7aa53d',
+	'96ea95735b61c48c6f465db8ca0246a62539f34c3a977be6338770d92461da89',
 	'8c18c036b257d7b9c5a970a786efa04c320f3cf5afa73fa310a6603744d1ee3a',
-	'2aaba839e8546a8cb6d04a81ff5be83ac4e700ca4491607a16ebd60dc4995750',
-	'b742b7509a97c2b346ea762f0510e8475b30dc988417f0f146ae00a800c6dd56',
+	'a7a6187e54e83acdb893d456c8b4ad6877e4738ea9e0d47c9b2070bf2c98a35f',
 	'836d72150b6f3033b6220d15ac9d49457d81041a700d12898bd3b8e737b4d265',
-	'8ba4736edc68da8e5b21c23af4de1f9131f47778c2a5b2a970a799223a9380b3',
+	'e3d1c40538a8aed282a430647e3ff16ff94b64b8ed0a7cf427e8b0e2780a9b2a',
+	'2155224ef35cfb4bbdb06d982b42bb9b93d97b2bc691c22c804e1759a0a04882',
+	'5f6549ad9dd15dd57c204b1a9b60c68c376e77d7d114cfa13219e6a1a71f901f',
+	'ba8dd5a7070aee7102d4f8bc83ac497091e2e473a0f448a1c513569167dd0791',
 	'4f07e1da3685a858970a9f39300564971e97257f5d37b55a6d9882014aecc421',
-	'698a2ca7a09e88fa6594801da037f4dbce6ae841d1d33736aebcf8f6fe104e01',
-	'd5b5b2167602f7277cdac76cfda8bdad0befcb8ff12df495dfabf40c91d1120c',
-	'50c7c2e8e8c7f4aabffb195187a1ac1105f5712859f02d491d794ba2d8498e08',
-	'6e1f1626a9308abd0b7732fecbc7d49366ced46dead63ef3603fb0f4ec7aa53d',
-	'85cb7cf0245613d08b3027f879f58a6db645bf0db107242beb856b340ee49ee8',
-	'd6dbb18d5df5e92c8c74ee59aa86d19dff25a5d0f9d030e84285a686f86804d7',
+	'01aa9348244c4b65de3df758d49c98076e17a109aef04bc211abc77cf42dc51d',
+	'080574eb9e0613926e0e5d9b667c132e12965a1b1d47218a0b290a2d55c55d2f',
+	'08ce4840184f63a779bcd1f91bbcb56a2e8cba75c3ba2dbd290a559a57e4238e',
+	'27caa38c14a85ad64b4c4469a34e61a3965a1cbc4cad9a85707da374301c830d',
 	'eccc90741370ba4acc70bc65f4ccc38fddb1327d977c366156018974bc52fe4a',
-	'78ae0118856a1f17c13f292628fcf3dccc150c7278578caaceb9f35ca8bc9f55',
-	'43ce93c9835e983403a01329918d184832c5516e1b0ea4e0878b4c4def042777',
-	'5f88f7f579ce50d7bcf60d6e9556f77acf361ba54caf3eb61dc4f2ca9c94c6a2',
+	'3759946d9e875ac2fc5c51ed850686193bb1e0716219e42efd52f3965993b275',
+	'db5fe28b8ddb9ae5e4f5e0e757ee60bc938bffbdfdd38de807939e212d3c5066',
+	'3f8f861e663accee51e68b987705ce647a7446b7f118abc94c632e158acbb44f',
 	'43bab95a047112dca6705506f916a97252363a20da4a4c0a5ab7b676e11083fc',
-	'08ce4840184f63a779bcd1f91bbcb56a2e8cba75c3ba2dbd290a559a57e4238e',
+	'd3018e45c66dd485697f738ad191af98267e6255d562496dd06b1a662e0c7a88',
+	'0ec2e8d07e053d686140857493ece653cde52764a60aa1d25651d81811d44a3d',
 	'4595bb092682af7177799464364c047fbfa7ede767336734949bce5d085fce15',
+	'6524936709e0719f9e28bf1caac91f86f323d1a79f10ab65a03fa9ea2e6b3270',
+	'8ba4736edc68da8e5b21c23af4de1f9131f47778c2a5b2a970a799223a9380b3',
+	'2aaba839e8546a8cb6d04a81ff5be83ac4e700ca4491607a16ebd60dc4995750',
+	'5f88f7f579ce50d7bcf60d6e9556f77acf361ba54caf3eb61dc4f2ca9c94c6a2',
+	'd1ca262272613d7386fecce7f1ad268188940b59ea83fdd1f8d7ab85771e3f43',
+	'5211890e4128d8d730802cc75ee105867e8878581d5e72ffc98a0d60027a5398',
+	'c1dececcbd7b623bfaa726392512e6ea110db93a0649dd01bf9e559318514f7c',
+	'43ce93c9835e983403a01329918d184832c5516e1b0ea4e0878b4c4def042777',
 	'c84724a398bda8d20436fb0663d059c196628fa71192bb720fa5adf6137bed9b',
-	'65309f82cd9f9926a578d09e1ad13909f68a06d02b853760731a4225f7aecef4',
-	'433519d13f2b64fe82a90cd054797d4779507fea93c1054bd51c35ba846a0f7f',
-	'4d8ad7a761d068b7ef9b058fb4ba924b276e7a45a3ad47a79b767e08e821e038',
-	'2cc94821f56d21918ba4f2770d97f280e06fd99f4199167e2f4ddc780f404c8a',
-	'7849ac0f31056265efb0110038f86e61effe17b7db836377d88433b73312e65a',
-	'2155224ef35cfb4bbdb06d982b42bb9b93d97b2bc691c22c804e1759a0a04882',
-	'9d9a9a40c490f05d7dbafde8bf60d68aab7dcb79a7976eef62d1448a4549816b',
-	'5f6549ad9dd15dd57c204b1a9b60c68c376e77d7d114cfa13219e6a1a71f901f',
-	'f46310b2e60727af071d09e759814f52f933688a0ff0995c7da373b381e70005',
 	'f307620a90a36045fa550316d61be4755c1f6c7f3fc81c95fc4d590ac568b2c4',
-	'6f2618272bb0164247e9b0f40b19f020c1c9253510dc658a3cc078d079ef01bf',
-	'6dbec748ea87e959390b0df429c005fccffe9e672864f555c14c7a407b940870',
-	'a7a6187e54e83acdb893d456c8b4ad6877e4738ea9e0d47c9b2070bf2c98a35f',
-	'3759946d9e875ac2fc5c51ed850686193bb1e0716219e42efd52f3965993b275',
+	'78ae0118856a1f17c13f292628fcf3dccc150c7278578caaceb9f35ca8bc9f55',
+	'9d9a9a40c490f05d7dbafde8bf60d68aab7dcb79a7976eef62d1448a4549816b',
 	'f6017bec50563dbbb24b979214ae225f96b01dea5b090b174038ff2842a1c6b1',
-	'fd502d5007bfc62a91eb7a34c1ae23b9de4a20cf5e1bbd86dadc421d7083099c',
-	'e3d1c40538a8aed282a430647e3ff16ff94b64b8ed0a7cf427e8b0e2780a9b2a',
-	'27caa38c14a85ad64b4c4469a34e61a3965a1cbc4cad9a85707da374301c830d',
-	'080574eb9e0613926e0e5d9b667c132e12965a1b1d47218a0b290a2d55c55d2f',
+	'6dbec748ea87e959390b0df429c005fccffe9e672864f555c14c7a407b940870',
+	'11701e76233395ebdba8d1d50334d1a0cc3a158f3452260c9a7b9a067b78d753',
+	'7354f3829dd05c838aa16d66b00316f7994797927a4d3b594c8af04a2b4ae86a',
 	'14d254333c6240fbdacbbbe261f7ae15be2e83bffcf084f4f59f459bae0a4571',
-	'82390020b2bca461204cc49b20ee6fec1b93dad476726f377785d04040a4d6c3',
+	'7849ac0f31056265efb0110038f86e61effe17b7db836377d88433b73312e65a',
+	'9018be885177c675baf9b36978428d841ca30a9185e11de1a31238a08e3ec1af',
+	'777c5715de7423597fea6c03c496ea46414f0508cd96e119261f002965beb805',
+	'b742b7509a97c2b346ea762f0510e8475b30dc988417f0f146ae00a800c6dd56',
 	'7af3029a826e6dfba23ad502901a3632ef4ee047bd45d618b1f106717b0af7ea',
+	'82390020b2bca461204cc49b20ee6fec1b93dad476726f377785d04040a4d6c3',
 	'6bc2990699be7f610c9f6a49bc7a19b034040727bc3de63fee89a1573fe00673',
-	'96ea95735b61c48c6f465db8ca0246a62539f34c3a977be6338770d92461da89',
+	'50c7c2e8e8c7f4aabffb195187a1ac1105f5712859f02d491d794ba2d8498e08',
+	'5d1d3769cd141603ce907df5dca159e389ca4d75338eddbe1b7db1c0766cbfd6',
+	'4d8ad7a761d068b7ef9b058fb4ba924b276e7a45a3ad47a79b767e08e821e038',
+	'd5b5b2167602f7277cdac76cfda8bdad0befcb8ff12df495dfabf40c91d1120c',
+	'6f2618272bb0164247e9b0f40b19f020c1c9253510dc658a3cc078d079ef01bf',
+	'fd502d5007bfc62a91eb7a34c1ae23b9de4a20cf5e1bbd86dadc421d7083099c',
+	'914813583b901044970b9c7d6dcdfde4344339325f5988d0dd681d377f1243fb',
+	'85cb7cf0245613d08b3027f879f58a6db645bf0db107242beb856b340ee49ee8',
+	'd6dbb18d5df5e92c8c74ee59aa86d19dff25a5d0f9d030e84285a686f86804d7',
+	'65309f82cd9f9926a578d09e1ad13909f68a06d02b853760731a4225f7aecef4',
+	'433519d13f2b64fe82a90cd054797d4779507fea93c1054bd51c35ba846a0f7f',
+	'62a55d4d6e4b6f992a1c1840f041585c957affcdbf875202cf9e1db9def05aeb',
+	'e19eb1eeabdeffa04ccd792eb09776690cf2121887b26a7c5d20d66e3e8fd0fb',
+	'a80951fc593035abb2dda045a2076d29a30f5cc470e0a20db39c3ec588ed61d8',
 	'4f1b39906714266a7a1936bfa8e08c5d891285dd2b188b4bcd4afb0107671004',
-	'6524936709e0719f9e28bf1caac91f86f323d1a79f10ab65a03fa9ea2e6b3270',
-	'5d1d3769cd141603ce907df5dca159e389ca4d75338eddbe1b7db1c0766cbfd6'
+	'f46310b2e60727af071d09e759814f52f933688a0ff0995c7da373b381e70005',
+	'2cc94821f56d21918ba4f2770d97f280e06fd99f4199167e2f4ddc780f404c8a',
+	'698a2ca7a09e88fa6594801da037f4dbce6ae841d1d33736aebcf8f6fe104e01',
 ];
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 9e1066e2..9b3e5592 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -256,3 +256,11 @@ export let types = {
 };
 
 export let ease = (t) => (t < 0.5 ? 8 * t * t * t * t : 1 - 8 * --t * t * t * t);
+
+	export function shuffleArray(array) {
+		for (let i = array.length - 1; i > 0; i--) {
+			const j = Math.floor(Math.random() * (i + 1));
+			[array[i], array[j]] = [array[j], array[i]];
+		}
+	}
+
-- 
cgit v1.2.3


From cb6f474608cd0b91c2cf3258f2b07f930bc6f8b7 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 20 Nov 2023 14:38:36 -0800
Subject: add qr generator button

---
 src/locales/en.json                          |  1 +
 src/routes/(app)/send/[...text]/+page.svelte | 12 ++++++++++++
 2 files changed, 13 insertions(+)

(limited to 'src')

diff --git a/src/locales/en.json b/src/locales/en.json
index c68b5b91..2e7b2079 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -189,6 +189,7 @@
 			"showQR": "Show QR"
 		},
 		"send": {
+      "makeQR": "QR",
 			"contacts": "Contacts",
 			"scan": "Scan",
 			"paste": "Paste",
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index b2c9616c..74afd846 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -56,6 +56,18 @@
 		</div>
 
 		<div class="flex justify-end">
+			{#if text?.length}
+				<a href={`/qr/${encodeURIComponent(text)}`}>
+					<button
+						type="button"
+						class="flex border rounded-full px-6 py-2 font-bold hover:opacity-80 mr-1"
+					>
+						<Icon icon="qr" style="mr-2 w-6 my-auto invert" />
+						<div class="my-auto">{$t('user.send.makeQR')}</div>
+					</button>
+				</a>
+			{/if}
+
 			<a href="/scan">
 				<button
 					type="button"
-- 
cgit v1.2.3


From 537401d4f3e7d3a90f5ff7a55feb9c05d4ac9f5e Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 23 Nov 2023 22:59:29 -0800
Subject: don't prefill registration form

---
 src/lib/store.js                          |  2 +-
 src/routes/(app)/register/+page.server.js | 21 +---------------
 src/routes/(app)/register/+page.svelte    | 41 ++++++++++++++++++++++---------
 static/icons/random.svg                   |  6 +++++
 4 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 static/icons/random.svg

(limited to 'src')

diff --git a/src/lib/store.js b/src/lib/store.js
index 64cf015e..3d8e687d 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -43,7 +43,7 @@ export const last = writable();
 export const loginRedirect = writable();
 export const decrypted = persistLocal('decrypted', {});
 export const newPayment = persistLocal('newPayment');
-export const password = persistLocal('password');
+export const password = writable();
 export const passwordPrompt = writable();
 export const pin = writable();
 export const rate = writable();
diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js
index f2b49e3f..45344907 100644
--- a/src/routes/(app)/register/+page.server.js
+++ b/src/routes/(app)/register/+page.server.js
@@ -1,10 +1,3 @@
-import {
-	NumberDictionary,
-	uniqueNamesGenerator,
-	colors,
-	adjectives,
-	animals
-} from 'unique-names-generator';
 import { fail, redirect } from '@sveltejs/kit';
 import { fd, post, login } from '$lib/utils';
 
@@ -12,21 +5,9 @@ export const load = async ({ parent }) => {
 	let { user } = await parent();
 	if (user) throw redirect(307, `/${user.username}`);
 
-	let username = uniqueNamesGenerator({
-		dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })],
-		length: 2,
-		separator: ''
-	});
-
-	let password = uniqueNamesGenerator({
-		dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })],
-		length: 2,
-    separator: ''
-	});
-
 	let index = Math.floor(Math.random() * 64) + 1;
 
-	return { index, username, password };
+	return { index };
 };
 
 export const actions = {
diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index 573de4d0..a9f9d047 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -12,11 +12,20 @@
 	import { t } from '$lib/translations';
 	import { page } from '$app/stores';
 	import { generate } from '$lib/nostr';
+	import {
+		NumberDictionary,
+		uniqueNamesGenerator,
+		colors,
+		adjectives,
+		animals
+	} from 'unique-names-generator';
 
 	export let form;
 	export let data;
 
 	$: data && ($avatar = undefined);
+	let username;
+	let { index } = data;
 
 	let cleared;
 	let clear = () => {
@@ -29,16 +38,20 @@
 	};
 
 	let refresh = async () => {
-		await invalidateAll();
-		await tick();
-		username = data.username;
-		$password = data.password;
-	};
+		username = uniqueNamesGenerator({
+			dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })],
+			length: 2,
+			separator: ''
+		});
 
-	let username = data.username;
-	$password = data.password;
+		$password = uniqueNamesGenerator({
+			dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })],
+			length: 2,
+			separator: ''
+		});
 
-	let { index } = data;
+		revealPassword = true;
+	};
 
 	afterNavigate(async () => {
 		try {
@@ -63,7 +76,7 @@
 
 	$: token && token?.length === 6 && tick().then(() => btn.click());
 
-	let revealPassword = true;
+	let revealPassword;
 
 	let loading;
 	async function handleSubmit(e) {
@@ -192,6 +205,8 @@
 				<div class="relative">
 					<label for="username" class="font-semibold">{$t('login.username')}</label>
 					<input
+                           use:focus
+						tabindex="1"
 						name="username"
 						type="text"
 						required
@@ -200,8 +215,8 @@
 						on:focus={clear}
 						autocapitalize="none"
 					/>
-					<button type="button" on:click={refresh} class="absolute right-0 top-4">
-						<Icon icon="refresh" style="w-6 m-6" />
+					<button type="button" on:click={refresh} class="absolute right-0 top-4" tabindex="5">
+						<Icon icon="random" style="w-10 m-4" />
 					</button>
 				</div>
 
@@ -209,6 +224,7 @@
 					<label for="password" class="block font-semibold">{$t('login.password')}</label>
 					{#if revealPassword}
 						<input
+							tabindex="2"
 							name="password"
 							type="text"
 							required
@@ -218,6 +234,7 @@
 						/>
 					{:else}
 						<input
+							tabindex="2"
 							name="password"
 							type="password"
 							required
@@ -229,6 +246,7 @@
 					{/if}
 					<button
 						type="button"
+						tabindex="4"
 						on:click={() => (revealPassword = !revealPassword)}
 						class="absolute right-0 top-4"
 					>
@@ -241,6 +259,7 @@
 				</p>
 
 				<button
+					tabindex="3"
 					type="submit"
 					class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
 					disabled={loading}
diff --git a/static/icons/random.svg b/static/icons/random.svg
new file mode 100644
index 00000000..f3e59233
--- /dev/null
+++ b/static/icons/random.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<title>perspective-dice-random</title>
+<path d="M15.676 17.312h0.048c-0.114-0.273-0.263-0.539-0.436-0.78l-11.114-6.346c-0.37 0.13-0.607 0.519-0.607 1.109v9.84c0 1.034 0.726 2.291 1.621 2.808l9.168 5.294c0.544 0.314 1.026 0.282 1.32-0.023v-11.902h-0zM10.049 24.234l-1.83-1.057v-1.918l1.83 1.057v1.918zM11.605 19.993c-0.132 0.2-0.357 0.369-0.674 0.505l-0.324 0.12c-0.23 0.090-0.38 0.183-0.451 0.278-0.071 0.092-0.106 0.219-0.106 0.38v0.242l-1.83-1.056v-0.264c0-0.294 0.056-0.523 0.167-0.685 0.111-0.165 0.346-0.321 0.705-0.466l0.324-0.125c0.193-0.076 0.333-0.171 0.421-0.285 0.091-0.113 0.137-0.251 0.137-0.417 0-0.251-0.081-0.494-0.243-0.728-0.162-0.237-0.389-0.44-0.679-0.608-0.274-0.158-0.569-0.268-0.887-0.329-0.318-0.065-0.649-0.078-0.994-0.040v-1.691c0.409 0.085 0.782 0.19 1.12 0.313s0.664 0.276 0.978 0.457c0.825 0.476 1.453 1.019 1.886 1.627 0.433 0.605 0.649 1.251 0.649 1.937 0 0.352-0.066 0.63-0.198 0.834zM27.111 8.247l-9.531-5.514c-0.895-0.518-2.346-0.518-3.241 0l-9.531 5.514c-0.763 0.442-0.875 1.117-0.336 1.628l10.578 6.040c0.583 0.146 1.25 0.145 1.832-0.003l10.589-6.060c0.512-0.508 0.392-1.17-0.36-1.605zM16.305 10.417l-0.23-0.129c-0.257-0.144-0.421-0.307-0.492-0.488-0.074-0.183-0.062-0.474 0.037-0.874l0.095-0.359c0.055-0.214 0.061-0.389 0.016-0.525-0.041-0.139-0.133-0.248-0.277-0.329-0.219-0.123-0.482-0.167-0.788-0.133-0.309 0.033-0.628 0.141-0.958 0.326-0.31 0.174-0.592 0.391-0.846 0.653-0.257 0.26-0.477 0.557-0.661 0.892l-1.476-0.827c0.332-0.333 0.658-0.625 0.978-0.875s0.659-0.474 1.015-0.674c0.934-0.524 1.803-0.835 2.607-0.934 0.8-0.101 1.5 0.016 2.098 0.352 0.307 0.172 0.508 0.368 0.603 0.589 0.092 0.219 0.097 0.507 0.016 0.865l-0.1 0.356c-0.066 0.255-0.080 0.438-0.041 0.55 0.035 0.11 0.124 0.205 0.265 0.284l0.212 0.118-2.074 1.162zM18.674 11.744l-1.673-0.937 2.074-1.162 1.673 0.937-2.074 1.162zM27.747 10.174l-11.060 6.329c-0.183 0.25-0.34 0.527-0.459 0.813v11.84c0.287 0.358 0.793 0.414 1.37 0.081l9.168-5.294c0.895-0.517 1.621-1.774 1.621-2.808v-9.84c0-0.608-0.251-1.003-0.641-1.121zM23.147 23.68l-1.83 1.056v-1.918l1.83-1.057v1.918zM24.703 17.643c-0.132 0.353-0.357 0.78-0.674 1.284l-0.324 0.494c-0.23 0.355-0.38 0.622-0.451 0.799-0.071 0.174-0.106 0.342-0.106 0.503v0.242l-1.83 1.056v-0.264c0-0.294 0.056-0.587 0.167-0.878 0.111-0.294 0.346-0.721 0.705-1.279l0.324-0.5c0.193-0.298 0.333-0.555 0.421-0.771 0.091-0.218 0.137-0.409 0.137-0.575 0-0.251-0.081-0.4-0.243-0.447-0.162-0.050-0.389 0.009-0.679 0.177-0.274 0.158-0.569 0.39-0.887 0.695-0.318 0.302-0.649 0.671-0.994 1.107v-1.692c0.409-0.387 0.782-0.714 1.12-0.981s0.664-0.491 0.978-0.673c0.825-0.476 1.453-0.659 1.886-0.55 0.433 0.106 0.649 0.502 0.649 1.188 0 0.352-0.066 0.706-0.198 1.062z"></path>
+</svg>
\ No newline at end of file
-- 
cgit v1.2.3


From a1d7bf0cebb94ea5b1c98d72549f82bc0fc61aea Mon Sep 17 00:00:00 2001
From: Adrien Hopkins <adrien.p.hopkins@gmail.com>
Date: Sat, 25 Nov 2023 08:59:45 -0500
Subject: Met en jour la traduction française
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/fr.json | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/locales/fr.json b/src/locales/fr.json
index 2bd20c63..b79f5d54 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -31,18 +31,10 @@
 	},
 	"faq": {
 		"header": "FAQ",
-		"why": {
-			"question": "Pourquoi accepter le Bitcoin?",
-			"answer": "Avec le Bitcoin, les commerçants économisent sur les frais, les consommateurs bénéficient de la confidentialité et les épargnants gagnent en pouvoir d'achat. Nous promouvrons votre entreprise auprès d'une communauté enthousiaste qui préfère faire ses achats dans des lieux acceptant le Bitcoin."
-		},
 		"cost": {
 			"question": "Combien cela coûte-t-il?",
 			"answer": "Recevoir des paiements sur votre compte est gratuit. Les retraits vers des portefeuilles externes entraînent des frais minimes qui varient en fonction des conditions du réseau. Nous facturons 0,1% pour convertir entre le Bitcoin lightning et le Bitcoin on-chain. Envoyer à d'autres comptes Coinos est gratuit."
 		},
-		"individuals": {
-			"question": "Qui peut l'utiliser?",
-			"answer": "N'importe qui, n'importe où dans le monde. Coinos convient aux particuliers comme aux entreprises."
-		},
 		"compatibility": {
 			"question": "Ai-je besoin d'un dispositif ou d'un logiciel spécial?",
 			"answer": "Non, Coinos est une application web qui fonctionne partout où il y a Internet. Les commerçants pourraient l'utiliser sur une tablette ou afficher un code QR pour que les clients puissent le scanner avec leur téléphone."
@@ -55,14 +47,6 @@
 			"question": "Coinos peut-il s'intégrer à mon PoS existant?",
 			"answer": "Nous recommandons d'entrer les ventes dans votre PoS existant comme des transactions en espèces."
 		},
-		"accounting": {
-			"question": "Qu'en est-il de la comptabilité?",
-			"answer": "Nous affichons tous les paiements en termes de votre monnaie locale et vous permettons de filtrer par date pour que vous puissiez déclarer vos revenus normalement. Vous pouvez exporter l'historique de votre compte dans un fichier csv. Si vous vendez du Bitcoin avec un bénéfice, vous voudrez peut-être déclarer les plus-values."
-		},
-		"offramp": {
-			"question": "Puis-je convertir le Bitcoin que je reçois en ma monnaie locale?",
-			"answer": "Vous pouvez retirer vos fonds à tout moment vers une bourse ou un courtier pour vendre votre Bitcoin et recevoir un virement bancaire. Nous pourrions être prêts à fournir une liquidation directe par virement électronique à certains commerçants canadiens."
-		},
 		"bitcoin": {
 			"question": "Que puis-je faire avec le Bitcoin?",
 			"answer": "Dépensez-le chez d'autres commerçants ou payez vos dépenses avec en incitant votre personnel, vos fournisseurs et votre propriétaire à l'accepter."
@@ -248,7 +232,8 @@
 			"scan": "Scannez",
 			"paste": "Collez",
 			"next": "Prochain",
-			"placeholder": "Collez une adresse de bitcoin, facture de lightning ou nom d'utilisateur coinos"
+			"placeholder": "Collez une adresse de bitcoin, facture de lightning ou nom d'utilisateur coinos",
+			"makeQR": "QR"
 		},
 		"requestPayment": "Demander un Paiement",
 		"welcome": "Bienvenue! Le solde de votre conte est vide. Vous pouvez commencer par déposer ou recevoir un paiement.",
@@ -268,7 +253,6 @@
 		"subheader": "Dernières Informations"
 	},
 	"payments": {
-		"moneyPot": "Pot d'argent",
 		"addFunds": "Ajouter d'argent",
 		"takeFunds": "Prendre d'argent",
 		"show": "Démontrer",
-- 
cgit v1.2.3


From eee8f9327d2eb5926d9017792e2b45d96e74e417 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 28 Nov 2023 09:02:03 -0800
Subject: handle links without http: prefix

---
 src/routes/(app)/send/[...text]/+page.server.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index 6b4b000e..3ca50bca 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -8,6 +8,7 @@ let parse = async (t, host) => {
 	if (!t) return;
 
 	if (t.startsWith('http')) throw redirect(307, t);
+	if (t.startsWith(host)) throw redirect(307, `http://${t}`);
 
 	let amount, user, id;
 
-- 
cgit v1.2.3


From 60735521a3549089f639fdefb921030c23a4d74b Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 28 Nov 2023 15:43:30 -0800
Subject: nostr key reveal

---
 src/lib/nostr.js                                   |  6 ++-
 src/locales/en.json                                |  7 +++
 .../[username]/settings/[...tab]/_security.svelte  | 53 ++++++++++++++++++++--
 3 files changed, 61 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/lib/nostr.js b/src/lib/nostr.js
index 28dbe50f..c2634c83 100644
--- a/src/lib/nostr.js
+++ b/src/lib/nostr.js
@@ -3,7 +3,7 @@ import { Buffer } from 'buffer';
 import { fail, wait, post, stretch } from '$lib/utils';
 import { decrypted, password as pw, passwordPrompt, pin, loginRedirect } from '$lib/store';
 import { goto, invalidate } from '$app/navigation';
-import { getPublicKey, signEvent, getEventHash, nip04, nip06 } from 'nostr-tools';
+import { getPublicKey, signEvent, getEventHash, nip04, nip06, nip19 } from 'nostr-tools';
 import { mnemonicToEntropy, entropyToMnemonic } from '@scure/bip39';
 import wordlist from '$lib/english';
 import { bech32m } from '@scure/base';
@@ -92,6 +92,10 @@ let getPrivateKey = async (user) => {
 	return privateKeyFromSeedWords(await getMnemonic(user));
 };
 
+export let getNsec = async (user) => {
+	return nip19.nsecEncode(await getPrivateKey(user));
+};
+
 export let sign = async ({ event, user }) => {
 	event.id = getEventHash(event);
 	event.sig = signEvent(event, await getPrivateKey(user));
diff --git a/src/locales/en.json b/src/locales/en.json
index 2e7b2079..608668a9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -197,6 +197,13 @@
 			"placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
 		},
 		"settings": {
+      "seedPhrase": "Seed phrase",
+      "nostrKeys": "Nostr key",
+      "nostrDescription": "Your nostr key is used to sign and decrypt messages, keep it safe or someone may be able to impersonate you.", 
+      "seedDescription": "This 12 word seed phrase is used to derive your nostr private key and your self-custodial wallet keys which determine your auto-withdrawal addresses. Back it up and don't let anyone see it.",
+      "emailDescription": "For password resets and notifications",
+      "hideNsec": "Hide nostr secret key",
+      "revealNsec": "Reveal nostr secret key",
       "hideSeed": "Hide seed phrase",
       "revealSeed": "Reveal seed phrase",
 			"saveSettings": "Save Settings",
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index 170df744..113f7d7e 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -1,5 +1,5 @@
 <script>
-	import { getMnemonic } from '$lib/nostr';
+	import { getMnemonic, getNsec } from '$lib/nostr';
 	import { tick } from 'svelte';
 	import { t } from '$lib/translations';
 	import { Pin, Icon, Qr } from '$comp';
@@ -14,21 +14,36 @@
 		disabling2fa,
 		locked,
 		mnemonic,
+		nsec,
 		old,
 		otp,
 		password,
 		pin,
 		revealPassword,
 		revealSeed,
+		revealNsec,
 		token = '',
 		setting2fa,
 		settingPin,
 		verify;
 
+	let toggleNsec = async () => {
+		try {
+			nsec = await getNsec(user);
+			revealNsec = !revealNsec;
+		} catch (e) {
+			console.log(e);
+		}
+	};
+
 	let togglePassword = () => (revealPassword = !revealPassword);
 	let toggleSeed = async () => {
-		mnemonic = await getMnemonic(user);
-		revealSeed = !revealSeed;
+		try {
+			mnemonic = await getMnemonic(user);
+			revealSeed = !revealSeed;
+		} catch (e) {
+			console.log(e);
+		}
 	};
 
 	$: verifying = pin?.length > 5;
@@ -223,7 +238,13 @@
 	</select>
 </div>
 
-<div class="space-y-5">
+<div>
+	<label for="seedphrase" class="font-bold">{$t('user.settings.seedPhrase')}</label>
+
+	<p class="text-secondary mb-1">
+		{$t('user.settings.seedDescription')}
+	</p>
+
 	<button type="button" class="primary" on:click={toggleSeed}>
 		<Icon icon="warning" style="mr-1 w-6 my-auto" />
 		{revealSeed ? $t('user.settings.hideSeed') : $t('user.settings.revealSeed')}
@@ -240,3 +261,27 @@
 		</button>
 	{/if}
 </div>
+
+<div>
+	<label for="seedphrase" class="font-bold">{$t('user.settings.nostrKeys')}</label>
+
+	<p class="text-secondary mb-1">
+		{$t('user.settings.nostrDescription')}
+	</p>
+
+	<button type="button" class="primary" on:click={toggleNsec}>
+		<Icon icon="warning" style="mr-1 w-6 my-auto" />
+		{revealNsec ? $t('user.settings.hideNsec') : $t('user.settings.revealNsec')}
+	</button>
+
+	{#if revealNsec}
+		<div class="text-lg break-all">
+			{nsec}
+		</div>
+
+		<button type="button" class="primary" on:click={() => copy(nsec)}>
+			<Icon icon="copy" style="mr-1 w-6 my-auto" />
+			Copy
+		</button>
+	{/if}
+</div>
-- 
cgit v1.2.3


From ad4b96fadd7a40bb9023450d2e2af22beebba830 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 29 Nov 2023 08:09:09 -0800
Subject: email field

---
 src/routes/(app)/[username]/settings/[...tab]/_pos.svelte | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index a96528a0..cdcec8ce 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -22,6 +22,15 @@
 	</select>
 </div>
 
+<div class="space-y-1">
+	<label for="email" class="font-bold block">{$t('user.settings.email')}</label>
+  <p class="text-secondary">
+    {$t('user.settings.emailDescription')}
+  </p>
+	<input type="text" name="email" bind:value={user.email} />
+</div>
+
+
 <div>
 	<div class="flex justify-between items-center">
 		<span class="font-bold">{$t('user.settings.tipPrompt')}</span>
-- 
cgit v1.2.3


From 4972b423fe4f88bcef1b790b2287e2db3517b529 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 30 Nov 2023 12:57:57 -0800
Subject: pin fixes

---
 src/components/AppHeader.svelte                    |  2 +-
 src/lib/store.js                                   |  6 ++-
 src/locales/en.json                                |  9 +++--
 src/routes/(app)/+layout.svelte                    |  4 +-
 src/routes/(app)/[username]/+layout.server.js      |  1 -
 .../[username]/settings/[...tab]/+page.svelte      | 45 +++++++++++++---------
 .../(app)/[username]/settings/[...tab]/_pos.svelte | 11 +++++-
 .../[username]/settings/[...tab]/_security.svelte  | 31 ++++++++-------
 8 files changed, 66 insertions(+), 43 deletions(-)

(limited to 'src')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 123606e1..ae162e1f 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -13,7 +13,7 @@
 	let update = (data) => ({ subject, user } = data);
 
 	let menuButtons;
-	if (user)
+	$: if (user)
 		menuButtons = [
 			{ key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` },
 			{ key: 'nav.support', icon: 'support', href: `/support` },
diff --git a/src/lib/store.js b/src/lib/store.js
index 3d8e687d..403ee816 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -8,7 +8,9 @@ const persistSession = (key, defaultValue) => {
 			: defaultValue
 	);
 
-	s.subscribe((v) => browser && sessionStorage.setItem(key, JSON.stringify(v)));
+	s.subscribe((v) => {
+		browser && sessionStorage.setItem(key, JSON.stringify(v));
+	});
 
 	return s;
 };
@@ -45,7 +47,7 @@ export const decrypted = persistLocal('decrypted', {});
 export const newPayment = persistLocal('newPayment');
 export const password = writable();
 export const passwordPrompt = writable();
-export const pin = writable();
+export const pin = persistSession('pin');
 export const rate = writable();
 export const request = writable();
 export const requestRedirect = writable();
diff --git a/src/locales/en.json b/src/locales/en.json
index 608668a9..c0efade3 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -240,8 +240,8 @@
 			"securityPIN": "Security PIN",
 			"securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.",
 			"setPIN": "Set PIN",
-			"autoLock": "Auto-Lock Timer",
-			"autoLockDescription": "Your account will go into a secure mode, requiring you to re-enter your credentials after a specified time:",
+			"autoLock": "Timeout",
+			"autoLockDescription": "Time after which your PIN needs to be re-entered:",
 			"twofa": "2-Factor Authentication",
 			"twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.",
 			"twofaSetup": "Set up 2FA",
@@ -249,7 +249,10 @@
 			"select": "Select",
 			"verifyPIN": "Verify PIN",
 			"enablePIN": "Enable PIN",
-			"disablePIN": "Disable PIN"
+			"disablePIN": "Disable PIN",
+      "publishNip5": "Publish nostr identity",
+      "nip5a": "Use",
+      "nip5b": "as your publicly verified nostr address"
 		},
 		"support": {
 			"header": "Support",
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 012dd957..7f4e3c7b 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -32,7 +32,7 @@
 		if (browser) {
 			let log = console.log;
 			checkSocket();
-			expirePin();
+      expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000);
 
 			// if (window.NDEFReader) {
 			// 	try {
@@ -74,7 +74,7 @@
 
 	let expirePin = () => {
 		$pin = null;
-		expireTimer = setTimeout(expirePin, 300000);
+		expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000);
 	};
 
 	onDestroy(() => {
diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js
index 27502386..8df75f0f 100644
--- a/src/routes/(app)/[username]/+layout.server.js
+++ b/src/routes/(app)/[username]/+layout.server.js
@@ -8,7 +8,6 @@ export let load = async ({ depends, params: { username } }) => {
 		let subject = await get(`/users/${username}`);
 		return { subject };
 	} catch (e) {
-		console.log(e);
 		throw error(500, 'Unable to retrieve user account data');
 	}
 };
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 087c9450..a3afce62 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-	import { onMount } from 'svelte';
+	import { browser } from '$app/environment';
+	import { onMount, tick } from 'svelte';
 	import { fly } from 'svelte/transition';
 	import { applyAction, deserialize } from '$app/forms';
 
@@ -26,9 +27,13 @@
 	let formElement;
 
 	let { user, token, rates, tab } = data;
+	let prev;
 
 	$: update(data);
-	let update = () => ({ user, token, rates, tab } = data);
+	let update = () => {
+		({ user, token, rates, tab } = data);
+		prev = { ...user };
+	};
 
 	$: form?.user && ({ user } = form);
 
@@ -95,23 +100,25 @@
 				}
 			}
 
-			let event = {
-				pubkey: user.pubkey,
-				created_at: Math.floor(Date.now() / 1000),
-				kind: 0,
-				content: JSON.stringify({
-					name: user.username,
-					about: user.address,
-					picture: `${PUBLIC_COINOS_URL}/public/${user.profile}.webp`
-				}),
-				tags: []
-			};
-
-			try {
-				await sign({ event, user });
-				await send(event);
-			} catch (e) {
-				warning('nostr profile could not be updated');
+			if (['username', 'address', 'profile'].some((a) => user[a] !== prev[a])) {
+				let event = {
+					pubkey: user.pubkey,
+					created_at: Math.floor(Date.now() / 1000),
+					kind: 0,
+					content: JSON.stringify({
+						name: user.username,
+						about: user.address,
+						picture: `${PUBLIC_COINOS_URL}/public/${user.profile}.webp`
+					}),
+					tags: []
+				};
+
+				try {
+					await sign({ event, user });
+					await send(event);
+				} catch (e) {
+					warning('nostr profile could not be updated');
+				}
 			}
 
 			const response = await fetch(formElement.action, {
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index cdcec8ce..a5431d6a 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -30,7 +30,6 @@
 	<input type="text" name="email" bind:value={user.email} />
 </div>
 
-
 <div>
 	<div class="flex justify-between items-center">
 		<span class="font-bold">{$t('user.settings.tipPrompt')}</span>
@@ -41,6 +40,16 @@
 	</p>
 </div>
 
+<div>
+	<div class="flex justify-between items-center">
+		<span class="font-bold">{$t('user.settings.publishNip5')}</span>
+		<Toggle id="nip5" bind:value={user.nip5} />
+	</div>
+	<p class="text-secondary mt-1 w-9/12">
+  {$t('user.settings.nip5a')} <span class="font-bold">{user.username}@{$page.url.host}</span> {$t('user.settings.nip5b')}
+	</p>
+</div>
+
 <a href="./shopify">
 	<button
 		class="flex rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full gap-2 my-5 justify-center"
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index 113f7d7e..3cd0480e 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -92,6 +92,7 @@
 			}
 		} else {
 			settingPin = true;
+      disablingPin = false;
 		}
 	};
 
@@ -187,6 +188,22 @@
 	{/if}
 </div>
 
+{#if user.haspin}
+	<div>
+		<label for="locktime" class="font-bold mb-1">{$t('user.settings.autoLock')}</label>
+		<p class="text-secondary mb-1">
+			{$t('user.settings.autoLockDescription')}
+		</p>
+		<select name="locktime" class="select-styles block py-3 w-full" value={parseInt(user.locktime)}>
+			<option value={5 * 60}>5 {$t('user.settings.minutes')}</option>
+			<option value={10 * 60}>10 {$t('user.settings.minutes')}</option>
+			<option value={30 * 60}>30 {$t('user.settings.minutes')}</option>
+			<option value={60 * 60}>1 {$t('user.settings.hour')}</option>
+			<option value={8 * 60 * 60}>8 {$t('user.settings.hours')}</option>
+		</select>
+	</div>
+{/if}
+
 <div>
 	<span class="font-bold mb-1">{$t('user.settings.twofa')}</span>
 	<p class="text-secondary mb-4">
@@ -224,20 +241,6 @@
 	{/if}
 </div>
 
-<div>
-	<label for="locktime" class="font-bold mb-1">{$t('user.settings.autoLock')}</label>
-	<p class="text-secondary mb-1">
-		{$t('user.settings.autoLockDescription')}
-	</p>
-	<select name="locktime" class="select-styles block py-3 w-full" value={parseInt(user.locktime)}>
-		<option value={5 * 60}>5 {$t('user.settings.minutes')}</option>
-		<option value={10 * 60}>10 {$t('user.settings.minutes')}</option>
-		<option value={30 * 60}>30 {$t('user.settings.minutes')}</option>
-		<option value={60 * 60}>1 {$t('user.settings.hour')}</option>
-		<option value={8 * 60 * 60}>8 {$t('user.settings.hours')}</option>
-	</select>
-</div>
-
 <div>
 	<label for="seedphrase" class="font-bold">{$t('user.settings.seedPhrase')}</label>
 
-- 
cgit v1.2.3


From 3c97ac12bdb8e201d75261e62a176f08d9cbdb1c Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 30 Nov 2023 16:44:58 -0800
Subject: page transitions

---
 package.json                                       |   2 +-
 pnpm-lock.yaml                                     | 124 ++++++++++++---------
 src/components/AppHeader.svelte                    |   4 +
 src/routes/(app)/+layout.svelte                    |   5 +-
 src/routes/(app)/[username]/+layout.svelte         |  52 ++++++++-
 .../[username]/settings/[...tab]/+page.svelte      |  40 ++++---
 6 files changed, 156 insertions(+), 71 deletions(-)

(limited to 'src')

diff --git a/package.json b/package.json
index 911e287f..b1b4bcd5 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
 	"devDependencies": {
 		"@scure/base": "^1.1.1",
 		"@sveltejs/adapter-node": "^1.1.4",
-		"@sveltejs/kit": "^1.14.0",
+		"@sveltejs/kit": "^1.27.6",
 		"@tailwindcss/line-clamp": "^0.4.2",
 		"@zerodevx/svelte-toast": "^0.7.2",
 		"autoprefixer": "^10.4.13",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1463027a..026e22a3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -33,10 +33,10 @@ devDependencies:
     version: 1.1.1
   '@sveltejs/adapter-node':
     specifier: ^1.1.4
-    version: 1.1.4(@sveltejs/kit@1.14.0)
+    version: 1.1.4(@sveltejs/kit@1.27.6)
   '@sveltejs/kit':
-    specifier: ^1.14.0
-    version: 1.14.0(svelte@3.55.0)(vite@4.2.1)
+    specifier: ^1.27.6
+    version: 1.27.6(svelte@3.55.0)(vite@4.2.1)
   '@tailwindcss/line-clamp':
     specifier: ^0.4.2
     version: 0.4.2(tailwindcss@3.2.4)
@@ -330,10 +330,19 @@ packages:
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'}
     dev: false
 
+  /@fastify/busboy@2.1.0:
+    resolution: {integrity: sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==}
+    engines: {node: '>=14'}
+    dev: true
+
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
     dev: true
 
+  /@jridgewell/sourcemap-codec@1.4.15:
+    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
+    dev: true
+
   /@mapbox/geojson-rewind@0.5.2:
     resolution: {integrity: sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==}
     hasBin: true
@@ -506,7 +515,7 @@ packages:
       '@noble/hashes': 1.3.0
       '@scure/base': 1.1.1
 
-  /@sveltejs/adapter-node@1.1.4(@sveltejs/kit@1.14.0):
+  /@sveltejs/adapter-node@1.1.4(@sveltejs/kit@1.27.6):
     resolution: {integrity: sha512-3iEBqi1fXLXP9YIbVuz2LXajoebRJCmAFEQbN40DlxAnA7G+InxUgnqFun3q9gBMz2Qvd99K51g/HxWetXRe8Q==}
     peerDependencies:
       '@sveltejs/kit': ^1.0.0
@@ -514,53 +523,70 @@ packages:
       '@rollup/plugin-commonjs': 24.0.1(rollup@3.8.1)
       '@rollup/plugin-json': 6.0.0(rollup@3.8.1)
       '@rollup/plugin-node-resolve': 15.0.1(rollup@3.8.1)
-      '@sveltejs/kit': 1.14.0(svelte@3.55.0)(vite@4.2.1)
+      '@sveltejs/kit': 1.27.6(svelte@3.55.0)(vite@4.2.1)
       rollup: 3.8.1
     dev: true
 
-  /@sveltejs/kit@1.14.0(svelte@3.55.0)(vite@4.2.1):
-    resolution: {integrity: sha512-4e/cZT0z4IppEkqNvMrurGz6VE1gScukFU7XqwTL/yrGJGXHqS9D7RvsOcE1hASsgrMu6w/fKTIhxT5oN0K1Jw==}
+  /@sveltejs/kit@1.27.6(svelte@3.55.0)(vite@4.2.1):
+    resolution: {integrity: sha512-GsjTkMbKzXdbeRg0tk8S7HNShQ4879ftRr0ZHaZfjbig1xQwG57Bvcm9U9/mpLJtCapLbLWUnygKrgcLISLC8A==}
     engines: {node: ^16.14 || >=18}
     hasBin: true
     requiresBuild: true
     peerDependencies:
-      svelte: ^3.54.0
+      svelte: ^3.54.0 || ^4.0.0-next.0 || ^5.0.0-next.0
       vite: ^4.0.0 || 4
     dependencies:
-      '@sveltejs/vite-plugin-svelte': 2.0.2(svelte@3.55.0)(vite@4.2.1)
+      '@sveltejs/vite-plugin-svelte': 2.5.3(svelte@3.55.0)(vite@4.2.1)
       '@types/cookie': 0.5.1
       cookie: 0.5.0
-      devalue: 4.3.0
+      devalue: 4.3.2
       esm-env: 1.0.0
       kleur: 4.1.5
       magic-string: 0.30.0
-      mime: 3.0.0
+      mrmime: 1.0.1
       sade: 1.8.1
-      set-cookie-parser: 2.5.1
+      set-cookie-parser: 2.6.0
       sirv: 2.0.2
       svelte: 3.55.0
       tiny-glob: 0.2.9
-      undici: 5.21.0
+      undici: 5.26.5
       vite: 4.2.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@sveltejs/vite-plugin-svelte@2.0.2(svelte@3.55.0)(vite@4.2.1):
-    resolution: {integrity: sha512-xCEan0/NNpQuL0l5aS42FjwQ6wwskdxC3pW1OeFtEKNZwRg7Evro9lac9HesGP6TdFsTv2xMes5ASQVKbCacxg==}
+  /@sveltejs/vite-plugin-svelte-inspector@1.0.4(@sveltejs/vite-plugin-svelte@2.5.3)(svelte@3.55.0)(vite@4.2.1):
+    resolution: {integrity: sha512-zjiuZ3yydBtwpF3bj0kQNV0YXe+iKE545QGZVTaylW3eAzFr+pJ/cwK8lZEaRp4JtaJXhD5DyWAV4AxLh6DgaQ==}
     engines: {node: ^14.18.0 || >= 16}
     peerDependencies:
-      svelte: ^3.54.0
+      '@sveltejs/vite-plugin-svelte': ^2.2.0
+      svelte: ^3.54.0 || ^4.0.0
       vite: ^4.0.0 || 4
     dependencies:
+      '@sveltejs/vite-plugin-svelte': 2.5.3(svelte@3.55.0)(vite@4.2.1)
       debug: 4.3.4
-      deepmerge: 4.2.2
+      svelte: 3.55.0
+      vite: 4.2.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@sveltejs/vite-plugin-svelte@2.5.3(svelte@3.55.0)(vite@4.2.1):
+    resolution: {integrity: sha512-erhNtXxE5/6xGZz/M9eXsmI7Pxa6MS7jyTy06zN3Ck++ldrppOnOlJwHHTsMC7DHDQdgUp4NAc4cDNQ9eGdB/w==}
+    engines: {node: ^14.18.0 || >= 16}
+    peerDependencies:
+      svelte: ^3.54.0 || ^4.0.0 || ^5.0.0-next.0
+      vite: ^4.0.0 || 4
+    dependencies:
+      '@sveltejs/vite-plugin-svelte-inspector': 1.0.4(@sveltejs/vite-plugin-svelte@2.5.3)(svelte@3.55.0)(vite@4.2.1)
+      debug: 4.3.4
+      deepmerge: 4.3.1
       kleur: 4.1.5
-      magic-string: 0.27.0
+      magic-string: 0.30.5
       svelte: 3.55.0
-      svelte-hmr: 0.15.1(svelte@3.55.0)
+      svelte-hmr: 0.15.3(svelte@3.55.0)
       vite: 4.2.1
-      vitefu: 0.2.4(vite@4.2.1)
+      vitefu: 0.2.5(vite@4.2.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -796,13 +822,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /busboy@1.6.0:
-    resolution: {integrity: sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==}
-    engines: {node: '>=10.16.0'}
-    dependencies:
-      streamsearch: 1.1.0
-    dev: true
-
   /bytewise-core@1.2.3:
     resolution: {integrity: sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA==}
     dependencies:
@@ -898,6 +917,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /defined@1.0.1:
     resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
     dev: true
@@ -917,8 +941,8 @@ packages:
       minimist: 1.2.7
     dev: true
 
-  /devalue@4.3.0:
-    resolution: {integrity: sha512-n94yQo4LI3w7erwf84mhRUkUJfhLoCZiLyoOZ/QFsDbcWNZePrLwbQpvZBUG2TNxwV3VjCKPxkiiQA6pe3TrTA==}
+  /devalue@4.3.2:
+    resolution: {integrity: sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==}
     dev: true
 
   /didyoumean@1.2.2:
@@ -1305,6 +1329,13 @@ packages:
       '@jridgewell/sourcemap-codec': 1.4.14
     dev: true
 
+  /magic-string@0.30.5:
+    resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: true
+
   /maplibre-gl@3.3.1:
     resolution: {integrity: sha512-SfRq9bT68GytDzCOG0IoTGg2rASbgdYunW/6xhnp55QuLmwG1M/YOlXxqHaphwia7kZbMvBOocvY0fp5yfTjZA==}
     engines: {node: '>=16.14.0', npm: '>=8.1.0'}
@@ -1349,12 +1380,6 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /mime@3.0.0:
-    resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    dev: true
-
   /min-indent@1.0.1:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
@@ -1720,8 +1745,8 @@ packages:
     engines: {node: ^14.13.1 || >=16.0.0}
     dev: true
 
-  /set-cookie-parser@2.5.1:
-    resolution: {integrity: sha512-1jeBGaKNGdEq4FgIrORu/N570dwoPYio8lSoYLWmX7sQ//0JY08Xh9o5pBcgmHQ/MbsYp/aZnOe1s1lIsbLprQ==}
+  /set-cookie-parser@2.6.0:
+    resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==}
     dev: true
 
   /set-value@2.0.1:
@@ -1804,11 +1829,6 @@ packages:
       extend-shallow: 3.0.2
     dev: false
 
-  /streamsearch@1.1.0:
-    resolution: {integrity: sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==}
-    engines: {node: '>=10.0.0'}
-    dev: true
-
   /strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -1827,11 +1847,11 @@ packages:
     engines: {node: '>= 0.4'}
     dev: true
 
-  /svelte-hmr@0.15.1(svelte@3.55.0):
-    resolution: {integrity: sha512-BiKB4RZ8YSwRKCNVdNxK/GfY+r4Kjgp9jCLEy0DuqAKfmQtpL38cQK3afdpjw4sqSs4PLi3jIPJIFp259NkZtA==}
+  /svelte-hmr@0.15.3(svelte@3.55.0):
+    resolution: {integrity: sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==}
     engines: {node: ^12.20 || ^14.13.1 || >= 16}
     peerDependencies:
-      svelte: '>=3.19.0'
+      svelte: ^3.19.0 || ^4.0.0
     dependencies:
       svelte: 3.55.0
     dev: true
@@ -2005,11 +2025,11 @@ packages:
     engines: {node: '>=18'}
     dev: false
 
-  /undici@5.21.0:
-    resolution: {integrity: sha512-HOjK8l6a57b2ZGXOcUsI5NLfoTrfmbOl90ixJDl0AEFG4wgHNDQxtZy15/ZQp7HhjkpaGlp/eneMgtsu1dIlUA==}
-    engines: {node: '>=12.18'}
+  /undici@5.26.5:
+    resolution: {integrity: sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==}
+    engines: {node: '>=14.0'}
     dependencies:
-      busboy: 1.6.0
+      '@fastify/busboy': 2.1.0
     dev: true
 
   /union-value@1.0.1:
@@ -2086,10 +2106,10 @@ packages:
       fsevents: 2.3.3
     dev: true
 
-  /vitefu@0.2.4(vite@4.2.1):
-    resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==}
+  /vitefu@0.2.5(vite@4.2.1):
+    resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==}
     peerDependencies:
-      vite: ^3.0.0 || ^4.0.0 || 4
+      vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || 4
     peerDependenciesMeta:
       vite:
         optional: true
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index ae162e1f..53b31de4 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -142,4 +142,8 @@
 	.z {
 		z-index: 100;
 	}
+
+	header {
+		view-transition-name: header;
+	}
 </style>
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 7f4e3c7b..3422d358 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -10,8 +10,6 @@
 	import { warning, protectedRoutes } from '$lib/utils';
 	import { t, locale } from '$lib/translations';
 
-	const localeLocalStorageKey = 'sveltekit-i18n-locale';
-
 	export let data;
 
 	let { rate, user, subject, token, rates } = data;
@@ -22,6 +20,7 @@
 	};
 
 	onMount(async () => {
+		let localeLocalStorageKey = 'sveltekit-i18n-locale';
 		let localStorageLocale = localStorage.getItem(localeLocalStorageKey);
 		if (localStorageLocale) locale.set(localStorageLocale);
 
@@ -32,7 +31,7 @@
 		if (browser) {
 			let log = console.log;
 			checkSocket();
-      expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000);
+			expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000);
 
 			// if (window.NDEFReader) {
 			// 	try {
diff --git a/src/routes/(app)/[username]/+layout.svelte b/src/routes/(app)/[username]/+layout.svelte
index b2efa894..54fcd600 100644
--- a/src/routes/(app)/[username]/+layout.svelte
+++ b/src/routes/(app)/[username]/+layout.svelte
@@ -1,7 +1,57 @@
 <script>
 	import { AppHeader } from '$comp';
+	import { onNavigate } from '$app/navigation';
 	export let data;
+
+	onNavigate((navigation) => {
+		if (!document.startViewTransition) return;
+
+		return new Promise((resolve) => {
+			document.startViewTransition(async () => {
+				resolve();
+				await navigation.complete;
+			});
+		});
+	});
 </script>
 
 <AppHeader {data} />
-<slot />
+<div class="content">
+	<slot />
+</div>
+
+<style>
+	@keyframes fade-in {
+		from {
+			opacity: 0;
+		}
+	}
+
+	@keyframes fade-out {
+		to {
+			opacity: 0;
+		}
+	}
+
+	@keyframes slide-from-right {
+		from {
+			transform: translateX(60px);
+		}
+	}
+
+	@keyframes slide-to-left {
+		to {
+			transform: translateX(-60px);
+		}
+	}
+
+	:root::view-transition-old(root) {
+		animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
+			180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
+	}
+
+	:root::view-transition-new(root) {
+		animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
+			180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
+	}
+</style>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index a3afce62..933fa1f6 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -121,6 +121,10 @@
 				}
 			}
 
+			if (user.email !== prev.email) {
+				await post('/api/verify', { test: true });
+			}
+
 			const response = await fetch(formElement.action, {
 				method: 'POST',
 				body: data
@@ -156,20 +160,22 @@
 	<input type="hidden" name="pin" value={$pin} />
 
 	<div class="mt-24 mb-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
-		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">
-			{$t('user.settings.header')}
-		</h1>
-
-		<div class="font-bold flex justify-around items-center border-b pb-3 text-secondary">
-			{#each tabs.filter((t) => t.name !== 'shopify') as { name, key }}
-				<a href={`/${user.username}/settings/${name}`}>
-					<button
-						class="hover:opacity-80"
-						class:text-black={tab === name || (tab === 'shopify' && name === 'pos')}
-						>{$t(`user.settings.${key}`)}</button
-					>
-				</a>
-			{/each}
+		<div class="header">
+			<h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">
+				{$t('user.settings.header')}
+			</h1>
+
+			<div class="font-bold flex justify-around items-center border-b pb-3 text-secondary">
+				{#each tabs.filter((t) => t.name !== 'shopify') as { name, key }}
+					<a href={`/${user.username}/settings/${name}`}>
+						<button
+							class="hover:opacity-80"
+							class:text-black={tab === name || (tab === 'shopify' && name === 'pos')}
+							>{$t(`user.settings.${key}`)}</button
+						>
+					</a>
+				{/each}
+			</div>
 		</div>
 
 		<svelte:component this={comp} {user} {rates} {submit} />
@@ -192,3 +198,9 @@
 		</button>
 	</div>
 </form>
+
+<style>
+	.header {
+		view-transition-name: tabs;
+	}
+</style>
-- 
cgit v1.2.3


From da8cbb695c9516130ba6ed8f14b922f260d2f0c6 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 30 Nov 2023 16:49:54 -0800
Subject: transitions on app pages

---
 src/routes/(app)/+layout.svelte | 48 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'src')

diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 3422d358..5aa46242 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -9,9 +9,21 @@
 	import { LoadingSplash, Invoice, Password, Request } from '$comp';
 	import { warning, protectedRoutes } from '$lib/utils';
 	import { t, locale } from '$lib/translations';
+	import { onNavigate } from '$app/navigation';
 
 	export let data;
 
+	onNavigate((navigation) => {
+		if (!document.startViewTransition) return;
+
+		return new Promise((resolve) => {
+			document.startViewTransition(async () => {
+				resolve();
+				await navigation.complete;
+			});
+		});
+	});
+
 	let { rate, user, subject, token, rates } = data;
 
 	$: update(data);
@@ -116,3 +128,39 @@
 {#if $request}
 	<Request {user} />
 {/if}
+
+<style>
+	@keyframes fade-in {
+		from {
+			opacity: 0;
+		}
+	}
+
+	@keyframes fade-out {
+		to {
+			opacity: 0;
+		}
+	}
+
+	@keyframes slide-from-right {
+		from {
+			transform: translateX(60px);
+		}
+	}
+
+	@keyframes slide-to-left {
+		to {
+			transform: translateX(-60px);
+		}
+	}
+
+	:root::view-transition-old(root) {
+		animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
+			180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
+	}
+
+	:root::view-transition-new(root) {
+		animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
+			180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
+	}
+</style>
-- 
cgit v1.2.3


From 9a1cbd040ead975d51f23f9546ba8d8bf9034207 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 1 Dec 2023 15:17:58 -0800
Subject: optimizing

---
 Dockerfile                                         |   13 +-
 bun.lockb                                          |  Bin 0 -> 110513 bytes
 package.json                                       |  121 +-
 pnpm-lock.yaml                                     | 2147 --------------------
 src/components/About.svelte                        |   11 +-
 src/components/LocationsMap.svelte                 |    5 +-
 src/routes/(app)/+layout.svelte                    |    3 +-
 .../[username]/settings/[...tab]/_account.svelte   |    1 +
 .../(app)/[username]/settings/[...tab]/_pos.svelte |    1 +
 src/routes/+layout.svelte                          |   10 +-
 src/routes/+page.server.js                         |   13 +-
 src/routes/+page.svelte                            |   32 +-
 static/images/customize.webp                       |  Bin 210574 -> 81624 bytes
 static/images/hero-image.webp                      |  Bin 258018 -> 72000 bytes
 static/images/lightning-qr.webp                    |  Bin 132588 -> 65206 bytes
 static/images/phone-checkout.webp                  |  Bin 386656 -> 50980 bytes
 static/images/test.webp                            |  Bin 33858 -> 0 bytes
 17 files changed, 107 insertions(+), 2250 deletions(-)
 create mode 100755 bun.lockb
 delete mode 100644 pnpm-lock.yaml
 delete mode 100644 static/images/test.webp

(limited to 'src')

diff --git a/Dockerfile b/Dockerfile
index a451ddad..d045c896 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,16 +1,11 @@
-FROM node:18-alpine
+FROM oven/bun
 
 ARG NODE_ENV=production
 ENV NODE_ENV $NODE_ENV
 
-RUN npm i -g pnpm
-WORKDIR /app
-
-ADD package.json .
-RUN --mount=type=cache,target=/root/.local/share/pnpm/store NODE_ENV=development pnpm i
-
 COPY . .
-RUN pnpm build
+RUN bun i
+RUN bun run build
 
 # CMD ["node", "build"]
-CMD ["pnpm", "preview", "--host", "--port", "3000"]
+CMD ["bun", "run", "--bun", "preview", "--host", "--port", "3000"]
diff --git a/bun.lockb b/bun.lockb
new file mode 100755
index 00000000..04f28ca8
Binary files /dev/null and b/bun.lockb differ
diff --git a/package.json b/package.json
index b1b4bcd5..c4ce55bb 100644
--- a/package.json
+++ b/package.json
@@ -1,63 +1,62 @@
 {
-	"name": "my-app",
-	"version": "0.0.1",
-	"scripts": {
-		"dev": "vite dev",
-		"build": "vite build",
-		"docker": "docker build . -t coinos-ui",
-		"preview": "vite preview",
-		"lint": "prettier --check --plugin-search-dir=. .",
-		"format": "prettier --write --plugin-search-dir=. ."
-	},
-	"devDependencies": {
-		"@scure/base": "^1.1.1",
-		"@sveltejs/adapter-node": "^1.1.4",
-		"@sveltejs/kit": "^1.27.6",
-		"@tailwindcss/line-clamp": "^0.4.2",
-		"@zerodevx/svelte-toast": "^0.7.2",
-		"autoprefixer": "^10.4.13",
-		"bech32": "^2.0.0",
-		"bip21": "^2.0.3",
-		"bitcoin-address-validation": "^2.2.1",
-		"buffer": "^6.0.3",
-		"date-fns": "^2.29.3",
-		"html5-qrcode": "^2.3.8",
-		"leaflet": "^1.9.3",
-		"leaflet.markercluster": "^1.5.3",
-		"nostr-tools": "^1.14.2",
-		"postcss": "^8.4.20",
-		"prettier": "^2.8.1",
-		"prettier-plugin-svelte": "^2.9.0",
-		"qr-code-styling": "1.6.0-rc.1",
-		"qr-scanner": "^1.4.2",
-		"qrcode-base64": "^1.0.1",
-		"rollup": "^2.79.1",
-		"screenfull": "^6.0.2",
-		"svelte": "^3.55.0",
-		"svelte-outclick": "^3.3.3",
-		"svelte-preprocess": "^4.10.7",
-		"svelte-virtual-scroll-list": "^1.1.0",
-		"sveltekit-i18n": "^2.2.2",
-		"tailwind-scrollbar": "^2.1.0",
-		"tailwindcss": "^3.2.4",
-		"uuid": "^9.0.0",
-		"vite": "^4.2.1"
-	},
-	"pnpm": {
-		"peerDependencyRules": {
-			"allowedVersions": {
-				"vite": "4"
-			}
-		}
-	},
-	"type": "module",
-	"dependencies": {
-		"@faker-js/faker": "^8.2.0",
-		"@scure/bip39": "^1.2.1",
-		"html2canvas": "^1.4.1",
-		"leaflet-tooltip-layout": "^0.1.2",
-		"maplibre-gl": "^3.3.1",
-		"uint8array-extras": "^0.5.0",
-		"unique-names-generator": "^4.7.1"
-	}
+  "name": "my-app",
+  "version": "0.0.1",
+  "scripts": {
+    "dev": "vite dev",
+    "build": "vite build",
+    "docker": "docker build . -t coinos-ui",
+    "preview": "vite preview",
+    "lint": "prettier --check --plugin-search-dir=. .",
+    "format": "prettier --write --plugin-search-dir=. ."
+  },
+  "devDependencies": {
+    "@scure/base": "^1.1.1",
+    "@sveltejs/adapter-node": "^1.1.4",
+    "@sveltejs/kit": "^1.27.6",
+    "@tailwindcss/line-clamp": "^0.4.2",
+    "@zerodevx/svelte-toast": "^0.7.2",
+    "autoprefixer": "^10.4.13",
+    "bech32": "^2.0.0",
+    "bip21": "^2.0.3",
+    "bitcoin-address-validation": "^2.2.1",
+    "buffer": "^6.0.3",
+    "date-fns": "^2.29.3",
+    "html5-qrcode": "^2.3.8",
+    "leaflet": "^1.9.3",
+    "leaflet.markercluster": "^1.5.3",
+    "nostr-tools": "^1.14.2",
+    "postcss": "^8.4.20",
+    "prettier": "2",
+    "prettier-plugin-svelte": "2",
+    "qr-code-styling": "1.6.0-rc.1",
+    "qr-scanner": "^1.4.2",
+    "qrcode-base64": "^1.0.1",
+    "rollup": "^2.79.1",
+    "screenfull": "^6.0.2",
+    "svelte": "^3.55.0",
+    "svelte-outclick": "^3.3.3",
+    "svelte-preprocess": "^4.10.7",
+    "svelte-virtual-scroll-list": "^1.1.0",
+    "sveltekit-i18n": "^2.2.2",
+    "tailwind-scrollbar": "^2.1.0",
+    "tailwindcss": "^3.2.4",
+    "uuid": "^9.0.0",
+    "vite": "^4.2.1"
+  },
+  "pnpm": {
+    "peerDependencyRules": {
+      "allowedVersions": {
+        "vite": "4"
+      }
+    }
+  },
+  "type": "module",
+  "dependencies": {
+    "@faker-js/faker": "^8.2.0",
+    "@scure/bip39": "^1.2.1",
+    "leaflet-tooltip-layout": "^0.1.2",
+    "maplibre-gl": "^3.3.1",
+    "uint8array-extras": "^0.5.0",
+    "unique-names-generator": "^4.7.1"
+  }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
deleted file mode 100644
index 026e22a3..00000000
--- a/pnpm-lock.yaml
+++ /dev/null
@@ -1,2147 +0,0 @@
-lockfileVersion: '6.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-dependencies:
-  '@faker-js/faker':
-    specifier: ^8.2.0
-    version: 8.2.0
-  '@scure/bip39':
-    specifier: ^1.2.1
-    version: 1.2.1
-  html2canvas:
-    specifier: ^1.4.1
-    version: 1.4.1
-  leaflet-tooltip-layout:
-    specifier: ^0.1.2
-    version: 0.1.2(leaflet@1.9.3)
-  maplibre-gl:
-    specifier: ^3.3.1
-    version: 3.3.1
-  uint8array-extras:
-    specifier: ^0.5.0
-    version: 0.5.0
-  unique-names-generator:
-    specifier: ^4.7.1
-    version: 4.7.1
-
-devDependencies:
-  '@scure/base':
-    specifier: ^1.1.1
-    version: 1.1.1
-  '@sveltejs/adapter-node':
-    specifier: ^1.1.4
-    version: 1.1.4(@sveltejs/kit@1.27.6)
-  '@sveltejs/kit':
-    specifier: ^1.27.6
-    version: 1.27.6(svelte@3.55.0)(vite@4.2.1)
-  '@tailwindcss/line-clamp':
-    specifier: ^0.4.2
-    version: 0.4.2(tailwindcss@3.2.4)
-  '@zerodevx/svelte-toast':
-    specifier: ^0.7.2
-    version: 0.7.2
-  autoprefixer:
-    specifier: ^10.4.13
-    version: 10.4.13(postcss@8.4.20)
-  bech32:
-    specifier: ^2.0.0
-    version: 2.0.0
-  bip21:
-    specifier: ^2.0.3
-    version: 2.0.3
-  bitcoin-address-validation:
-    specifier: ^2.2.1
-    version: 2.2.1
-  buffer:
-    specifier: ^6.0.3
-    version: 6.0.3
-  date-fns:
-    specifier: ^2.29.3
-    version: 2.29.3
-  html5-qrcode:
-    specifier: ^2.3.8
-    version: 2.3.8
-  leaflet:
-    specifier: ^1.9.3
-    version: 1.9.3
-  leaflet.markercluster:
-    specifier: ^1.5.3
-    version: 1.5.3(leaflet@1.9.3)
-  nostr-tools:
-    specifier: ^1.14.2
-    version: 1.14.2
-  postcss:
-    specifier: ^8.4.20
-    version: 8.4.20
-  prettier:
-    specifier: ^2.8.1
-    version: 2.8.1
-  prettier-plugin-svelte:
-    specifier: ^2.9.0
-    version: 2.9.0(prettier@2.8.1)(svelte@3.55.0)
-  qr-code-styling:
-    specifier: 1.6.0-rc.1
-    version: 1.6.0-rc.1
-  qr-scanner:
-    specifier: ^1.4.2
-    version: 1.4.2
-  qrcode-base64:
-    specifier: ^1.0.1
-    version: 1.0.1
-  rollup:
-    specifier: ^2.79.1
-    version: 2.79.1
-  screenfull:
-    specifier: ^6.0.2
-    version: 6.0.2
-  svelte:
-    specifier: ^3.55.0
-    version: 3.55.0
-  svelte-outclick:
-    specifier: ^3.3.3
-    version: 3.3.3(svelte@3.55.0)
-  svelte-preprocess:
-    specifier: ^4.10.7
-    version: 4.10.7(postcss@8.4.20)(svelte@3.55.0)
-  svelte-virtual-scroll-list:
-    specifier: ^1.1.0
-    version: 1.1.0(svelte@3.55.0)
-  sveltekit-i18n:
-    specifier: ^2.2.2
-    version: 2.2.2(svelte@3.55.0)
-  tailwind-scrollbar:
-    specifier: ^2.1.0
-    version: 2.1.0(tailwindcss@3.2.4)
-  tailwindcss:
-    specifier: ^3.2.4
-    version: 3.2.4(postcss@8.4.20)
-  uuid:
-    specifier: ^9.0.0
-    version: 9.0.0
-  vite:
-    specifier: ^4.2.1
-    version: 4.2.1
-
-packages:
-
-  /@esbuild/android-arm64@0.17.13:
-    resolution: {integrity: sha512-F5DgvJMV2ZEpLNpPCO7FEk1wy8O5tg6cikWSB6uvvncsgE1xgbPlm+Boio/4820C2/mj713X83X1h01v0qoeHg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm@0.17.13:
-    resolution: {integrity: sha512-5tZZ/hLIfBmt7E8JsE5KbsknoAFmoElkg+A/gjyPtmSQvJjPf+9GsSJihid8VMa08lrsYyaEXOT9RLh3xXQONw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-x64@0.17.13:
-    resolution: {integrity: sha512-5m1UUslzpfVrumG3m3Zv2x9VNAcvMOQWJy009y6jt10tcHpzIq2/b0I0k4fz0QYqGSNS1GteRIhVPN4H7OyCXg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/darwin-arm64@0.17.13:
-    resolution: {integrity: sha512-TXbXp/05r7heRsG8yWwbHw9diay+wXIyRNcIHFoNARRIGahYbTW/qwJzE37zkfxLIUPHgR/SyLTUlnTICg14ag==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/darwin-x64@0.17.13:
-    resolution: {integrity: sha512-Ku9Db2sblCxFvQdEO7X9nBaLR/S81uch81e2Q2+Os5z1NcnsFjuqhIYH0Gm6KNNpIKaEbC7gCLbiIPbLLMX4Pg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/freebsd-arm64@0.17.13:
-    resolution: {integrity: sha512-t1T5/nIf2j+FdSf1Fa3dcU0cXycr0nK4xJe52qjWa+1I249mM5NBY1ODjiabZxZ0x3CG05y4fd9bxfDLy9kQtA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/freebsd-x64@0.17.13:
-    resolution: {integrity: sha512-/zbkgEO4gY2qGZr9UNAGI38w/FwUY4bx4EC88k9VeiCKNr3ukNgwH/oIgB5Z9/OqpkNLlcS4w9e2d/MIiy5fbw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm64@0.17.13:
-    resolution: {integrity: sha512-siu3QZrQ7eGrSttvFaRKyjT7kNRbUuHEKzCCyqRh19MbpGokGY13jbIsBEjx6JmH3T50hds325oweS9Ey2ihAQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm@0.17.13:
-    resolution: {integrity: sha512-RrhjzrCF6aCDH248nUAQoldnRmN7nHMxv85GOj5AH+qkxxYvcig7fnUmgANngntRu4btXhN9WKHMgQ5seERDMw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-ia32@0.17.13:
-    resolution: {integrity: sha512-ADHA1PqP5gIegehVP0RvxMmNPxpLgetI8QCwYOjUheGXKIKWSdUN8ZS3rusQv3NGZmFCpYdMZzFoI0QtzzGAdw==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-loong64@0.17.13:
-    resolution: {integrity: sha512-n1JQPxETmR0brkpWlJHeohReEPLH+m00bnJdNnFyHN3zLBt1QypevuZSmnmFWsC+7r7HTwWILj3lBDjtPH3ydg==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-mips64el@0.17.13:
-    resolution: {integrity: sha512-d0pnD/j5KKQ43xtSIvOD+wNIy6D/Vh9GbXVRa3u4zCyiJMYWjxkPkbBzlEgNjdDmUM+5gBFen9k7B8Xscy+Myg==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-ppc64@0.17.13:
-    resolution: {integrity: sha512-C9sMpa/VcGLjVtsT01sXtzZNS7bAZ+icUclkKkiUwBQ9hzT+J+/Xpj+EykI5hB3KgtxQVo4XUahanFoZNxbQ1g==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-riscv64@0.17.13:
-    resolution: {integrity: sha512-jYkc5EpNpvjccAHNYekiAtklusVGWftR0VVLtng7dJzDyy+5adAsf1fOG3LllP0WALxS55/w6boLE/728J/bXw==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-s390x@0.17.13:
-    resolution: {integrity: sha512-4jAJI5O6E/hATL4lsrG2A+noDjZ377KlATVFKwV3SWaNHj+OvoXe/T84ScQIXEtPI7ndJyLkMYruXj8RR5Ilyw==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-x64@0.17.13:
-    resolution: {integrity: sha512-eFLQhJq98qijGRcv9je/9M4Mz1suZ+pOtj62ArsLd0gubNGhhQDz6T30X2X3f1KZ8lkKkr+zN5vtZzx1GAMoFw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/netbsd-x64@0.17.13:
-    resolution: {integrity: sha512-F8PXDeT+3eQpPjf4bmNJapPLu0SKKlWRGPQvBQqVS+YDGoMKnyyYp2UENLFMV8zT7kS39zKxZRZvUL3fMz/7Ww==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/openbsd-x64@0.17.13:
-    resolution: {integrity: sha512-9jWfzbFCnIZdHjNs+00KQHArUbp7kjQDNmiuqkwGOQFs67m4/dKNupBv2DP5hTqVlQY4tW4RG3qpb6Y3zOHJeA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/sunos-x64@0.17.13:
-    resolution: {integrity: sha512-ALbOMlTIBkAVi6KqYjONa7u2oH95RN7OpetFqMtjufFLBiSaayRuwUzhs2yuR9CfGT4qi0jv6HQDav+EG314TQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-arm64@0.17.13:
-    resolution: {integrity: sha512-FJBLYL4PkrZGeuHzEqme+0DjNetxkJ+XbB+Aoeow7aQ53JCwsA0/mo8sS5aPkDHgCnMkN4A5GLoFTlDj3BKDrQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-ia32@0.17.13:
-    resolution: {integrity: sha512-Qrvst9RkLz4qgi3hqswNliYuKW92/HGJnd7xLWkGaGPa8S4qsONf81FW0ebDc5iUHb0I7QJwQATutvghTabnFA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-x64@0.17.13:
-    resolution: {integrity: sha512-pZ/NIgz861XaUPlIkPFjP55nJ4PJa0o/CD4zgeRb1Q9FVE+8GvdB6ifJcK05jRhny5hKExhnRFIdgHmmCYH8vg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /@faker-js/faker@8.2.0:
-    resolution: {integrity: sha512-VacmzZqVxdWdf9y64lDOMZNDMM/FQdtM9IsaOPKOm2suYwEatb8VkdHqOzXcDnZbk7YDE2BmsJmy/2Hmkn563g==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0, npm: '>=6.14.13'}
-    dev: false
-
-  /@fastify/busboy@2.1.0:
-    resolution: {integrity: sha512-+KpH+QxZU7O4675t3mnkQKcZZg56u+K/Ct2K+N2AZYNVK8kyeo/bI18tI8aPm3tvNNRyTWfj6s5tnGNlcbQRsA==}
-    engines: {node: '>=14'}
-    dev: true
-
-  /@jridgewell/sourcemap-codec@1.4.14:
-    resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
-    dev: true
-
-  /@jridgewell/sourcemap-codec@1.4.15:
-    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
-    dev: true
-
-  /@mapbox/geojson-rewind@0.5.2:
-    resolution: {integrity: sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==}
-    hasBin: true
-    dependencies:
-      get-stream: 6.0.1
-      minimist: 1.2.7
-    dev: false
-
-  /@mapbox/jsonlint-lines-primitives@2.0.2:
-    resolution: {integrity: sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==}
-    engines: {node: '>= 0.6'}
-    dev: false
-
-  /@mapbox/point-geometry@0.1.0:
-    resolution: {integrity: sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==}
-    dev: false
-
-  /@mapbox/tiny-sdf@2.0.6:
-    resolution: {integrity: sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==}
-    dev: false
-
-  /@mapbox/unitbezier@0.0.1:
-    resolution: {integrity: sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==}
-    dev: false
-
-  /@mapbox/vector-tile@1.3.1:
-    resolution: {integrity: sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==}
-    dependencies:
-      '@mapbox/point-geometry': 0.1.0
-    dev: false
-
-  /@mapbox/whoots-js@3.1.0:
-    resolution: {integrity: sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==}
-    engines: {node: '>=6.0.0'}
-    dev: false
-
-  /@maplibre/maplibre-gl-style-spec@19.3.2:
-    resolution: {integrity: sha512-C2JAk64XUz9v78+bpyTk1zvgjjnDsB8CCjNumyAYdWK2dvdDtILzh1AGBMdS/llX3KaHjGYxAE5wOwfdwq4Pog==}
-    hasBin: true
-    dependencies:
-      '@mapbox/jsonlint-lines-primitives': 2.0.2
-      '@mapbox/unitbezier': 0.0.1
-      json-stringify-pretty-compact: 3.0.0
-      minimist: 1.2.8
-      rw: 1.3.3
-      sort-object: 3.0.3
-    dev: false
-
-  /@noble/ciphers@0.2.0:
-    resolution: {integrity: sha512-6YBxJDAapHSdd3bLDv6x2wRPwq4QFMUaB3HvljNBUTThDd12eSm7/3F+2lnfzx2jvM+S6Nsy0jEt9QbPqSwqRw==}
-    dev: true
-
-  /@noble/curves@1.1.0:
-    resolution: {integrity: sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==}
-    dependencies:
-      '@noble/hashes': 1.3.1
-    dev: true
-
-  /@noble/hashes@1.3.0:
-    resolution: {integrity: sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==}
-
-  /@noble/hashes@1.3.1:
-    resolution: {integrity: sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==}
-    engines: {node: '>= 16'}
-    dev: true
-
-  /@nodelib/fs.scandir@2.1.5:
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      run-parallel: 1.2.0
-    dev: true
-
-  /@nodelib/fs.stat@2.0.5:
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: '>= 8'}
-    dev: true
-
-  /@nodelib/fs.walk@1.2.8:
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.14.0
-    dev: true
-
-  /@polka/url@1.0.0-next.21:
-    resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
-    dev: true
-
-  /@rollup/plugin-commonjs@24.0.1(rollup@3.8.1):
-    resolution: {integrity: sha512-15LsiWRZk4eOGqvrJyu3z3DaBu5BhXIMeWnijSRvd8irrrg9SHpQ1pH+BUK4H6Z9wL9yOxZJMTLU+Au86XHxow==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^2.68.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@rollup/pluginutils': 5.0.2(rollup@3.8.1)
-      commondir: 1.0.1
-      estree-walker: 2.0.2
-      glob: 8.1.0
-      is-reference: 1.2.1
-      magic-string: 0.27.0
-      rollup: 3.8.1
-    dev: true
-
-  /@rollup/plugin-json@6.0.0(rollup@3.8.1):
-    resolution: {integrity: sha512-i/4C5Jrdr1XUarRhVu27EEwjt4GObltD7c+MkCIpO2QIbojw8MUs+CCTqOphQi3Qtg1FLmYt+l+6YeoIf51J7w==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@rollup/pluginutils': 5.0.2(rollup@3.8.1)
-      rollup: 3.8.1
-    dev: true
-
-  /@rollup/plugin-node-resolve@15.0.1(rollup@3.8.1):
-    resolution: {integrity: sha512-ReY88T7JhJjeRVbfCyNj+NXAG3IIsVMsX9b5/9jC98dRP8/yxlZdz7mHZbHk5zHr24wZZICS5AcXsFZAXYUQEg==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^2.78.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@rollup/pluginutils': 5.0.2(rollup@3.8.1)
-      '@types/resolve': 1.20.2
-      deepmerge: 4.2.2
-      is-builtin-module: 3.2.0
-      is-module: 1.0.0
-      resolve: 1.22.1
-      rollup: 3.8.1
-    dev: true
-
-  /@rollup/pluginutils@5.0.2(rollup@3.8.1):
-    resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@types/estree': 1.0.0
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
-      rollup: 3.8.1
-    dev: true
-
-  /@scure/base@1.1.1:
-    resolution: {integrity: sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==}
-
-  /@scure/bip32@1.3.1:
-    resolution: {integrity: sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==}
-    dependencies:
-      '@noble/curves': 1.1.0
-      '@noble/hashes': 1.3.1
-      '@scure/base': 1.1.1
-    dev: true
-
-  /@scure/bip39@1.2.1:
-    resolution: {integrity: sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==}
-    dependencies:
-      '@noble/hashes': 1.3.0
-      '@scure/base': 1.1.1
-
-  /@sveltejs/adapter-node@1.1.4(@sveltejs/kit@1.27.6):
-    resolution: {integrity: sha512-3iEBqi1fXLXP9YIbVuz2LXajoebRJCmAFEQbN40DlxAnA7G+InxUgnqFun3q9gBMz2Qvd99K51g/HxWetXRe8Q==}
-    peerDependencies:
-      '@sveltejs/kit': ^1.0.0
-    dependencies:
-      '@rollup/plugin-commonjs': 24.0.1(rollup@3.8.1)
-      '@rollup/plugin-json': 6.0.0(rollup@3.8.1)
-      '@rollup/plugin-node-resolve': 15.0.1(rollup@3.8.1)
-      '@sveltejs/kit': 1.27.6(svelte@3.55.0)(vite@4.2.1)
-      rollup: 3.8.1
-    dev: true
-
-  /@sveltejs/kit@1.27.6(svelte@3.55.0)(vite@4.2.1):
-    resolution: {integrity: sha512-GsjTkMbKzXdbeRg0tk8S7HNShQ4879ftRr0ZHaZfjbig1xQwG57Bvcm9U9/mpLJtCapLbLWUnygKrgcLISLC8A==}
-    engines: {node: ^16.14 || >=18}
-    hasBin: true
-    requiresBuild: true
-    peerDependencies:
-      svelte: ^3.54.0 || ^4.0.0-next.0 || ^5.0.0-next.0
-      vite: ^4.0.0 || 4
-    dependencies:
-      '@sveltejs/vite-plugin-svelte': 2.5.3(svelte@3.55.0)(vite@4.2.1)
-      '@types/cookie': 0.5.1
-      cookie: 0.5.0
-      devalue: 4.3.2
-      esm-env: 1.0.0
-      kleur: 4.1.5
-      magic-string: 0.30.0
-      mrmime: 1.0.1
-      sade: 1.8.1
-      set-cookie-parser: 2.6.0
-      sirv: 2.0.2
-      svelte: 3.55.0
-      tiny-glob: 0.2.9
-      undici: 5.26.5
-      vite: 4.2.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@sveltejs/vite-plugin-svelte-inspector@1.0.4(@sveltejs/vite-plugin-svelte@2.5.3)(svelte@3.55.0)(vite@4.2.1):
-    resolution: {integrity: sha512-zjiuZ3yydBtwpF3bj0kQNV0YXe+iKE545QGZVTaylW3eAzFr+pJ/cwK8lZEaRp4JtaJXhD5DyWAV4AxLh6DgaQ==}
-    engines: {node: ^14.18.0 || >= 16}
-    peerDependencies:
-      '@sveltejs/vite-plugin-svelte': ^2.2.0
-      svelte: ^3.54.0 || ^4.0.0
-      vite: ^4.0.0 || 4
-    dependencies:
-      '@sveltejs/vite-plugin-svelte': 2.5.3(svelte@3.55.0)(vite@4.2.1)
-      debug: 4.3.4
-      svelte: 3.55.0
-      vite: 4.2.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@sveltejs/vite-plugin-svelte@2.5.3(svelte@3.55.0)(vite@4.2.1):
-    resolution: {integrity: sha512-erhNtXxE5/6xGZz/M9eXsmI7Pxa6MS7jyTy06zN3Ck++ldrppOnOlJwHHTsMC7DHDQdgUp4NAc4cDNQ9eGdB/w==}
-    engines: {node: ^14.18.0 || >= 16}
-    peerDependencies:
-      svelte: ^3.54.0 || ^4.0.0 || ^5.0.0-next.0
-      vite: ^4.0.0 || 4
-    dependencies:
-      '@sveltejs/vite-plugin-svelte-inspector': 1.0.4(@sveltejs/vite-plugin-svelte@2.5.3)(svelte@3.55.0)(vite@4.2.1)
-      debug: 4.3.4
-      deepmerge: 4.3.1
-      kleur: 4.1.5
-      magic-string: 0.30.5
-      svelte: 3.55.0
-      svelte-hmr: 0.15.3(svelte@3.55.0)
-      vite: 4.2.1
-      vitefu: 0.2.5(vite@4.2.1)
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@sveltekit-i18n/base@1.2.1(svelte@3.55.0):
-    resolution: {integrity: sha512-F8gqG2+KAOeT0o2wYlUrW3TRCX7zaD7rBy/1CEVNw0irfw9TgFf/ODmhubkHHT3+6Zk+SMz8RNgeuffBfAMbJw==}
-    peerDependencies:
-      svelte: ^3.x
-    dependencies:
-      svelte: 3.55.0
-    optionalDependencies:
-      '@sveltekit-i18n/parser-default': 1.0.3
-    dev: true
-
-  /@sveltekit-i18n/parser-default@1.0.3:
-    resolution: {integrity: sha512-HheveklTjp3hxpYQhoHfyA6B4bQaUeSV5MQf2usIv/58UF2jY/YqhCAWj9bDBjufbuZc5pSz4BXvdX3WVT+viA==}
-    dev: true
-
-  /@tailwindcss/line-clamp@0.4.2(tailwindcss@3.2.4):
-    resolution: {integrity: sha512-HFzAQuqYCjyy/SX9sLGB1lroPzmcnWv1FHkIpmypte10hptf4oPUfucryMKovZh2u0uiS9U5Ty3GghWfEJGwVw==}
-    peerDependencies:
-      tailwindcss: '>=2.0.0 || >=3.0.0 || >=3.0.0-alpha.1'
-    dependencies:
-      tailwindcss: 3.2.4(postcss@8.4.20)
-    dev: true
-
-  /@types/cookie@0.5.1:
-    resolution: {integrity: sha512-COUnqfB2+ckwXXSFInsFdOAWQzCCx+a5hq2ruyj+Vjund94RJQd4LG2u9hnvJrTgunKAaax7ancBYlDrNYxA0g==}
-    dev: true
-
-  /@types/estree@0.0.39:
-    resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
-    dev: true
-
-  /@types/estree@1.0.0:
-    resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
-    dev: true
-
-  /@types/geojson@7946.0.11:
-    resolution: {integrity: sha512-L7A0AINMXQpVwxHJ4jxD6/XjZ4NDufaRlUJHjNIFKYUFBH1SvOW+neaqb0VTRSLW5suSrSu19ObFEFnfNcr+qg==}
-    dev: false
-
-  /@types/mapbox__point-geometry@0.1.2:
-    resolution: {integrity: sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA==}
-    dev: false
-
-  /@types/mapbox__vector-tile@1.3.1:
-    resolution: {integrity: sha512-RpwGE57xM4a/YCH6XWzfcPVRPAu/jiCll0bEGRn6a4iubN2k4xZizskQoRj8fuXyo9BpI7F3bwz3uxs0pWbGNw==}
-    dependencies:
-      '@types/geojson': 7946.0.11
-      '@types/mapbox__point-geometry': 0.1.2
-      '@types/pbf': 3.0.3
-    dev: false
-
-  /@types/node@18.11.17:
-    resolution: {integrity: sha512-HJSUJmni4BeDHhfzn6nF0sVmd1SMezP7/4F0Lq+aXzmp2xm9O7WXrUtHW/CHlYVtZUbByEvWidHqRtcJXGF2Ng==}
-    dev: true
-
-  /@types/offscreencanvas@2019.7.0:
-    resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==}
-    dev: true
-
-  /@types/pbf@3.0.3:
-    resolution: {integrity: sha512-hw6bDMjvm+QTvEC+pRLpnTknQXoPu8Fnf+A+zX9HB7j/7RfYajFSbdukabo3adPwvvEHhIMafQl0R0Tpej7clQ==}
-    dev: false
-
-  /@types/pug@2.0.6:
-    resolution: {integrity: sha512-SnHmG9wN1UVmagJOnyo/qkk0Z7gejYxOYYmaAwr5u2yFYfsupN3sg10kyzN8Hep/2zbHxCnsumxOoRIRMBwKCg==}
-    dev: true
-
-  /@types/resolve@1.20.2:
-    resolution: {integrity: sha512-60BCwRFOZCQhDncwQdxxeOEEkbc5dIMccYLwbxsS4TUNeVECQ/pBJ0j09mrHOl/JJvpRPGwO9SvE4nR2Nb/a4Q==}
-    dev: true
-
-  /@types/sass@1.43.1:
-    resolution: {integrity: sha512-BPdoIt1lfJ6B7rw35ncdwBZrAssjcwzI5LByIrYs+tpXlj/CAkuVdRsgZDdP4lq5EjyWzwxZCqAoFyHKFwp32g==}
-    dependencies:
-      '@types/node': 18.11.17
-    dev: true
-
-  /@types/supercluster@7.1.1:
-    resolution: {integrity: sha512-dNK02GO1UApgo+1KpY4jOfm3uWb2eBCMB/VMM2y8cMoF49FiqVVcOawEg19wxYcaX7SvEs370incOuFtFGrVLg==}
-    dependencies:
-      '@types/geojson': 7946.0.11
-    dev: false
-
-  /@zerodevx/svelte-toast@0.7.2:
-    resolution: {integrity: sha512-vWiY6IqsstcOoQ8PFBuFuxgPkj1JFAGhUF9gC7wLx7c5A9SSfdtxWs/39ekGSIeyJK0yqWhTcmzGrCEWSELzDw==}
-    dev: true
-
-  /acorn-node@1.8.2:
-    resolution: {integrity: sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==}
-    dependencies:
-      acorn: 7.4.1
-      acorn-walk: 7.2.0
-      xtend: 4.0.2
-    dev: true
-
-  /acorn-walk@7.2.0:
-    resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
-    engines: {node: '>=0.4.0'}
-    dev: true
-
-  /acorn@7.4.1:
-    resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
-
-  /anymatch@3.1.3:
-    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
-    engines: {node: '>= 8'}
-    dependencies:
-      normalize-path: 3.0.0
-      picomatch: 2.3.1
-    dev: true
-
-  /arg@5.0.2:
-    resolution: {integrity: sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==}
-    dev: true
-
-  /arr-union@3.1.0:
-    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /assign-symbols@1.0.0:
-    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /autoprefixer@10.4.13(postcss@8.4.20):
-    resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-    dependencies:
-      browserslist: 4.21.4
-      caniuse-lite: 1.0.30001441
-      fraction.js: 4.2.0
-      normalize-range: 0.1.2
-      picocolors: 1.0.0
-      postcss: 8.4.20
-      postcss-value-parser: 4.2.0
-    dev: true
-
-  /balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
-    dev: true
-
-  /base58-js@1.0.5:
-    resolution: {integrity: sha512-LkkAPP8Zu+c0SVNRTRVDyMfKVORThX+rCViget00xdgLRrKkClCTz1T7cIrpr69ShwV5XJuuoZvMvJ43yURwkA==}
-    engines: {node: '>= 8'}
-    dev: true
-
-  /base64-arraybuffer@1.0.2:
-    resolution: {integrity: sha512-I3yl4r9QB5ZRY3XuJVEPfc2XhZO6YweFPI+UovAzn+8/hb3oJ6lnysaFcjVpkCPfVWFUDvoZ8kmVDP7WyRtYtQ==}
-    engines: {node: '>= 0.6.0'}
-    dev: false
-
-  /base64-js@1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-    dev: true
-
-  /bech32@2.0.0:
-    resolution: {integrity: sha512-LcknSilhIGatDAsY1ak2I8VtGaHNhgMSYVxFrGLXv+xLHytaKZKcaUJJUE7qmBr7h33o5YQwP55pMI0xmkpJwg==}
-    dev: true
-
-  /binary-extensions@2.2.0:
-    resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /bip21@2.0.3:
-    resolution: {integrity: sha512-L4ODmASLjsHYAU+TG7xffkYNMvHzAe4mkVX7mcvOUyKAr/MDBPrsRgqUhE8EmKdeEKHk5SYpX1Aexzvm/6WdbQ==}
-    dependencies:
-      qs: 6.11.0
-    dev: true
-
-  /bitcoin-address-validation@2.2.1:
-    resolution: {integrity: sha512-f6LXNpvRKlTbHWb37N9tHoAbYGbshzM8FPWvCtloh++hxZ0/dmkokvKNVLz6HkG82zVwo8w6Sq4JmfO2timzyg==}
-    dependencies:
-      base58-js: 1.0.5
-      bech32: 2.0.0
-      sha256-uint8array: 0.10.3
-    dev: true
-
-  /brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
-    dependencies:
-      balanced-match: 1.0.2
-      concat-map: 0.0.1
-    dev: true
-
-  /brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
-    dependencies:
-      balanced-match: 1.0.2
-    dev: true
-
-  /braces@3.0.2:
-    resolution: {integrity: sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==}
-    engines: {node: '>=8'}
-    dependencies:
-      fill-range: 7.0.1
-    dev: true
-
-  /browserslist@4.21.4:
-    resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-    dependencies:
-      caniuse-lite: 1.0.30001441
-      electron-to-chromium: 1.4.284
-      node-releases: 2.0.8
-      update-browserslist-db: 1.0.10(browserslist@4.21.4)
-    dev: true
-
-  /buffer-crc32@0.2.13:
-    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
-    dev: true
-
-  /buffer@6.0.3:
-    resolution: {integrity: sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==}
-    dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
-    dev: true
-
-  /builtin-modules@3.3.0:
-    resolution: {integrity: sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /bytewise-core@1.2.3:
-    resolution: {integrity: sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA==}
-    dependencies:
-      typewise-core: 1.2.0
-    dev: false
-
-  /bytewise@1.1.0:
-    resolution: {integrity: sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ==}
-    dependencies:
-      bytewise-core: 1.2.3
-      typewise: 1.0.3
-    dev: false
-
-  /call-bind@1.0.2:
-    resolution: {integrity: sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==}
-    dependencies:
-      function-bind: 1.1.1
-      get-intrinsic: 1.1.3
-    dev: true
-
-  /camelcase-css@2.0.1:
-    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
-    engines: {node: '>= 6'}
-    dev: true
-
-  /caniuse-lite@1.0.30001441:
-    resolution: {integrity: sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==}
-    dev: true
-
-  /chokidar@3.5.3:
-    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
-    engines: {node: '>= 8.10.0'}
-    dependencies:
-      anymatch: 3.1.3
-      braces: 3.0.2
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.6.0
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
-
-  /color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
-    dev: true
-
-  /commondir@1.0.1:
-    resolution: {integrity: sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==}
-    dev: true
-
-  /concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
-    dev: true
-
-  /cookie@0.5.0:
-    resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
-    engines: {node: '>= 0.6'}
-    dev: true
-
-  /css-line-break@2.1.0:
-    resolution: {integrity: sha512-FHcKFCZcAha3LwfVBhCQbW2nCNbkZXn7KVUJcsT5/P8YmfsVja0FMPJr0B903j/E69HUphKiV9iQArX8SDYA4w==}
-    dependencies:
-      utrie: 1.0.2
-    dev: false
-
-  /cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
-    dev: true
-
-  /date-fns@2.29.3:
-    resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==}
-    engines: {node: '>=0.11'}
-    dev: true
-
-  /debug@4.3.4:
-    resolution: {integrity: sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-    dependencies:
-      ms: 2.1.2
-    dev: true
-
-  /deepmerge@4.2.2:
-    resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /deepmerge@4.3.1:
-    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /defined@1.0.1:
-    resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
-    dev: true
-
-  /detect-indent@6.1.0:
-    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
-    engines: {node: '>=8'}
-    dev: true
-
-  /detective@5.2.1:
-    resolution: {integrity: sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw==}
-    engines: {node: '>=0.8.0'}
-    hasBin: true
-    dependencies:
-      acorn-node: 1.8.2
-      defined: 1.0.1
-      minimist: 1.2.7
-    dev: true
-
-  /devalue@4.3.2:
-    resolution: {integrity: sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==}
-    dev: true
-
-  /didyoumean@1.2.2:
-    resolution: {integrity: sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==}
-    dev: true
-
-  /dlv@1.1.3:
-    resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==}
-    dev: true
-
-  /earcut@2.2.4:
-    resolution: {integrity: sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==}
-    dev: false
-
-  /electron-to-chromium@1.4.284:
-    resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
-    dev: true
-
-  /es6-promise@3.3.1:
-    resolution: {integrity: sha512-SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==}
-    dev: true
-
-  /esbuild@0.17.13:
-    resolution: {integrity: sha512-4ixMwdErBcQHgTBeoxnowENCPKWFAGxgTyKHMK8gqn9sZaC7ZNWFKtim16g2rzQ2b/FYyy3lIUUJboFtjolhqg==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.17.13
-      '@esbuild/android-arm64': 0.17.13
-      '@esbuild/android-x64': 0.17.13
-      '@esbuild/darwin-arm64': 0.17.13
-      '@esbuild/darwin-x64': 0.17.13
-      '@esbuild/freebsd-arm64': 0.17.13
-      '@esbuild/freebsd-x64': 0.17.13
-      '@esbuild/linux-arm': 0.17.13
-      '@esbuild/linux-arm64': 0.17.13
-      '@esbuild/linux-ia32': 0.17.13
-      '@esbuild/linux-loong64': 0.17.13
-      '@esbuild/linux-mips64el': 0.17.13
-      '@esbuild/linux-ppc64': 0.17.13
-      '@esbuild/linux-riscv64': 0.17.13
-      '@esbuild/linux-s390x': 0.17.13
-      '@esbuild/linux-x64': 0.17.13
-      '@esbuild/netbsd-x64': 0.17.13
-      '@esbuild/openbsd-x64': 0.17.13
-      '@esbuild/sunos-x64': 0.17.13
-      '@esbuild/win32-arm64': 0.17.13
-      '@esbuild/win32-ia32': 0.17.13
-      '@esbuild/win32-x64': 0.17.13
-    dev: true
-
-  /escalade@3.1.1:
-    resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /esm-env@1.0.0:
-    resolution: {integrity: sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA==}
-    dev: true
-
-  /estree-walker@2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
-    dev: true
-
-  /extend-shallow@2.0.1:
-    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-extendable: 0.1.1
-    dev: false
-
-  /extend-shallow@3.0.2:
-    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      assign-symbols: 1.0.0
-      is-extendable: 1.0.1
-    dev: false
-
-  /fast-glob@3.2.12:
-    resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
-    engines: {node: '>=8.6.0'}
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      '@nodelib/fs.walk': 1.2.8
-      glob-parent: 5.1.2
-      merge2: 1.4.1
-      micromatch: 4.0.5
-    dev: true
-
-  /fastq@1.14.0:
-    resolution: {integrity: sha512-eR2D+V9/ExcbF9ls441yIuN6TI2ED1Y2ZcA5BmMtJsOkWOFRJQ0Jt0g1UwqXJJVAb+V+umH5Dfr8oh4EVP7VVg==}
-    dependencies:
-      reusify: 1.0.4
-    dev: true
-
-  /fill-range@7.0.1:
-    resolution: {integrity: sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      to-regex-range: 5.0.1
-    dev: true
-
-  /fraction.js@4.2.0:
-    resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
-    dev: true
-
-  /fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
-    dev: true
-
-  /fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
-
-  /function-bind@1.1.1:
-    resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==}
-    dev: true
-
-  /geojson-vt@3.2.1:
-    resolution: {integrity: sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==}
-    dev: false
-
-  /get-intrinsic@1.1.3:
-    resolution: {integrity: sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==}
-    dependencies:
-      function-bind: 1.1.1
-      has: 1.0.3
-      has-symbols: 1.0.3
-    dev: true
-
-  /get-stream@6.0.1:
-    resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==}
-    engines: {node: '>=10'}
-    dev: false
-
-  /get-value@2.0.6:
-    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /gl-matrix@3.4.3:
-    resolution: {integrity: sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==}
-    dev: false
-
-  /glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
-    dependencies:
-      is-glob: 4.0.3
-    dev: true
-
-  /glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
-    dependencies:
-      is-glob: 4.0.3
-    dev: true
-
-  /glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 3.1.2
-      once: 1.4.0
-      path-is-absolute: 1.0.1
-    dev: true
-
-  /glob@8.1.0:
-    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 5.1.6
-      once: 1.4.0
-    dev: true
-
-  /global-prefix@3.0.0:
-    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
-    engines: {node: '>=6'}
-    dependencies:
-      ini: 1.3.8
-      kind-of: 6.0.3
-      which: 1.3.1
-    dev: false
-
-  /globalyzer@0.1.0:
-    resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==}
-    dev: true
-
-  /globrex@0.1.2:
-    resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==}
-    dev: true
-
-  /graceful-fs@4.2.10:
-    resolution: {integrity: sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==}
-    dev: true
-
-  /has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /has@1.0.3:
-    resolution: {integrity: sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==}
-    engines: {node: '>= 0.4.0'}
-    dependencies:
-      function-bind: 1.1.1
-    dev: true
-
-  /html2canvas@1.4.1:
-    resolution: {integrity: sha512-fPU6BHNpsyIhr8yyMpTLLxAbkaK8ArIBcmZIRiBLiDhjeqvXolaEmDGmELFuX9I4xDcaKKcJl+TKZLqruBbmWA==}
-    engines: {node: '>=8.0.0'}
-    dependencies:
-      css-line-break: 2.1.0
-      text-segmentation: 1.0.3
-    dev: false
-
-  /html5-qrcode@2.3.8:
-    resolution: {integrity: sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ==}
-    dev: true
-
-  /ieee754@1.2.1:
-    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-
-  /inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
-    dependencies:
-      once: 1.4.0
-      wrappy: 1.0.2
-    dev: true
-
-  /inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
-    dev: true
-
-  /ini@1.3.8:
-    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
-    dev: false
-
-  /is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: '>=8'}
-    dependencies:
-      binary-extensions: 2.2.0
-    dev: true
-
-  /is-builtin-module@3.2.0:
-    resolution: {integrity: sha512-phDA4oSGt7vl1n5tJvTWooWWAsXLY+2xCnxNqvKhGEzujg+A43wPlPOyDg3C8XQHN+6k/JTQWJ/j0dQh/qr+Hw==}
-    engines: {node: '>=6'}
-    dependencies:
-      builtin-modules: 3.3.0
-    dev: true
-
-  /is-core-module@2.11.0:
-    resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==}
-    dependencies:
-      has: 1.0.3
-    dev: true
-
-  /is-extendable@0.1.1:
-    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /is-extendable@1.0.1:
-    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-plain-object: 2.0.4
-    dev: false
-
-  /is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-extglob: 2.1.1
-    dev: true
-
-  /is-module@1.0.0:
-    resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==}
-    dev: true
-
-  /is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
-    dev: true
-
-  /is-plain-object@2.0.4:
-    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      isobject: 3.0.1
-    dev: false
-
-  /is-reference@1.2.1:
-    resolution: {integrity: sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==}
-    dependencies:
-      '@types/estree': 0.0.39
-    dev: true
-
-  /isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
-    dev: false
-
-  /isobject@3.0.1:
-    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /json-stringify-pretty-compact@3.0.0:
-    resolution: {integrity: sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==}
-    dev: false
-
-  /kdbush@4.0.2:
-    resolution: {integrity: sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==}
-    dev: false
-
-  /kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /kleur@4.1.5:
-    resolution: {integrity: sha512-o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /leaflet-tooltip-layout@0.1.2(leaflet@1.9.3):
-    resolution: {integrity: sha512-bc3hhaJQ2vldHE5jg4lnq0D1C83XqDUA2eN/fKF5P9CzBjAn9JBnKjnKJsxWG0TScRt4L6KoRKlYlsKksuKrFA==}
-    peerDependencies:
-      leaflet: ^1.3.4
-    dependencies:
-      leaflet: 1.9.3
-    dev: false
-
-  /leaflet.markercluster@1.5.3(leaflet@1.9.3):
-    resolution: {integrity: sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA==}
-    peerDependencies:
-      leaflet: ^1.3.1
-    dependencies:
-      leaflet: 1.9.3
-    dev: true
-
-  /leaflet@1.9.3:
-    resolution: {integrity: sha512-iB2cR9vAkDOu5l3HAay2obcUHZ7xwUBBjph8+PGtmW/2lYhbLizWtG7nTeYht36WfOslixQF9D/uSIzhZgGMfQ==}
-
-  /lilconfig@2.0.6:
-    resolution: {integrity: sha512-9JROoBW7pobfsx+Sq2JsASvCo6Pfo6WWoUW79HuB1BCoBXD4PLWJPqDF6fNj67pqBYTbAHkE57M1kS/+L1neOg==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /magic-string@0.25.9:
-    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
-    dependencies:
-      sourcemap-codec: 1.4.8
-    dev: true
-
-  /magic-string@0.27.0:
-    resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
-
-  /magic-string@0.30.0:
-    resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
-
-  /magic-string@0.30.5:
-    resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
-    dev: true
-
-  /maplibre-gl@3.3.1:
-    resolution: {integrity: sha512-SfRq9bT68GytDzCOG0IoTGg2rASbgdYunW/6xhnp55QuLmwG1M/YOlXxqHaphwia7kZbMvBOocvY0fp5yfTjZA==}
-    engines: {node: '>=16.14.0', npm: '>=8.1.0'}
-    dependencies:
-      '@mapbox/geojson-rewind': 0.5.2
-      '@mapbox/jsonlint-lines-primitives': 2.0.2
-      '@mapbox/point-geometry': 0.1.0
-      '@mapbox/tiny-sdf': 2.0.6
-      '@mapbox/unitbezier': 0.0.1
-      '@mapbox/vector-tile': 1.3.1
-      '@mapbox/whoots-js': 3.1.0
-      '@maplibre/maplibre-gl-style-spec': 19.3.2
-      '@types/geojson': 7946.0.11
-      '@types/mapbox__point-geometry': 0.1.2
-      '@types/mapbox__vector-tile': 1.3.1
-      '@types/pbf': 3.0.3
-      '@types/supercluster': 7.1.1
-      earcut: 2.2.4
-      geojson-vt: 3.2.1
-      gl-matrix: 3.4.3
-      global-prefix: 3.0.0
-      kdbush: 4.0.2
-      murmurhash-js: 1.0.0
-      pbf: 3.2.1
-      potpack: 2.0.0
-      quickselect: 2.0.0
-      supercluster: 8.0.1
-      tinyqueue: 2.0.3
-      vt-pbf: 3.1.3
-    dev: false
-
-  /merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
-    dev: true
-
-  /micromatch@4.0.5:
-    resolution: {integrity: sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==}
-    engines: {node: '>=8.6'}
-    dependencies:
-      braces: 3.0.2
-      picomatch: 2.3.1
-    dev: true
-
-  /min-indent@1.0.1:
-    resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
-    dependencies:
-      brace-expansion: 1.1.11
-    dev: true
-
-  /minimatch@5.1.6:
-    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
-    engines: {node: '>=10'}
-    dependencies:
-      brace-expansion: 2.0.1
-    dev: true
-
-  /minimist@1.2.7:
-    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
-
-  /minimist@1.2.8:
-    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
-    dev: false
-
-  /mkdirp@0.5.6:
-    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
-    hasBin: true
-    dependencies:
-      minimist: 1.2.7
-    dev: true
-
-  /mri@1.2.0:
-    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
-    engines: {node: '>=4'}
-    dev: true
-
-  /mrmime@1.0.1:
-    resolution: {integrity: sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /ms@2.1.2:
-    resolution: {integrity: sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==}
-    dev: true
-
-  /murmurhash-js@1.0.0:
-    resolution: {integrity: sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==}
-    dev: false
-
-  /nanoid@3.3.4:
-    resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-    dev: true
-
-  /node-releases@2.0.8:
-    resolution: {integrity: sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==}
-    dev: true
-
-  /normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /normalize-range@0.1.2:
-    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /nostr-tools@1.14.2:
-    resolution: {integrity: sha512-QEe8+tMDW0632eNDcQ+EG1edmsCXLV4WPiWLDcdT3uoE+GM15pVcy18sKwbN7SmgO4GKFEqQ49k45eANC6++SQ==}
-    dependencies:
-      '@noble/ciphers': 0.2.0
-      '@noble/curves': 1.1.0
-      '@noble/hashes': 1.3.1
-      '@scure/base': 1.1.1
-      '@scure/bip32': 1.3.1
-      '@scure/bip39': 1.2.1
-    dev: true
-
-  /object-hash@3.0.0:
-    resolution: {integrity: sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==}
-    engines: {node: '>= 6'}
-    dev: true
-
-  /object-inspect@1.12.2:
-    resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
-    dev: true
-
-  /once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
-    dependencies:
-      wrappy: 1.0.2
-    dev: true
-
-  /path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /path-parse@1.0.7:
-    resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
-    dev: true
-
-  /pbf@3.2.1:
-    resolution: {integrity: sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==}
-    hasBin: true
-    dependencies:
-      ieee754: 1.2.1
-      resolve-protobuf-schema: 2.1.0
-    dev: false
-
-  /picocolors@1.0.0:
-    resolution: {integrity: sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==}
-    dev: true
-
-  /picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-    dev: true
-
-  /pify@2.3.0:
-    resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /postcss-import@14.1.0(postcss@8.4.20):
-    resolution: {integrity: sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      postcss: ^8.0.0
-    dependencies:
-      postcss: 8.4.20
-      postcss-value-parser: 4.2.0
-      read-cache: 1.0.0
-      resolve: 1.22.1
-    dev: true
-
-  /postcss-js@4.0.0(postcss@8.4.20):
-    resolution: {integrity: sha512-77QESFBwgX4irogGVPgQ5s07vLvFqWr228qZY+w6lW599cRlK/HmnlivnnVUxkjHnCu4J16PDMHcH+e+2HbvTQ==}
-    engines: {node: ^12 || ^14 || >= 16}
-    peerDependencies:
-      postcss: ^8.3.3
-    dependencies:
-      camelcase-css: 2.0.1
-      postcss: 8.4.20
-    dev: true
-
-  /postcss-load-config@3.1.4(postcss@8.4.20):
-    resolution: {integrity: sha512-6DiM4E7v4coTE4uzA8U//WhtPwyhiim3eyjEMFCnUpzbrkK9wJHgKDT2mR+HbtSrd/NubVaYTOpSpjUl8NQeRg==}
-    engines: {node: '>= 10'}
-    peerDependencies:
-      postcss: '>=8.0.9'
-      ts-node: '>=9.0.0'
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-      ts-node:
-        optional: true
-    dependencies:
-      lilconfig: 2.0.6
-      postcss: 8.4.20
-      yaml: 1.10.2
-    dev: true
-
-  /postcss-nested@6.0.0(postcss@8.4.20):
-    resolution: {integrity: sha512-0DkamqrPcmkBDsLn+vQDIrtkSbNkv5AD/M322ySo9kqFkCIYklym2xEmWkwo+Y3/qZo34tzEPNUw4y7yMCdv5w==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.2.14
-    dependencies:
-      postcss: 8.4.20
-      postcss-selector-parser: 6.0.11
-    dev: true
-
-  /postcss-selector-parser@6.0.11:
-    resolution: {integrity: sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==}
-    engines: {node: '>=4'}
-    dependencies:
-      cssesc: 3.0.0
-      util-deprecate: 1.0.2
-    dev: true
-
-  /postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-    dev: true
-
-  /postcss@8.4.20:
-    resolution: {integrity: sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.4
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: true
-
-  /postcss@8.4.21:
-    resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.4
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-    dev: true
-
-  /potpack@2.0.0:
-    resolution: {integrity: sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==}
-    dev: false
-
-  /prettier-plugin-svelte@2.9.0(prettier@2.8.1)(svelte@3.55.0):
-    resolution: {integrity: sha512-3doBi5NO4IVgaNPtwewvrgPpqAcvNv0NwJNflr76PIGgi9nf1oguQV1Hpdm9TI2ALIQVn/9iIwLpBO5UcD2Jiw==}
-    peerDependencies:
-      prettier: ^1.16.4 || ^2.0.0
-      svelte: ^3.2.0
-    dependencies:
-      prettier: 2.8.1
-      svelte: 3.55.0
-    dev: true
-
-  /prettier@2.8.1:
-    resolution: {integrity: sha512-lqGoSJBQNJidqCHE80vqZJHWHRFoNYsSpP9AjFhlhi9ODCJA541svILes/+/1GM3VaL/abZi7cpFzOpdR9UPKg==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    dev: true
-
-  /protocol-buffers-schema@3.6.0:
-    resolution: {integrity: sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==}
-    dev: false
-
-  /qr-code-styling@1.6.0-rc.1:
-    resolution: {integrity: sha512-ModRIiW6oUnsP18QzrRYZSc/CFKFKIdj7pUs57AEVH20ajlglRpN3HukjHk0UbNMTlKGuaYl7Gt6/O5Gg2NU2Q==}
-    dependencies:
-      qrcode-generator: 1.4.4
-    dev: true
-
-  /qr-scanner@1.4.2:
-    resolution: {integrity: sha512-kV1yQUe2FENvn59tMZW6mOVfpq9mGxGf8l6+EGaXUOd4RBOLg7tRC83OrirM5AtDvZRpdjdlXURsHreAOSPOUw==}
-    dependencies:
-      '@types/offscreencanvas': 2019.7.0
-    dev: true
-
-  /qrcode-base64@1.0.1:
-    resolution: {integrity: sha512-B0BDmnRSvbj47Nq/+IeZjj22afNrf4rwIloNrSXN6OwnkoO+Q0hsUa53gCEfqNQjx+OcytF3azvQhi6wV2Tk6g==}
-    dev: true
-
-  /qrcode-generator@1.4.4:
-    resolution: {integrity: sha512-HM7yY8O2ilqhmULxGMpcHSF1EhJJ9yBj8gvDEuZ6M+KGJ0YY2hKpnXvRD+hZPLrDVck3ExIGhmPtSdcjC+guuw==}
-    dev: true
-
-  /qs@6.11.0:
-    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
-    engines: {node: '>=0.6'}
-    dependencies:
-      side-channel: 1.0.4
-    dev: true
-
-  /queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
-    dev: true
-
-  /quick-lru@5.1.1:
-    resolution: {integrity: sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==}
-    engines: {node: '>=10'}
-    dev: true
-
-  /quickselect@2.0.0:
-    resolution: {integrity: sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==}
-    dev: false
-
-  /read-cache@1.0.0:
-    resolution: {integrity: sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==}
-    dependencies:
-      pify: 2.3.0
-    dev: true
-
-  /readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
-    dependencies:
-      picomatch: 2.3.1
-    dev: true
-
-  /resolve-protobuf-schema@2.1.0:
-    resolution: {integrity: sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==}
-    dependencies:
-      protocol-buffers-schema: 3.6.0
-    dev: false
-
-  /resolve@1.22.1:
-    resolution: {integrity: sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==}
-    hasBin: true
-    dependencies:
-      is-core-module: 2.11.0
-      path-parse: 1.0.7
-      supports-preserve-symlinks-flag: 1.0.0
-    dev: true
-
-  /reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
-    dev: true
-
-  /rimraf@2.7.1:
-    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
-    hasBin: true
-    dependencies:
-      glob: 7.2.3
-    dev: true
-
-  /rollup@2.79.1:
-    resolution: {integrity: sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
-
-  /rollup@3.20.2:
-    resolution: {integrity: sha512-3zwkBQl7Ai7MFYQE0y1MeQ15+9jsi7XxfrqwTb/9EK8D9C9+//EBR4M+CuA1KODRaNbFez/lWxA5vhEGZp4MUg==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
-
-  /rollup@3.8.1:
-    resolution: {integrity: sha512-4yh9eMW7byOroYcN8DlF9P/2jCpu6txVIHjEqquQVSx7DI0RgyCCN3tjrcy4ra6yVtV336aLBB3v2AarYAxePQ==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
-
-  /run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
-    dependencies:
-      queue-microtask: 1.2.3
-    dev: true
-
-  /rw@1.3.3:
-    resolution: {integrity: sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==}
-    dev: false
-
-  /sade@1.8.1:
-    resolution: {integrity: sha512-xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==}
-    engines: {node: '>=6'}
-    dependencies:
-      mri: 1.2.0
-    dev: true
-
-  /sander@0.5.1:
-    resolution: {integrity: sha512-3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==}
-    dependencies:
-      es6-promise: 3.3.1
-      graceful-fs: 4.2.10
-      mkdirp: 0.5.6
-      rimraf: 2.7.1
-    dev: true
-
-  /screenfull@6.0.2:
-    resolution: {integrity: sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw==}
-    engines: {node: ^14.13.1 || >=16.0.0}
-    dev: true
-
-  /set-cookie-parser@2.6.0:
-    resolution: {integrity: sha512-RVnVQxTXuerk653XfuliOxBP81Sf0+qfQE73LIYKcyMYHG94AuH0kgrQpRDuTZnSmjpysHmzxJXKNfa6PjFhyQ==}
-    dev: true
-
-  /set-value@2.0.1:
-    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      extend-shallow: 2.0.1
-      is-extendable: 0.1.1
-      is-plain-object: 2.0.4
-      split-string: 3.1.0
-    dev: false
-
-  /sha256-uint8array@0.10.3:
-    resolution: {integrity: sha512-SFTs87RfXVulKrhhP6B5/qcFruOKQZaKf6jY9V4PJ7NOG0qIlQP6XL4pQq5xagsuP/Wd55S7tUBJpRajEsDUEQ==}
-    dev: true
-
-  /side-channel@1.0.4:
-    resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
-    dependencies:
-      call-bind: 1.0.2
-      get-intrinsic: 1.1.3
-      object-inspect: 1.12.2
-    dev: true
-
-  /sirv@2.0.2:
-    resolution: {integrity: sha512-4Qog6aE29nIjAOKe/wowFTxOdmbEZKb+3tsLljaBRzJwtqto0BChD2zzH0LhgCSXiI+V7X+Y45v14wBZQ1TK3w==}
-    engines: {node: '>= 10'}
-    dependencies:
-      '@polka/url': 1.0.0-next.21
-      mrmime: 1.0.1
-      totalist: 3.0.0
-    dev: true
-
-  /sorcery@0.10.0:
-    resolution: {integrity: sha512-R5ocFmKZQFfSTstfOtHjJuAwbpGyf9qjQa1egyhvXSbM7emjrtLXtGdZsDJDABC85YBfVvrOiGWKSYXPKdvP1g==}
-    hasBin: true
-    dependencies:
-      buffer-crc32: 0.2.13
-      minimist: 1.2.7
-      sander: 0.5.1
-      sourcemap-codec: 1.4.8
-    dev: true
-
-  /sort-asc@0.2.0:
-    resolution: {integrity: sha512-umMGhjPeHAI6YjABoSTrFp2zaBtXBej1a0yKkuMUyjjqu6FJsTF+JYwCswWDg+zJfk/5npWUUbd33HH/WLzpaA==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /sort-desc@0.2.0:
-    resolution: {integrity: sha512-NqZqyvL4VPW+RAxxXnB8gvE1kyikh8+pR+T+CXLksVRN9eiQqkQlPwqWYU0mF9Jm7UnctShlxLyAt1CaBOTL1w==}
-    engines: {node: '>=0.10.0'}
-    dev: false
-
-  /sort-object@3.0.3:
-    resolution: {integrity: sha512-nK7WOY8jik6zaG9CRwZTaD5O7ETWDLZYMM12pqY8htll+7dYeqGfEUPcUBHOpSJg2vJOrvFIY2Dl5cX2ih1hAQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      bytewise: 1.1.0
-      get-value: 2.0.6
-      is-extendable: 0.1.1
-      sort-asc: 0.2.0
-      sort-desc: 0.2.0
-      union-value: 1.0.1
-    dev: false
-
-  /source-map-js@1.0.2:
-    resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
-  /sourcemap-codec@1.4.8:
-    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
-    deprecated: Please use @jridgewell/sourcemap-codec instead
-    dev: true
-
-  /split-string@3.1.0:
-    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      extend-shallow: 3.0.2
-    dev: false
-
-  /strip-indent@3.0.0:
-    resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      min-indent: 1.0.1
-    dev: true
-
-  /supercluster@8.0.1:
-    resolution: {integrity: sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==}
-    dependencies:
-      kdbush: 4.0.2
-    dev: false
-
-  /supports-preserve-symlinks-flag@1.0.0:
-    resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==}
-    engines: {node: '>= 0.4'}
-    dev: true
-
-  /svelte-hmr@0.15.3(svelte@3.55.0):
-    resolution: {integrity: sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==}
-    engines: {node: ^12.20 || ^14.13.1 || >= 16}
-    peerDependencies:
-      svelte: ^3.19.0 || ^4.0.0
-    dependencies:
-      svelte: 3.55.0
-    dev: true
-
-  /svelte-outclick@3.3.3(svelte@3.55.0):
-    resolution: {integrity: sha512-1XyaNhhDfH0C9GR4NreTc9OTgKcnQVoT7iVLvdbgZ/Dur/Bq94Pl5RBaJ/fu2qlEZk9ZIhODpuWiNNUjyhjVCg==}
-    peerDependencies:
-      svelte: 3.x
-    dependencies:
-      svelte: 3.55.0
-    dev: true
-
-  /svelte-preprocess@4.10.7(postcss@8.4.20)(svelte@3.55.0):
-    resolution: {integrity: sha512-sNPBnqYD6FnmdBrUmBCaqS00RyCsCpj2BG58A1JBswNF7b0OKviwxqVrOL/CKyJrLSClrSeqQv5BXNg2RUbPOw==}
-    engines: {node: '>= 9.11.2'}
-    requiresBuild: true
-    peerDependencies:
-      '@babel/core': ^7.10.2
-      coffeescript: ^2.5.1
-      less: ^3.11.3 || ^4.0.0
-      node-sass: '*'
-      postcss: ^7 || ^8
-      postcss-load-config: ^2.1.0 || ^3.0.0 || ^4.0.0
-      pug: ^3.0.0
-      sass: ^1.26.8
-      stylus: ^0.55.0
-      sugarss: ^2.0.0
-      svelte: ^3.23.0
-      typescript: ^3.9.5 || ^4.0.0
-    peerDependenciesMeta:
-      '@babel/core':
-        optional: true
-      coffeescript:
-        optional: true
-      less:
-        optional: true
-      node-sass:
-        optional: true
-      postcss:
-        optional: true
-      postcss-load-config:
-        optional: true
-      pug:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      typescript:
-        optional: true
-    dependencies:
-      '@types/pug': 2.0.6
-      '@types/sass': 1.43.1
-      detect-indent: 6.1.0
-      magic-string: 0.25.9
-      postcss: 8.4.20
-      sorcery: 0.10.0
-      strip-indent: 3.0.0
-      svelte: 3.55.0
-    dev: true
-
-  /svelte-virtual-scroll-list@1.1.0(svelte@3.55.0):
-    resolution: {integrity: sha512-GFaBhD9izv77xgJTyFMD1MP+ElGMUGMC9CDCM+uX9hkZIYipNS6u8oDMYDGwCXUw7QGEihU4yLmBvBSeBp78uw==}
-    peerDependencies:
-      svelte: ^3.0.0
-    dependencies:
-      svelte: 3.55.0
-    dev: true
-
-  /svelte@3.55.0:
-    resolution: {integrity: sha512-uGu2FVMlOuey4JoKHKrpZFkoYyj0VLjJdz47zX5+gVK5odxHM40RVhar9/iK2YFRVxvfg9FkhfVlR0sjeIrOiA==}
-    engines: {node: '>= 8'}
-    dev: true
-
-  /sveltekit-i18n@2.2.2(svelte@3.55.0):
-    resolution: {integrity: sha512-6eygICleGCSL7elY7A3trF8XUhV+mlW56ZSoD0UUKXlw+Y6u0MTTHDq48u1LyY73SfnlbPHXgTarhTjZ0BvUKA==}
-    peerDependencies:
-      svelte: ^3.x
-    dependencies:
-      '@sveltekit-i18n/base': 1.2.1(svelte@3.55.0)
-      '@sveltekit-i18n/parser-default': 1.0.3
-      svelte: 3.55.0
-    dev: true
-
-  /tailwind-scrollbar@2.1.0(tailwindcss@3.2.4):
-    resolution: {integrity: sha512-zpvY5mDs0130YzYjZKBiDaw32rygxk5RyJ4KmeHjGnwkvbjm/PszON1m4Bbt2DkMRIXlXsfNevykAESgURN4KA==}
-    engines: {node: '>=12.13.0'}
-    peerDependencies:
-      tailwindcss: 3.x
-    dependencies:
-      tailwindcss: 3.2.4(postcss@8.4.20)
-    dev: true
-
-  /tailwindcss@3.2.4(postcss@8.4.20):
-    resolution: {integrity: sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ==}
-    engines: {node: '>=12.13.0'}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.0.9
-    dependencies:
-      arg: 5.0.2
-      chokidar: 3.5.3
-      color-name: 1.1.4
-      detective: 5.2.1
-      didyoumean: 1.2.2
-      dlv: 1.1.3
-      fast-glob: 3.2.12
-      glob-parent: 6.0.2
-      is-glob: 4.0.3
-      lilconfig: 2.0.6
-      micromatch: 4.0.5
-      normalize-path: 3.0.0
-      object-hash: 3.0.0
-      picocolors: 1.0.0
-      postcss: 8.4.20
-      postcss-import: 14.1.0(postcss@8.4.20)
-      postcss-js: 4.0.0(postcss@8.4.20)
-      postcss-load-config: 3.1.4(postcss@8.4.20)
-      postcss-nested: 6.0.0(postcss@8.4.20)
-      postcss-selector-parser: 6.0.11
-      postcss-value-parser: 4.2.0
-      quick-lru: 5.1.1
-      resolve: 1.22.1
-    transitivePeerDependencies:
-      - ts-node
-    dev: true
-
-  /text-segmentation@1.0.3:
-    resolution: {integrity: sha512-iOiPUo/BGnZ6+54OsWxZidGCsdU8YbE4PSpdPinp7DeMtUJNJBoJ/ouUSTJjHkh1KntHaltHl/gDs2FC4i5+Nw==}
-    dependencies:
-      utrie: 1.0.2
-    dev: false
-
-  /tiny-glob@0.2.9:
-    resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
-    dependencies:
-      globalyzer: 0.1.0
-      globrex: 0.1.2
-    dev: true
-
-  /tinyqueue@2.0.3:
-    resolution: {integrity: sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==}
-    dev: false
-
-  /to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
-    dependencies:
-      is-number: 7.0.0
-    dev: true
-
-  /totalist@3.0.0:
-    resolution: {integrity: sha512-eM+pCBxXO/njtF7vdFsHuqb+ElbxqtI4r5EAvk6grfAFyJ6IvWlSkfZ5T9ozC6xWw3Fj1fGoSmrl0gUs46JVIw==}
-    engines: {node: '>=6'}
-    dev: true
-
-  /typewise-core@1.2.0:
-    resolution: {integrity: sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg==}
-    dev: false
-
-  /typewise@1.0.3:
-    resolution: {integrity: sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ==}
-    dependencies:
-      typewise-core: 1.2.0
-    dev: false
-
-  /uint8array-extras@0.5.0:
-    resolution: {integrity: sha512-CKAKa+/rjCblsuGrcmIJLluHcZMYKcMwgdhAZZEnSplFFGCuGKF6e2L+CeVXK0zX5rYyerrqG2dnHIANm3i9qA==}
-    engines: {node: '>=18'}
-    dev: false
-
-  /undici@5.26.5:
-    resolution: {integrity: sha512-cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==}
-    engines: {node: '>=14.0'}
-    dependencies:
-      '@fastify/busboy': 2.1.0
-    dev: true
-
-  /union-value@1.0.1:
-    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      arr-union: 3.1.0
-      get-value: 2.0.6
-      is-extendable: 0.1.1
-      set-value: 2.0.1
-    dev: false
-
-  /unique-names-generator@4.7.1:
-    resolution: {integrity: sha512-lMx9dX+KRmG8sq6gulYYpKWZc9RlGsgBR6aoO8Qsm3qvkSJ+3rAymr+TnV8EDMrIrwuFJ4kruzMWM/OpYzPoow==}
-    engines: {node: '>=8'}
-    dev: false
-
-  /update-browserslist-db@1.0.10(browserslist@4.21.4):
-    resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-    dependencies:
-      browserslist: 4.21.4
-      escalade: 3.1.1
-      picocolors: 1.0.0
-    dev: true
-
-  /util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
-    dev: true
-
-  /utrie@1.0.2:
-    resolution: {integrity: sha512-1MLa5ouZiOmQzUbjbu9VmjLzn1QLXBhwpUa7kdLUQK+KQ5KA9I1vk5U4YHe/X2Ch7PYnJfWuWT+VbuxbGwljhw==}
-    dependencies:
-      base64-arraybuffer: 1.0.2
-    dev: false
-
-  /uuid@9.0.0:
-    resolution: {integrity: sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==}
-    hasBin: true
-    dev: true
-
-  /vite@4.2.1:
-    resolution: {integrity: sha512-7MKhqdy0ISo4wnvwtqZkjke6XN4taqQ2TBaTccLIpOKv7Vp2h4Y+NpmWCnGDeSvvn45KxvWgGyb0MkHvY1vgbg==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      esbuild: 0.17.13
-      postcss: 8.4.21
-      resolve: 1.22.1
-      rollup: 3.20.2
-    optionalDependencies:
-      fsevents: 2.3.3
-    dev: true
-
-  /vitefu@0.2.5(vite@4.2.1):
-    resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==}
-    peerDependencies:
-      vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || 4
-    peerDependenciesMeta:
-      vite:
-        optional: true
-    dependencies:
-      vite: 4.2.1
-    dev: true
-
-  /vt-pbf@3.1.3:
-    resolution: {integrity: sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==}
-    dependencies:
-      '@mapbox/point-geometry': 0.1.0
-      '@mapbox/vector-tile': 1.3.1
-      pbf: 3.2.1
-    dev: false
-
-  /which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
-    dependencies:
-      isexe: 2.0.0
-    dev: false
-
-  /wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
-    dev: true
-
-  /xtend@4.0.2:
-    resolution: {integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==}
-    engines: {node: '>=0.4'}
-    dev: true
-
-  /yaml@1.10.2:
-    resolution: {integrity: sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==}
-    engines: {node: '>= 6'}
-    dev: true
diff --git a/src/components/About.svelte b/src/components/About.svelte
index 4292b9fd..1dbd8038 100644
--- a/src/components/About.svelte
+++ b/src/components/About.svelte
@@ -1,5 +1,14 @@
 <script>
-	export let locations;
+  import { onMount } from "svelte";
+
+	let locations;
+  onMount(async () => {
+    try {
+      ({ locations } = await fetch("/locations").then((r) => r.json()));
+    } catch (e) {
+      console.log(e);
+    }
+  });
 
 	import { Image, Icon, LocationsMap } from '$comp';
 	import { t } from '$lib/translations';
diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index d5caba0d..0068b95f 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -1,9 +1,8 @@
 <script>
 	import { tick, onMount, onDestroy } from 'svelte';
 	import { browser } from '$app/environment';
-	import html2canvas from 'html2canvas';
 	import { Icon, Popup } from '$comp';
-    import { shuffleArray } from "$lib/utils";
+	import { shuffleArray } from '$lib/utils';
 
 	import 'maplibre-gl/dist/maplibre-gl.css';
 
@@ -127,7 +126,7 @@
 		}
 
 		inview = inview.sort((a, b) => a.tags.name.localeCompare(b.tags.name));
-      shuffleArray(inview);
+		shuffleArray(inview);
 	}
 
 	let popups = {};
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 5aa46242..c6b11639 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -90,6 +90,7 @@
 
 	onDestroy(() => {
 		if (browser) {
+      close();
 			clearTimeout(checkTimer);
 			clearTimeout(expireTimer);
 		}
@@ -117,7 +118,7 @@
 
 <SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
 
-<main data-sveltekit-prefetch class="pb-20">
+<main class="pb-20">
 	<slot />
 </main>
 
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
index 15d286c8..2a06b31d 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
@@ -6,6 +6,7 @@
 	import { page } from '$app/stores';
 
 	export let user, rates, submit;
+
 	let { id } = user;
 
 	let selectedTheme = 1;
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index a5431d6a..9100401a 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -5,6 +5,7 @@
 	import { page } from '$app/stores';
 
 	export let user, rates, submit;
+
 	let fiats = Object.keys(rates);
 </script>
 
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 2cd0c473..32d31fa8 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,9 +1,11 @@
 <script>
+	import { PUBLIC_DOMAIN } from '$env/static/public';
 	import '../app.css';
 	import { loading, t } from '$lib/translations';
 
 	export let data;
-	let { host, pathname } = data;
+	let { pathname } = data;
+  let host = PUBLIC_DOMAIN.includes("localhost") ? `http://${PUBLIC_DOMAIN}` : `https://${PUBLIC_DOMAIN}`
 </script>
 
 <svelte:head>
@@ -11,7 +13,7 @@
 	<meta property="og:title" content="coinos" />
 	<meta name="twitter:title" content="coinos" />
 
-	<meta property="og:image" content={`${host}/icons/logo.svg`} />
+	<meta property="og:image" content={`${host}/images/logo.png`} />
 
 	<meta property="og:type" content="website" />
 	<meta property="og:description" content="An easy to use bitcoin web wallet" />
@@ -19,7 +21,7 @@
 
 	<meta name="keywords" content="coinos easy bitcoin web wallet" />
 
-	<meta name="twitter:image" content={`${host}/icons/logo.svg`} />
+	<meta name="twitter:image" content={`${host}/images/logo.png`} />
 	<meta name="twitter:card" content="summary_large_image" />
 
 	<meta property="og:url" content={host + pathname} />
@@ -28,7 +30,7 @@
 </svelte:head>
 
 {#if !$loading}
-<slot />
+	<slot />
 {/if}
 
 <style global>
diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js
index 9e4b62e2..a32b0bfe 100644
--- a/src/routes/+page.server.js
+++ b/src/routes/+page.server.js
@@ -1,13 +1,4 @@
-import { get } from '$lib/utils';
-
-// export const prerender = true;
+export const prerender = true;
 export let load = async () => {
-	let data = { locations: [] };
-
-	try {
-		data = await get('/locations');
-	} catch (e) {}
-
-    data.faqs = ['cost', 'compatibility', 'safety', 'pos', 'bitcoin'];
-	return data;
+	return { faqs: ['cost', 'compatibility', 'safety', 'pos', 'bitcoin'] };
 };
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 9d2ba213..59d56bf1 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -11,8 +11,7 @@
 	} from '$comp';
 
 	import { t } from '$lib/translations';
-	import { close } from '$lib/socket';
-	import { onDestroy, onMount } from 'svelte';
+	import { onDestroy, onMount, tick } from 'svelte';
 
 	export let data;
 	let { faqs, locations, user } = data;
@@ -33,16 +32,17 @@
 
 	let loaded;
 
-	onMount(async () => {
-		close();
+	let observer;
+	let isIntersecting = false;
 
-		try {
-			({ locations } = await fetch('/locations').then((r) => r.json()));
-		} catch (e) {
-			console.log(e);
-		}
+	onMount(async () => {
+		observer = new IntersectionObserver((entries) => {
+			isIntersecting = isIntersecting || entries[0].isIntersecting;
+		});
 
 		loaded = true;
+		await tick();
+		observer.observe(document.getElementById('faq'));
 	});
 
 	onDestroy(() => (loaded = false));
@@ -56,7 +56,7 @@
 	<LandingHeader {howItWorks} {faq} {about} {user} />
 
 	<main class="space-y-40 py-20 md:py-32 lg:py-36 xl:py-40 px-5 md:px-0">
-		<LandingHero {user} />
+		<LandingHero />
 		<LandingInfoCard
 			image="lightning-qr"
 			title={$t('landing.info1.title')}
@@ -82,7 +82,9 @@
 		</div>
 
 		<div>
-			<h3 class="text-5xl font-medium mb-10 text-center">{$t('howItWorks.header')}</h3>
+			<h3 class="text-5xl font-medium mb-10 text-center">
+				{$t('howItWorks.header')}
+			</h3>
 			<div class="grid lg:grid-cols-3 space-y-10 lg:space-y-0 text-center">
 				{#each howItWorksSteps as step}
 					<HowItWorksCard image={step.image} stepID={step.stepID} />
@@ -93,7 +95,9 @@
 
 		<div>
 			<div class="space-y-10">
-				<h3 class="text-5xl font-medium text-center pt-40 -mt-40" id="faq">{$t('faq.header')}</h3>
+				<h3 class="text-5xl font-medium text-center pt-40 -mt-40" id="faq">
+					{$t('faq.header')}
+				</h3>
 				{#each faqs as f}
 					<FaqCard questionID={f} />
 				{/each}
@@ -101,7 +105,9 @@
 			<div bind:this={about} />
 		</div>
 
-		<About {locations} />
+		{#if isIntersecting}
+			<About />
+		{/if}
 	</main>
 
 	<Footer />
diff --git a/static/images/customize.webp b/static/images/customize.webp
index 9d558683..a5c9a37f 100644
Binary files a/static/images/customize.webp and b/static/images/customize.webp differ
diff --git a/static/images/hero-image.webp b/static/images/hero-image.webp
index 794e764b..c4dd22bd 100644
Binary files a/static/images/hero-image.webp and b/static/images/hero-image.webp differ
diff --git a/static/images/lightning-qr.webp b/static/images/lightning-qr.webp
index 9d4eb3c2..0462e28f 100644
Binary files a/static/images/lightning-qr.webp and b/static/images/lightning-qr.webp differ
diff --git a/static/images/phone-checkout.webp b/static/images/phone-checkout.webp
index a6d81ded..0d075c63 100644
Binary files a/static/images/phone-checkout.webp and b/static/images/phone-checkout.webp differ
diff --git a/static/images/test.webp b/static/images/test.webp
deleted file mode 100644
index cbe25d5a..00000000
Binary files a/static/images/test.webp and /dev/null differ
-- 
cgit v1.2.3


From acc51782323a3f8a3630aaa90908a69f417b4a60 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 1 Dec 2023 15:22:13 -0800
Subject: fix locktime bug

---
 src/routes/(app)/+layout.svelte | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index c6b11639..51ade9c7 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -41,9 +41,9 @@
 		});
 
 		if (browser) {
-			let log = console.log;
 			checkSocket();
-			expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000);
+			let locktime = user && user.locktime ? user.locktime : 300;
+			expireTimer = setTimeout(expirePin, locktime * 1000);
 
 			// if (window.NDEFReader) {
 			// 	try {
@@ -58,7 +58,7 @@
 			// 			goto(`/${user.username}/card/${serialNumber.replace(/:/g, '-')}`);
 			// 		});
 			// 	} catch (error) {
-			// 		log('Argh! ' + error);
+			// 		console.log('Argh! ' + error);
 			// 	}
 			// }
 		}
@@ -90,7 +90,7 @@
 
 	onDestroy(() => {
 		if (browser) {
-      close();
+			close();
 			clearTimeout(checkTimer);
 			clearTimeout(expireTimer);
 		}
-- 
cgit v1.2.3


From ed4d4eee2b81d5e516f2fdb001f29f22280b29b6 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 1 Dec 2023 15:23:45 -0800
Subject: disable prerender

---
 src/routes/+page.server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js
index a32b0bfe..dbd7fdf7 100644
--- a/src/routes/+page.server.js
+++ b/src/routes/+page.server.js
@@ -1,4 +1,4 @@
-export const prerender = true;
+// export const prerender = true;
 export let load = async () => {
 	return { faqs: ['cost', 'compatibility', 'safety', 'pos', 'bitcoin'] };
 };
-- 
cgit v1.2.3


From 216a600224fde22ce76b367557a02094ec693886 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 1 Dec 2023 20:04:13 -0800
Subject: prettier

---
 .prettierrc                                        |    6 +-
 doc/i18n-technical.md                              |   10 +-
 docker-compose.yml                                 |   16 +-
 postcss.config.cjs                                 |    8 +-
 src/app.css                                        |   33 +-
 src/app.html                                       |   27 +-
 src/components/404.svelte                          |   20 +-
 src/components/About.svelte                        |  131 +-
 src/components/AppHeader.svelte                    |  276 +-
 src/components/Avatar.svelte                       |   44 +-
 src/components/Balance.svelte                      |   48 +-
 src/components/Calendar.svelte                     |   22 +-
 src/components/Card.svelte                         |   22 +-
 src/components/Check.svelte                        |   18 +-
 src/components/Code.svelte                         |   42 +-
 src/components/Event.svelte                        |  147 +-
 src/components/FaqCard.svelte                      |   18 +-
 src/components/Feed.svelte                         |  124 +-
 src/components/Footer.svelte                       |  121 +-
 src/components/Heart.svelte                        |   26 +-
 src/components/HowItWorksCard.svelte               |   18 +-
 src/components/Icon.svelte                         |    4 +-
 src/components/Image.svelte                        |    4 +-
 src/components/Invoice.svelte                      |   61 +-
 src/components/LandingHeader.svelte                |  230 +-
 src/components/LandingHero.svelte                  |   63 +-
 src/components/LandingInfoCard.svelte              |   46 +-
 src/components/Left.svelte                         |   26 +-
 src/components/Lnurlp.svelte                       |  104 +-
 src/components/Lnurlw.svelte                       |  103 +-
 src/components/LoadingSplash.svelte                |    4 +-
 src/components/LocaleSelector.svelte               |   20 +-
 src/components/LocationsMap.svelte                 |  546 ++--
 src/components/Lock.svelte                         |   22 +-
 src/components/Numpad.svelte                       |  445 ++--
 src/components/Password.svelte                     |  144 +-
 src/components/Pin.svelte                          |  112 +-
 src/components/Pinpad.svelte                       |  144 +-
 src/components/Popup.svelte                        |   66 +-
 src/components/Qr.svelte                           |   16 +-
 src/components/Quote.svelte                        |   18 +-
 src/components/RegisterOrLogin.svelte              |  322 +--
 src/components/Request.svelte                      |   56 +-
 src/components/Slider.svelte                       |   90 +-
 src/components/Spinner.svelte                      |   27 +-
 src/components/Toggle.svelte                       |   18 +-
 src/components/index.js                            |   80 +-
 src/lib/english.js                                 |    2 +-
 src/lib/invoice.js                                 |   67 +-
 src/lib/nostr.js                                   |  230 +-
 src/lib/punks.js                                   |  128 +-
 src/lib/samples.js                                 |   26 +-
 src/lib/socket.js                                  |  122 +-
 src/lib/store.js                                   |   66 +-
 src/lib/ticket.js                                  |   50 +-
 src/lib/tickets.js                                 |  100 +-
 src/lib/translations/index.js                      |  111 +-
 src/lib/translations/lang.json                     |   16 +-
 src/lib/upload.js                                  |   32 +-
 src/lib/utils.js                                   |  418 +--
 src/locales/de.json                                |  594 ++---
 src/locales/el.json                                |  590 ++---
 src/locales/en.json                                |  542 ++--
 src/locales/es.json                                |  494 ++--
 src/locales/fa.json                                |  560 ++--
 src/locales/fr.json                                |  620 ++---
 src/locales/pt.json                                |  530 ++--
 src/locales/zh.json                                |  576 ++---
 src/params/uuid.js                                 |    2 +-
 src/routes/(app)/+error.svelte                     |   58 +-
 src/routes/(app)/+layout.server.js                 |   86 +-
 src/routes/(app)/+layout.svelte                    |  297 +--
 .../(app)/[username]/(profile)/+layout.server.js   |   36 +-
 .../(app)/[username]/(profile)/+layout.svelte      |  466 ++--
 .../(app)/[username]/(profile)/+page.server.js     |   52 +-
 src/routes/(app)/[username]/(profile)/+page.svelte |  462 ++--
 .../(profile)/event/[id]/+page.server.js           |   18 +-
 .../[username]/(profile)/event/[id]/+page.svelte   |    6 +-
 .../[username]/(profile)/followers/+page.svelte    |   81 +-
 .../[username]/(profile)/follows/+page.svelte      |   78 +-
 .../[username]/(profile)/request/+page.server.js   |   22 +-
 .../[username]/(profile)/request/+page.svelte      |   50 +-
 .../[username]/(profile)/request/sent/+page.svelte |   21 +-
 src/routes/(app)/[username]/+layout.server.js      |   18 +-
 src/routes/(app)/[username]/+layout.svelte         |   96 +-
 .../(app)/[username]/address/+page.server.js       |   14 +-
 .../(app)/[username]/card/[serial]/+page.server.js |   22 +-
 .../(app)/[username]/card/[serial]/+page.svelte    |   60 +-
 src/routes/(app)/[username]/funds/+page.svelte     |   83 +-
 src/routes/(app)/[username]/generate/+page.svelte  |  110 +-
 src/routes/(app)/[username]/generate/+server.js    |   16 +-
 src/routes/(app)/[username]/invoice/+server.js     |    8 +-
 .../[username]/invoice/[id]/+layout.server.js      |   52 +-
 .../(app)/[username]/invoice/[id]/+page.server.js  |    4 +-
 .../(app)/[username]/invoice/[id]/+page.svelte     |  442 ++--
 .../[username]/invoice/[id]/paid/+page.svelte      |  108 +-
 .../[username]/invoice/[id]/tip/+page.server.js    |   11 +-
 .../(app)/[username]/invoice/[id]/tip/+page.svelte |  386 +--
 .../(app)/[username]/invoice/sent/+page.svelte     |    8 +-
 src/routes/(app)/[username]/map/+page.server.js    |   12 +-
 src/routes/(app)/[username]/map/+page.svelte       |    6 +-
 .../(app)/[username]/messages/+page.server.js      |   31 +-
 src/routes/(app)/[username]/messages/+page.svelte  |  335 +--
 .../[username]/payments/[...page]/+page.server.js  |   30 +-
 .../[username]/payments/[...page]/+page.svelte     |  514 ++--
 .../(app)/[username]/payments/[...page]/+server.js |   22 +-
 .../[username]/receive/[...param]/+page.server.js  |   14 +-
 .../[username]/receive/[...param]/+page.svelte     |   82 +-
 .../(app)/[username]/request/[id]/+page.server.js  |   35 +-
 .../(app)/[username]/request/[id]/+page.svelte     |   85 +-
 src/routes/(app)/[username]/reset/+server.js       |   14 +-
 .../[username]/settings/[...tab]/+page.server.js   |   31 +-
 .../[username]/settings/[...tab]/+page.svelte      |  400 +--
 .../[username]/settings/[...tab]/_account.svelte   |  342 +--
 .../(app)/[username]/settings/[...tab]/_pos.svelte |   84 +-
 .../[username]/settings/[...tab]/_security.svelte  |  561 ++--
 .../[username]/settings/[...tab]/_shopify.svelte   |  129 +-
 src/routes/(app)/[username]/shopify.js/+server.js  |   14 +-
 src/routes/(app)/admin/+layout.server.js           |   14 +-
 src/routes/(app)/admin/+layout.svelte              |    8 +-
 src/routes/(app)/admin/+page.server.js             |   14 +-
 src/routes/(app)/admin/+page.svelte                |   34 +-
 src/routes/(app)/buy/+page.server.js               |   43 +-
 src/routes/(app)/buy/+page.svelte                  |  230 +-
 src/routes/(app)/disable2fa/+server.js             |   18 +-
 src/routes/(app)/enable2fa/+server.js              |    8 +-
 src/routes/(app)/events/+server.js                 |    6 +-
 src/routes/(app)/fund/[id]/+page.server.js         |   28 +-
 src/routes/(app)/fund/[id]/+page.svelte            |  256 +-
 src/routes/(app)/fund/[id]/sweep/+page.server.js   |   17 +-
 src/routes/(app)/fund/[id]/sweep/+page.svelte      |   54 +-
 .../(app)/fund/[id]/withdraw/+page.server.js       |   26 +-
 src/routes/(app)/fund/[id]/withdraw/+page.svelte   |   94 +-
 src/routes/(app)/fund/[id]/withdraw/+server.js     |    6 +-
 src/routes/(app)/launch/+page.server.js            |    6 +-
 src/routes/(app)/launch/+page.svelte               |  187 +-
 src/routes/(app)/launch/purchase/+page.server.js   |   68 +-
 src/routes/(app)/launch/purchase/+page.svelte      |  114 +-
 .../(app)/launch/purchase/card/+page.server.js     |   88 +-
 src/routes/(app)/launch/purchase/card/+page.svelte |  134 +-
 .../(app)/launch/thanks/[asset]/+page.svelte       |   40 +-
 src/routes/(app)/launch/ticket/+page.server.js     |   14 +-
 src/routes/(app)/launch/ticket/+page.svelte        |   56 +-
 src/routes/(app)/ln/[lnurl]/+page.server.js        |  118 +-
 src/routes/(app)/ln/[lnurl]/+page.svelte           |   14 +-
 src/routes/(app)/ln/withdrawal/sent/+page.svelte   |   31 +-
 src/routes/(app)/locations/+server.js              |   20 +-
 src/routes/(app)/login/+page.server.js             |   36 +-
 src/routes/(app)/login/+page.svelte                |   20 +-
 src/routes/(app)/logout/+page.server.js            |   12 +-
 src/routes/(app)/otpsecret/+server.js              |   26 +-
 src/routes/(app)/password/+server.js               |    8 +-
 src/routes/(app)/payment/[id]/+page.server.js      |    6 +-
 src/routes/(app)/payment/[id]/+page.svelte         |  289 ++-
 .../(app)/payment/[id]/plain/+page.server.js       |    6 +-
 src/routes/(app)/payment/[id]/plain/+page.svelte   |  132 +-
 src/routes/(app)/payment/[id]/print/+server.js     |    8 +-
 src/routes/(app)/pin/+server.js                    |    8 +-
 src/routes/(app)/qr/[text]/+page.server.js         |    8 +-
 src/routes/(app)/qr/[text]/+page.svelte            |   18 +-
 .../(app)/redeem/[redeemcode]/+page.server.js      |   24 +-
 src/routes/(app)/redeem/[redeemcode]/+page.svelte  |    4 +-
 src/routes/(app)/register/+page.server.js          |   67 +-
 src/routes/(app)/register/+page.svelte             |  582 +++--
 src/routes/(app)/scan/+page.svelte                 |   63 +-
 src/routes/(app)/send/+layout.svelte               |   14 +-
 src/routes/(app)/send/[...text]/+page.server.js    |  182 +-
 src/routes/(app)/send/[...text]/+page.svelte       |  212 +-
 .../bitcoin/[address]/[...amount]/+page.server.js  |   45 +-
 .../bitcoin/[address]/[...amount]/+page.svelte     |  279 +-
 .../send/fund/[name]/[...amount]/+page.server.js   |   24 +-
 .../send/fund/[name]/[...amount]/+page.svelte      |   94 +-
 src/routes/(app)/send/invoice/[id]/+page.server.js |   65 +-
 src/routes/(app)/send/invoice/[id]/+page.svelte    |  300 +--
 .../(app)/send/lightning/[payreq]/+page.server.js  |   30 +-
 .../(app)/send/lightning/[payreq]/+page.svelte     |  181 +-
 .../user/[username]/[...amount]/+page.server.js    |   81 +-
 .../send/user/[username]/[...amount]/+page.svelte  |  166 +-
 src/routes/(app)/sent/+page.server.js              |    6 +-
 src/routes/(app)/sent/+page.svelte                 |   73 +-
 src/routes/(app)/support/+page.svelte              |  214 +-
 src/routes/(app)/support/+server.js                |    8 +-
 src/routes/(app)/withdraw/+server.js               |   11 +-
 src/routes/(static)/+layout.server.js              |   22 +-
 src/routes/(static)/+layout.svelte                 |   10 +-
 src/routes/(static)/bounties/+page.svelte          |  174 +-
 src/routes/(static)/docs/+page.server.js           |    4 +-
 src/routes/(static)/docs/+page.svelte              |  241 +-
 src/routes/+layout.server.js                       |   26 +-
 src/routes/+layout.svelte                          |   57 +-
 src/routes/+page.server.js                         |    2 +-
 src/routes/+page.svelte                            |  216 +-
 src/routes/about/+server.js                        |    4 +-
 src/routes/map/+page.server.js                     |   12 +-
 src/routes/map/+page.svelte                        |   22 +-
 static/lottie/success.json                         | 2660 +++++++++----------
 static/manifest.webmanifest                        |   72 +-
 static/qr.js                                       | 2698 ++++++++++----------
 static/shopify.html                                |  267 +-
 svelte.config.js                                   |   35 +-
 tailwind.config.cjs                                |   28 +-
 vite.config.js                                     |   32 +-
 202 files changed, 14108 insertions(+), 13258 deletions(-)

(limited to 'src')

diff --git a/.prettierrc b/.prettierrc
index 4d33dfc8..98ddc618 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,7 +1,3 @@
 {
-	"useTabs": true,
-	"singleQuote": true,
-	"trailingComma": "none",
-	"printWidth": 100,
-	"plugins": ["./node_modules/prettier-plugin-svelte"]
+  "plugins": ["./node_modules/prettier-plugin-svelte"]
 }
diff --git a/doc/i18n-technical.md b/doc/i18n-technical.md
index 3f6a09d5..6aed2068 100644
--- a/doc/i18n-technical.md
+++ b/doc/i18n-technical.md
@@ -23,11 +23,11 @@ Each locale in `coinos-ui-v2` is defined by a JSON file in `src/locales`. Its na
 
 ```json
 {
-	"howItWorks": "How it works",
-	"faq": "FAQ",
-	"about": "About",
-	"startInSeconds": "Start in Seconds",
-	"signIn": "Sign In"
+  "howItWorks": "How it works",
+  "faq": "FAQ",
+  "about": "About",
+  "startInSeconds": "Start in Seconds",
+  "signIn": "Sign In"
 }
 ```
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 7e6e4e61..e40cf483 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '3.6'
+version: "3.6"
 services:
   v2:
     container_name: v2
@@ -6,18 +6,18 @@ services:
       context: .
       dockerfile: Dockerfile.dev
       args:
-        URL: '${PUBLIC_COINOS_URL}'
-        BTC: '${PUBLIC_BTC}'
-        SOCKET: '${PUBLIC_SOCKET}'
+        URL: "${PUBLIC_COINOS_URL}"
+        BTC: "${PUBLIC_BTC}"
+        SOCKET: "${PUBLIC_SOCKET}"
     restart: always
     ports:
-      - '3121:3121'
+      - "3121:3121"
     environment:
       NODE_ENV: production
-      ORIGIN: '${ORIGIN}'
+      ORIGIN: "${ORIGIN}"
       PORT: 3121
-      STRIPE: '${STRIPE}'
-      LAUNCH: '${LAUNCH}'
+      STRIPE: "${STRIPE}"
+      LAUNCH: "${LAUNCH}"
     extra_hosts:
       - host.docker.internal:host-gateway
 networks:
diff --git a/postcss.config.cjs b/postcss.config.cjs
index 054c147c..12a703d9 100644
--- a/postcss.config.cjs
+++ b/postcss.config.cjs
@@ -1,6 +1,6 @@
 module.exports = {
-	plugins: {
-		tailwindcss: {},
-		autoprefixer: {}
-	}
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
 };
diff --git a/src/app.css b/src/app.css
index 3a722fb1..ba1db128 100644
--- a/src/app.css
+++ b/src/app.css
@@ -3,39 +3,40 @@
 @tailwind utilities;
 
 @font-face {
-	font-family: 'PublicSans';
-	src: url('/fonts/Public_Sans/static/PublicSans-Regular.ttf') format('truetype');
+  font-family: "PublicSans";
+  src: url("/fonts/Public_Sans/static/PublicSans-Regular.ttf")
+    format("truetype");
 }
 
 html {
-	font-family: PublicSans, sans-serif;
+  font-family: PublicSans, sans-serif;
 }
 
 ::selection {
-	color: black;
-	background: #eaf2ff;
+  color: black;
+  background: #eaf2ff;
 }
 
 :fullscreen {
-	background-color: white;
+  background-color: white;
 }
 
 input,
 textarea {
-	@apply block border rounded-2xl px-5 py-4 w-full;
+  @apply block border rounded-2xl px-5 py-4 w-full;
 }
 
 button.primary {
-	@apply rounded-full border py-2 font-bold my-4 flex px-4 bg-white mx-auto hover:opacity-80;
+  @apply rounded-full border py-2 font-bold my-4 flex px-4 bg-white mx-auto hover:opacity-80;
 }
 
 .select-styles {
-	@apply border rounded-2xl py-4 px-5;
-	cursor: pointer;
-	-webkit-appearance: none;
-	-moz-appearance: none;
-	background: transparent;
-	background-repeat: no-repeat;
-	background-position-x: 95%;
-	background-position-y: 1em;
+  @apply border rounded-2xl py-4 px-5;
+  cursor: pointer;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  background: transparent;
+  background-repeat: no-repeat;
+  background-position-x: 95%;
+  background-position-y: 1em;
 }
diff --git a/src/app.html b/src/app.html
index c0b7b4c1..28f07d06 100644
--- a/src/app.html
+++ b/src/app.html
@@ -1,15 +1,18 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="utf-8" />
-		<link rel="icon" href="%sveltekit.assets%/favicon.svg" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
-		<meta name="description" content="An easy bitcoin web wallet" />
-		<meta name="keywords" content="open source bitcoin lightning web wallet" />
-		<link rel="manifest" href="/manifest.webmanifest" />
-		%sveltekit.head%
-	</head>
-	<body>
-		<div>%sveltekit.body%</div>
-	</body>
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="%sveltekit.assets%/favicon.svg" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"
+    />
+    <meta name="description" content="An easy bitcoin web wallet" />
+    <meta name="keywords" content="open source bitcoin lightning web wallet" />
+    <link rel="manifest" href="/manifest.webmanifest" />
+    %sveltekit.head%
+  </head>
+  <body>
+    <div>%sveltekit.body%</div>
+  </body>
 </html>
diff --git a/src/components/404.svelte b/src/components/404.svelte
index 08323d40..d831a40a 100644
--- a/src/components/404.svelte
+++ b/src/components/404.svelte
@@ -1,17 +1,17 @@
 <script>
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
+  import { Icon } from "$comp";
+  import { t } from "$lib/translations";
 </script>
 
 <div class="flex justify-center items-center mt-20">
-	<div class="space-y-5 text-center">
-		<a href="/">
-			<Icon icon="logo" style="mx-auto" />
-		</a>
+  <div class="space-y-5 text-center">
+    <a href="/">
+      <Icon icon="logo" style="mx-auto" />
+    </a>
 
-		<Icon icon="question" style="mx-auto w-56" />
+    <Icon icon="question" style="mx-auto w-56" />
 
-		<h1 class="font-bold text-5xl">{$t('404.404')}</h1>
-		<p>{$t('404.pageNotFound')}</p>
-	</div>
+    <h1 class="font-bold text-5xl">{$t("404.404")}</h1>
+    <p>{$t("404.pageNotFound")}</p>
+  </div>
 </div>
diff --git a/src/components/About.svelte b/src/components/About.svelte
index 1dbd8038..6e0cdcb5 100644
--- a/src/components/About.svelte
+++ b/src/components/About.svelte
@@ -1,7 +1,7 @@
 <script>
   import { onMount } from "svelte";
 
-	let locations;
+  let locations;
   onMount(async () => {
     try {
       ({ locations } = await fetch("/locations").then((r) => r.json()));
@@ -10,70 +10,85 @@
     }
   });
 
-	import { Image, Icon, LocationsMap } from '$comp';
-	import { t } from '$lib/translations';
+  import { Image, Icon, LocationsMap } from "$comp";
+  import { t } from "$lib/translations";
 
-	let team = [
-		{
-			name: 'adam',
-			socials: [
-				{ type: 'twitter', url: 'https://twitter.com/adamsoltys', color: 'bg-[#1D9BF0]' },
-				{ type: 'github', url: 'https://github.com/asoltys', color: 'bg-gray-800' }
-			]
-		},
-		{ name: 'cole', socials: [] }
-	];
+  let team = [
+    {
+      name: "adam",
+      socials: [
+        {
+          type: "twitter",
+          url: "https://twitter.com/adamsoltys",
+          color: "bg-[#1D9BF0]",
+        },
+        {
+          type: "github",
+          url: "https://github.com/asoltys",
+          color: "bg-gray-800",
+        },
+      ],
+    },
+    { name: "cole", socials: [] },
+  ];
 </script>
 
 <div class="flex justify-center">
-	<div class="container space-y-10">
-		<h3 class="text-5xl font-medium text-center">
-			{$t('about.team.header')}
-		</h3>
-		<div class="space-y-10 2xl:space-y-0 2xl:grid gap-y-10 grid-cols-2">
-			{#each team as member}
-				<div class="flex w-full">
-					<div class="md:flex 2xl:items-start md:max-w-2xl mx-auto">
-						<div class="w-[220px] mx-auto">
-							<Image image={member.name} style="rounded-full mx-auto w-40 h-40 mb-5 object-cover" />
+  <div class="container space-y-10">
+    <h3 class="text-5xl font-medium text-center">
+      {$t("about.team.header")}
+    </h3>
+    <div class="space-y-10 2xl:space-y-0 2xl:grid gap-y-10 grid-cols-2">
+      {#each team as member}
+        <div class="flex w-full">
+          <div class="md:flex 2xl:items-start md:max-w-2xl mx-auto">
+            <div class="w-[220px] mx-auto">
+              <Image
+                image={member.name}
+                style="rounded-full mx-auto w-40 h-40 mb-5 object-cover"
+              />
 
-							<div class="space-y-2">
-								<span class="text-2xl text-center font-semibold block"
-									>{$t(`about.team.${member.name}.name`)}</span
-								>
-								<span class="text-xl text-center text-secondary block"
-									>{$t(`about.team.${member.name}.position`)}</span
-								>
-							</div>
+              <div class="space-y-2">
+                <span class="text-2xl text-center font-semibold block"
+                  >{$t(`about.team.${member.name}.name`)}</span
+                >
+                <span class="text-xl text-center text-secondary block"
+                  >{$t(`about.team.${member.name}.position`)}</span
+                >
+              </div>
 
-							<div class="mt-2 flex justify-center items-center space-x-5">
-								{#each member.socials as social}
-									<a
-										href={social.url}
-										target="_blank"
-										rel="noreferrer"
-										class={`rounded-full p-2 ${social.color} hover:opacity-80`}
-										><Icon icon={social.type} style="w-6" /></a
-									>
-								{/each}
-							</div>
-						</div>
-						<div class="text-secondary text-xl w-full max-w-[450px] mt-5">
-							{$t(`about.team.${member.name}.bio`)}
-						</div>
-					</div>
-				</div>
-			{/each}
-		</div>
-	</div>
+              <div class="mt-2 flex justify-center items-center space-x-5">
+                {#each member.socials as social}
+                  <a
+                    href={social.url}
+                    target="_blank"
+                    rel="noreferrer"
+                    class={`rounded-full p-2 ${social.color} hover:opacity-80`}
+                    ><Icon icon={social.type} style="w-6" /></a
+                  >
+                {/each}
+              </div>
+            </div>
+            <div class="text-secondary text-xl w-full max-w-[450px] mt-5">
+              {$t(`about.team.${member.name}.bio`)}
+            </div>
+          </div>
+        </div>
+      {/each}
+    </div>
+  </div>
 </div>
 
 {#if locations?.length}
-	<div>
-		<h3 class="text-5xl font-medium mb-5 text-center">{$t('about.locations.header')}</h3>
-		<p class="text-secondary text-xl w-full md:w-10/12 lg:w-2/3 2xl:w-[800px] mx-auto mb-10">
-			{@html $t('about.locations.description')}
-		</p>
-		<LocationsMap {locations} />
-	</div>
+  <div>
+    <h3 class="text-5xl font-medium mb-5 text-center">
+      {$t("about.locations.header")}
+    </h3>
+    <p
+      class="text-secondary text-xl w-full md:w-10/12 lg:w-2/3 2xl:w-[800px] mx-auto mb-10"
+    >
+      {@html $t("about.locations.description")}
+    </p>
+    <LocationsMap {locations} />
+  </div>
 {/if}
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 53b31de4..2f088eec 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -1,149 +1,159 @@
 <script>
-	import OutClick from 'svelte-outclick';
-	import { banner, newPayment, colorTheme } from '$lib/store';
-	import { goto } from '$app/navigation';
-	import { Avatar, Icon } from '$comp';
-	import { loading, t } from '$lib/translations';
-	import { page } from '$app/stores';
+  import OutClick from "svelte-outclick";
+  import { banner, newPayment, colorTheme } from "$lib/store";
+  import { goto } from "$app/navigation";
+  import { Avatar, Icon } from "$comp";
+  import { loading, t } from "$lib/translations";
+  import { page } from "$app/stores";
 
-	export let data;
+  export let data;
 
-	let { subject, user } = data;
-	$: update(data);
-	let update = (data) => ({ subject, user } = data);
+  let { subject, user } = data;
+  $: update(data);
+  let update = (data) => ({ subject, user } = data);
 
-	let menuButtons;
-	$: if (user)
-		menuButtons = [
-			{ key: 'nav.settings', icon: 'settings', href: `/${user.username}/settings` },
-			{ key: 'nav.support', icon: 'support', href: `/support` },
-			{ key: 'nav.map', icon: 'map', href: `/${user.username}/map` },
-			{ key: 'nav.merch', icon: 'shop', href: `https://coinosmerch.com` },
-			{ key: 'nav.signOut', icon: 'logout', href: `/logout` }
-		];
+  let menuButtons;
+  $: if (user)
+    menuButtons = [
+      {
+        key: "nav.settings",
+        icon: "settings",
+        href: `/${user.username}/settings`,
+      },
+      { key: "nav.support", icon: "support", href: `/support` },
+      { key: "nav.map", icon: "map", href: `/${user.username}/map` },
+      { key: "nav.merch", icon: "shop", href: `https://coinosmerch.com` },
+      { key: "nav.signOut", icon: "logout", href: `/logout` },
+    ];
 
-	let showMenu = false;
+  let showMenu = false;
 
-	$: bg =
-		$banner?.id && $banner.id === subject.id
-			? `url(${$banner.src})`
-			: subject?.banner
-			? `url(/api/public/${subject.banner}.webp)`
-			: undefined;
+  $: bg =
+    $banner?.id && $banner.id === subject.id
+      ? `url(${$banner.src})`
+      : subject?.banner
+      ? `url(/api/public/${subject.banner}.webp)`
+      : undefined;
 
-	$: $page && (showMenu = false);
+  $: $page && (showMenu = false);
 </script>
 
 {#if !$loading}
-	<header
-		class="bg-gradient-to-r {$colorTheme} h-[175px] w-full relative bg-cover mb-20"
-		style:background-image={bg}
-	>
-		<nav class="flex justify-end items-center space-x-4 p-5">
-			{#if user}
-				<a href={`/${user.username}`}>
-					<button
-						class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-							.url.pathname === `/${user.username}`
-							? 'opacity-100'
-							: 'opacity-70 hover:opacity-80'}"
-						><Icon icon="home" style="mx-auto w-6 md:w-8" />
-					</button>
-				</a>
-				<a href={`/${user.username}/receive`}>
-					<button
-						class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-							.url.pathname === `/${user.username}/receive`
-							? 'opacity-100'
-							: 'opacity-70 hover:opacity-80'}"
-						><Icon icon="numpad" style="mx-auto w-6 md:w-8" />
-					</button>
-				</a>
-				<a href={`/${user.username}/payments`}>
-					<button
-						class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-							.url.pathname === `/${user.username}/payments`
-							? 'opacity-100'
-							: 'opacity-70 hover:opacity-80'} relative"
-						><Icon icon="clock" style="mx-auto w-6 md:w-8" />
-						{#if $newPayment}
-							<span class="absolute top-0 right-0">
-								<span class="flex h-3 w-3">
-									<span
-										class="animate-ping absolute inline-flex h-full w-full rounded-full bg-[#F7931A] opacity-75"
-									/>
-									<span class="relative inline-flex rounded-full h-3 w-3 bg-[#F7931A]" />
-								</span>
-							</span>
-						{/if}
-					</button>
-				</a>
-				<a href={`/send`}>
-					<button
-						class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-							.url.pathname === `/send`
-							? 'opacity-100'
-							: 'opacity-70 hover:opacity-80'}"
-						><Icon icon="send" style="mx-auto w-6 md:w-8" />
-					</button>
-				</a>
-				<div class="relative">
-					<OutClick on:outclick={() => (showMenu = false)}>
-						<button
-							class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
-								.url.pathname === `/${user.username}` ||
-							$page.url.pathname === `/${user.username}/settings` ||
-							$page.url.pathname === `/support`
-								? 'opacity-100'
-								: `opacity-70 hover:opacity-80 ${showMenu ? 'opacity-80' : ''}`}"
-							on:click={() => (showMenu = !showMenu)}
-							><Icon icon="menu" style="mx-auto w-6 md:w-8" />
-						</button>
+  <header
+    class="bg-gradient-to-r {$colorTheme} h-[175px] w-full relative bg-cover mb-20"
+    style:background-image={bg}
+  >
+    <nav class="flex justify-end items-center space-x-4 p-5">
+      {#if user}
+        <a href={`/${user.username}`}>
+          <button
+            class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+              .url.pathname === `/${user.username}`
+              ? 'opacity-100'
+              : 'opacity-70 hover:opacity-80'}"
+            ><Icon icon="home" style="mx-auto w-6 md:w-8" />
+          </button>
+        </a>
+        <a href={`/${user.username}/receive`}>
+          <button
+            class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+              .url.pathname === `/${user.username}/receive`
+              ? 'opacity-100'
+              : 'opacity-70 hover:opacity-80'}"
+            ><Icon icon="numpad" style="mx-auto w-6 md:w-8" />
+          </button>
+        </a>
+        <a href={`/${user.username}/payments`}>
+          <button
+            class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+              .url.pathname === `/${user.username}/payments`
+              ? 'opacity-100'
+              : 'opacity-70 hover:opacity-80'} relative"
+            ><Icon icon="clock" style="mx-auto w-6 md:w-8" />
+            {#if $newPayment}
+              <span class="absolute top-0 right-0">
+                <span class="flex h-3 w-3">
+                  <span
+                    class="animate-ping absolute inline-flex h-full w-full rounded-full bg-[#F7931A] opacity-75"
+                  />
+                  <span
+                    class="relative inline-flex rounded-full h-3 w-3 bg-[#F7931A]"
+                  />
+                </span>
+              </span>
+            {/if}
+          </button>
+        </a>
+        <a href={`/send`}>
+          <button
+            class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+              .url.pathname === `/send`
+              ? 'opacity-100'
+              : 'opacity-70 hover:opacity-80'}"
+            ><Icon icon="send" style="mx-auto w-6 md:w-8" />
+          </button>
+        </a>
+        <div class="relative">
+          <OutClick on:outclick={() => (showMenu = false)}>
+            <button
+              class="bg-white p-2 rounded-full w-12 h-12 md:w-16 md:h-16 drop-shadow-xl border border-black/10 {$page
+                .url.pathname === `/${user.username}` ||
+              $page.url.pathname === `/${user.username}/settings` ||
+              $page.url.pathname === `/support`
+                ? 'opacity-100'
+                : `opacity-70 hover:opacity-80 ${
+                    showMenu ? 'opacity-80' : ''
+                  }`}"
+              on:click={() => (showMenu = !showMenu)}
+              ><Icon icon="menu" style="mx-auto w-6 md:w-8" />
+            </button>
 
-						<div
-							class="{showMenu
-								? 'block'
-								: 'hidden'} absolute top-14 right-0 bg-white rounded-3xl p-8 shadow-xl z"
-						>
-							<ul class="space-y-5 w-48">
-								{#each menuButtons as { href, icon, key }}
-									<li>
-										<a {href} data-sveltekit-prefetch="off">
-											<button
-												class="flex justify-center items-center font-semibold hover:opacity-80"
-												><Icon {icon} style="mr-2 w-6 md:w-8" /> {$t(key)}
-											</button>
-										</a>
-									</li>
-								{/each}
-							</ul>
-							<hr class="my-4" />
-							<a href="/"><img src="/images/logo.svg" alt="Coinos" class="w-32" /></a>
-						</div>
-					</OutClick>
-				</div>
-			{:else}
-				<a href={`/login?redirect=${$page.url.pathname}`}>
-					<button class="bg-white px-5 py-2 rounded-xl font-semibold text-sm"
-						>{$t('nav.signIn')}</button
-					>
-				</a>
-			{/if}
-		</nav>
-		<div
-			class="absolute md:w-[64px] md:mx-auto lg:left-[164px] left-[calc(50vw-64px)] -bottom-[64px] z-30"
-		>
-			<Avatar user={subject} />
-		</div>
-	</header>
+            <div
+              class="{showMenu
+                ? 'block'
+                : 'hidden'} absolute top-14 right-0 bg-white rounded-3xl p-8 shadow-xl z"
+            >
+              <ul class="space-y-5 w-48">
+                {#each menuButtons as { href, icon, key }}
+                  <li>
+                    <a {href} data-sveltekit-prefetch="off">
+                      <button
+                        class="flex justify-center items-center font-semibold hover:opacity-80"
+                        ><Icon {icon} style="mr-2 w-6 md:w-8" /> {$t(key)}
+                      </button>
+                    </a>
+                  </li>
+                {/each}
+              </ul>
+              <hr class="my-4" />
+              <a href="/"
+                ><img src="/images/logo.svg" alt="Coinos" class="w-32" /></a
+              >
+            </div>
+          </OutClick>
+        </div>
+      {:else}
+        <a href={`/login?redirect=${$page.url.pathname}`}>
+          <button class="bg-white px-5 py-2 rounded-xl font-semibold text-sm"
+            >{$t("nav.signIn")}</button
+          >
+        </a>
+      {/if}
+    </nav>
+    <div
+      class="absolute md:w-[64px] md:mx-auto lg:left-[164px] left-[calc(50vw-64px)] -bottom-[64px] z-30"
+    >
+      <Avatar user={subject} />
+    </div>
+  </header>
 {/if}
 
 <style>
-	.z {
-		z-index: 100;
-	}
+  .z {
+    z-index: 100;
+  }
 
-	header {
-		view-transition-name: header;
-	}
+  header {
+    view-transition-name: header;
+  }
 </style>
diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte
index b258a0e8..3955a42f 100644
--- a/src/components/Avatar.svelte
+++ b/src/components/Avatar.svelte
@@ -1,29 +1,31 @@
 <script>
-	import { avatar, banner, colorTheme } from '$lib/store';
-	import { Icon } from '$comp';
-	import { punk } from '$lib/utils';
+  import { avatar, banner, colorTheme } from "$lib/store";
+  import { Icon } from "$comp";
+  import { punk } from "$lib/utils";
 
-	export let user;
-	export let size = 32;
-	export let disabled = false;
+  export let user;
+  export let size = 32;
+  export let disabled = false;
 
-	$: s = size.toString();
-	$: link = user.anon ? `/${user.pubkey}` : `/${user.username}`;
+  $: s = size.toString();
+  $: link = user.anon ? `/${user.pubkey}` : `/${user.username}`;
 
-	$: src =
-		($avatar?.id && $avatar.id === user.id && $avatar.src) ||
-		'/api/public/' +
-			(user.profile ? user.profile + '.webp' : 'punks/' + punk(user.pubkey || user.id || 'aa'));
+  $: src =
+    ($avatar?.id && $avatar.id === user.id && $avatar.src) ||
+    "/api/public/" +
+      (user.profile
+        ? user.profile + ".webp"
+        : "punks/" + punk(user.pubkey || user.id || "aa"));
 </script>
 
 <a href={link} class:pointer-events-none={disabled}>
-	<div
-		class="w-{s} h-{s} rounded-full border-4 border-white overflow-hidden bg-gradient-to-r {$colorTheme} flex justify-center items-center"
-	>
-		<img
-			{src}
-			class="w-full h-full object-cover object-center overflow-hidden"
-			alt={user.username}
-		/>
-	</div>
+  <div
+    class="w-{s} h-{s} rounded-full border-4 border-white overflow-hidden bg-gradient-to-r {$colorTheme} flex justify-center items-center"
+  >
+    <img
+      {src}
+      class="w-full h-full object-cover object-center overflow-hidden"
+      alt={user.username}
+    />
+  </div>
 </a>
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
index 0e4f2ec2..92714f98 100644
--- a/src/components/Balance.svelte
+++ b/src/components/Balance.svelte
@@ -1,34 +1,34 @@
 <script>
-	import { Pin } from '$comp';
-	import { f, s, sat, sats } from '$lib/utils';
-	import { animatedRate, pin } from '$lib/store';
-	import { t } from '$lib/translations';
+  import { Pin } from "$comp";
+  import { f, s, sat, sats } from "$lib/utils";
+  import { animatedRate, pin } from "$lib/store";
+  import { t } from "$lib/translations";
 
-	let show;
-	export let user;
+  let show;
+  export let user;
 </script>
 
 {#if show && user.haspin && $pin?.length !== 6}
-	<Pin cancel={() => (show = false)} />
+  <Pin cancel={() => (show = false)} />
 {/if}
 
 <div class="space-y-2">
-	{#if user.haspin && !$pin}
-		<button
-			class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
-			on:click={() => (show = true)}>{$t('user.showBalance')}</button
-		>
-	{:else}
-		<div class="text-5xl font-bold tabular-nums">
-			{#if isNaN($animatedRate)}
-				<div class="text-gray-200">&mdash;</div>
-			{:else}
-				{f((user.balance * $animatedRate) / sats, user.currency)}
-			{/if}
-		</div>
+  {#if user.haspin && !$pin}
+    <button
+      class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
+      on:click={() => (show = true)}>{$t("user.showBalance")}</button
+    >
+  {:else}
+    <div class="text-5xl font-bold tabular-nums">
+      {#if isNaN($animatedRate)}
+        <div class="text-gray-200">&mdash;</div>
+      {:else}
+        {f((user.balance * $animatedRate) / sats, user.currency)}
+      {/if}
+    </div>
 
-		<div class="text-secondary text-2xl">
-			⚡️{s(user.balance)}
-		</div>
-	{/if}
+    <div class="text-secondary text-2xl">
+      ⚡️{s(user.balance)}
+    </div>
+  {/if}
 </div>
diff --git a/src/components/Calendar.svelte b/src/components/Calendar.svelte
index 7504f48e..b07c136c 100644
--- a/src/components/Calendar.svelte
+++ b/src/components/Calendar.svelte
@@ -1,14 +1,14 @@
 <svg
-	xmlns="http://www.w3.org/2000/svg"
-	class="absolute bottom-0 left-0 -mb-0.5 transform translate-x-1/2 -translate-y-1/2 text-black peer-placeholder-shown:text-gray-300 h-6 w-6"
-	fill="none"
-	viewBox="0 0 24 24"
-	stroke="currentColor"
+  xmlns="http://www.w3.org/2000/svg"
+  class="absolute bottom-0 left-0 -mb-0.5 transform translate-x-1/2 -translate-y-1/2 text-black peer-placeholder-shown:text-gray-300 h-6 w-6"
+  fill="none"
+  viewBox="0 0 24 24"
+  stroke="currentColor"
 >
-	<path
-		stroke-linecap="round"
-		stroke-linejoin="round"
-		stroke-width="2"
-		d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
-	/>
+  <path
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    stroke-width="2"
+    d="M8 7V3m8 4V3m-9 8h10M5 21h14a2 2 0 002-2V7a2 2 0 00-2-2H5a2 2 0 00-2 2v12a2 2 0 002 2z"
+  />
 </svg>
diff --git a/src/components/Card.svelte b/src/components/Card.svelte
index 44ab635f..864465c0 100644
--- a/src/components/Card.svelte
+++ b/src/components/Card.svelte
@@ -1,14 +1,14 @@
 <svg
-	xmlns="http://www.w3.org/2000/svg"
-	class="absolute bottom-0 left-0 -mb-0.5 transform translate-x-1/2 -translate-y-1/2 text-black peer-placeholder-shown:text-gray-300 h-6 w-6"
-	fill="none"
-	viewBox="0 0 24 24"
-	stroke="currentColor"
+  xmlns="http://www.w3.org/2000/svg"
+  class="absolute bottom-0 left-0 -mb-0.5 transform translate-x-1/2 -translate-y-1/2 text-black peer-placeholder-shown:text-gray-300 h-6 w-6"
+  fill="none"
+  viewBox="0 0 24 24"
+  stroke="currentColor"
 >
-	<path
-		stroke-linecap="round"
-		stroke-linejoin="round"
-		stroke-width="2"
-		d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z"
-	/>
+  <path
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    stroke-width="2"
+    d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z"
+  />
 </svg>
diff --git a/src/components/Check.svelte b/src/components/Check.svelte
index 4c9f504b..222c4dea 100644
--- a/src/components/Check.svelte
+++ b/src/components/Check.svelte
@@ -1,11 +1,11 @@
 <svg
-	class="flex-shrink-0 w-5 h-5 text-gray-500 mr-1"
-	fill="currentColor"
-	viewBox="0 0 20 20"
-	xmlns="http://www.w3.org/2000/svg"
-	><path
-		fill-rule="evenodd"
-		d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
-		clip-rule="evenodd"
-	/></svg
+  class="flex-shrink-0 w-5 h-5 text-gray-500 mr-1"
+  fill="currentColor"
+  viewBox="0 0 20 20"
+  xmlns="http://www.w3.org/2000/svg"
+  ><path
+    fill-rule="evenodd"
+    d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z"
+    clip-rule="evenodd"
+  /></svg
 >
diff --git a/src/components/Code.svelte b/src/components/Code.svelte
index ffca98a4..6c1048cf 100644
--- a/src/components/Code.svelte
+++ b/src/components/Code.svelte
@@ -1,27 +1,31 @@
 <script>
-	import { copyNoNewlines as copy } from '$lib/utils';
-	import { Icon } from '$comp';
-	import samples from '$lib/samples';
-	export let sample;
+  import { copyNoNewlines as copy } from "$lib/utils";
+  import { Icon } from "$comp";
+  import samples from "$lib/samples";
+  export let sample;
 </script>
 
-<div class="bg-black text-white rounded-lg p-4 flex gap-4 whitespace-pre-wrap font-mono">
-	<div class="overflow-x-scroll max-w-full scrollbar-hide">
-		<div class="break-all min-w-[800px]">{samples[sample]}</div>
-	</div>
-	<button class="ml-auto my-auto invert opacity-90" on:click={() => copy(samples[sample])}
-		><Icon icon="copy" style="w-10 max-w-none" /></button
-	>
+<div
+  class="bg-black text-white rounded-lg p-4 flex gap-4 whitespace-pre-wrap font-mono"
+>
+  <div class="overflow-x-scroll max-w-full scrollbar-hide">
+    <div class="break-all min-w-[800px]">{samples[sample]}</div>
+  </div>
+  <button
+    class="ml-auto my-auto invert opacity-90"
+    on:click={() => copy(samples[sample])}
+    ><Icon icon="copy" style="w-10 max-w-none" /></button
+  >
 </div>
 
 <style>
-	.scrollbar-hide::-webkit-scrollbar {
-		display: none;
-	}
+  .scrollbar-hide::-webkit-scrollbar {
+    display: none;
+  }
 
-	/* For IE, Edge and Firefox */
-	.scrollbar-hide {
-		-ms-overflow-style: none; /* IE and Edge */
-		scrollbar-width: none; /* Firefox */
-	}
+  /* For IE, Edge and Firefox */
+  .scrollbar-hide {
+    -ms-overflow-style: none; /* IE and Edge */
+    scrollbar-width: none; /* Firefox */
+  }
 </style>
diff --git a/src/components/Event.svelte b/src/components/Event.svelte
index 68f44589..2312f44e 100644
--- a/src/components/Event.svelte
+++ b/src/components/Event.svelte
@@ -1,84 +1,87 @@
 <script>
-	import { Avatar, Icon } from '$comp';
-	export let event;
+  import { Avatar, Icon } from "$comp";
+  export let event;
 
-	let { id, user, seen, content } = event;
+  let { id, user, seen, content } = event;
 
-	let distance = (date) => {
-		let m = 60;
-		let h = 60 * m;
-		let d = 24 * h;
+  let distance = (date) => {
+    let m = 60;
+    let h = 60 * m;
+    let d = 24 * h;
 
-		let diff = Math.round(Date.now() / 1000) - date;
-		return diff > d
-			? Math.round(diff / d) + 'd'
-			: diff > h
-			? Math.round(diff / h) + 'h'
-			: diff > m
-			? Math.round(diff / m) + 'm'
-			: diff > 2
-			? diff + 's'
-			: 'now';
-	};
+    let diff = Math.round(Date.now() / 1000) - date;
+    return diff > d
+      ? Math.round(diff / d) + "d"
+      : diff > h
+      ? Math.round(diff / h) + "h"
+      : diff > m
+      ? Math.round(diff / m) + "m"
+      : diff > 2
+      ? diff + "s"
+      : "now";
+  };
 
-	let w;
+  let w;
 </script>
 
 <svelte:window bind:innerWidth={w} />
 
-<div class="flex text-sm lg:text-base text-secondary hover:bg-gray-100 px-4 py-3" :key={id}>
-	<a href={`/${user.pubkey}`}>
-		<div class="mb-auto mr-2">
-			<div class="md:hidden">
-				<Avatar size={12} {user} disabled={true} />
-			</div>
-			<div class="hidden md:block">
-				<Avatar size={20} {user} disabled={true} />
-			</div>
-		</div>
-	</a>
+<div
+  class="flex text-sm lg:text-base text-secondary hover:bg-gray-100 px-4 py-3"
+  :key={id}
+>
+  <a href={`/${user.pubkey}`}>
+    <div class="mb-auto mr-2">
+      <div class="md:hidden">
+        <Avatar size={12} {user} disabled={true} />
+      </div>
+      <div class="hidden md:block">
+        <Avatar size={20} {user} disabled={true} />
+      </div>
+    </div>
+  </a>
 
-	<div class="grow" style={`max-width: ${w - 100}px`}>
-		<div class="w-full flex pb-1 text-black pt-1">
-			<div>
-				{user.display_name || ''}
-				<span class="text-secondary">@{user.username}</span>
-			</div>
-			<div class="text-secondary">&nbsp;{distance(seen)}</div>
-		</div>
-		<div class="break-words text-black">
-			{content}
-		</div>
+  <div class="grow" style={`max-width: ${w - 100}px`}>
+    <div class="w-full flex pb-1 text-black pt-1">
+      <div>
+        {user.display_name || ""}
+        <span class="text-secondary">@{user.username}</span>
+      </div>
+      <div class="text-secondary">&nbsp;{distance(seen)}</div>
+    </div>
+    <div class="break-words text-black">
+      {content}
+    </div>
 
-		<div class="flex justify-between text-sm text-secondary pt-3">
-			<div class="flex group">
-				<Icon
-					icon="party"
-					style="mr-1 w-10 my-auto opacity-50 group-hover:opacity-100 group-hover:bg-white rounded-full p-2"
-				/>
-				<div class="my-auto group-hover:text-black">444</div>
-			</div>
-			<div class="flex group">
-				<Icon
-					icon="support"
-					style="mr-1 w-10 my-auto opacity-50 group-hover:opacity-100 group-hover:bg-white rounded-full p-2"
-				/>
-				<div class="my-auto group-hover:text-black">1072</div>
-			</div>
-			<div class="flex group">
-				<Icon
-					icon="smile"
-					style="mr-1 w-10 my-auto opacity-50 group-hover:opacity-100 group-hover:bg-white rounded-full p-2"
-				/>
-				<div class="my-auto group-hover:text-black">26</div>
-			</div>
-			<div class="flex group">
-				<Icon
-					icon="bolt"
-					style="mr-1 h-10 my-auto opacity-50 group-hover:opacity-100 group-hover:bg-white rounded-full p-2"
-				/>
-				<div class="my-auto group-hover:text-black">4</div>
-			</div>
-		</div>
-	</div>
+    <div class="flex justify-between text-sm text-secondary pt-3">
+      <div class="flex group">
+        <Icon
+          icon="party"
+          style="mr-1 w-10 my-auto opacity-50 group-hover:opacity-100 group-hover:bg-white rounded-full p-2"
+        />
+        <div class="my-auto group-hover:text-black">444</div>
+      </div>
+      <div class="flex group">
+        <Icon
+          icon="support"
+          style="mr-1 w-10 my-auto opacity-50 group-hover:opacity-100 group-hover:bg-white rounded-full p-2"
+        />
+        <div class="my-auto group-hover:text-black">1072</div>
+      </div>
+      <div class="flex group">
+        <Icon
+          icon="smile"
+          style="mr-1 w-10 my-auto opacity-50 group-hover:opacity-100 group-hover:bg-white rounded-full p-2"
+        />
+        <div class="my-auto group-hover:text-black">26</div>
+      </div>
+      <div class="flex group">
+        <Icon
+          icon="bolt"
+          style="mr-1 h-10 my-auto opacity-50 group-hover:opacity-100 group-hover:bg-white rounded-full p-2"
+        />
+        <div class="my-auto group-hover:text-black">4</div>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/src/components/FaqCard.svelte b/src/components/FaqCard.svelte
index 918e03d6..ae1ad077 100644
--- a/src/components/FaqCard.svelte
+++ b/src/components/FaqCard.svelte
@@ -1,15 +1,15 @@
 <script>
-	import { t } from '$lib/translations';
+  import { t } from "$lib/translations";
 
-	// this ID will be used to get the strings from the locale
-	// question is at faq.[questionID].question
-	// answer is at faq.[questionID].answer
-	export let questionID;
+  // this ID will be used to get the strings from the locale
+  // question is at faq.[questionID].question
+  // answer is at faq.[questionID].answer
+  export let questionID;
 </script>
 
 <div class="mx-auto w-full md:w-2/3 lg:w-[700px] space-y-5">
-	<p class="text-2xl font-medium">{$t('faq.' + questionID + '.question')}</p>
-	<p class="text-secondary text-xl font-medium">
-		{$t('faq.' + questionID + '.answer')}
-	</p>
+  <p class="text-2xl font-medium">{$t("faq." + questionID + ".question")}</p>
+  <p class="text-secondary text-xl font-medium">
+    {$t("faq." + questionID + ".answer")}
+  </p>
 </div>
diff --git a/src/components/Feed.svelte b/src/components/Feed.svelte
index 7de087a7..0c9c96d1 100644
--- a/src/components/Feed.svelte
+++ b/src/components/Feed.svelte
@@ -1,72 +1,84 @@
 <script>
-	import { t } from '$lib/translations';
-	import { onMount } from 'svelte';
-	import { Event } from '$comp';
-	import { browser } from '$app/environment';
-	import VirtualScroll from 'svelte-virtual-scroll-list';
-	import { fail } from '$lib/utils';
-	import { sign, send } from '$lib/nostr';
+  import { t } from "$lib/translations";
+  import { onMount } from "svelte";
+  import { Event } from "$comp";
+  import { browser } from "$app/environment";
+  import VirtualScroll from "svelte-virtual-scroll-list";
+  import { fail } from "$lib/utils";
+  import { sign, send } from "$lib/nostr";
 
-	export let events;
-	export let user = undefined;
+  export let events;
+  export let user = undefined;
 
-	let message;
+  let message;
 
-	let submit = async () => {
-		try {
-			let mnemonic, key, seed, entropy, child, privkey;
+  let submit = async () => {
+    try {
+      let mnemonic, key, seed, entropy, child, privkey;
 
-			let event = {
-				pubkey: user.pubkey,
-				created_at: Math.floor(Date.now() / 1000),
-				kind: 1,
-				content: message,
-				tags: []
-			};
+      let event = {
+        pubkey: user.pubkey,
+        created_at: Math.floor(Date.now() / 1000),
+        kind: 1,
+        content: message,
+        tags: [],
+      };
 
-			await sign({ event, user });
-			await send(event);
+      await sign({ event, user });
+      await send(event);
 
-			event.user = user;
-			event.seen = event.created_at;
+      event.user = user;
+      event.seen = event.created_at;
 
-			events[event.id] = event;
-			events = events;
-		} catch (e) {
-			console.log(e, e.stack);
-			fail('Problem posting event');
-		}
-	};
+      events[event.id] = event;
+      events = events;
+    } catch (e) {
+      console.log(e, e.stack);
+      fail("Problem posting event");
+    }
+  };
 
-	$: sorted = Object.values(events)
-		.filter((ev) => ev?.pubkey && ev?.kind === 1)
-		.sort((a, b) => b.seen - a.seen);
+  $: sorted = Object.values(events)
+    .filter((ev) => ev?.pubkey && ev?.kind === 1)
+    .sort((a, b) => b.seen - a.seen);
 </script>
 
 {#if user}
-	<form on:submit|preventDefault={submit} class="flex justify-center gap-4 max-w-2xl mx-auto">
-		<div class="grow">
-			<input
-				name="message"
-				bind:value={message}
-				placeholder="What's happening?"
-				class="my-5 mx-auto"
-			/>
-		</div>
-		<button class="rounded-full border py-4 px-5 font-bold hover:opacity-80 w-40 my-5">Post</button>
-	</form>
+  <form
+    on:submit|preventDefault={submit}
+    class="flex justify-center gap-4 max-w-2xl mx-auto"
+  >
+    <div class="grow">
+      <input
+        name="message"
+        bind:value={message}
+        placeholder="What's happening?"
+        class="my-5 mx-auto"
+      />
+    </div>
+    <button
+      class="rounded-full border py-4 px-5 font-bold hover:opacity-80 w-40 my-5"
+      >Post</button
+    >
+  </form>
 {/if}
 
 {#if browser}
-	{#if sorted.length}
-		<VirtualScroll data={sorted} key="id" let:data pageMode={true} estimateSize={200}>
-			<a href={`/${data.user.pubkey}/event/${data.id}`}>
-				<Event event={data} />
-			</a>
-		</VirtualScroll>
-	{:else}
-		<div class="flex w-full">
-			<div class="mx-auto text-secondary">{$t('user.noNotes')}</div>
-		</div>
-	{/if}
+  {#if sorted.length}
+    <VirtualScroll
+      data={sorted}
+      key="id"
+      let:data
+      pageMode={true}
+      estimateSize={200}
+    >
+      <a href={`/${data.user.pubkey}/event/${data.id}`}>
+        <Event event={data} />
+      </a>
+    </VirtualScroll>
+  {:else}
+    <div class="flex w-full">
+      <div class="mx-auto text-secondary">{$t("user.noNotes")}</div>
+    </div>
+  {/if}
 {/if}
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
index eda26526..c1ac79cf 100644
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -1,65 +1,74 @@
 <script>
-	import { Icon, LocaleSelector } from '$comp';
-	import { t } from '$lib/translations';
+  import { Icon, LocaleSelector } from "$comp";
+  import { t } from "$lib/translations";
 
-	const followLinks = [
-		{ url: 'https://twitter.com/coinoswallet', titleID: 'twitter' },
-		{ url: 'https://t.me/coinoswallet', titleID: 'telegram' },
-		{ url: 'https://linktr.ee/coinos.io', titleID: 'linktree' }
-	];
+  const followLinks = [
+    { url: "https://twitter.com/coinoswallet", titleID: "twitter" },
+    { url: "https://t.me/coinoswallet", titleID: "telegram" },
+    { url: "https://linktr.ee/coinos.io", titleID: "linktree" },
+  ];
 
-	const companyLinks = [
-		{ url: '/docs', titleID: 'documentation' },
-		{ url: '/support', titleID: 'support' }
-	];
+  const companyLinks = [
+    { url: "/docs", titleID: "documentation" },
+    { url: "/support", titleID: "support" },
+  ];
 </script>
 
-<footer class="space-y-10 md:space-y-0 text-xl block md:flex justify-around mb-20">
-	<div class="space-y-5">
-		<div class="text-center w-full">
-			<a href="/"><Icon icon="logo" style="w-48 mx-auto md:mx-0" /></a>
-		</div>
-		<div class="flex gap-2 justify-center sm:hidden">
-			<div>
-				<a href="/register">
-					<button
-						class="bg-black text-white border rounded-full px-4 py-2 font-bold hover:opacity-80 text-lg"
-					>
-						{$t('nav.startInSeconds')}
-					</button>
-				</a>
-			</div>
-		</div>
-		<div class="w-full flex">
-			<div class="mx-auto">
-				<LocaleSelector
-					style="p-2 text-center hover:opacity-80 cursor-pointer border rounded-full"
-				/>
-			</div>
-		</div>
-	</div>
+<footer
+  class="space-y-10 md:space-y-0 text-xl block md:flex justify-around mb-20"
+>
+  <div class="space-y-5">
+    <div class="text-center w-full">
+      <a href="/"><Icon icon="logo" style="w-48 mx-auto md:mx-0" /></a>
+    </div>
+    <div class="flex gap-2 justify-center sm:hidden">
+      <div>
+        <a href="/register">
+          <button
+            class="bg-black text-white border rounded-full px-4 py-2 font-bold hover:opacity-80 text-lg"
+          >
+            {$t("nav.startInSeconds")}
+          </button>
+        </a>
+      </div>
+    </div>
+    <div class="w-full flex">
+      <div class="mx-auto">
+        <LocaleSelector
+          style="p-2 text-center hover:opacity-80 cursor-pointer border rounded-full"
+        />
+      </div>
+    </div>
+  </div>
 
-	<div class="text-center md:text-left">
-		<p class="font-semibold">{$t('footer.followUs')}</p>
-		<ul class="mt-5 text-secondary space-y-3 font-medium">
-			{#each followLinks as link}
-				<li>
-					<a href={link.url} target="_blank" rel="noreferrer" class="hover:opacity-80"
-						>{$t('footer.' + link.titleID)}</a
-					>
-				</li>
-			{/each}
-		</ul>
-	</div>
+  <div class="text-center md:text-left">
+    <p class="font-semibold">{$t("footer.followUs")}</p>
+    <ul class="mt-5 text-secondary space-y-3 font-medium">
+      {#each followLinks as link}
+        <li>
+          <a
+            href={link.url}
+            target="_blank"
+            rel="noreferrer"
+            class="hover:opacity-80">{$t("footer." + link.titleID)}</a
+          >
+        </li>
+      {/each}
+    </ul>
+  </div>
 
-	<div class="text-center md:text-left">
-		<p class="font-semibold">{$t('footer.company')}</p>
-		<ul class="mt-5 text-secondary space-y-3">
-			{#each companyLinks as link}
-				<li><a href={link.url} class="hover:opacity-80">{$t('footer.' + link.titleID)}</a></li>
-			{/each}
-		</ul>
-	</div>
+  <div class="text-center md:text-left">
+    <p class="font-semibold">{$t("footer.company")}</p>
+    <ul class="mt-5 text-secondary space-y-3">
+      {#each companyLinks as link}
+        <li>
+          <a href={link.url} class="hover:opacity-80"
+            >{$t("footer." + link.titleID)}</a
+          >
+        </li>
+      {/each}
+    </ul>
+  </div>
 
-	<Icon icon="shield" style="mx-auto md:mx-0" />
+  <Icon icon="shield" style="mx-auto md:mx-0" />
 </footer>
diff --git a/src/components/Heart.svelte b/src/components/Heart.svelte
index 55b13fa9..9bae6500 100644
--- a/src/components/Heart.svelte
+++ b/src/components/Heart.svelte
@@ -1,16 +1,16 @@
 <svg
-	width="24"
-	height="24"
-	class="mr-1"
-	viewBox="0 0 24 24"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  class="mr-1"
+  viewBox="0 0 24 24"
+  fill="none"
+  xmlns="http://www.w3.org/2000/svg"
 >
-	<path
-		d="M4.31802 6.31802C2.56066 8.07538 2.56066 10.9246 4.31802 12.682L12.0001 20.364L19.682 12.682C21.4393 10.9246 21.4393 8.07538 19.682 6.31802C17.9246 4.56066 15.0754 4.56066 13.318 6.31802L12.0001 7.63609L10.682 6.31802C8.92462 4.56066 6.07538 4.56066 4.31802 6.31802Z"
-		stroke="currentColor"
-		stroke-width="2"
-		stroke-linecap="round"
-		stroke-linejoin="round"
-	/>
+  <path
+    d="M4.31802 6.31802C2.56066 8.07538 2.56066 10.9246 4.31802 12.682L12.0001 20.364L19.682 12.682C21.4393 10.9246 21.4393 8.07538 19.682 6.31802C17.9246 4.56066 15.0754 4.56066 13.318 6.31802L12.0001 7.63609L10.682 6.31802C8.92462 4.56066 6.07538 4.56066 4.31802 6.31802Z"
+    stroke="currentColor"
+    stroke-width="2"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+  />
 </svg>
diff --git a/src/components/HowItWorksCard.svelte b/src/components/HowItWorksCard.svelte
index 784c738d..e5e62d05 100644
--- a/src/components/HowItWorksCard.svelte
+++ b/src/components/HowItWorksCard.svelte
@@ -1,14 +1,14 @@
 <script>
-	import Icon from './Icon.svelte';
-	import { t } from '$lib/translations';
-	export let image;
-	export let stepID;
+  import Icon from "./Icon.svelte";
+  import { t } from "$lib/translations";
+  export let image;
+  export let stepID;
 </script>
 
 <div class="space-y-5">
-	<Icon icon={image} style="mx-auto w-32 h-32" />
-	<p class="text-2xl font-medium">{$t('howItWorks.' + stepID + '.header')}</p>
-	<p class="text-secondary text-xl font-medium w-full md:w-2/3 mx-auto">
-		{$t('howItWorks.' + stepID + '.description')}
-	</p>
+  <Icon icon={image} style="mx-auto w-32 h-32" />
+  <p class="text-2xl font-medium">{$t("howItWorks." + stepID + ".header")}</p>
+  <p class="text-secondary text-xl font-medium w-full md:w-2/3 mx-auto">
+    {$t("howItWorks." + stepID + ".description")}
+  </p>
 </div>
diff --git a/src/components/Icon.svelte b/src/components/Icon.svelte
index 4b86cc43..0b47f726 100644
--- a/src/components/Icon.svelte
+++ b/src/components/Icon.svelte
@@ -1,6 +1,6 @@
 <script>
-	export let icon;
-	export let style = undefined;
+  export let icon;
+  export let style = undefined;
 </script>
 
 <img src="/icons/{icon}.svg" alt={icon} class={style} />
diff --git a/src/components/Image.svelte b/src/components/Image.svelte
index dcd9d3ff..4f8b39bb 100644
--- a/src/components/Image.svelte
+++ b/src/components/Image.svelte
@@ -1,6 +1,6 @@
 <script>
-	export let image;
-	export let style;
+  export let image;
+  export let style;
 </script>
 
 <img src="/images/{image}.webp" alt={image} class={style} />
diff --git a/src/components/Invoice.svelte b/src/components/Invoice.svelte
index b0cd58a2..363d260a 100644
--- a/src/components/Invoice.svelte
+++ b/src/components/Invoice.svelte
@@ -1,32 +1,39 @@
 <script>
-	import { t } from '$lib/translations';
-	import { f, sat, sats } from '$lib/utils';
-	import { fly } from 'svelte/transition';
-	import { Avatar, Icon } from '$comp';
-	import { invoice } from '$lib/store';
+  import { t } from "$lib/translations";
+  import { f, sat, sats } from "$lib/utils";
+  import { fly } from "svelte/transition";
+  import { Avatar, Icon } from "$comp";
+  import { invoice } from "$lib/store";
 </script>
 
 {#if $invoice}
-	<div class="fixed bottom-0 border-t w-full p-4 bg-white z-50" in:fly>
-		<div class="flex flex-wrap md:flex-nowrap max-w-xl mx-auto gap-2">
-			<div class="my-auto mx-auto">
-				<div class="flex">
-					<Avatar user={$invoice.user.username} size={12} />
-					<h1 class="my-auto">
-						<b>{$invoice.user.username}</b>
-						{$t('payments.isRequesting')}
-						<b>{f(($invoice.amount * $invoice.rate) / sats, $invoice.currency)}</b>
-						{sat($invoice.amount)}
-					</h1>
-				</div>
-			</div>
-			<div class="mx-auto my-auto flex gap-2">
-				<a href={`/${invoice.user.username}/invoice/${$invoice.id}/tip`}>
-					<button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-32">
-						{$t('payments.pay')}
-					</button>
-				</a>
-			</div>
-		</div>
-	</div>
+  <div class="fixed bottom-0 border-t w-full p-4 bg-white z-50" in:fly>
+    <div class="flex flex-wrap md:flex-nowrap max-w-xl mx-auto gap-2">
+      <div class="my-auto mx-auto">
+        <div class="flex">
+          <Avatar user={$invoice.user.username} size={12} />
+          <h1 class="my-auto">
+            <b>{$invoice.user.username}</b>
+            {$t("payments.isRequesting")}
+            <b
+              >{f(
+                ($invoice.amount * $invoice.rate) / sats,
+                $invoice.currency
+              )}</b
+            >
+            {sat($invoice.amount)}
+          </h1>
+        </div>
+      </div>
+      <div class="mx-auto my-auto flex gap-2">
+        <a href={`/${invoice.user.username}/invoice/${$invoice.id}/tip`}>
+          <button
+            class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-32"
+          >
+            {$t("payments.pay")}
+          </button>
+        </a>
+      </div>
+    </div>
+  </div>
 {/if}
diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index ed7907c1..556d44a3 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -1,125 +1,133 @@
 <script>
-	import { goto } from '$app/navigation';
-	import { scroll } from '$lib/utils';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-	import { page } from '$app/stores';
+  import { goto } from "$app/navigation";
+  import { scroll } from "$lib/utils";
+  import { Icon } from "$comp";
+  import { t } from "$lib/translations";
+  import { page } from "$app/stores";
 
-	export let howItWorks;
-	export let faq;
-	export let about;
-	export let user;
+  export let howItWorks;
+  export let faq;
+  export let about;
+  export let user;
 
-	let showMobileMenu = false;
-	let header;
-	const mobileMenuButtonClick = (section) => {
-		showMobileMenu = false;
-		scroll(section);
-	};
+  let showMobileMenu = false;
+  let header;
+  const mobileMenuButtonClick = (section) => {
+    showMobileMenu = false;
+    scroll(section);
+  };
 </script>
 
 <header
-	class="w-full lg:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90"
-	bind:this={header}
+  class="w-full lg:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90"
+  bind:this={header}
 >
-	<nav class="block xl:flex flex-wrap justify-between items-center">
-		<div class="flex justify-start md:justify-center items-center md:space-x-10">
-			<a href="/" on:click={() => scroll(header)}>
-				<Icon icon="logo" style="hidden md:block mb-5 xl:mb-0" />
-				<Icon icon="logo" style="block md:hidden ml-5 w-48" />
-			</a>
-		</div>
+  <nav class="block xl:flex flex-wrap justify-between items-center">
+    <div
+      class="flex justify-start md:justify-center items-center md:space-x-10"
+    >
+      <a href="/" on:click={() => scroll(header)}>
+        <Icon icon="logo" style="hidden md:block mb-5 xl:mb-0" />
+        <Icon icon="logo" style="block md:hidden ml-5 w-48" />
+      </a>
+    </div>
 
-		<!-- desktop nav -->
-		<div class="hidden space-x-10 md:flex flex-wrap justify-center items-center font-bold">
-			{#if $page.url.pathname === '/'}
-				<button class="hover:opacity-80" on:click={() => scroll(howItWorks)}
-					>{$t('howItWorks.header')}</button
-				>
-				<button class="hover:opacity-80" on:click={() => scroll(faq)}>{$t('faq.header')}</button>
-				<button class="hover:opacity-80" on:click={() => scroll(about)}>{$t('about.header')}</button
-				>
-			{/if}
-			{#if user}
-				<button
-					class="border rounded-full px-6 py-2 font-bold"
-					on:click={() => goto(`/${user.username}`)}
-					>Home
-				</button>
-				<button
-					class="bg-black text-white border rounded-full px-6 py-2 font-bold"
-					on:click={() => goto('/logout')}
-				>
-					{$t('nav.signOut')}
-				</button>
-			{:else}
-				<button
-					class="border rounded-full px-6 py-2 font-bold hover:opacity-80"
-					on:click={() => goto('/register')}
-					>{$t('nav.startInSeconds')}
-				</button>
-				<button
-					class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80"
-					on:click={() => goto('/login')}
-				>
-					{$t('nav.signIn')}
-				</button>
-			{/if}
-		</div>
+    <!-- desktop nav -->
+    <div
+      class="hidden space-x-10 md:flex flex-wrap justify-center items-center font-bold"
+    >
+      {#if $page.url.pathname === "/"}
+        <button class="hover:opacity-80" on:click={() => scroll(howItWorks)}
+          >{$t("howItWorks.header")}</button
+        >
+        <button class="hover:opacity-80" on:click={() => scroll(faq)}
+          >{$t("faq.header")}</button
+        >
+        <button class="hover:opacity-80" on:click={() => scroll(about)}
+          >{$t("about.header")}</button
+        >
+      {/if}
+      {#if user}
+        <button
+          class="border rounded-full px-6 py-2 font-bold"
+          on:click={() => goto(`/${user.username}`)}
+          >Home
+        </button>
+        <button
+          class="bg-black text-white border rounded-full px-6 py-2 font-bold"
+          on:click={() => goto("/logout")}
+        >
+          {$t("nav.signOut")}
+        </button>
+      {:else}
+        <button
+          class="border rounded-full px-6 py-2 font-bold hover:opacity-80"
+          on:click={() => goto("/register")}
+          >{$t("nav.startInSeconds")}
+        </button>
+        <button
+          class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80"
+          on:click={() => goto("/login")}
+        >
+          {$t("nav.signIn")}
+        </button>
+      {/if}
+    </div>
 
-		<!-- mobile nav -->
-		<button
-			class="block md:hidden absolute top-[34.5px] right-10 z"
-			on:click={() => (showMobileMenu = !showMobileMenu)}
-			><Icon icon={!showMobileMenu ? 'menu' : 'close'} />
-		</button>
+    <!-- mobile nav -->
+    <button
+      class="block md:hidden absolute top-[34.5px] right-10 z"
+      on:click={() => (showMobileMenu = !showMobileMenu)}
+      ><Icon icon={!showMobileMenu ? "menu" : "close"} />
+    </button>
 
-		<div
-			class="container w-full px-10 md:hidden absolute top-0 {showMobileMenu
-				? 'right-0'
-				: 'right-[-100%]'} transition-all ease-in-out duration-300 h-[100vh] w-full bg-white"
-		>
-			<div class="space-y-8 mt-24 font-bold text-xl">
-				<button on:click={() => mobileMenuButtonClick(howItWorks)} class="block"
-					>{$t('howItWorks.header')}</button
-				>
-				<button on:click={() => mobileMenuButtonClick(faq)} class="block">{$t('faq.header')}</button
-				>
-				<button on:click={() => mobileMenuButtonClick(about)} class="block"
-					>{$t('about.header')}</button
-				>
-				{#if !user}
-					<button
-						class="border rounded-full px-6 py-2 font-bold block w-full"
-						on:click={() => goto('/register')}
-						>{$t('nav.startInSeconds')}
-					</button>
-					<button
-						class="bg-black text-white border rounded-full px-6 py-2 font-bold block w-full"
-						on:click={() => goto('/login')}
-					>
-						{$t('nav.signIn')}
-					</button>
-				{:else}
-					<button
-						class="border rounded-full px-6 py-2 font-bold block"
-						on:click={() => goto(`/${user.username}`)}
-						>{$t('nav.account')}
-					</button>
-					<button
-						class="bg-black text-white border rounded-full px-6 py-2 font-bold block"
-						on:click={() => goto('/logout')}
-					>
-						{$t('nav.signOut')}
-					</button>
-				{/if}
-			</div>
-		</div>
-	</nav>
+    <div
+      class="container w-full px-10 md:hidden absolute top-0 {showMobileMenu
+        ? 'right-0'
+        : 'right-[-100%]'} transition-all ease-in-out duration-300 h-[100vh] w-full bg-white"
+    >
+      <div class="space-y-8 mt-24 font-bold text-xl">
+        <button on:click={() => mobileMenuButtonClick(howItWorks)} class="block"
+          >{$t("howItWorks.header")}</button
+        >
+        <button on:click={() => mobileMenuButtonClick(faq)} class="block"
+          >{$t("faq.header")}</button
+        >
+        <button on:click={() => mobileMenuButtonClick(about)} class="block"
+          >{$t("about.header")}</button
+        >
+        {#if !user}
+          <button
+            class="border rounded-full px-6 py-2 font-bold block w-full"
+            on:click={() => goto("/register")}
+            >{$t("nav.startInSeconds")}
+          </button>
+          <button
+            class="bg-black text-white border rounded-full px-6 py-2 font-bold block w-full"
+            on:click={() => goto("/login")}
+          >
+            {$t("nav.signIn")}
+          </button>
+        {:else}
+          <button
+            class="border rounded-full px-6 py-2 font-bold block"
+            on:click={() => goto(`/${user.username}`)}
+            >{$t("nav.account")}
+          </button>
+          <button
+            class="bg-black text-white border rounded-full px-6 py-2 font-bold block"
+            on:click={() => goto("/logout")}
+          >
+            {$t("nav.signOut")}
+          </button>
+        {/if}
+      </div>
+    </div>
+  </nav>
 </header>
 
 <style>
-	.z {
-		z-index: 100;
-	}
+  .z {
+    z-index: 100;
+  }
 </style>
diff --git a/src/components/LandingHero.svelte b/src/components/LandingHero.svelte
index 8e1d6476..e03bfdc2 100644
--- a/src/components/LandingHero.svelte
+++ b/src/components/LandingHero.svelte
@@ -1,37 +1,40 @@
 <script>
-	import { goto } from '$app/navigation';
-	import { Icon, Image } from '$comp';
-	import { t } from '$lib/translations';
+  import { goto } from "$app/navigation";
+  import { Icon, Image } from "$comp";
+  import { t } from "$lib/translations";
 </script>
 
 <div class="mt-[96.88px] md:mt-0">
-	<div class="space-y-10">
-		<h1
-			class="text-5xl md:text-6xl lg:text-7xl font-medium text-center w-full md:w-3/4 lg:w-1/2 max-w-7xl mx-auto leading-tight"
-		>
-			{$t('landing.header_before_icon')}
-			<span class="relative">
-				{$t('landing.header_with_icon')}
-				<Icon icon="rays" style="absolute -top-16 left-5 md:left-8 lg:left-14 2xl:left-24" />
-			</span>
-			{$t('landing.header_after_icon')}
-		</h1>
-		<h2
-			class="text-center text-secondary w-full md:w-3/5 lg:w-2/5 max-w-3xl mx-auto text-xl leading-normal font-medium"
-		>
-			{$t('landing.subheader')}
-		</h2>
+  <div class="space-y-10">
+    <h1
+      class="text-5xl md:text-6xl lg:text-7xl font-medium text-center w-full md:w-3/4 lg:w-1/2 max-w-7xl mx-auto leading-tight"
+    >
+      {$t("landing.header_before_icon")}
+      <span class="relative">
+        {$t("landing.header_with_icon")}
+        <Icon
+          icon="rays"
+          style="absolute -top-16 left-5 md:left-8 lg:left-14 2xl:left-24"
+        />
+      </span>
+      {$t("landing.header_after_icon")}
+    </h1>
+    <h2
+      class="text-center text-secondary w-full md:w-3/5 lg:w-2/5 max-w-3xl mx-auto text-xl leading-normal font-medium"
+    >
+      {$t("landing.subheader")}
+    </h2>
 
-		<div class="flex justify-center">
-			<a href="/register">
-				<button
-					class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80"
-				>
-					{$t('nav.startInSeconds')}
-				</button>
-			</a>
-		</div>
-	</div>
+    <div class="flex justify-center">
+      <a href="/register">
+        <button
+          class="bg-black text-white border rounded-full px-6 py-2 font-bold hover:opacity-80"
+        >
+          {$t("nav.startInSeconds")}
+        </button>
+      </a>
+    </div>
+  </div>
 
-	<Image image="hero-image" style="w-full md:w-2/3 max-w-5xl mx-auto mt-20" />
+  <Image image="hero-image" style="w-full md:w-2/3 max-w-5xl mx-auto mt-20" />
 </div>
diff --git a/src/components/LandingInfoCard.svelte b/src/components/LandingInfoCard.svelte
index 3d719e0b..fadcb6c0 100644
--- a/src/components/LandingInfoCard.svelte
+++ b/src/components/LandingInfoCard.svelte
@@ -1,26 +1,32 @@
 <script>
-	import Image from './Image.svelte';
+  import Image from "./Image.svelte";
 
-	export let image;
-	export let title;
-	export let description = undefined;
-	export let order = undefined;
+  export let image;
+  export let title;
+  export let description = undefined;
+  export let order = undefined;
 </script>
 
 <div class="block lg:flex justify-center lg:space-x-20 items-center">
-	<Image
-		{image}
-		style="w-2/3 md:w-5/12 lg:w-2/5 xl:w-1/3 2xl:w-1/4 max-w-xl mx-auto lg:mx-0 mb-10 lg:mb-0 {order ===
-			'reverse' && 'order-last'}"
-	/>
-	<div class="w-full lg:w-1/2 max-w-3xl space-y-10 mx-auto lg:mx-0">
-		<h3 class="text-5xl font-medium text-left w-full mx-auto lg:mx-0 md:w-[500px]">{title}</h3>
-		<p class="text-secondary text-xl font-medium w-full md:w-[500px] mx-auto lg:mx-0">
-			{#if description}
-				{description}
-			{:else}
-				<slot />
-			{/if}
-		</p>
-	</div>
+  <Image
+    {image}
+    style="w-2/3 md:w-5/12 lg:w-2/5 xl:w-1/3 2xl:w-1/4 max-w-xl mx-auto lg:mx-0 mb-10 lg:mb-0 {order ===
+      'reverse' && 'order-last'}"
+  />
+  <div class="w-full lg:w-1/2 max-w-3xl space-y-10 mx-auto lg:mx-0">
+    <h3
+      class="text-5xl font-medium text-left w-full mx-auto lg:mx-0 md:w-[500px]"
+    >
+      {title}
+    </h3>
+    <p
+      class="text-secondary text-xl font-medium w-full md:w-[500px] mx-auto lg:mx-0"
+    >
+      {#if description}
+        {description}
+      {:else}
+        <slot />
+      {/if}
+    </p>
+  </div>
 </div>
diff --git a/src/components/Left.svelte b/src/components/Left.svelte
index 24ab927f..1e236969 100644
--- a/src/components/Left.svelte
+++ b/src/components/Left.svelte
@@ -1,16 +1,16 @@
 <svg
-	class="w-5"
-	width="24"
-	height="24"
-	viewBox="0 0 24 24"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
+  class="w-5"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  xmlns="http://www.w3.org/2000/svg"
 >
-	<path
-		d="M15 19L8 12L15 5"
-		stroke="currentColor"
-		stroke-width="2"
-		stroke-linecap="round"
-		stroke-linejoin="round"
-	/>
+  <path
+    d="M15 19L8 12L15 5"
+    stroke="currentColor"
+    stroke-width="2"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+  />
 </svg>
diff --git a/src/components/Lnurlp.svelte b/src/components/Lnurlp.svelte
index 9918a3f4..427e4c07 100644
--- a/src/components/Lnurlp.svelte
+++ b/src/components/Lnurlp.svelte
@@ -1,60 +1,60 @@
 <script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Numpad, Spinner } from '$comp';
-	import { pin } from '$lib/store';
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { Numpad, Spinner } from "$comp";
+  import { pin } from "$lib/store";
 
-	export let data, form;
-	let { currency } = data.user;
-	let { minSendable, maxSendable, callback, metadata, rates } = data;
+  export let data, form;
+  let { currency } = data.user;
+  let { minSendable, maxSendable, callback, metadata, rates } = data;
 
-	$: rate = rates[currency];
+  $: rate = rates[currency];
 
-	let amount = Math.round(minSendable / 1000),
-		loading;
-	let submit = () => (loading = true);
+  let amount = Math.round(minSendable / 1000),
+    loading;
+  let submit = () => (loading = true);
 </script>
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-	<div class="text-center mb-8">
-		{#each JSON.parse(metadata) as m}
-			<div>
-				{#if m[0] === 'text/plain'}
-					<h1 class="text-3xl md:text-4xl font-semibold mb-2">{m[1]}</h1>
-				{/if}
-				{#if m[0].includes('image')}
-					<img src={`data:image/png;base64,${m[1]}`} alt="Recipient" />
-				{/if}
-			</div>
-		{/each}
-	</div>
-
-	{#if form?.error}
-		<div class="text-red-600 text-center mb-5">
-			{form.error}
-		</div>
-	{/if}
-
-	<Numpad bind:amount bind:rate {currency} />
-
-	<form action="?/pay" method="POST" use:enhance on:submit={submit}>
-		<input name="amount" value={amount} type="hidden" />
-		<input name="minSendable" value={minSendable} type="hidden" />
-		<input name="maxSendable" value={maxSendable} type="hidden" />
-		<input name="callback" value={callback} type="hidden" />
-		<input name="pin" value={$pin} 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}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
+  <div class="text-center mb-8">
+    {#each JSON.parse(metadata) as m}
+      <div>
+        {#if m[0] === "text/plain"}
+          <h1 class="text-3xl md:text-4xl font-semibold mb-2">{m[1]}</h1>
+        {/if}
+        {#if m[0].includes("image")}
+          <img src={`data:image/png;base64,${m[1]}`} alt="Recipient" />
+        {/if}
+      </div>
+    {/each}
+  </div>
+
+  {#if form?.error}
+    <div class="text-red-600 text-center mb-5">
+      {form.error}
+    </div>
+  {/if}
+
+  <Numpad bind:amount bind:rate {currency} />
+
+  <form action="?/pay" method="POST" use:enhance on:submit={submit}>
+    <input name="amount" value={amount} type="hidden" />
+    <input name="minSendable" value={minSendable} type="hidden" />
+    <input name="maxSendable" value={maxSendable} type="hidden" />
+    <input name="callback" value={callback} type="hidden" />
+    <input name="pin" value={$pin} 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}
+          {$t("payments.send")}
+        {/if}
+      </button>
+    </div>
+  </form>
 </div>
diff --git a/src/components/Lnurlw.svelte b/src/components/Lnurlw.svelte
index f780d755..09bbca7f 100644
--- a/src/components/Lnurlw.svelte
+++ b/src/components/Lnurlw.svelte
@@ -1,56 +1,65 @@
 <script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Numpad, Spinner } from '$comp';
-	import { pin } from '$lib/store';
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { Numpad, Spinner } from "$comp";
+  import { pin } from "$lib/store";
 
-	export let data, form;
+  export let data, form;
 
-	let { currency, username } = data.user;
-	let { defaultDescription, minWithdrawable, maxWithdrawable, k1, callback, rates } = data;
-	$: rate = rates[currency];
+  let { currency, username } = data.user;
+  let {
+    defaultDescription,
+    minWithdrawable,
+    maxWithdrawable,
+    k1,
+    callback,
+    rates,
+  } = data;
+  $: rate = rates[currency];
 
-	let amount = Math.round(maxWithdrawable / 1000),
-		loading;
+  let amount = Math.round(maxWithdrawable / 1000),
+    loading;
 
-	let submit = () => (loading = true);
+  let submit = () => (loading = true);
 </script>
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-	<div class="text-center mb-8">
-		<div>
-			<h1 class="text-3xl md:text-4xl font-semibold mb-2">{defaultDescription}</h1>
-		</div>
-	</div>
-
-	{#if form?.error}
-		<div class="text-red-600 text-center mb-5">
-			{form.error}
-		</div>
-	{/if}
-
-	<Numpad bind:amount {currency} bind:rate />
-
-	<form action="?/withdraw" method="POST" use:enhance on:submit={submit}>
-		<input name="amount" value={amount} type="hidden" />
-		<input name="username" value={username} type="hidden" />
-		<input name="currency" value={currency} type="hidden" />
-		<input name="minWithdrawable" value={minWithdrawable} type="hidden" />
-		<input name="maxWithdrawable" value={maxWithdrawable} type="hidden" />
-		<input name="callback" value={callback} type="hidden" />
-		<input name="k1" value={k1} 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}
-					{$t('payments.redeem')}
-				{/if}
-			</button>
-		</div>
-	</form>
+  <div class="text-center mb-8">
+    <div>
+      <h1 class="text-3xl md:text-4xl font-semibold mb-2">
+        {defaultDescription}
+      </h1>
+    </div>
+  </div>
+
+  {#if form?.error}
+    <div class="text-red-600 text-center mb-5">
+      {form.error}
+    </div>
+  {/if}
+
+  <Numpad bind:amount {currency} bind:rate />
+
+  <form action="?/withdraw" method="POST" use:enhance on:submit={submit}>
+    <input name="amount" value={amount} type="hidden" />
+    <input name="username" value={username} type="hidden" />
+    <input name="currency" value={currency} type="hidden" />
+    <input name="minWithdrawable" value={minWithdrawable} type="hidden" />
+    <input name="maxWithdrawable" value={maxWithdrawable} type="hidden" />
+    <input name="callback" value={callback} type="hidden" />
+    <input name="k1" value={k1} 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}
+          {$t("payments.redeem")}
+        {/if}
+      </button>
+    </div>
+  </form>
 </div>
diff --git a/src/components/LoadingSplash.svelte b/src/components/LoadingSplash.svelte
index 2ab4c739..65ee5cd8 100644
--- a/src/components/LoadingSplash.svelte
+++ b/src/components/LoadingSplash.svelte
@@ -1,7 +1,7 @@
 <script>
-	import { Icon } from '$comp';
+  import { Icon } from "$comp";
 </script>
 
 <div class="flex justify-center items-center">
-	<Icon icon="logo" style="mt-[calc(50vh-72px)]" />
+  <Icon icon="logo" style="mt-[calc(50vh-72px)]" />
 </div>
diff --git a/src/components/LocaleSelector.svelte b/src/components/LocaleSelector.svelte
index 28e01d07..8ec5def0 100644
--- a/src/components/LocaleSelector.svelte
+++ b/src/components/LocaleSelector.svelte
@@ -1,18 +1,18 @@
 <script>
-	import { t, locale, locales } from '$lib/translations';
-	export let style;
+  import { t, locale, locales } from "$lib/translations";
+  export let style;
 </script>
 
 <select name="language" bind:value={$locale} class={style}>
-	{#each $locales as locale}
-		<option value={locale}>{$t(`lang.${locale}`)}</option>
-	{/each}
+  {#each $locales as locale}
+    <option value={locale}>{$t(`lang.${locale}`)}</option>
+  {/each}
 </select>
 
 <style>
-	select {
-		-webkit-appearance: none;
-		-moz-appearance: none;
-		appearance: none;
-	}
+  select {
+    -webkit-appearance: none;
+    -moz-appearance: none;
+    appearance: none;
+  }
 </style>
diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index 0068b95f..cd26d4bd 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -1,276 +1,286 @@
 <script>
-	import { tick, onMount, onDestroy } from 'svelte';
-	import { browser } from '$app/environment';
-	import { Icon, Popup } from '$comp';
-	import { shuffleArray } from '$lib/utils';
-
-	import 'maplibre-gl/dist/maplibre-gl.css';
-
-	export let locations;
-	let map;
-	let mapContainer, mapWrapper;
-	let markers = [];
-
-	let currentIndex = -1;
-	let timeout;
-
-	let full = () => {
-		if (!document.fullscreenElement) {
-			if (mapWrapper.requestFullscreen) {
-				mapWrapper.requestFullscreen();
-			} else if (mapWrapper.mozRequestFullScreen) {
-				/* Firefox */
-				mapWrapper.mozRequestFullScreen();
-			} else if (mapWrapper.webkitRequestFullscreen) {
-				/* Chrome, Safari & Opera */
-				mapWrapper.webkitRequestFullscreen();
-			} else if (mapWrapper.msRequestFullscreen) {
-				/* IE/Edge */
-				mapWrapper.msRequestFullscreen();
-			}
-
-			map.resize();
-		} else {
-			if (document.exitFullscreen) {
-				document.exitFullscreen();
-			} else if (document.mozCancelFullScreen) {
-				/* Firefox */
-				document.mozCancelFullScreen();
-			} else if (document.webkitExitFullscreen) {
-				/* Chrome, Safari and Opera */
-				document.webkitExitFullscreen();
-			} else if (document.msExitFullscreen) {
-				/* IE/Edge */
-				document.msExitFullscreen();
-			}
-		}
-	};
-
-	function select(m) {
-		stopFlying();
-		currentIndex = inview.indexOf(m);
-		flyToMarker(m);
-	}
-
-	async function flyToMarker(marker) {
-		map.flyTo({
-			zoom: 12,
-			center: marker.getLngLat(),
-			essential: true,
-			easing: function (t) {
-				return 1 - Math.pow(1 - t, 3);
-			},
-			duration: 3000
-		});
-
-		await new Promise((r) => setTimeout(r, 3000));
-		marker.getElement().click();
-		await new Promise((r) => setTimeout(r, 1500));
-
-		if (!timeout) return;
-
-		map.flyTo({
-			zoom: 10.5,
-			center: marker.getLngLat(),
-			essential: true,
-			easing: function (t) {
-				return 1 - Math.pow(1 - t, 3);
-			},
-			duration: 1500
-		});
-	}
-
-	let toggle = () => {
-		if (timeout) stopFlying();
-		else startFlying();
-	};
-
-	let currentPopup;
-	function startFlying() {
-		currentIndex++;
-
-		for (let p in popups) popups[p].remove();
-		if (currentIndex >= inview.length) currentIndex = 0;
-		flyToMarker(inview[currentIndex]);
-
-		timeout = setTimeout(startFlying, 6000);
-	}
-
-	function stopFlying() {
-		if (!timeout) return;
-		timeout = clearTimeout(timeout);
-
-		if (currentPopup) {
-			currentPopup.remove();
-		}
-
-		map.jumpTo({ center: map.getCenter(), zoom: map.getZoom() });
-		map.off('moveend'); // Remove moveend listener if set
-	}
-
-	let inview = [];
-
-	function updateLabelVisibility() {
-		inview = [];
-		if (!map) return;
-		let zoom = map.getZoom();
-		let bounds = map.getBounds();
-
-		for (let marker of markers) {
-			let isInView = bounds.contains(marker.getLngLat());
-			let { tags } = marker;
-
-			if (isInView) {
-				inview.push(marker);
-			}
-		}
-
-		inview = inview.sort((a, b) => a.tags.name.localeCompare(b.tags.name));
-		shuffleArray(inview);
-	}
-
-	let popups = {};
-	let counter = 0;
-
-	onMount(() => {
-		if (browser) {
-			import('maplibre-gl').then(({ default: maplibre }) => {
-				map = new maplibre.Map({
-					container: mapContainer,
-					style: 'https://tiles.stadiamaps.com/styles/stamen_toner.json',
-					center: [-123.05, 49.26],
-					zoom: 10.5
-				});
-
-				map.on('load', () => {
-					locations.forEach((location) => {
-						if (location['deleted_at']) return;
-
-						let { lat, lon, tags } = location['osm_json'];
-						if (!(lat && lon)) return;
-
-						let element = document.createElement('div');
-						element.className = 'marker';
-
-						let popupContainer = document.createElement('div');
-
-						let popup = new Popup({
-							target: popupContainer,
-							props: { tags }
-						});
-
-						let marker = new maplibre.Marker({ color: '#F7931A' })
-							.setLngLat([lon, lat])
-							.setPopup(new maplibre.Popup().setDOMContent(popupContainer))
-							.addTo(map);
-
-						marker.id = counter++;
-
-						marker.getElement().addEventListener('click', () => {
-							let p = marker.getPopup();
-							popups[marker.id] = p;
-							p.setDOMContent(popupContainer);
-							p.on('close', () => {
-								delete popups[marker.id];
-							});
-						});
-
-						marker.tags = tags;
-
-						markers.push(marker);
-					});
-
-					updateLabelVisibility();
-
-					let observer = new IntersectionObserver(
-						(entries, observer) => {
-							entries.forEach((entry) => {
-								if (entry.isIntersecting) startFlying();
-								else stopFlying();
-							});
-						},
-						{ threshold: 0.5 }
-					);
-
-					observer.observe(mapContainer);
-				});
-
-				map.on('mousedown', stopFlying);
-				map.on('touchstart', stopFlying);
-				map.on('wheel', stopFlying);
-				map.on('dragstart', stopFlying);
-
-				let resize = () => map && map.resize();
-
-				document.addEventListener('fullscreenchange', resize, false);
-				document.addEventListener('webkitfullscreenchange', resize, false);
-				document.addEventListener('mozfullscreenchange', resize, false);
-				document.addEventListener('MSFullscreenChange', resize, false);
-			});
-		}
-	});
-
-	onDestroy(() => map && map.remove());
+  import { tick, onMount, onDestroy } from "svelte";
+  import { browser } from "$app/environment";
+  import { Icon, Popup } from "$comp";
+  import { shuffleArray } from "$lib/utils";
+
+  import "maplibre-gl/dist/maplibre-gl.css";
+
+  export let locations;
+  let map;
+  let mapContainer, mapWrapper;
+  let markers = [];
+
+  let currentIndex = -1;
+  let timeout;
+
+  let full = () => {
+    if (!document.fullscreenElement) {
+      if (mapWrapper.requestFullscreen) {
+        mapWrapper.requestFullscreen();
+      } else if (mapWrapper.mozRequestFullScreen) {
+        /* Firefox */
+        mapWrapper.mozRequestFullScreen();
+      } else if (mapWrapper.webkitRequestFullscreen) {
+        /* Chrome, Safari & Opera */
+        mapWrapper.webkitRequestFullscreen();
+      } else if (mapWrapper.msRequestFullscreen) {
+        /* IE/Edge */
+        mapWrapper.msRequestFullscreen();
+      }
+
+      map.resize();
+    } else {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        /* Firefox */
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        /* Chrome, Safari and Opera */
+        document.webkitExitFullscreen();
+      } else if (document.msExitFullscreen) {
+        /* IE/Edge */
+        document.msExitFullscreen();
+      }
+    }
+  };
+
+  function select(m) {
+    stopFlying();
+    currentIndex = inview.indexOf(m);
+    flyToMarker(m);
+  }
+
+  async function flyToMarker(marker) {
+    map.flyTo({
+      zoom: 12,
+      center: marker.getLngLat(),
+      essential: true,
+      easing: function (t) {
+        return 1 - Math.pow(1 - t, 3);
+      },
+      duration: 3000,
+    });
+
+    await new Promise((r) => setTimeout(r, 3000));
+    marker.getElement().click();
+    await new Promise((r) => setTimeout(r, 1500));
+
+    if (!timeout) return;
+
+    map.flyTo({
+      zoom: 10.5,
+      center: marker.getLngLat(),
+      essential: true,
+      easing: function (t) {
+        return 1 - Math.pow(1 - t, 3);
+      },
+      duration: 1500,
+    });
+  }
+
+  let toggle = () => {
+    if (timeout) stopFlying();
+    else startFlying();
+  };
+
+  let currentPopup;
+  function startFlying() {
+    currentIndex++;
+
+    for (let p in popups) popups[p].remove();
+    if (currentIndex >= inview.length) currentIndex = 0;
+    flyToMarker(inview[currentIndex]);
+
+    timeout = setTimeout(startFlying, 6000);
+  }
+
+  function stopFlying() {
+    if (!timeout) return;
+    timeout = clearTimeout(timeout);
+
+    if (currentPopup) {
+      currentPopup.remove();
+    }
+
+    map.jumpTo({ center: map.getCenter(), zoom: map.getZoom() });
+    map.off("moveend"); // Remove moveend listener if set
+  }
+
+  let inview = [];
+
+  function updateLabelVisibility() {
+    inview = [];
+    if (!map) return;
+    let zoom = map.getZoom();
+    let bounds = map.getBounds();
+
+    for (let marker of markers) {
+      let isInView = bounds.contains(marker.getLngLat());
+      let { tags } = marker;
+
+      if (isInView) {
+        inview.push(marker);
+      }
+    }
+
+    inview = inview.sort((a, b) => a.tags.name.localeCompare(b.tags.name));
+    shuffleArray(inview);
+  }
+
+  let popups = {};
+  let counter = 0;
+
+  onMount(() => {
+    if (browser) {
+      import("maplibre-gl").then(({ default: maplibre }) => {
+        map = new maplibre.Map({
+          container: mapContainer,
+          style: "https://tiles.stadiamaps.com/styles/stamen_toner.json",
+          center: [-123.05, 49.26],
+          zoom: 10.5,
+        });
+
+        map.on("load", () => {
+          locations.forEach((location) => {
+            if (location["deleted_at"]) return;
+
+            let { lat, lon, tags } = location["osm_json"];
+            if (!(lat && lon)) return;
+
+            let element = document.createElement("div");
+            element.className = "marker";
+
+            let popupContainer = document.createElement("div");
+
+            let popup = new Popup({
+              target: popupContainer,
+              props: { tags },
+            });
+
+            let marker = new maplibre.Marker({ color: "#F7931A" })
+              .setLngLat([lon, lat])
+              .setPopup(new maplibre.Popup().setDOMContent(popupContainer))
+              .addTo(map);
+
+            marker.id = counter++;
+
+            marker.getElement().addEventListener("click", () => {
+              let p = marker.getPopup();
+              popups[marker.id] = p;
+              p.setDOMContent(popupContainer);
+              p.on("close", () => {
+                delete popups[marker.id];
+              });
+            });
+
+            marker.tags = tags;
+
+            markers.push(marker);
+          });
+
+          updateLabelVisibility();
+
+          let observer = new IntersectionObserver(
+            (entries, observer) => {
+              entries.forEach((entry) => {
+                if (entry.isIntersecting) startFlying();
+                else stopFlying();
+              });
+            },
+            { threshold: 0.5 }
+          );
+
+          observer.observe(mapContainer);
+        });
+
+        map.on("mousedown", stopFlying);
+        map.on("touchstart", stopFlying);
+        map.on("wheel", stopFlying);
+        map.on("dragstart", stopFlying);
+
+        let resize = () => map && map.resize();
+
+        document.addEventListener("fullscreenchange", resize, false);
+        document.addEventListener("webkitfullscreenchange", resize, false);
+        document.addEventListener("mozfullscreenchange", resize, false);
+        document.addEventListener("MSFullscreenChange", resize, false);
+      });
+    }
+  });
+
+  onDestroy(() => map && map.remove());
 </script>
 
 <div class="container mx-auto p-2 space-y-5">
-	<div class="flex w-full h-[60vh]" id="map" bind:this={mapWrapper}>
-		<div id="map-container" class="mx-auto h-full w-full z-0" bind:this={mapContainer} />
-		<div class="relative">
-			<div class="flex absolute flex top-2 right-2 gap-2">
-				<button class="rounded-full border-2 border-black bg-white w-10 h-10" on:click={toggle}>
-					{#if timeout}
-						<Icon icon="pause" style="w-4 m-auto" />
-					{:else}
-						<Icon icon="play" style="w-4 m-auto" />
-					{/if}
-				</button>
-				<button class="rounded-full border-2 border-black bg-white w-10 h-10" on:click={full}>
-					<Icon icon="full" style="w-4 m-auto" />
-				</button>
-			</div>
-		</div>
-	</div>
-
-	<!-- <div class="hidden lg:grid grid-cols-3 justify-items-center"> -->
-	<!-- 	{#each inview as m} -->
-	<!-- 		<button -->
-	<!-- 			on:click={() => select(m)} -->
-	<!-- 			class="text-left" -->
-	<!-- 			class:font-bold={m.id === inview[currentIndex]?.id} -->
-	<!-- 			id={`marker-${m.id}`}>{m.tags.name}</button -->
-	<!-- 		> -->
-	<!-- 	{/each} -->
-	<!-- </div> -->
+  <div class="flex w-full h-[60vh]" id="map" bind:this={mapWrapper}>
+    <div
+      id="map-container"
+      class="mx-auto h-full w-full z-0"
+      bind:this={mapContainer}
+    />
+    <div class="relative">
+      <div class="flex absolute flex top-2 right-2 gap-2">
+        <button
+          class="rounded-full border-2 border-black bg-white w-10 h-10"
+          on:click={toggle}
+        >
+          {#if timeout}
+            <Icon icon="pause" style="w-4 m-auto" />
+          {:else}
+            <Icon icon="play" style="w-4 m-auto" />
+          {/if}
+        </button>
+        <button
+          class="rounded-full border-2 border-black bg-white w-10 h-10"
+          on:click={full}
+        >
+          <Icon icon="full" style="w-4 m-auto" />
+        </button>
+      </div>
+    </div>
+  </div>
+
+  <!-- <div class="hidden lg:grid grid-cols-3 justify-items-center"> -->
+  <!-- 	{#each inview as m} -->
+  <!-- 		<button -->
+  <!-- 			on:click={() => select(m)} -->
+  <!-- 			class="text-left" -->
+  <!-- 			class:font-bold={m.id === inview[currentIndex]?.id} -->
+  <!-- 			id={`marker-${m.id}`}>{m.tags.name}</button -->
+  <!-- 		> -->
+  <!-- 	{/each} -->
+  <!-- </div> -->
 </div>
 
 <style>
-	#map:fullscreen,
-	#map-container:fullscreen {
-		width: 100% !important;
-		height: 100% !important;
-	}
-
-	:global(.maplibregl-popup-close-button) {
-		font-size: 24px;
-		padding: 8px;
-	}
-
-	:global(.maplibregl-popup :focus) {
-		outline: none;
-	}
-
-	:global(.maplibregl-ctrl-attrib) {
-		display: none;
-	}
-
-	:global(.maplibregl-popup-content) {
-		padding: 1em 2em;
-		border-radius: 4px;
-		font-size: 14px;
-		color: black;
-		background-color: white;
-		overflow: hidden;
-		width: 280px;
-	}
+  #map:fullscreen,
+  #map-container:fullscreen {
+    width: 100% !important;
+    height: 100% !important;
+  }
+
+  :global(.maplibregl-popup-close-button) {
+    font-size: 24px;
+    padding: 8px;
+  }
+
+  :global(.maplibregl-popup :focus) {
+    outline: none;
+  }
+
+  :global(.maplibregl-ctrl-attrib) {
+    display: none;
+  }
+
+  :global(.maplibregl-popup-content) {
+    padding: 1em 2em;
+    border-radius: 4px;
+    font-size: 14px;
+    color: black;
+    background-color: white;
+    overflow: hidden;
+    width: 280px;
+  }
 </style>
diff --git a/src/components/Lock.svelte b/src/components/Lock.svelte
index 11475acf..fce994a2 100644
--- a/src/components/Lock.svelte
+++ b/src/components/Lock.svelte
@@ -1,14 +1,14 @@
 <svg
-	xmlns="http://www.w3.org/2000/svg"
-	class="absolute bottom-0 left-0 -mb-0.5 transform translate-x-1/2 -translate-y-1/2 text-black peer-placeholder-shown:text-gray-300 h-6 w-6"
-	fill="none"
-	viewBox="0 0 24 24"
-	stroke="currentColor"
+  xmlns="http://www.w3.org/2000/svg"
+  class="absolute bottom-0 left-0 -mb-0.5 transform translate-x-1/2 -translate-y-1/2 text-black peer-placeholder-shown:text-gray-300 h-6 w-6"
+  fill="none"
+  viewBox="0 0 24 24"
+  stroke="currentColor"
 >
-	<path
-		stroke-linecap="round"
-		stroke-linejoin="round"
-		stroke-width="2"
-		d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"
-	/>
+  <path
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    stroke-width="2"
+    d="M12 15v2m-6 4h12a2 2 0 002-2v-6a2 2 0 00-2-2H6a2 2 0 00-2 2v6a2 2 0 002 2zm10-10V7a4 4 0 00-8 0v4h8z"
+  />
 </svg>
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 5ea1418c..6b779085 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -1,219 +1,236 @@
 <script>
-	import { Left, Icon } from '$comp';
-	import { f, s, post, warning, sat, sats } from '$lib/utils';
-	import { t } from '$lib/translations';
-
-	export let amount,
-		currency,
-		fiat = !amount,
-		rate,
-		submit = undefined;
-
-	export let amountFiat = 0;
-
-	let arrow = '<';
-
-	$: update(amount, amountFiat);
-	let update = (a, f) => {
-		if (fiat) {
-			amount = Math.round(f / (rate / sats));
-		} else {
-			amountFiat = ((a * rate) / sats).toFixed(2);
-		}
-	};
-
-	let loading = false;
-
-	let symbol =
-		{
-			USD: '$',
-			CAD: '$',
-			AUD: '$',
-			NZD: '$',
-			MXN: '$',
-			BRL: 'R$',
-			HKD: '$',
-			TWD: '$',
-			JPY: '¥',
-			CNY: '¥',
-			GBP: '£',
-			EUR: '€',
-			KRW: '₩'
-		}[currency] || '';
-
-	const numPad = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '.', '0', '<'];
-
-	const handleInput = (value) => {
-		if (fiat) {
-			if (amountFiat === 0 && value !== '.' && value !== '<' && value !== '0') {
-				amountFiat = value;
-			} else if ((amountFiat === 0 || amountFiat === '0') && value === '0') {
-				return;
-			} else if (amountFiat === 0 && value === '.') {
-				amountFiat = '0.';
-			} else if (amountFiat !== 0 && amountFiat.includes('.') && value === '.') {
-				return;
-			} else if (value === '<') {
-				if (amountFiat !== 0) {
-					amountFiat = amountFiat.slice(0, amountFiat.length - 1);
-					if (amountFiat.length === 0) {
-						amountFiat = 0;
-						amount = 0;
-					}
-				}
-			} else if (value !== '.' && value !== '<' && parseInt(amountFiat + value) > rate) {
-				warning($t('user.receive.lessThan1BTCWarning'));
-			} else if (amountFiat !== 0 && amountFiat.match(/\.../)) {
-				return;
-			} else {
-				amountFiat = amountFiat + value;
-			}
-		} else {
-			if (value === '.') {
-				return;
-			} else if (!amount && value !== '<' && value !== '0') {
-				amount = parseInt(value);
-			} else if (value === '<') {
-				if (amount !== 0) {
-					amount = Math.floor(amount / 10);
-					if (amount.length === 0) {
-						amount = 0;
-						amountFiat = 0;
-					}
-				}
-			} 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);
-			}
-		}
-	};
-
-	$: html = fiat ? amountFiat : s(amount);
-
-	let prev = '';
-
-	let input = (e) => {
-		if (prev === '0' && html !== '0.') {
-			prev = '';
-			html = html.replace('0', '');
-		}
-
-		let sel = getSelection();
-		let i = sel.focusOffset;
-
-		let clean = html
-			.substr(0, 15)
-			.replace(/[^0-9.,]+/g, '')
-			.replace('.', 'F')
-			.replace(/\./g, '')
-			.replace('F', '.');
-
-		if (fiat) clean = clean.replace(',', '');
-		if (clean !== html) {
-			html = clean;
-			i = html.length;
-		}
-
-		if (amount > sats && html.length > prev.length) {
-			html = prev;
-			warning($t('user.receive.lessThan1BTCWarning'));
-			i--;
-		}
-
-		if (fiat) {
-			amountFiat = html;
-		} else {
-			amount = parseInt(html.replace(/,/g, ''));
-		}
-
-		if (!amount) amount = null;
-
-		setTimeout(() => {
-			if (!fiat) {
-				let p = prev.split(',')[0].length;
-				if (html.length > prev.length && p === 3) i++;
-				if (html.length < prev.length && p === 1 && i > 1) i--;
-			}
-
-			let node = e.target.childNodes[0];
-			let range = document.createRange();
-
-			if (node) {
-				range.setStart(node, i);
-				range.setEnd(node, i);
-
-				let sel = getSelection();
-				sel.removeAllRanges();
-				sel.addRange(range);
-			}
-
-			prev = html.toString();
-		}, 0);
-	};
-
-	let focus = (e) => {
-		let range = document.createRange();
-		range.selectNodeContents(e.target);
-		let sel = getSelection();
-		sel.removeAllRanges();
-		sel.addRange(range);
-	};
-
-	let keydown = (e) => e.key === 'Enter' && (e.preventDefault() || submit.click());
+  import { Left, Icon } from "$comp";
+  import { f, s, post, warning, sat, sats } from "$lib/utils";
+  import { t } from "$lib/translations";
+
+  export let amount,
+    currency,
+    fiat = !amount,
+    rate,
+    submit = undefined;
+
+  export let amountFiat = 0;
+
+  let arrow = "<";
+
+  $: update(amount, amountFiat);
+  let update = (a, f) => {
+    if (fiat) {
+      amount = Math.round(f / (rate / sats));
+    } else {
+      amountFiat = ((a * rate) / sats).toFixed(2);
+    }
+  };
+
+  let loading = false;
+
+  let symbol =
+    {
+      USD: "$",
+      CAD: "$",
+      AUD: "$",
+      NZD: "$",
+      MXN: "$",
+      BRL: "R$",
+      HKD: "$",
+      TWD: "$",
+      JPY: "¥",
+      CNY: "¥",
+      GBP: "£",
+      EUR: "€",
+      KRW: "₩",
+    }[currency] || "";
+
+  const numPad = ["1", "2", "3", "4", "5", "6", "7", "8", "9", ".", "0", "<"];
+
+  const handleInput = (value) => {
+    if (fiat) {
+      if (amountFiat === 0 && value !== "." && value !== "<" && value !== "0") {
+        amountFiat = value;
+      } else if ((amountFiat === 0 || amountFiat === "0") && value === "0") {
+        return;
+      } else if (amountFiat === 0 && value === ".") {
+        amountFiat = "0.";
+      } else if (
+        amountFiat !== 0 &&
+        amountFiat.includes(".") &&
+        value === "."
+      ) {
+        return;
+      } else if (value === "<") {
+        if (amountFiat !== 0) {
+          amountFiat = amountFiat.slice(0, amountFiat.length - 1);
+          if (amountFiat.length === 0) {
+            amountFiat = 0;
+            amount = 0;
+          }
+        }
+      } else if (
+        value !== "." &&
+        value !== "<" &&
+        parseInt(amountFiat + value) > rate
+      ) {
+        warning($t("user.receive.lessThan1BTCWarning"));
+      } else if (amountFiat !== 0 && amountFiat.match(/\.../)) {
+        return;
+      } else {
+        amountFiat = amountFiat + value;
+      }
+    } else {
+      if (value === ".") {
+        return;
+      } else if (!amount && value !== "<" && value !== "0") {
+        amount = parseInt(value);
+      } else if (value === "<") {
+        if (amount !== 0) {
+          amount = Math.floor(amount / 10);
+          if (amount.length === 0) {
+            amount = 0;
+            amountFiat = 0;
+          }
+        }
+      } 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);
+      }
+    }
+  };
+
+  $: html = fiat ? amountFiat : s(amount);
+
+  let prev = "";
+
+  let input = (e) => {
+    if (prev === "0" && html !== "0.") {
+      prev = "";
+      html = html.replace("0", "");
+    }
+
+    let sel = getSelection();
+    let i = sel.focusOffset;
+
+    let clean = html
+      .substr(0, 15)
+      .replace(/[^0-9.,]+/g, "")
+      .replace(".", "F")
+      .replace(/\./g, "")
+      .replace("F", ".");
+
+    if (fiat) clean = clean.replace(",", "");
+    if (clean !== html) {
+      html = clean;
+      i = html.length;
+    }
+
+    if (amount > sats && html.length > prev.length) {
+      html = prev;
+      warning($t("user.receive.lessThan1BTCWarning"));
+      i--;
+    }
+
+    if (fiat) {
+      amountFiat = html;
+    } else {
+      amount = parseInt(html.replace(/,/g, ""));
+    }
+
+    if (!amount) amount = null;
+
+    setTimeout(() => {
+      if (!fiat) {
+        let p = prev.split(",")[0].length;
+        if (html.length > prev.length && p === 3) i++;
+        if (html.length < prev.length && p === 1 && i > 1) i--;
+      }
+
+      let node = e.target.childNodes[0];
+      let range = document.createRange();
+
+      if (node) {
+        range.setStart(node, i);
+        range.setEnd(node, i);
+
+        let sel = getSelection();
+        sel.removeAllRanges();
+        sel.addRange(range);
+      }
+
+      prev = html.toString();
+    }, 0);
+  };
+
+  let focus = (e) => {
+    let range = document.createRange();
+    range.selectNodeContents(e.target);
+    let sel = getSelection();
+    sel.removeAllRanges();
+    sel.addRange(range);
+  };
+
+  let keydown = (e) =>
+    e.key === "Enter" && (e.preventDefault() || submit.click());
 </script>
 
 <div class="flex justify-center items-center mb-3 px-3">
-	<div class="space-y-5">
-		<div class="text-center">
-			<div class="text-5xl md:text-6xl font-semibold tracking-widest flex justify-center">
-				<div class="my-auto" class:text-5xl={!fiat}>{fiat ? symbol : '⚡️'}</div>
-				<div
-					contenteditable
-					bind:innerHTML={html}
-					on:focus={focus}
-					on:input={input}
-					on:keydown={keydown}
-					class="outline-none my-auto"
-				/>
-			</div>
-			<div class="mt-2">
-				<span class="text-secondary mr-1">{fiat ? sat(amount) : f(amountFiat, currency)}</span>
-				<button
-					type="button"
-					on:click={() => {
-						if (fiat) {
-							amount = parseInt((amountFiat / (rate / sats)).toFixed(0));
-						} else {
-							amountFiat =
-								(amount * (rate / sats)).toFixed(2) > 0.0 ? (amount * (rate / sats)).toFixed(2) : 0;
-						}
-						fiat = !fiat;
-					}}><Icon icon="swap" style="inline hover:opacity-80" /></button
-				>
-			</div>
-		</div>
-
-		<div class="grid grid-cols-3 gap-2 w-[300px] mx-auto">
-			{#each numPad as value}
-				{#if value === arrow}
-					<button
-						type="button"
-						class="bg-primary rounded-xl py-4 px-8 font-semibold active:bg-black active:text-white flex justify-center items-center hover:opacity-80"
-						on:click={() => handleInput(value)}
-					>
-						<Left />
-					</button>
-				{:else}
-					<button
-						type="button"
-						class="bg-primary rounded-xl py-4 px-8 font-semibold active:bg-black active:text-white hover:opacity-80"
-						on:click={() => handleInput(value)}>{value}</button
-					>
-				{/if}
-			{/each}
-		</div>
-	</div>
+  <div class="space-y-5">
+    <div class="text-center">
+      <div
+        class="text-5xl md:text-6xl font-semibold tracking-widest flex justify-center"
+      >
+        <div class="my-auto" class:text-5xl={!fiat}>
+          {fiat ? symbol : "⚡️"}
+        </div>
+        <div
+          contenteditable
+          bind:innerHTML={html}
+          on:focus={focus}
+          on:input={input}
+          on:keydown={keydown}
+          class="outline-none my-auto"
+        />
+      </div>
+      <div class="mt-2">
+        <span class="text-secondary mr-1"
+          >{fiat ? sat(amount) : f(amountFiat, currency)}</span
+        >
+        <button
+          type="button"
+          on:click={() => {
+            if (fiat) {
+              amount = parseInt((amountFiat / (rate / sats)).toFixed(0));
+            } else {
+              amountFiat =
+                (amount * (rate / sats)).toFixed(2) > 0.0
+                  ? (amount * (rate / sats)).toFixed(2)
+                  : 0;
+            }
+            fiat = !fiat;
+          }}><Icon icon="swap" style="inline hover:opacity-80" /></button
+        >
+      </div>
+    </div>
+
+    <div class="grid grid-cols-3 gap-2 w-[300px] mx-auto">
+      {#each numPad as value}
+        {#if value === arrow}
+          <button
+            type="button"
+            class="bg-primary rounded-xl py-4 px-8 font-semibold active:bg-black active:text-white flex justify-center items-center hover:opacity-80"
+            on:click={() => handleInput(value)}
+          >
+            <Left />
+          </button>
+        {:else}
+          <button
+            type="button"
+            class="bg-primary rounded-xl py-4 px-8 font-semibold active:bg-black active:text-white hover:opacity-80"
+            on:click={() => handleInput(value)}>{value}</button
+          >
+        {/if}
+      {/each}
+    </div>
+  </div>
 </div>
diff --git a/src/components/Password.svelte b/src/components/Password.svelte
index a84c0b16..007ce718 100644
--- a/src/components/Password.svelte
+++ b/src/components/Password.svelte
@@ -1,77 +1,83 @@
 <script>
-	import { Icon } from '$comp';
-	import { focus, fail, post } from '$lib/utils';
-	import { password as pw, passwordPrompt } from '$lib/store';
+  import { Icon } from "$comp";
+  import { focus, fail, post } from "$lib/utils";
+  import { password as pw, passwordPrompt } from "$lib/store";
 
-	export let user;
+  export let user;
 
-	let password;
-	let { username } = user;
-	let revealPassword = false;
+  let password;
+  let { username } = user;
+  let revealPassword = false;
 
-	let cancel = () => ($passwordPrompt = false);
+  let cancel = () => ($passwordPrompt = false);
 
-	let submit = async () => {
-		try {
-			await post('/password', { password });
-			$passwordPrompt = false;
-			$pw = password;
-		} catch (e) {
-			fail('Invalid password, try again');
-		}
-	};
+  let submit = async () => {
+    try {
+      await post("/password", { password });
+      $passwordPrompt = false;
+      $pw = password;
+    } catch (e) {
+      fail("Invalid password, try again");
+    }
+  };
 </script>
 
-<div class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-20">
-	<div class="relative top-1/3 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white space-y-5">
-		<h1 class="text-center text-2xl font-semibold">Please enter your password</h1>
-		<form on:submit|preventDefault={submit}>
-			<div class="relative mb-5">
-				{#if revealPassword}
-					<input
-						name="password"
-						type="text"
-						required
-						class="bg-primary"
-						bind:value={password}
-						autocapitalize="none"
-						use:focus
-					/>
-				{:else}
-					<input
-						name="password"
-						type="password"
-						required
-						class="bg-primary"
-						bind:value={password}
-						autocapitalize="none"
-						use:focus
-					/>
-				{/if}
-				<button
-					type="button"
-					on:click={() => (revealPassword = !revealPassword)}
-					class="absolute right-5 top-6"
-				>
-					<Icon icon={revealPassword ? 'eye' : 'eye-off'} />
-				</button>
-			</div>
-			<div class="w-full flex">
-				<button
-					type="button"
-					class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
-					on:click={cancel}
-					on:keydown={cancel}
-				>
-					<div class="my-auto">Cancel</div>
-				</button>
-				<button
-					type="submit"
-					class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
-				>
-					<div class="my-auto">Submit</div>
-				</button>
-			</div>
-		</form>
-	</div>
+<div
+  class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-20"
+>
+  <div
+    class="relative top-1/3 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white space-y-5"
+  >
+    <h1 class="text-center text-2xl font-semibold">
+      Please enter your password
+    </h1>
+    <form on:submit|preventDefault={submit}>
+      <div class="relative mb-5">
+        {#if revealPassword}
+          <input
+            name="password"
+            type="text"
+            required
+            class="bg-primary"
+            bind:value={password}
+            autocapitalize="none"
+            use:focus
+          />
+        {:else}
+          <input
+            name="password"
+            type="password"
+            required
+            class="bg-primary"
+            bind:value={password}
+            autocapitalize="none"
+            use:focus
+          />
+        {/if}
+        <button
+          type="button"
+          on:click={() => (revealPassword = !revealPassword)}
+          class="absolute right-5 top-6"
+        >
+          <Icon icon={revealPassword ? "eye" : "eye-off"} />
+        </button>
+      </div>
+      <div class="w-full flex">
+        <button
+          type="button"
+          class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
+          on:click={cancel}
+          on:keydown={cancel}
+        >
+          <div class="my-auto">Cancel</div>
+        </button>
+        <button
+          type="submit"
+          class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
+        >
+          <div class="my-auto">Submit</div>
+        </button>
+      </div>
+    </form>
+  </div>
 </div>
diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte
index 0cff904f..bd51cb0a 100644
--- a/src/components/Pin.svelte
+++ b/src/components/Pin.svelte
@@ -1,59 +1,63 @@
 <script>
-	import { t } from '$lib/translations';
-	import { post, success, fail, focus } from '$lib/utils';
-	import { Pinpad } from '$comp';
-	import { pin } from '$lib/store';
-	import { onMount } from 'svelte';
-
-	export let value = '';
-	export let title = $t('user.settings.verifyPIN');
-	export let cancel = () => (p = '');
-	export let persist = true;
-	export let notify = true;
-
-	let p = '';
-
-	$: update(value);
-	let update = (value) => (p = value);
-
-	$: p.toString().length > 5 && (value = p.toString());
-
-	let loaded;
-	onMount(() => setTimeout(() => (loaded = true), 500));
-
-	$: loaded && checkPin(p);
-	let checkPin = async (p) => {
-		if (p?.length !== 6) return;
-		let result;
-		try {
-			result = await post('/pin', { pin: p });
-		} catch (e) {
-			console.log('Pin check failed', e);
-		}
-
-		if (result) {
-			if (notify) success('Pin confirmed');
-			if (persist) $pin = p;
-		} else {
-			fail('Invalid pin');
-			value = '';
-		}
-	};
+  import { t } from "$lib/translations";
+  import { post, success, fail, focus } from "$lib/utils";
+  import { Pinpad } from "$comp";
+  import { pin } from "$lib/store";
+  import { onMount } from "svelte";
+
+  export let value = "";
+  export let title = $t("user.settings.verifyPIN");
+  export let cancel = () => (p = "");
+  export let persist = true;
+  export let notify = true;
+
+  let p = "";
+
+  $: update(value);
+  let update = (value) => (p = value);
+
+  $: p.toString().length > 5 && (value = p.toString());
+
+  let loaded;
+  onMount(() => setTimeout(() => (loaded = true), 500));
+
+  $: loaded && checkPin(p);
+  let checkPin = async (p) => {
+    if (p?.length !== 6) return;
+    let result;
+    try {
+      result = await post("/pin", { pin: p });
+    } catch (e) {
+      console.log("Pin check failed", e);
+    }
+
+    if (result) {
+      if (notify) success("Pin confirmed");
+      if (persist) $pin = p;
+    } else {
+      fail("Invalid pin");
+      value = "";
+    }
+  };
 </script>
 
 {#if loaded}
-	<div class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-50">
-		<div class="relative top-40 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white space-y-5">
-			<h1 class="text-center text-2xl font-semibold">{title}</h1>
-			<Pinpad bind:v={p} {cancel} />
-			<div class="w-full flex">
-				<button
-					class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
-					on:click|preventDefault={cancel}
-				>
-					<div class="my-auto">Cancel</div>
-				</button>
-			</div>
-		</div>
-	</div>
+  <div
+    class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full z-50"
+  >
+    <div
+      class="relative top-40 mx-auto p-5 border w-96 shadow-lg rounded-md bg-white space-y-5"
+    >
+      <h1 class="text-center text-2xl font-semibold">{title}</h1>
+      <Pinpad bind:v={p} {cancel} />
+      <div class="w-full flex">
+        <button
+          class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80 mx-auto"
+          on:click|preventDefault={cancel}
+        >
+          <div class="my-auto">Cancel</div>
+        </button>
+      </div>
+    </div>
+  </div>
 {/if}
diff --git a/src/components/Pinpad.svelte b/src/components/Pinpad.svelte
index f55dc40d..5db23154 100644
--- a/src/components/Pinpad.svelte
+++ b/src/components/Pinpad.svelte
@@ -1,80 +1,88 @@
 <script>
-	import { Left, Icon } from '$comp';
-	import { focus, post, warning } from '$lib/utils';
-	import { t } from '$lib/translations';
+  import { Left, Icon } from "$comp";
+  import { focus, post, warning } from "$lib/utils";
+  import { t } from "$lib/translations";
 
-	export let v;
-	export let cancel;
+  export let v;
+  export let cancel;
 
-	let arrow = '<';
-	let loading = false;
+  let arrow = "<";
+  let loading = false;
 
-	const numPad = ['1', '2', '3', '4', '5', '6', '7', '8', '9', 'C', '0', '<'];
+  const numPad = ["1", "2", "3", "4", "5", "6", "7", "8", "9", "C", "0", "<"];
 
-	const handleInput = (n) => {
-		v = (v || '').toString();
-		if (n === 'C') return (v = '');
-		if (n === '<') return (v = v.length > 1 ? Math.floor(v / 10) : '');
-		if (v.length > 5) n = '';
-		if (parseInt(n) >= 0) v += n;
-	};
+  const handleInput = (n) => {
+    v = (v || "").toString();
+    if (n === "C") return (v = "");
+    if (n === "<") return (v = v.length > 1 ? Math.floor(v / 10) : "");
+    if (v.length > 5) n = "";
+    if (parseInt(n) >= 0) v += n;
+  };
 
-	let validate = (e) => {
-		let k = e.key || e.code;
-		if (k === 'Escape') cancel();
-		if (e.key.length <= 1 && !(e.metaKey || e.ctrlKey || e.altKey) && !(k >= '0' && k <= '9')) {
-			if (e.preventDefault) e.preventDefault();
-			else e.returnValue = false;
-		}
-	};
+  let validate = (e) => {
+    let k = e.key || e.code;
+    if (k === "Escape") cancel();
+    if (
+      e.key.length <= 1 &&
+      !(e.metaKey || e.ctrlKey || e.altKey) &&
+      !(k >= "0" && k <= "9")
+    ) {
+      if (e.preventDefault) e.preventDefault();
+      else e.returnValue = false;
+    }
+  };
 
-	let hide = true;
+  let hide = true;
 </script>
 
 <div class="flex justify-center items-center">
-	<div class="space-y-5">
-		<div class="text-5xl md:text-6xl font-semibold relative w-[300px]">
-			{#if hide}
-				<input
-					on:keydown={validate}
-					use:focus
-					bind:value={v}
-					type="password"
-					class="outline-none border-0 text-center py-0"
-					pattern="[0-9]+"
-				/>
-			{:else}
-				<input
-					on:keydown={validate}
-					bind:value={v}
-					class="outline-none border-0 text-center py-0"
-					type="text"
-					pattern="[0-9]+"
-				/>
-			{/if}
-			<button type="button" on:click={() => (hide = !hide)} class="absolute -right-5 top-5">
-				<Icon icon={hide ? 'eye-off' : 'eye'} style="w-8" />
-			</button>
-		</div>
+  <div class="space-y-5">
+    <div class="text-5xl md:text-6xl font-semibold relative w-[300px]">
+      {#if hide}
+        <input
+          on:keydown={validate}
+          use:focus
+          bind:value={v}
+          type="password"
+          class="outline-none border-0 text-center py-0"
+          pattern="[0-9]+"
+        />
+      {:else}
+        <input
+          on:keydown={validate}
+          bind:value={v}
+          class="outline-none border-0 text-center py-0"
+          type="text"
+          pattern="[0-9]+"
+        />
+      {/if}
+      <button
+        type="button"
+        on:click={() => (hide = !hide)}
+        class="absolute -right-5 top-5"
+      >
+        <Icon icon={hide ? "eye-off" : "eye"} style="w-8" />
+      </button>
+    </div>
 
-		<div class="grid grid-cols-3 gap-2 w-[300px] mx-auto grayscale">
-			{#each numPad as value}
-				{#if value === arrow}
-					<button
-						type="button"
-						class="bg-primary rounded-xl py-4 px-8 font-semibold active:bg-black active:text-white flex justify-center items-center hover:opacity-80"
-						on:click={() => handleInput(value)}
-					>
-						<Left />
-					</button>
-				{:else}
-					<button
-						type="button"
-						class="bg-primary rounded-xl py-4 px-8 font-semibold active:bg-black active:text-white hover:opacity-80"
-						on:click={() => handleInput(value)}>{value}</button
-					>
-				{/if}
-			{/each}
-		</div>
-	</div>
+    <div class="grid grid-cols-3 gap-2 w-[300px] mx-auto grayscale">
+      {#each numPad as value}
+        {#if value === arrow}
+          <button
+            type="button"
+            class="bg-primary rounded-xl py-4 px-8 font-semibold active:bg-black active:text-white flex justify-center items-center hover:opacity-80"
+            on:click={() => handleInput(value)}
+          >
+            <Left />
+          </button>
+        {:else}
+          <button
+            type="button"
+            class="bg-primary rounded-xl py-4 px-8 font-semibold active:bg-black active:text-white hover:opacity-80"
+            on:click={() => handleInput(value)}>{value}</button
+          >
+        {/if}
+      {/each}
+    </div>
+  </div>
 </div>
diff --git a/src/components/Popup.svelte b/src/components/Popup.svelte
index 8fe1d160..5d2b9b6a 100644
--- a/src/components/Popup.svelte
+++ b/src/components/Popup.svelte
@@ -1,38 +1,42 @@
 <script>
-	import { page } from '$app/stores';
-	import { Avatar } from '$comp';
-	export let tags;
+  import { page } from "$app/stores";
+  import { Avatar } from "$comp";
+  export let tags;
 
-	let addr = (tags) => {
-		let { 'addr:housenumber': house, 'addr:street': street, 'addr:city': city } = tags;
-		if (house) return `${house} ${street}`;
-		return '';
-	};
+  let addr = (tags) => {
+    let {
+      "addr:housenumber": house,
+      "addr:street": street,
+      "addr:city": city,
+    } = tags;
+    if (house) return `${house} ${street}`;
+    return "";
+  };
 </script>
 
 {#if tags}
-	{#if tags.user}
-		<a href={`/${tags.user.username}`}>
-			<div class="space-y-5">
-				<div>
-					<span class="block font-bold">{tags.name}</span>
-					<span class="block">{addr(tags)}</span>
-				</div>
+  {#if tags.user}
+    <a href={`/${tags.user.username}`}>
+      <div class="space-y-5">
+        <div>
+          <span class="block font-bold">{tags.name}</span>
+          <span class="block">{addr(tags)}</span>
+        </div>
 
-				<div>
-					<div class="flex w-full">
-						<div class="mx-auto">
-							<Avatar user={tags.user} size={16} />
-						</div>
-					</div>
-					<div class="break-all text-center">
-						{$page.url.host}/{tags.user.username.toLowerCase()}
-					</div>
-				</div>
-			</div>
-		</a>
-	{:else}
-		<span class="block font-bold">{tags.name}</span>
-		<span class="block">{addr(tags)}</span>
-	{/if}
+        <div>
+          <div class="flex w-full">
+            <div class="mx-auto">
+              <Avatar user={tags.user} size={16} />
+            </div>
+          </div>
+          <div class="break-all text-center">
+            {$page.url.host}/{tags.user.username.toLowerCase()}
+          </div>
+        </div>
+      </div>
+    </a>
+  {:else}
+    <span class="block font-bold">{tags.name}</span>
+    <span class="block">{addr(tags)}</span>
+  {/if}
 {/if}
diff --git a/src/components/Qr.svelte b/src/components/Qr.svelte
index c67d134e..8a716b14 100644
--- a/src/components/Qr.svelte
+++ b/src/components/Qr.svelte
@@ -1,14 +1,14 @@
 <script>
-	import screenfull from 'screenfull';
-	export let src;
-	let qr;
+  import screenfull from "screenfull";
+  export let src;
+  let qr;
 </script>
 
 <div
-	class="w-80 mx-auto my-5 cursor-pointer"
-	bind:this={qr}
-	on:click={() => screenfull.toggle(qr)}
-	on:keydown={() => screenfull.toggle(qr)}
+  class="w-80 mx-auto my-5 cursor-pointer"
+  bind:this={qr}
+  on:click={() => screenfull.toggle(qr)}
+  on:keydown={() => screenfull.toggle(qr)}
 >
-	<img {src} class="mx-auto" alt="QR Code" />
+  <img {src} class="mx-auto" alt="QR Code" />
 </div>
diff --git a/src/components/Quote.svelte b/src/components/Quote.svelte
index 1e099061..8901dae1 100644
--- a/src/components/Quote.svelte
+++ b/src/components/Quote.svelte
@@ -1,11 +1,11 @@
 <svg
-	aria-hidden="true"
-	class="w-10 h-10 text-gray-400 dark:text-gray-600"
-	viewBox="0 0 24 27"
-	fill="none"
-	xmlns="http://www.w3.org/2000/svg"
-	><path
-		d="M14.017 18L14.017 10.609C14.017 4.905 17.748 1.039 23 0L23.995 2.151C21.563 3.068 20 5.789 20 8h34V18H14.017ZM0 18V10.609C0 4.905 3.748 1.038 9 0L9.996 2.151C7.563 3.068 6 5.789 6 8H9.983L9.983 18L0 18Z"
-		fill="currentColor"
-	/></svg
+  aria-hidden="true"
+  class="w-10 h-10 text-gray-400 dark:text-gray-600"
+  viewBox="0 0 24 27"
+  fill="none"
+  xmlns="http://www.w3.org/2000/svg"
+  ><path
+    d="M14.017 18L14.017 10.609C14.017 4.905 17.748 1.039 23 0L23.995 2.151C21.563 3.068 20 5.789 20 8h34V18H14.017ZM0 18V10.609C0 4.905 3.748 1.038 9 0L9.996 2.151C7.563 3.068 6 5.789 6 8H9.983L9.983 18L0 18Z"
+    fill="currentColor"
+  /></svg
 >
diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte
index 57e0eeed..5617fc7b 100644
--- a/src/components/RegisterOrLogin.svelte
+++ b/src/components/RegisterOrLogin.svelte
@@ -1,179 +1,191 @@
 <script>
-	import { applyAction, deserialize } from '$app/forms';
-	import { tick } from 'svelte';
-	import { fly } from 'svelte/transition';
-	import { enhance } from '$app/forms';
-	import { Pin, Icon, Spinner } from '$comp';
-	import { focus, fail } from '$lib/utils';
-	import { password, loginRedirect } from '$lib/store';
-	import { t } from '$lib/translations';
-	import { page } from '$app/stores';
-	import { generate } from '$lib/nostr';
-	import { invalidateAll } from '$app/navigation';
+  import { applyAction, deserialize } from "$app/forms";
+  import { tick } from "svelte";
+  import { fly } from "svelte/transition";
+  import { enhance } from "$app/forms";
+  import { Pin, Icon, Spinner } from "$comp";
+  import { focus, fail } from "$lib/utils";
+  import { password, loginRedirect } from "$lib/store";
+  import { t } from "$lib/translations";
+  import { page } from "$app/stores";
+  import { generate } from "$lib/nostr";
+  import { invalidateAll } from "$app/navigation";
 
-	export let form;
-	export let pageID;
+  export let form;
+  export let pageID;
 
-	let token, formElement;
-	let code = [];
-	let redirect;
+  let token, formElement;
+  let code = [];
+  let redirect;
 
-	$password = undefined;
+  $password = undefined;
 
-	$: need2fa = form?.message === '2fa';
-	let cancel = () => (need2fa = false);
-	$: if (form?.message === '2fa' && form.token === token) token = '';
+  $: need2fa = form?.message === "2fa";
+  let cancel = () => (need2fa = false);
+  $: if (form?.message === "2fa" && form.token === token) token = "";
 
-	let username, email, btn;
+  let username, email, btn;
 
-	$: update(form);
-	let update = (form) => form && ({ username, password: $password } = form);
+  $: update(form);
+  let update = (form) => form && ({ username, password: $password } = form);
 
-	$: token && token?.length === 6 && tick().then(() => btn.click());
+  $: token && token?.length === 6 && tick().then(() => btn.click());
 
-	let revealPassword = false;
+  let revealPassword = false;
 
-	let action = {
-		register: '/register',
-		signIn: '/login'
-	}[pageID];
+  let action = {
+    register: "/register",
+    signIn: "/login",
+  }[pageID];
 
-	let loading;
-	async function handleSubmit(e) {
-		loading = true;
+  let loading;
+  async function handleSubmit(e) {
+    loading = true;
 
-		let data = new FormData(this);
-		let user = Object.fromEntries(data);
-		await generate(user);
+    let data = new FormData(this);
+    let user = Object.fromEntries(data);
+    await generate(user);
 
-		for (let k in user) {
-			data.set(k, user[k]);
-		}
+    for (let k in user) {
+      data.set(k, user[k]);
+    }
 
-		const response = await fetch(action, {
-			method: 'POST',
-			body: data
-		});
+    const response = await fetch(action, {
+      method: "POST",
+      body: data,
+    });
 
-		const result = deserialize(await response.text());
+    const result = deserialize(await response.text());
 
-		if (result.type === 'success') {
-			await invalidateAll();
-		}
+    if (result.type === "success") {
+      await invalidateAll();
+    }
 
-		applyAction(result);
-		loading = false;
-	}
+    applyAction(result);
+    loading = false;
+  }
 </script>
 
 {#if need2fa}
-	<Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
+  <Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
 {/if}
 
 <div class="pt-10">
-	<div class="w-[243px] mx-auto mb-10">
-		<a href="/">
-			<Icon icon="logo" />
-		</a>
-	</div>
-
-	<div class="flex justify-center items-center">
-		<div class="shadow-xl rounded-3xl p-10 pb-12 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]">
-			<h1 class="text-2xl font-bold text-center">{$t('login.' + pageID)}</h1>
-
-			{#if form?.error}
-				<div class="text-red-600 text-center" in:fly>
-					{form.error}
-				</div>
-			{/if}
-
-			<form class="space-y-5" on:submit|preventDefault={handleSubmit} method="POST">
-				<input
-					type="hidden"
-					name="loginRedirect"
-					value={$loginRedirect || $page.url.searchParams.get('redirect')}
-				/>
-				<input type="hidden" name="token" value={token} />
-
-				<div>
-					<label for="username" class="font-semibold">{$t('login.username')}</label>
-					<input
-						name="username"
-						type="text"
-						required
-						class="bg-primary"
-						bind:value={username}
-						use:focus
-						autocapitalize="none"
-					/>
-				</div>
-
-				<div class="relative">
-					<label for="password" class="block font-semibold">{$t('login.password')}</label>
-					{#if revealPassword}
-						<input
-							name="password"
-							type="text"
-							required
-							class="bg-primary"
-							bind:value={$password}
-							autocapitalize="none"
-						/>
-					{:else}
-						<input
-							name="password"
-							type="password"
-							required
-							class="bg-primary"
-							bind:value={$password}
-							autocapitalize="none"
-						/>
-					{/if}
-					<button
-						type="button"
-						on:click={() => (revealPassword = !revealPassword)}
-						class="absolute right-5 top-10"
-					>
-						<Icon icon={revealPassword ? 'eye' : 'eye-off'} />
-					</button>
-				</div>
-
-				{#if pageID === 'register'}
-					<p class="text-secondary text-sm">
-						{$t('login.passwordRecommendation')}
-					</p>
-				{:else}
-					<!-- TODO -->
-					<!-- <div class="flex justify-end items-center"> -->
-					<!-- 	<a href="/forgot" class="underline underline-offset-4 text-black text-sm" -->
-					<!-- 		>{$t('login.forgotUserOrPassword')}</a -->
-					<!-- 	> -->
-					<!-- </div> -->
-				{/if}
-
-				<button
-					type="submit"
-					class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
-					disabled={loading}
-					bind:this={btn}
-				>
-					{#if loading}
-						<Spinner />
-					{:else}
-						{$t('login.' + pageID)}
-					{/if}
-				</button>
-			</form>
-
-			<p class="text-secondary text-center font-medium">
-				{pageID === 'register' ? $t('login.haveAccount') : $t('login.noAccount')}
-				<a
-					href={pageID === 'register' ? '/login' : '/register'}
-					class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
-				>
-					{pageID === 'register' ? $t('login.signIn') : $t('login.register')}
-				</a>
-			</p>
-		</div>
-	</div>
+  <div class="w-[243px] mx-auto mb-10">
+    <a href="/">
+      <Icon icon="logo" />
+    </a>
+  </div>
+
+  <div class="flex justify-center items-center">
+    <div
+      class="shadow-xl rounded-3xl p-10 pb-12 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]"
+    >
+      <h1 class="text-2xl font-bold text-center">{$t("login." + pageID)}</h1>
+
+      {#if form?.error}
+        <div class="text-red-600 text-center" in:fly>
+          {form.error}
+        </div>
+      {/if}
+
+      <form
+        class="space-y-5"
+        on:submit|preventDefault={handleSubmit}
+        method="POST"
+      >
+        <input
+          type="hidden"
+          name="loginRedirect"
+          value={$loginRedirect || $page.url.searchParams.get("redirect")}
+        />
+        <input type="hidden" name="token" value={token} />
+
+        <div>
+          <label for="username" class="font-semibold"
+            >{$t("login.username")}</label
+          >
+          <input
+            name="username"
+            type="text"
+            required
+            class="bg-primary"
+            bind:value={username}
+            use:focus
+            autocapitalize="none"
+          />
+        </div>
+
+        <div class="relative">
+          <label for="password" class="block font-semibold"
+            >{$t("login.password")}</label
+          >
+          {#if revealPassword}
+            <input
+              name="password"
+              type="text"
+              required
+              class="bg-primary"
+              bind:value={$password}
+              autocapitalize="none"
+            />
+          {:else}
+            <input
+              name="password"
+              type="password"
+              required
+              class="bg-primary"
+              bind:value={$password}
+              autocapitalize="none"
+            />
+          {/if}
+          <button
+            type="button"
+            on:click={() => (revealPassword = !revealPassword)}
+            class="absolute right-5 top-10"
+          >
+            <Icon icon={revealPassword ? "eye" : "eye-off"} />
+          </button>
+        </div>
+
+        {#if pageID === "register"}
+          <p class="text-secondary text-sm">
+            {$t("login.passwordRecommendation")}
+          </p>
+        {:else}
+          <!-- TODO -->
+          <!-- <div class="flex justify-end items-center"> -->
+          <!-- 	<a href="/forgot" class="underline underline-offset-4 text-black text-sm" -->
+          <!-- 		>{$t('login.forgotUserOrPassword')}</a -->
+          <!-- 	> -->
+          <!-- </div> -->
+        {/if}
+
+        <button
+          type="submit"
+          class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
+          disabled={loading}
+          bind:this={btn}
+        >
+          {#if loading}
+            <Spinner />
+          {:else}
+            {$t("login." + pageID)}
+          {/if}
+        </button>
+      </form>
+
+      <p class="text-secondary text-center font-medium">
+        {pageID === "register"
+          ? $t("login.haveAccount")
+          : $t("login.noAccount")}
+        <a
+          href={pageID === "register" ? "/login" : "/register"}
+          class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
+        >
+          {pageID === "register" ? $t("login.signIn") : $t("login.register")}
+        </a>
+      </p>
+    </div>
+  </div>
 </div>
diff --git a/src/components/Request.svelte b/src/components/Request.svelte
index 44f8516d..f3331954 100644
--- a/src/components/Request.svelte
+++ b/src/components/Request.svelte
@@ -1,34 +1,36 @@
 <script>
-	import { t } from '$lib/translations';
-	import { fly } from 'svelte/transition';
-	import { Avatar, Icon } from '$comp';
-	import { request, requestRedirect } from '$lib/store';
-	import { page } from '$app/stores';
+  import { t } from "$lib/translations";
+  import { fly } from "svelte/transition";
+  import { Avatar, Icon } from "$comp";
+  import { request, requestRedirect } from "$lib/store";
+  import { page } from "$app/stores";
 
-	export let user;
+  export let user;
 
-	$requestRedirect = $page.url.pathname;
+  $requestRedirect = $page.url.pathname;
 </script>
 
 {#if $request}
-	<div class="fixed bottom-0 border-t w-full p-4 bg-white z-50" in:fly>
-		<div class="flex flex-wrap md:flex-nowrap max-w-xl mx-auto gap-2">
-			<div class="my-auto mx-auto">
-				<div class="flex">
-					<Avatar user={$request.requester} size={12} />
-					<h1 class="my-auto">
-						<b>{$request.requester.username}</b>
-						{$t('payments.readyToPay')}
-					</h1>
-				</div>
-			</div>
-			<div class="mx-auto my-auto flex gap-2">
-				<a href={`/${user.username}/receive/${$request.id}`}>
-					<button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-32">
-						{$t('payments.invoice')}
-					</button>
-				</a>
-			</div>
-		</div>
-	</div>
+  <div class="fixed bottom-0 border-t w-full p-4 bg-white z-50" in:fly>
+    <div class="flex flex-wrap md:flex-nowrap max-w-xl mx-auto gap-2">
+      <div class="my-auto mx-auto">
+        <div class="flex">
+          <Avatar user={$request.requester} size={12} />
+          <h1 class="my-auto">
+            <b>{$request.requester.username}</b>
+            {$t("payments.readyToPay")}
+          </h1>
+        </div>
+      </div>
+      <div class="mx-auto my-auto flex gap-2">
+        <a href={`/${user.username}/receive/${$request.id}`}>
+          <button
+            class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-32"
+          >
+            {$t("payments.invoice")}
+          </button>
+        </a>
+      </div>
+    </div>
+  </div>
 {/if}
diff --git a/src/components/Slider.svelte b/src/components/Slider.svelte
index 3c94d127..b82b6bf9 100644
--- a/src/components/Slider.svelte
+++ b/src/components/Slider.svelte
@@ -1,56 +1,56 @@
 <script>
-	export let value,
-		handle,
-		min = 0,
-		max = 100;
+  export let value,
+    handle,
+    min = 0,
+    max = 100;
 </script>
 
 <input
-	id="slider"
-	type="range"
-	{min}
-	{max}
-	bind:value
-	class="px-0 py-0 my-5"
-	style="--bgPercent: {((value - min) * 100) / (max - min)}%;"
-	on:input={handle}
+  id="slider"
+  type="range"
+  {min}
+  {max}
+  bind:value
+  class="px-0 py-0 my-5"
+  style="--bgPercent: {((value - min) * 100) / (max - min)}%;"
+  on:input={handle}
 />
 
 <style>
-	#slider {
-		-webkit-appearance: none;
-		width: 100%;
-		height: 6px;
-		border-radius: 5px;
-		background: linear-gradient(
-			to right,
-			black 0%,
-			black var(--bgPercent),
-			#f5f7fa var(--bgPercent),
-			#f5f7fa 100%
-		);
-		outline: none;
-	}
+  #slider {
+    -webkit-appearance: none;
+    width: 100%;
+    height: 6px;
+    border-radius: 5px;
+    background: linear-gradient(
+      to right,
+      black 0%,
+      black var(--bgPercent),
+      #f5f7fa var(--bgPercent),
+      #f5f7fa 100%
+    );
+    outline: none;
+  }
 
-	#slider:active {
-		background-color: black;
-	}
+  #slider:active {
+    background-color: black;
+  }
 
-	#slider::-webkit-slider-thumb {
-		-webkit-appearance: none;
-		appearance: none;
-		width: 30px;
-		height: 30px;
-		border-radius: 50%;
-		background: black;
-		cursor: pointer;
-	}
+  #slider::-webkit-slider-thumb {
+    -webkit-appearance: none;
+    appearance: none;
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    background: black;
+    cursor: pointer;
+  }
 
-	#slider::-moz-range-thumb {
-		width: 30px;
-		height: 30px;
-		border-radius: 50%;
-		background: black;
-		cursor: pointer;
-	}
+  #slider::-moz-range-thumb {
+    width: 30px;
+    height: 30px;
+    border-radius: 50%;
+    background: black;
+    cursor: pointer;
+  }
 </style>
diff --git a/src/components/Spinner.svelte b/src/components/Spinner.svelte
index eccf98ce..e9c3348f 100644
--- a/src/components/Spinner.svelte
+++ b/src/components/Spinner.svelte
@@ -1,13 +1,20 @@
 <svg
-	class="mx-auto h-6 w-6 animate-spin text-white"
-	xmlns="http://www.w3.org/2000/svg"
-	fill="none"
-	viewBox="0 0 24 24"
+  class="mx-auto h-6 w-6 animate-spin text-white"
+  xmlns="http://www.w3.org/2000/svg"
+  fill="none"
+  viewBox="0 0 24 24"
 >
-	<circle class="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" stroke-width="4" />
-	<path
-		class="opacity-75"
-		fill="currentColor"
-		d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
-	/>
+  <circle
+    class="opacity-25"
+    cx="12"
+    cy="12"
+    r="10"
+    stroke="currentColor"
+    stroke-width="4"
+  />
+  <path
+    class="opacity-75"
+    fill="currentColor"
+    d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
+  />
 </svg>
diff --git a/src/components/Toggle.svelte b/src/components/Toggle.svelte
index 3516e48b..1e4cf4c4 100644
--- a/src/components/Toggle.svelte
+++ b/src/components/Toggle.svelte
@@ -1,11 +1,17 @@
 <script>
-	export let id;
-	export let value;
+  export let id;
+  export let value;
 </script>
 
 <label for={id} class="inline-flex relative items-center mr-5 cursor-pointer">
-	<input type="checkbox" bind:checked={value} {id} name={id} 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"
-	/>
+  <input
+    type="checkbox"
+    bind:checked={value}
+    {id}
+    name={id}
+    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"
+  />
 </label>
diff --git a/src/components/index.js b/src/components/index.js
index 53838581..661ad4fa 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,40 +1,40 @@
-export { default as Popup } from './Popup.svelte';
-export { default as Code } from './Code.svelte';
-export { default as Slider } from './Slider.svelte';
-export { default as Pinpad } from './Pinpad.svelte';
-export { default as Balance } from './Balance.svelte';
-export { default as Lnurlp } from './Lnurlp.svelte';
-export { default as Lnurlw } from './Lnurlw.svelte';
-export { default as Event } from './Event.svelte';
-export { default as Password } from './Password.svelte';
-export { default as Feed } from './Feed.svelte';
-export { default as Invoice } from './Invoice.svelte';
-export { default as Request } from './Request.svelte';
-export { default as Pin } from './Pin.svelte';
-export { default as Card } from './Card.svelte';
-export { default as Lock } from './Lock.svelte';
-export { default as Calendar } from './Calendar.svelte';
-export { default as Avatar } from './Avatar.svelte';
-export { default as Left } from './Left.svelte';
-export { default as Numpad } from './Numpad.svelte';
-export { default as Spinner } from './Spinner.svelte';
-export { default as Check } from './Check.svelte';
-export { default as Heart } from './Heart.svelte';
-export { default as Quote } from './Quote.svelte';
-export { default as LandingHeader } from './LandingHeader.svelte';
-export { default as LandingHero } from './LandingHero.svelte';
-export { default as LandingInfoCard } from './LandingInfoCard.svelte';
-export { default as HowItWorksCard } from './HowItWorksCard.svelte';
-export { default as FaqCard } from './FaqCard.svelte';
-export { default as Icon } from './Icon.svelte';
-export { default as Image } from './Image.svelte';
-export { default as RegisterOrLogin } from './RegisterOrLogin.svelte';
-export { default as AppHeader } from './AppHeader.svelte';
-export { default as LocaleSelector } from './LocaleSelector.svelte';
-export { default as LoadingSplash } from './LoadingSplash.svelte';
-export { default as PageNotFound } from './404.svelte';
-export { default as About } from './About.svelte';
-export { default as Footer } from './Footer.svelte';
-export { default as Toggle } from './Toggle.svelte';
-export { default as LocationsMap } from './LocationsMap.svelte';
-export { default as Qr } from './Qr.svelte';
+export { default as Popup } from "./Popup.svelte";
+export { default as Code } from "./Code.svelte";
+export { default as Slider } from "./Slider.svelte";
+export { default as Pinpad } from "./Pinpad.svelte";
+export { default as Balance } from "./Balance.svelte";
+export { default as Lnurlp } from "./Lnurlp.svelte";
+export { default as Lnurlw } from "./Lnurlw.svelte";
+export { default as Event } from "./Event.svelte";
+export { default as Password } from "./Password.svelte";
+export { default as Feed } from "./Feed.svelte";
+export { default as Invoice } from "./Invoice.svelte";
+export { default as Request } from "./Request.svelte";
+export { default as Pin } from "./Pin.svelte";
+export { default as Card } from "./Card.svelte";
+export { default as Lock } from "./Lock.svelte";
+export { default as Calendar } from "./Calendar.svelte";
+export { default as Avatar } from "./Avatar.svelte";
+export { default as Left } from "./Left.svelte";
+export { default as Numpad } from "./Numpad.svelte";
+export { default as Spinner } from "./Spinner.svelte";
+export { default as Check } from "./Check.svelte";
+export { default as Heart } from "./Heart.svelte";
+export { default as Quote } from "./Quote.svelte";
+export { default as LandingHeader } from "./LandingHeader.svelte";
+export { default as LandingHero } from "./LandingHero.svelte";
+export { default as LandingInfoCard } from "./LandingInfoCard.svelte";
+export { default as HowItWorksCard } from "./HowItWorksCard.svelte";
+export { default as FaqCard } from "./FaqCard.svelte";
+export { default as Icon } from "./Icon.svelte";
+export { default as Image } from "./Image.svelte";
+export { default as RegisterOrLogin } from "./RegisterOrLogin.svelte";
+export { default as AppHeader } from "./AppHeader.svelte";
+export { default as LocaleSelector } from "./LocaleSelector.svelte";
+export { default as LoadingSplash } from "./LoadingSplash.svelte";
+export { default as PageNotFound } from "./404.svelte";
+export { default as About } from "./About.svelte";
+export { default as Footer } from "./Footer.svelte";
+export { default as Toggle } from "./Toggle.svelte";
+export { default as LocationsMap } from "./LocationsMap.svelte";
+export { default as Qr } from "./Qr.svelte";
diff --git a/src/lib/english.js b/src/lib/english.js
index d6c205d9..52a0da82 100644
--- a/src/lib/english.js
+++ b/src/lib/english.js
@@ -2045,4 +2045,4 @@ youth
 zebra
 zero
 zone
-zoo`.split('\n');
+zoo`.split("\n");
diff --git a/src/lib/invoice.js b/src/lib/invoice.js
index 218972c6..87707c89 100644
--- a/src/lib/invoice.js
+++ b/src/lib/invoice.js
@@ -1,36 +1,37 @@
-import { auth, get, post } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
+import { auth, get, post } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export default async ({ cookies, request, url }) => {
-	let form = await request.formData();
-
-	let rates = await get('/rates');
-	let amount = parseInt(form.get('amount'));
-	let request_id = form.get('request_id');
-	if (request_id === 'undefined') request_id = undefined;
-
-	let invoice = {
-		amount,
-		tip: parseInt(form.get('tip')) || 0,
-		type: form.get('type'),
-		prompt: form.get('prompt') === 'true',
-		rate: parseFloat(form.get('rate')) || rates[form.get('currency')],
-		request_id
-	};
-
-	let user = { username: form.get('username'), currency: form.get('currency') };
-
-	invoice = await post('/invoice', { invoice, user }, auth(cookies));
-	let { id } = invoice;
-
-	if (request_id) {
-		if (url.pathname.endsWith('tip')) {
-			throw redirect(307, `/send/invoice/${id}`);
-		}
-
-		throw redirect(307, `/${user.username}/request/${request_id}`);
-	}
-
-	if (invoice.prompt) throw redirect(307, `/${user.username}/invoice/${id}/tip`);
-	else throw redirect(307, `/${user.username}/invoice/${id}`);
+  let form = await request.formData();
+
+  let rates = await get("/rates");
+  let amount = parseInt(form.get("amount"));
+  let request_id = form.get("request_id");
+  if (request_id === "undefined") request_id = undefined;
+
+  let invoice = {
+    amount,
+    tip: parseInt(form.get("tip")) || 0,
+    type: form.get("type"),
+    prompt: form.get("prompt") === "true",
+    rate: parseFloat(form.get("rate")) || rates[form.get("currency")],
+    request_id,
+  };
+
+  let user = { username: form.get("username"), currency: form.get("currency") };
+
+  invoice = await post("/invoice", { invoice, user }, auth(cookies));
+  let { id } = invoice;
+
+  if (request_id) {
+    if (url.pathname.endsWith("tip")) {
+      throw redirect(307, `/send/invoice/${id}`);
+    }
+
+    throw redirect(307, `/${user.username}/request/${request_id}`);
+  }
+
+  if (invoice.prompt)
+    throw redirect(307, `/${user.username}/invoice/${id}/tip`);
+  else throw redirect(307, `/${user.username}/invoice/${id}`);
 };
diff --git a/src/lib/nostr.js b/src/lib/nostr.js
index c2634c83..5ab87e51 100644
--- a/src/lib/nostr.js
+++ b/src/lib/nostr.js
@@ -1,144 +1,164 @@
-import { get } from 'svelte/store';
-import { Buffer } from 'buffer';
-import { fail, wait, post, stretch } from '$lib/utils';
-import { decrypted, password as pw, passwordPrompt, pin, loginRedirect } from '$lib/store';
-import { goto, invalidate } from '$app/navigation';
-import { getPublicKey, signEvent, getEventHash, nip04, nip06, nip19 } from 'nostr-tools';
-import { mnemonicToEntropy, entropyToMnemonic } from '@scure/bip39';
-import wordlist from '$lib/english';
-import { bech32m } from '@scure/base';
+import { get } from "svelte/store";
+import { Buffer } from "buffer";
+import { fail, wait, post, stretch } from "$lib/utils";
+import {
+  decrypted,
+  password as pw,
+  passwordPrompt,
+  pin,
+  loginRedirect,
+} from "$lib/store";
+import { goto, invalidate } from "$app/navigation";
+import {
+  getPublicKey,
+  signEvent,
+  getEventHash,
+  nip04,
+  nip06,
+  nip19,
+} from "nostr-tools";
+import { mnemonicToEntropy, entropyToMnemonic } from "@scure/bip39";
+import wordlist from "$lib/english";
+import { bech32m } from "@scure/base";
 
 const { generateSeedWords, privateKeyFromSeedWords } = nip06;
 const { encode, decode, toWords, fromWords } = bech32m;
 
 export let generate = async (user) => {
-	if (!get(pin)?.length === 6) return;
-	let password = get(pw);
-
-	let salt = crypto.getRandomValues(new Uint8Array(16));
-	let mnemonic = generateSeedWords();
-	let sk = privateKeyFromSeedWords(mnemonic);
-
-	let bytes = new Uint8Array(
-		await crypto.subtle.encrypt(
-			{ name: 'AES-GCM', iv: new Uint8Array(16) },
-			await stretch(password, salt),
-			Uint8Array.from(Buffer.from(mnemonicToEntropy(mnemonic, wordlist), 'hex'))
-		)
-	);
-
-	user.pubkey = getPublicKey(sk);
-	user.cipher = encode('en', toWords(bytes), 180);
-	user.salt = Buffer.from(salt).toString('hex');
+  if (!get(pin)?.length === 6) return;
+  let password = get(pw);
+
+  let salt = crypto.getRandomValues(new Uint8Array(16));
+  let mnemonic = generateSeedWords();
+  let sk = privateKeyFromSeedWords(mnemonic);
+
+  let bytes = new Uint8Array(
+    await crypto.subtle.encrypt(
+      { name: "AES-GCM", iv: new Uint8Array(16) },
+      await stretch(password, salt),
+      Uint8Array.from(Buffer.from(mnemonicToEntropy(mnemonic, wordlist), "hex"))
+    )
+  );
+
+  user.pubkey = getPublicKey(sk);
+  user.cipher = encode("en", toWords(bytes), 180);
+  user.salt = Buffer.from(salt).toString("hex");
 };
 
 export let encrypt = async ({ message, recipient, user }) => {
-	return nip04.encrypt(await getPrivateKey(user), recipient, message);
+  return nip04.encrypt(await getPrivateKey(user), recipient, message);
 };
 
 export let decrypt = async ({ event, user }) => {
-	let cache = get(decrypted);
-	try {
-		let { content, pubkey, id } = event;
-		if (cache[id]) return cache[id];
-		if (pubkey === user.pubkey) pubkey = event.tags[0][1];
-
-		let message = await nip04.decrypt(await getPrivateKey(user), pubkey, content);
-
-		cache[id] = Buffer.from(message).toString('utf8');
-		decrypted.set(cache);
-
-		return cache[id];
-	} catch (e) {
-		// console.log(e);
-	}
+  let cache = get(decrypted);
+  try {
+    let { content, pubkey, id } = event;
+    if (cache[id]) return cache[id];
+    if (pubkey === user.pubkey) pubkey = event.tags[0][1];
+
+    let message = await nip04.decrypt(
+      await getPrivateKey(user),
+      pubkey,
+      content
+    );
+
+    cache[id] = Buffer.from(message).toString("utf8");
+    decrypted.set(cache);
+
+    return cache[id];
+  } catch (e) {
+    // console.log(e);
+  }
 };
 
 function typedArrayToBuffer(array) {
-	return array.buffer.slice(array.byteOffset, array.byteLength + array.byteOffset);
+  return array.buffer.slice(
+    array.byteOffset,
+    array.byteLength + array.byteOffset
+  );
 }
 
 export let getMnemonic = async (user) => {
-	let { cipher, username, salt } = user;
-	let password = get(pw);
+  let { cipher, username, salt } = user;
+  let password = get(pw);
 
-	if (!password) {
-		passwordPrompt.set(true);
-	}
+  if (!password) {
+    passwordPrompt.set(true);
+  }
 
-	try {
-		await post('/password', { password });
-	} catch (e) {
-		passwordPrompt.set(true);
-	}
+  try {
+    await post("/password", { password });
+  } catch (e) {
+    passwordPrompt.set(true);
+  }
 
-	await wait(() => !!get(pw));
-	password = get(pw);
+  await wait(() => !!get(pw));
+  password = get(pw);
 
-	let mnemonic, key, seed, entropy, child, privkey;
+  let mnemonic, key, seed, entropy, child, privkey;
 
-	entropy = new Uint8Array(
-		await crypto.subtle.decrypt(
-			{ name: 'AES-GCM', iv: new Uint8Array(16) },
-			await stretch(password, Buffer.from(salt, 'hex')),
-			Uint8Array.from(fromWords(decode(cipher, 180).words))
-		)
-	);
+  entropy = new Uint8Array(
+    await crypto.subtle.decrypt(
+      { name: "AES-GCM", iv: new Uint8Array(16) },
+      await stretch(password, Buffer.from(salt, "hex")),
+      Uint8Array.from(fromWords(decode(cipher, 180).words))
+    )
+  );
 
-	return entropyToMnemonic(entropy, wordlist);
+  return entropyToMnemonic(entropy, wordlist);
 };
 
 let getPrivateKey = async (user) => {
-	return privateKeyFromSeedWords(await getMnemonic(user));
+  return privateKeyFromSeedWords(await getMnemonic(user));
 };
 
 export let getNsec = async (user) => {
-	return nip19.nsecEncode(await getPrivateKey(user));
+  return nip19.nsecEncode(await getPrivateKey(user));
 };
 
 export let sign = async ({ event, user }) => {
-	event.id = getEventHash(event);
-	event.sig = signEvent(event, await getPrivateKey(user));
+  event.id = getEventHash(event);
+  event.sig = signEvent(event, await getPrivateKey(user));
 };
 
 export let send = (event) => {
-	return post('/events', { event });
+  return post("/events", { event });
 };
 
 export let reEncryptEntropy = async (user, newPassword) => {
-	let { cipher, username, salt } = user;
-	let password = get(pw);
-
-	if (!password) {
-		passwordPrompt.set(true);
-	}
-
-	try {
-		await post('/password', { password });
-	} catch (e) {
-		passwordPrompt.set(true);
-	}
-
-	await wait(() => !!get(pw));
-	password = get(pw);
-
-	let mnemonic, key, seed, entropy, child, privkey;
-	entropy = Buffer.from(
-		await crypto.subtle.decrypt(
-			{ name: 'AES-GCM', iv: new Uint8Array(16) },
-			await stretch(password, Buffer.from(salt, 'hex')),
-			Uint8Array.from(fromWords(decode(cipher, 180).words))
-		),
-		'hex'
-	).toString('hex');
-
-	let bytes = new Uint8Array(
-		await crypto.subtle.encrypt(
-			{ name: 'AES-GCM', iv: new Uint8Array(16) },
-			await stretch(newPassword, Buffer.from(salt, 'hex')),
-			Uint8Array.from(Buffer.from(entropy, 'hex'))
-		)
-	);
-
-	return encode('en', toWords(bytes), 180);
+  let { cipher, username, salt } = user;
+  let password = get(pw);
+
+  if (!password) {
+    passwordPrompt.set(true);
+  }
+
+  try {
+    await post("/password", { password });
+  } catch (e) {
+    passwordPrompt.set(true);
+  }
+
+  await wait(() => !!get(pw));
+  password = get(pw);
+
+  let mnemonic, key, seed, entropy, child, privkey;
+  entropy = Buffer.from(
+    await crypto.subtle.decrypt(
+      { name: "AES-GCM", iv: new Uint8Array(16) },
+      await stretch(password, Buffer.from(salt, "hex")),
+      Uint8Array.from(fromWords(decode(cipher, 180).words))
+    ),
+    "hex"
+  ).toString("hex");
+
+  let bytes = new Uint8Array(
+    await crypto.subtle.encrypt(
+      { name: "AES-GCM", iv: new Uint8Array(16) },
+      await stretch(newPassword, Buffer.from(salt, "hex")),
+      Uint8Array.from(Buffer.from(entropy, "hex"))
+    )
+  );
+
+  return encode("en", toWords(bytes), 180);
 };
diff --git a/src/lib/punks.js b/src/lib/punks.js
index a87feb1f..e5551062 100644
--- a/src/lib/punks.js
+++ b/src/lib/punks.js
@@ -1,66 +1,66 @@
 export default [
-	'6e1f1626a9308abd0b7732fecbc7d49366ced46dead63ef3603fb0f4ec7aa53d',
-	'96ea95735b61c48c6f465db8ca0246a62539f34c3a977be6338770d92461da89',
-	'8c18c036b257d7b9c5a970a786efa04c320f3cf5afa73fa310a6603744d1ee3a',
-	'a7a6187e54e83acdb893d456c8b4ad6877e4738ea9e0d47c9b2070bf2c98a35f',
-	'836d72150b6f3033b6220d15ac9d49457d81041a700d12898bd3b8e737b4d265',
-	'e3d1c40538a8aed282a430647e3ff16ff94b64b8ed0a7cf427e8b0e2780a9b2a',
-	'2155224ef35cfb4bbdb06d982b42bb9b93d97b2bc691c22c804e1759a0a04882',
-	'5f6549ad9dd15dd57c204b1a9b60c68c376e77d7d114cfa13219e6a1a71f901f',
-	'ba8dd5a7070aee7102d4f8bc83ac497091e2e473a0f448a1c513569167dd0791',
-	'4f07e1da3685a858970a9f39300564971e97257f5d37b55a6d9882014aecc421',
-	'01aa9348244c4b65de3df758d49c98076e17a109aef04bc211abc77cf42dc51d',
-	'080574eb9e0613926e0e5d9b667c132e12965a1b1d47218a0b290a2d55c55d2f',
-	'08ce4840184f63a779bcd1f91bbcb56a2e8cba75c3ba2dbd290a559a57e4238e',
-	'27caa38c14a85ad64b4c4469a34e61a3965a1cbc4cad9a85707da374301c830d',
-	'eccc90741370ba4acc70bc65f4ccc38fddb1327d977c366156018974bc52fe4a',
-	'3759946d9e875ac2fc5c51ed850686193bb1e0716219e42efd52f3965993b275',
-	'db5fe28b8ddb9ae5e4f5e0e757ee60bc938bffbdfdd38de807939e212d3c5066',
-	'3f8f861e663accee51e68b987705ce647a7446b7f118abc94c632e158acbb44f',
-	'43bab95a047112dca6705506f916a97252363a20da4a4c0a5ab7b676e11083fc',
-	'd3018e45c66dd485697f738ad191af98267e6255d562496dd06b1a662e0c7a88',
-	'0ec2e8d07e053d686140857493ece653cde52764a60aa1d25651d81811d44a3d',
-	'4595bb092682af7177799464364c047fbfa7ede767336734949bce5d085fce15',
-	'6524936709e0719f9e28bf1caac91f86f323d1a79f10ab65a03fa9ea2e6b3270',
-	'8ba4736edc68da8e5b21c23af4de1f9131f47778c2a5b2a970a799223a9380b3',
-	'2aaba839e8546a8cb6d04a81ff5be83ac4e700ca4491607a16ebd60dc4995750',
-	'5f88f7f579ce50d7bcf60d6e9556f77acf361ba54caf3eb61dc4f2ca9c94c6a2',
-	'd1ca262272613d7386fecce7f1ad268188940b59ea83fdd1f8d7ab85771e3f43',
-	'5211890e4128d8d730802cc75ee105867e8878581d5e72ffc98a0d60027a5398',
-	'c1dececcbd7b623bfaa726392512e6ea110db93a0649dd01bf9e559318514f7c',
-	'43ce93c9835e983403a01329918d184832c5516e1b0ea4e0878b4c4def042777',
-	'c84724a398bda8d20436fb0663d059c196628fa71192bb720fa5adf6137bed9b',
-	'f307620a90a36045fa550316d61be4755c1f6c7f3fc81c95fc4d590ac568b2c4',
-	'78ae0118856a1f17c13f292628fcf3dccc150c7278578caaceb9f35ca8bc9f55',
-	'9d9a9a40c490f05d7dbafde8bf60d68aab7dcb79a7976eef62d1448a4549816b',
-	'f6017bec50563dbbb24b979214ae225f96b01dea5b090b174038ff2842a1c6b1',
-	'6dbec748ea87e959390b0df429c005fccffe9e672864f555c14c7a407b940870',
-	'11701e76233395ebdba8d1d50334d1a0cc3a158f3452260c9a7b9a067b78d753',
-	'7354f3829dd05c838aa16d66b00316f7994797927a4d3b594c8af04a2b4ae86a',
-	'14d254333c6240fbdacbbbe261f7ae15be2e83bffcf084f4f59f459bae0a4571',
-	'7849ac0f31056265efb0110038f86e61effe17b7db836377d88433b73312e65a',
-	'9018be885177c675baf9b36978428d841ca30a9185e11de1a31238a08e3ec1af',
-	'777c5715de7423597fea6c03c496ea46414f0508cd96e119261f002965beb805',
-	'b742b7509a97c2b346ea762f0510e8475b30dc988417f0f146ae00a800c6dd56',
-	'7af3029a826e6dfba23ad502901a3632ef4ee047bd45d618b1f106717b0af7ea',
-	'82390020b2bca461204cc49b20ee6fec1b93dad476726f377785d04040a4d6c3',
-	'6bc2990699be7f610c9f6a49bc7a19b034040727bc3de63fee89a1573fe00673',
-	'50c7c2e8e8c7f4aabffb195187a1ac1105f5712859f02d491d794ba2d8498e08',
-	'5d1d3769cd141603ce907df5dca159e389ca4d75338eddbe1b7db1c0766cbfd6',
-	'4d8ad7a761d068b7ef9b058fb4ba924b276e7a45a3ad47a79b767e08e821e038',
-	'd5b5b2167602f7277cdac76cfda8bdad0befcb8ff12df495dfabf40c91d1120c',
-	'6f2618272bb0164247e9b0f40b19f020c1c9253510dc658a3cc078d079ef01bf',
-	'fd502d5007bfc62a91eb7a34c1ae23b9de4a20cf5e1bbd86dadc421d7083099c',
-	'914813583b901044970b9c7d6dcdfde4344339325f5988d0dd681d377f1243fb',
-	'85cb7cf0245613d08b3027f879f58a6db645bf0db107242beb856b340ee49ee8',
-	'd6dbb18d5df5e92c8c74ee59aa86d19dff25a5d0f9d030e84285a686f86804d7',
-	'65309f82cd9f9926a578d09e1ad13909f68a06d02b853760731a4225f7aecef4',
-	'433519d13f2b64fe82a90cd054797d4779507fea93c1054bd51c35ba846a0f7f',
-	'62a55d4d6e4b6f992a1c1840f041585c957affcdbf875202cf9e1db9def05aeb',
-	'e19eb1eeabdeffa04ccd792eb09776690cf2121887b26a7c5d20d66e3e8fd0fb',
-	'a80951fc593035abb2dda045a2076d29a30f5cc470e0a20db39c3ec588ed61d8',
-	'4f1b39906714266a7a1936bfa8e08c5d891285dd2b188b4bcd4afb0107671004',
-	'f46310b2e60727af071d09e759814f52f933688a0ff0995c7da373b381e70005',
-	'2cc94821f56d21918ba4f2770d97f280e06fd99f4199167e2f4ddc780f404c8a',
-	'698a2ca7a09e88fa6594801da037f4dbce6ae841d1d33736aebcf8f6fe104e01',
+  "6e1f1626a9308abd0b7732fecbc7d49366ced46dead63ef3603fb0f4ec7aa53d",
+  "96ea95735b61c48c6f465db8ca0246a62539f34c3a977be6338770d92461da89",
+  "8c18c036b257d7b9c5a970a786efa04c320f3cf5afa73fa310a6603744d1ee3a",
+  "a7a6187e54e83acdb893d456c8b4ad6877e4738ea9e0d47c9b2070bf2c98a35f",
+  "836d72150b6f3033b6220d15ac9d49457d81041a700d12898bd3b8e737b4d265",
+  "e3d1c40538a8aed282a430647e3ff16ff94b64b8ed0a7cf427e8b0e2780a9b2a",
+  "2155224ef35cfb4bbdb06d982b42bb9b93d97b2bc691c22c804e1759a0a04882",
+  "5f6549ad9dd15dd57c204b1a9b60c68c376e77d7d114cfa13219e6a1a71f901f",
+  "ba8dd5a7070aee7102d4f8bc83ac497091e2e473a0f448a1c513569167dd0791",
+  "4f07e1da3685a858970a9f39300564971e97257f5d37b55a6d9882014aecc421",
+  "01aa9348244c4b65de3df758d49c98076e17a109aef04bc211abc77cf42dc51d",
+  "080574eb9e0613926e0e5d9b667c132e12965a1b1d47218a0b290a2d55c55d2f",
+  "08ce4840184f63a779bcd1f91bbcb56a2e8cba75c3ba2dbd290a559a57e4238e",
+  "27caa38c14a85ad64b4c4469a34e61a3965a1cbc4cad9a85707da374301c830d",
+  "eccc90741370ba4acc70bc65f4ccc38fddb1327d977c366156018974bc52fe4a",
+  "3759946d9e875ac2fc5c51ed850686193bb1e0716219e42efd52f3965993b275",
+  "db5fe28b8ddb9ae5e4f5e0e757ee60bc938bffbdfdd38de807939e212d3c5066",
+  "3f8f861e663accee51e68b987705ce647a7446b7f118abc94c632e158acbb44f",
+  "43bab95a047112dca6705506f916a97252363a20da4a4c0a5ab7b676e11083fc",
+  "d3018e45c66dd485697f738ad191af98267e6255d562496dd06b1a662e0c7a88",
+  "0ec2e8d07e053d686140857493ece653cde52764a60aa1d25651d81811d44a3d",
+  "4595bb092682af7177799464364c047fbfa7ede767336734949bce5d085fce15",
+  "6524936709e0719f9e28bf1caac91f86f323d1a79f10ab65a03fa9ea2e6b3270",
+  "8ba4736edc68da8e5b21c23af4de1f9131f47778c2a5b2a970a799223a9380b3",
+  "2aaba839e8546a8cb6d04a81ff5be83ac4e700ca4491607a16ebd60dc4995750",
+  "5f88f7f579ce50d7bcf60d6e9556f77acf361ba54caf3eb61dc4f2ca9c94c6a2",
+  "d1ca262272613d7386fecce7f1ad268188940b59ea83fdd1f8d7ab85771e3f43",
+  "5211890e4128d8d730802cc75ee105867e8878581d5e72ffc98a0d60027a5398",
+  "c1dececcbd7b623bfaa726392512e6ea110db93a0649dd01bf9e559318514f7c",
+  "43ce93c9835e983403a01329918d184832c5516e1b0ea4e0878b4c4def042777",
+  "c84724a398bda8d20436fb0663d059c196628fa71192bb720fa5adf6137bed9b",
+  "f307620a90a36045fa550316d61be4755c1f6c7f3fc81c95fc4d590ac568b2c4",
+  "78ae0118856a1f17c13f292628fcf3dccc150c7278578caaceb9f35ca8bc9f55",
+  "9d9a9a40c490f05d7dbafde8bf60d68aab7dcb79a7976eef62d1448a4549816b",
+  "f6017bec50563dbbb24b979214ae225f96b01dea5b090b174038ff2842a1c6b1",
+  "6dbec748ea87e959390b0df429c005fccffe9e672864f555c14c7a407b940870",
+  "11701e76233395ebdba8d1d50334d1a0cc3a158f3452260c9a7b9a067b78d753",
+  "7354f3829dd05c838aa16d66b00316f7994797927a4d3b594c8af04a2b4ae86a",
+  "14d254333c6240fbdacbbbe261f7ae15be2e83bffcf084f4f59f459bae0a4571",
+  "7849ac0f31056265efb0110038f86e61effe17b7db836377d88433b73312e65a",
+  "9018be885177c675baf9b36978428d841ca30a9185e11de1a31238a08e3ec1af",
+  "777c5715de7423597fea6c03c496ea46414f0508cd96e119261f002965beb805",
+  "b742b7509a97c2b346ea762f0510e8475b30dc988417f0f146ae00a800c6dd56",
+  "7af3029a826e6dfba23ad502901a3632ef4ee047bd45d618b1f106717b0af7ea",
+  "82390020b2bca461204cc49b20ee6fec1b93dad476726f377785d04040a4d6c3",
+  "6bc2990699be7f610c9f6a49bc7a19b034040727bc3de63fee89a1573fe00673",
+  "50c7c2e8e8c7f4aabffb195187a1ac1105f5712859f02d491d794ba2d8498e08",
+  "5d1d3769cd141603ce907df5dca159e389ca4d75338eddbe1b7db1c0766cbfd6",
+  "4d8ad7a761d068b7ef9b058fb4ba924b276e7a45a3ad47a79b767e08e821e038",
+  "d5b5b2167602f7277cdac76cfda8bdad0befcb8ff12df495dfabf40c91d1120c",
+  "6f2618272bb0164247e9b0f40b19f020c1c9253510dc658a3cc078d079ef01bf",
+  "fd502d5007bfc62a91eb7a34c1ae23b9de4a20cf5e1bbd86dadc421d7083099c",
+  "914813583b901044970b9c7d6dcdfde4344339325f5988d0dd681d377f1243fb",
+  "85cb7cf0245613d08b3027f879f58a6db645bf0db107242beb856b340ee49ee8",
+  "d6dbb18d5df5e92c8c74ee59aa86d19dff25a5d0f9d030e84285a686f86804d7",
+  "65309f82cd9f9926a578d09e1ad13909f68a06d02b853760731a4225f7aecef4",
+  "433519d13f2b64fe82a90cd054797d4779507fea93c1054bd51c35ba846a0f7f",
+  "62a55d4d6e4b6f992a1c1840f041585c957affcdbf875202cf9e1db9def05aeb",
+  "e19eb1eeabdeffa04ccd792eb09776690cf2121887b26a7c5d20d66e3e8fd0fb",
+  "a80951fc593035abb2dda045a2076d29a30f5cc470e0a20db39c3ec588ed61d8",
+  "4f1b39906714266a7a1936bfa8e08c5d891285dd2b188b4bcd4afb0107671004",
+  "f46310b2e60727af071d09e759814f52f933688a0ff0995c7da373b381e70005",
+  "2cc94821f56d21918ba4f2770d97f280e06fd99f4199167e2f4ddc780f404c8a",
+  "698a2ca7a09e88fa6594801da037f4dbce6ae841d1d33736aebcf8f6fe104e01",
 ];
diff --git a/src/lib/samples.js b/src/lib/samples.js
index ac9e2d7e..1a1f5d9c 100644
--- a/src/lib/samples.js
+++ b/src/lib/samples.js
@@ -1,32 +1,32 @@
 export default {
-	register: `curl "https://coinos.io/api/register" -H "content-type: application/json" -d '{
+  register: `curl "https://coinos.io/api/register" -H "content-type: application/json" -d '{
   "user": {
     "username": "demo",
     "password": "hunter2"
   }
 }'`,
-	login: `curl "https://coinos.io/api/login" -H "content-type: application/json" -d '{
+  login: `curl "https://coinos.io/api/login" -H "content-type: application/json" -d '{
   "username": "demo",
   "password": "hunter2"
 }'`,
-	payments: `curl "https://coinos.io/api/payments" 
+  payments: `curl "https://coinos.io/api/payments" 
   -H "content-type: application/json" 
   -H "Authorization: Bearer $token"
 `,
-	lightning: `curl "https://coinos.io/api/payments" 
+  lightning: `curl "https://coinos.io/api/payments" 
   -H "content-type: application/json" 
   -H "Authorization: Bearer $token"
   -d '{
     "payreq": "lnbc1pj94d8fsp5n77k340ps4m9jn7kp8he8yynpddvurv6mcsrrqpnq5l2jxdxzlwqpp5m96pqhc5nrlk8cqsu9ufdxxa43sarp8vwf9egvm2pg9nl0zu9r8qdq2vdhkjmn0wvxqztgcqpjrzjqwhmav82kntsppmkp8jp4vg4h9nns78tsy8mg7ve4lq5txrkp0h56zlarvqqdtcqqsqqqqqqqqqqp6cq9q9qyysgqzxlypywzphyujm3ga5j5csfcmqvlnae0fgnvymkaaw94eeg7py5rqzysyjkr3ev2snq63qpsc69vf54adkd0szvmvwt5cuadjnuy95sq4xfa40"
 }'`,
-	bitcoin: `curl "https://coinos.io/api/payments" 
+  bitcoin: `curl "https://coinos.io/api/payments" 
   -H "content-type: application/json" 
   -H "Authorization: Bearer $token"
   -d '{
     "amount": 5000,
     "hash": "bc1q3unh97w4rmelflrm2hvdwz37d8kray3vn4d5ca"
 }'`,
-	internal: `HASH=$(curl "https://coinos.io/api/invoice" 
+  internal: `HASH=$(curl "https://coinos.io/api/invoice" 
     -H "content-type: application/json" 
     -H "Authorization: Bearer $token"
     -d '{
@@ -46,10 +46,10 @@ export default {
     "amount": 5000,
     "hash": $HASH
 }'`,
-	rates: `curl "https://coinos.io/api/rates" 
+  rates: `curl "https://coinos.io/api/rates" 
   -H "content-type: application/json" 
 }'`,
-	lightningInvoice: `curl "https://coinos.io/api/invoice" 
+  lightningInvoice: `curl "https://coinos.io/api/invoice" 
   -H "content-type: application/json" 
   -H "Authorization: Bearer $token"
   -d '{
@@ -58,7 +58,7 @@ export default {
       "type": "lightning"
     }
 }'`,
-	bitcoinAddress: `curl "https://coinos.io/api/invoice" 
+  bitcoinAddress: `curl "https://coinos.io/api/invoice" 
   -H "content-type: application/json" 
   -H "Authorization: Bearer $token"
   -d '{
@@ -67,7 +67,7 @@ export default {
       "type": "bitcoin"
     }
 }'`,
-	webhook: `curl "https://coinos.io/api/invoice" 
+  webhook: `curl "https://coinos.io/api/invoice" 
   -H "content-type: application/json" 
   -H "Authorization: Bearer $token"
   -d '{
@@ -77,9 +77,9 @@ export default {
       "secret": "webhooksecret"
     }
 }'`,
-	fetchInvoice: `curl "https://coinos.io/api/invoice/bc1qmhfk9stzffhd9umzmld92vff7zg3mdlh7rvvaj" 
+  fetchInvoice: `curl "https://coinos.io/api/invoice/bc1qmhfk9stzffhd9umzmld92vff7zg3mdlh7rvvaj" 
   -H "content-type: application/json"'`,
-	invoiceResponse: `{
+  invoiceResponse: `{
   "amount":3141
   "tip":0
   "type":"bitcoin"
@@ -92,5 +92,5 @@ export default {
   "received":0
   "created":1677537428134
 }`,
-	socketAuth: `echo '{"type":"login","data":{"username":"user","password":"password"}}' | websocat -n https://coinos.io/ws`
+  socketAuth: `echo '{"type":"login","data":{"username":"user","password":"password"}}' | websocat -n https://coinos.io/ws`,
 };
diff --git a/src/lib/socket.js b/src/lib/socket.js
index 96fde317..d51ab39b 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -1,50 +1,58 @@
-import { get } from 'svelte/store';
-import { event, invoice, request, newPayment, last, rate, user } from '$lib/store';
-import { success, sat } from '$lib/utils';
-import { PUBLIC_SOCKET } from '$env/static/public';
-import { invalidate } from '$app/navigation';
-import { browser } from '$app/environment';
+import { get } from "svelte/store";
+import {
+  event,
+  invoice,
+  request,
+  newPayment,
+  last,
+  rate,
+  user,
+} from "$lib/store";
+import { success, sat } from "$lib/utils";
+import { PUBLIC_SOCKET } from "$env/static/public";
+import { invalidate } from "$app/navigation";
+import { browser } from "$app/environment";
 
 let socket, token;
 
-export const auth = () => token && send('login', token);
+export const auth = () => token && send("login", token);
 
 export const send = (type, data) => {
-	socket?.readyState === 1 && socket.send(JSON.stringify({ type, data }));
-	return true;
+  socket?.readyState === 1 && socket.send(JSON.stringify({ type, data }));
+  return true;
 };
 
 export const messages = (data) => ({
-	id() {
-		last.set(Date.now());
-	},
-	invoice() {
-		invoice.set(data);
-	},
-	event() {
-		event.set(data);
-	},
-	rate() {
-		rate.set(data);
-	},
-
-	request() {
-		request.set(data);
-		invalidate('app:invoice');
-	},
-
-	async payment() {
-		let { amount, confirmed } = data;
-		invalidate('app:user');
-		invalidate('app:invoice');
-		invalidate('app:payments');
-
-		if (amount > 0) {
-			success(`${confirmed ? 'Received' : 'Detected'} ${sat(amount)}!`);
-		}
-	},
-
-	connected: auth
+  id() {
+    last.set(Date.now());
+  },
+  invoice() {
+    invoice.set(data);
+  },
+  event() {
+    event.set(data);
+  },
+  rate() {
+    rate.set(data);
+  },
+
+  request() {
+    request.set(data);
+    invalidate("app:invoice");
+  },
+
+  async payment() {
+    let { amount, confirmed } = data;
+    invalidate("app:user");
+    invalidate("app:invoice");
+    invalidate("app:payments");
+
+    if (amount > 0) {
+      success(`${confirmed ? "Received" : "Detected"} ${sat(amount)}!`);
+    }
+  },
+
+  connected: auth,
 });
 
 const initialReconnectDelay = 1000;
@@ -53,39 +61,39 @@ const maxReconnectDelay = 16000;
 let currentReconnectDelay = initialReconnectDelay;
 
 export function connect(t) {
-	token = t;
+  token = t;
 
-	if (socket) return auth();
+  if (socket) return auth();
 
-	socket = new WebSocket(PUBLIC_SOCKET);
-	socket.addEventListener('open', onWebsocketOpen);
-	socket.addEventListener('close', onWebsocketClose);
-	socket.addEventListener('message', onWebsocketMessage);
+  socket = new WebSocket(PUBLIC_SOCKET);
+  socket.addEventListener("open", onWebsocketOpen);
+  socket.addEventListener("close", onWebsocketClose);
+  socket.addEventListener("message", onWebsocketMessage);
 }
 
 export function close() {
-	if (socket) socket.close();
+  if (socket) socket.close();
 }
 
 function onWebsocketMessage(msg) {
-	let { type, data } = JSON.parse(msg.data);
-	messages(data)[type] && messages(data)[type]();
+  let { type, data } = JSON.parse(msg.data);
+  messages(data)[type] && messages(data)[type]();
 }
 
 function onWebsocketOpen() {
-	currentReconnectDelay = initialReconnectDelay;
+  currentReconnectDelay = initialReconnectDelay;
 }
 
 function onWebsocketClose() {
-	socket = null;
-	setTimeout(() => {
-		reconnectToWebsocket();
-	}, currentReconnectDelay + Math.floor(Math.random() * 3000));
+  socket = null;
+  setTimeout(() => {
+    reconnectToWebsocket();
+  }, currentReconnectDelay + Math.floor(Math.random() * 3000));
 }
 
 function reconnectToWebsocket() {
-	if (currentReconnectDelay < maxReconnectDelay) {
-		currentReconnectDelay *= 2;
-	}
-	connect(token);
+  if (currentReconnectDelay < maxReconnectDelay) {
+    currentReconnectDelay *= 2;
+  }
+  connect(token);
 }
diff --git a/src/lib/store.js b/src/lib/store.js
index 403ee816..2ae8c9b9 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -1,56 +1,60 @@
-import { get, writable } from 'svelte/store';
-import { browser } from '$app/environment';
+import { get, writable } from "svelte/store";
+import { browser } from "$app/environment";
 
 const persistSession = (key, defaultValue) => {
-	let s = writable(
-		browser && sessionStorage.getItem(key) && sessionStorage.getItem(key) !== 'undefined'
-			? JSON.parse(sessionStorage.getItem(key))
-			: defaultValue
-	);
+  let s = writable(
+    browser &&
+      sessionStorage.getItem(key) &&
+      sessionStorage.getItem(key) !== "undefined"
+      ? JSON.parse(sessionStorage.getItem(key))
+      : defaultValue
+  );
 
-	s.subscribe((v) => {
-		browser && sessionStorage.setItem(key, JSON.stringify(v));
-	});
+  s.subscribe((v) => {
+    browser && sessionStorage.setItem(key, JSON.stringify(v));
+  });
 
-	return s;
+  return s;
 };
 
 const persistLocal = (key, defaultValue) => {
-	let s = writable(
-		browser && localStorage.getItem(key) && localStorage.getItem(key) !== 'undefined'
-			? JSON.parse(localStorage.getItem(key))
-			: defaultValue
-	);
+  let s = writable(
+    browser &&
+      localStorage.getItem(key) &&
+      localStorage.getItem(key) !== "undefined"
+      ? JSON.parse(localStorage.getItem(key))
+      : defaultValue
+  );
 
-	s.subscribe((v) => {
-		try {
-			browser && localStorage.setItem(key, JSON.stringify(v));
-		} catch (e) {
-			console.log('problem setting key', v);
-			console.log(e);
-		}
-	});
+  s.subscribe((v) => {
+    try {
+      browser && localStorage.setItem(key, JSON.stringify(v));
+    } catch (e) {
+      console.log("problem setting key", v);
+      console.log(e);
+    }
+  });
 
-	return s;
+  return s;
 };
 
-export const animatedRate = persistLocal('rate', 0);
+export const animatedRate = persistLocal("rate", 0);
 export const avatar = writable();
 export const banner = writable();
-export const colorTheme = writable('from-primary to-gradient');
+export const colorTheme = writable("from-primary to-gradient");
 export const event = writable();
 export const events = writable({});
 export const invoice = writable();
 export const last = writable();
 export const loginRedirect = writable();
-export const decrypted = persistLocal('decrypted', {});
-export const newPayment = persistLocal('newPayment');
+export const decrypted = persistLocal("decrypted", {});
+export const newPayment = persistLocal("newPayment");
 export const password = writable();
 export const passwordPrompt = writable();
-export const pin = persistSession('pin');
+export const pin = persistSession("pin");
 export const rate = writable();
 export const request = writable();
 export const requestRedirect = writable();
-export const token = persistSession('token');
+export const token = persistSession("token");
 export const user = writable();
 export const ndef = writable();
diff --git a/src/lib/ticket.js b/src/lib/ticket.js
index e1ebcb8c..73ef7716 100644
--- a/src/lib/ticket.js
+++ b/src/lib/ticket.js
@@ -1,31 +1,31 @@
-import { auth, get, post } from '$lib/utils';
-import { env } from '$env/dynamic/private';
-import tickets from '$lib/tickets';
+import { auth, get, post } from "$lib/utils";
+import { env } from "$env/dynamic/private";
+import tickets from "$lib/tickets";
 
 export const createTicket = async (cookies, username) => {
-	let { ticket } = await get('/ticket');
+  let { ticket } = await get("/ticket");
 
-	let { address } = await post(
-		`/${username}/invoice`,
-		{ invoice: { network: 'liquid' }, user: { username } },
-		auth(cookies)
-	);
+  let { address } = await post(
+    `/${username}/invoice`,
+    { invoice: { network: "liquid" }, user: { username } },
+    auth(cookies)
+  );
 
-	let { asset } = await post(
-		'/assets',
-		{
-			address,
-			name: `Launch Party Ticket ${ticket}`,
-			ticker: 'LPT',
-			precision: 0,
-			asset_amount: '1',
-			token_amount: 0,
-			domain: 'coinos.io',
-			filename: tickets[ticket]
-		},
-		{ authorization: `Bearer ${env.LAUNCH}` }
-	);
+  let { asset } = await post(
+    "/assets",
+    {
+      address,
+      name: `Launch Party Ticket ${ticket}`,
+      ticker: "LPT",
+      precision: 0,
+      asset_amount: "1",
+      token_amount: 0,
+      domain: "coinos.io",
+      filename: tickets[ticket],
+    },
+    { authorization: `Bearer ${env.LAUNCH}` }
+  );
 
-	await post('/ticket', { asset }, { authorization: `Bearer ${env.LAUNCH}` });
-	return asset;
+  await post("/ticket", { asset }, { authorization: `Bearer ${env.LAUNCH}` });
+  return asset;
 };
diff --git a/src/lib/tickets.js b/src/lib/tickets.js
index b0ca0ac0..1f8cbdac 100644
--- a/src/lib/tickets.js
+++ b/src/lib/tickets.js
@@ -1,52 +1,52 @@
 export default [
-	'QmPbFkiXNuaQyfwD4W9GcXP7qWaNd6wFd9KCnJir5mes1J',
-	'QmPVjvbaMxSJRpDxMLYTdUWQbknej1vYLckBQ2pAgxZgJN',
-	'QmVasycSFzCYhyXrcvTE7mN3d6W78RFnrhzg5cRF6Dp6Zq',
-	'QmTmnhjpTBjZdeHwXgT9Dftc3uWMW73qsZpZ5ECrTyiKKZ',
-	'QmWDBiyVPyFkzUrEdvy7DSJe1rBQpene1m6quKAtyjBP6a',
-	'QmcxxzQZwgG7SE9QbHNvoTiCi6Dhs9rrz9roqvxm2JQA88',
-	'Qmd9ThEpXLLHimEzRUWEFrAGLSw5PAHzn2SmwfCnjNLwWt',
-	'Qmc7pWw1yxc2ARBWitDMYiyPkWK61NsXXU8oYAQwNAvcx1',
-	'QmX9Hgw1rMFUgBBuq8QfZZDzLjN5xCED19fwFdDeDDqwmr',
-	'QmconCAyNyaagqKvvfKCbG7Eu8c6vCtkv2ivvxMoFN9YwA',
-	'QmWbFmvViy5gx4JdD5sw5YJETet4ZQcXtYgijYnrsnSZ3a',
-	'QmP6QiiJwoqkduZMqdd5e5htHZ4aYHCsvEu7WEEUknKYa5',
-	'QmefHk8hvBUHsuKugntok5u75Q8i886cnPwsj4LZZB6uWg',
-	'QmdrSDK5ByYHxc88hfDu8hQgK5XYFpXSfPorUXdyTbE437',
-	'QmZ6ZycjRzYpsjnLm1Lfgk1fXXDdhcYRkyfmqYJZVGwADy',
-	'QmSkBxS5yLPjB2VPs89oQRZANsoyodK6s8s52E8GKXr2zt',
-	'QmSn8TCPwq3UZ1Z4eyko76CvQo2H2Hyef1NGboDQN22m5i',
-	'QmP6CTH5zrKMzZwtjy7VaK9NXiq4Gw53kmuRjUbJjeovoe',
-	'QmdwT4yvz9Xf8g3t6irKRoh3Wa7MwRQrcUJckQxyQe1Bc5',
-	'QmcwuHH3bD5JExqjDvKqRQ3V5xEVGqs94qPNVDzaCqJa5a',
-	'QmRfVduHwn8sXwSoyfgZpxSi8L7EjP4LMp6fmijo9VApDp',
-	'Qmc4TGj1Ahbg9HJ9WDXDm2bXsNkT4zRDp8Wdw9wqqdEwuH',
-	'QmY8uQiHMWA8ztf2wAurNFW7eiTHQEUiLTQ2vGceMwVqz3',
-	'QmXiXbaD12F4mkbUSQcKhWshkPU4oi29cUawZGnPk86VVU',
-	'QmZaiAGjvBZBw4suz33s9JQNzY2Kshean2mQQPCa6gKMQe',
-	'Qme8bDSdzX7tanPYf672xXW8vPdkLkeSLqLzHJqidRXsYJ',
-	'QmRJirjuUKgh2AMyBF4jNquaXHFPBtDJf3gKFC614hX7qu',
-	'QmdRoSKSgabcrpekNBPB6T47RBtJnCETYE8ry2a3P37MUe',
-	'QmXoqArruHSghrUGW35vVQHPknBG5Cj939iWWHHXU3B616',
-	'QmYCxtDuoHLMAFhNpifUsLU9ptAeFKwyxSiSEJhDQLMZtN',
-	'QmQZQBw8wgzUsrmVDEejdePK23AEJbk9aUracvxLPyHz2x',
-	'QmSsbu7U3i62AQKuYqfisRo5E6nqdMZfHRKWYJgouaXDxD',
-	'QmaP4adVQuWyqtN4QCXeYXj4nr19Je4EqsaTG1zM9ywqFS',
-	'QmPPsvgfXsiN3wNqdAwHAhQVpw6SZWNpry9Na6R2Xb7zXY',
-	'QmR7z6wQmcfZUvRsVK83GRRboyvwZEDQujLwumMY33nAit',
-	'QmQXgkgorDLPUyQpFbW8aLUW6jioQjUKamtXw5UuNCttDg',
-	'QmcwYBeXt1BPfdSrtSrXFpWctRZ7RDHvmKTttC5hPPTSzG',
-	'QmTUexZnw3xPy3YVdUsqJALwTvy2qFax5b3QpJVMvTCJQb',
-	'QmNLkYXFUvctpfeeDTZxruZE2f834EUnYMM6JJUeTcUB4J',
-	'QmT7544UaTPgKFYMCpPE4unXphNGX71BLZBPKLkxAijSmj',
-	'QmTpVR4dqX1QV4fae5pZ1ACtRcANHwEWCLwpMXFmwE95Sm',
-	'Qmdfyps5fW8d8wstXMfpvpei2DTmaADBWgmxLT7e7uan4P',
-	'QmUSK8byipYoG3H97QpmPrHw9vYrvHygyhkiM81XmaKyxS',
-	'QmQUGRvp96LTw5i8Ly9f5LoMvUpeQHCLGNqC88KV74wEHK',
-	'Qma693TFLh9Z1MeBFzhPHi6Yk4tmTcZY2jogwJ8cPkU2B4',
-	'QmNu8FyMpmkFdbCXGRVG8mKJtMvvCoLP8LNzFsxBQwxQeS',
-	'QmWZHE87PKujL1MGLuFgP3D12o5GQxYbvbeTRgr12f1XMu',
-	'QmcZJn8gPGd3poS9yuiNJh6iP4cn9uy5fnypky71r4sSSw',
-	'QmTwrAF4E9ucpdnrUZFj6EfrQamGv7Qyn7ceSx1DUQYceC',
-	'QmexssxU5iTXypgNqrmrQwMDJnTNxyZUxor5wDLnwb5TZp'
+  "QmPbFkiXNuaQyfwD4W9GcXP7qWaNd6wFd9KCnJir5mes1J",
+  "QmPVjvbaMxSJRpDxMLYTdUWQbknej1vYLckBQ2pAgxZgJN",
+  "QmVasycSFzCYhyXrcvTE7mN3d6W78RFnrhzg5cRF6Dp6Zq",
+  "QmTmnhjpTBjZdeHwXgT9Dftc3uWMW73qsZpZ5ECrTyiKKZ",
+  "QmWDBiyVPyFkzUrEdvy7DSJe1rBQpene1m6quKAtyjBP6a",
+  "QmcxxzQZwgG7SE9QbHNvoTiCi6Dhs9rrz9roqvxm2JQA88",
+  "Qmd9ThEpXLLHimEzRUWEFrAGLSw5PAHzn2SmwfCnjNLwWt",
+  "Qmc7pWw1yxc2ARBWitDMYiyPkWK61NsXXU8oYAQwNAvcx1",
+  "QmX9Hgw1rMFUgBBuq8QfZZDzLjN5xCED19fwFdDeDDqwmr",
+  "QmconCAyNyaagqKvvfKCbG7Eu8c6vCtkv2ivvxMoFN9YwA",
+  "QmWbFmvViy5gx4JdD5sw5YJETet4ZQcXtYgijYnrsnSZ3a",
+  "QmP6QiiJwoqkduZMqdd5e5htHZ4aYHCsvEu7WEEUknKYa5",
+  "QmefHk8hvBUHsuKugntok5u75Q8i886cnPwsj4LZZB6uWg",
+  "QmdrSDK5ByYHxc88hfDu8hQgK5XYFpXSfPorUXdyTbE437",
+  "QmZ6ZycjRzYpsjnLm1Lfgk1fXXDdhcYRkyfmqYJZVGwADy",
+  "QmSkBxS5yLPjB2VPs89oQRZANsoyodK6s8s52E8GKXr2zt",
+  "QmSn8TCPwq3UZ1Z4eyko76CvQo2H2Hyef1NGboDQN22m5i",
+  "QmP6CTH5zrKMzZwtjy7VaK9NXiq4Gw53kmuRjUbJjeovoe",
+  "QmdwT4yvz9Xf8g3t6irKRoh3Wa7MwRQrcUJckQxyQe1Bc5",
+  "QmcwuHH3bD5JExqjDvKqRQ3V5xEVGqs94qPNVDzaCqJa5a",
+  "QmRfVduHwn8sXwSoyfgZpxSi8L7EjP4LMp6fmijo9VApDp",
+  "Qmc4TGj1Ahbg9HJ9WDXDm2bXsNkT4zRDp8Wdw9wqqdEwuH",
+  "QmY8uQiHMWA8ztf2wAurNFW7eiTHQEUiLTQ2vGceMwVqz3",
+  "QmXiXbaD12F4mkbUSQcKhWshkPU4oi29cUawZGnPk86VVU",
+  "QmZaiAGjvBZBw4suz33s9JQNzY2Kshean2mQQPCa6gKMQe",
+  "Qme8bDSdzX7tanPYf672xXW8vPdkLkeSLqLzHJqidRXsYJ",
+  "QmRJirjuUKgh2AMyBF4jNquaXHFPBtDJf3gKFC614hX7qu",
+  "QmdRoSKSgabcrpekNBPB6T47RBtJnCETYE8ry2a3P37MUe",
+  "QmXoqArruHSghrUGW35vVQHPknBG5Cj939iWWHHXU3B616",
+  "QmYCxtDuoHLMAFhNpifUsLU9ptAeFKwyxSiSEJhDQLMZtN",
+  "QmQZQBw8wgzUsrmVDEejdePK23AEJbk9aUracvxLPyHz2x",
+  "QmSsbu7U3i62AQKuYqfisRo5E6nqdMZfHRKWYJgouaXDxD",
+  "QmaP4adVQuWyqtN4QCXeYXj4nr19Je4EqsaTG1zM9ywqFS",
+  "QmPPsvgfXsiN3wNqdAwHAhQVpw6SZWNpry9Na6R2Xb7zXY",
+  "QmR7z6wQmcfZUvRsVK83GRRboyvwZEDQujLwumMY33nAit",
+  "QmQXgkgorDLPUyQpFbW8aLUW6jioQjUKamtXw5UuNCttDg",
+  "QmcwYBeXt1BPfdSrtSrXFpWctRZ7RDHvmKTttC5hPPTSzG",
+  "QmTUexZnw3xPy3YVdUsqJALwTvy2qFax5b3QpJVMvTCJQb",
+  "QmNLkYXFUvctpfeeDTZxruZE2f834EUnYMM6JJUeTcUB4J",
+  "QmT7544UaTPgKFYMCpPE4unXphNGX71BLZBPKLkxAijSmj",
+  "QmTpVR4dqX1QV4fae5pZ1ACtRcANHwEWCLwpMXFmwE95Sm",
+  "Qmdfyps5fW8d8wstXMfpvpei2DTmaADBWgmxLT7e7uan4P",
+  "QmUSK8byipYoG3H97QpmPrHw9vYrvHygyhkiM81XmaKyxS",
+  "QmQUGRvp96LTw5i8Ly9f5LoMvUpeQHCLGNqC88KV74wEHK",
+  "Qma693TFLh9Z1MeBFzhPHi6Yk4tmTcZY2jogwJ8cPkU2B4",
+  "QmNu8FyMpmkFdbCXGRVG8mKJtMvvCoLP8LNzFsxBQwxQeS",
+  "QmWZHE87PKujL1MGLuFgP3D12o5GQxYbvbeTRgr12f1XMu",
+  "QmcZJn8gPGd3poS9yuiNJh6iP4cn9uy5fnypky71r4sSSw",
+  "QmTwrAF4E9ucpdnrUZFj6EfrQamGv7Qyn7ceSx1DUQYceC",
+  "QmexssxU5iTXypgNqrmrQwMDJnTNxyZUxor5wDLnwb5TZp",
 ];
diff --git a/src/lib/translations/index.js b/src/lib/translations/index.js
index 5f4f1754..a07a6dbf 100644
--- a/src/lib/translations/index.js
+++ b/src/lib/translations/index.js
@@ -1,68 +1,71 @@
-import i18n from 'sveltekit-i18n';
-import lang from './lang.json';
+import i18n from "sveltekit-i18n";
+import lang from "./lang.json";
 
 // setup loaders & translations from lang.json data
 function createLocaleLoader(localeCode) {
-	return {
-		locale: localeCode,
-		key: '',
-		loader: async () => (await import(`../../locales/${localeCode}.json`)).default
-	};
+  return {
+    locale: localeCode,
+    key: "",
+    loader: async () =>
+      (await import(`../../locales/${localeCode}.json`)).default,
+  };
 }
 
 const availableLocales = Object.keys(lang);
 const translations = {};
 for (let i = 0; i < availableLocales.length; i++) {
-	translations[availableLocales[i]] = { lang };
+  translations[availableLocales[i]] = { lang };
 }
 const loaders = availableLocales.map(createLocaleLoader);
 
 const config = {
-	initLocale: 'en',
-	fallbackLocale: 'en',
-	translations,
-	loaders: [
-		{
-			locale: 'en',
-			key: '',
-			loader: async () => (await import('../../locales/en.json')).default
-		},
-		{
-			locale: 'es',
-			key: '',
-			loader: async () => (await import('../../locales/es.json')).default
-		},
-		{
-			locale: 'fr',
-			key: '',
-			loader: async () => (await import('../../locales/fr.json')).default
-		},
-		{
-			locale: 'pt',
-			key: '',
-			loader: async () => (await import('../../locales/pt.json')).default
-		},
-		{
-			locale: 'de',
-			key: '',
-			loader: async () => (await import('../../locales/de.json')).default
-		},
-		{
-			locale: 'zh',
-			key: '',
-			loader: async () => (await import('../../locales/zh.json')).default
-		},
-		{
-			locale: 'fa',
-			key: '',
-			loader: async () => (await import('../../locales/fa.json')).default
-		},
-		{
-			locale: 'el',
-			key: '',
-			loader: async () => (await import('../../locales/el.json')).default
-		}
-	]
+  initLocale: "en",
+  fallbackLocale: "en",
+  translations,
+  loaders: [
+    {
+      locale: "en",
+      key: "",
+      loader: async () => (await import("../../locales/en.json")).default,
+    },
+    {
+      locale: "es",
+      key: "",
+      loader: async () => (await import("../../locales/es.json")).default,
+    },
+    {
+      locale: "fr",
+      key: "",
+      loader: async () => (await import("../../locales/fr.json")).default,
+    },
+    {
+      locale: "pt",
+      key: "",
+      loader: async () => (await import("../../locales/pt.json")).default,
+    },
+    {
+      locale: "de",
+      key: "",
+      loader: async () => (await import("../../locales/de.json")).default,
+    },
+    {
+      locale: "zh",
+      key: "",
+      loader: async () => (await import("../../locales/zh.json")).default,
+    },
+    {
+      locale: "fa",
+      key: "",
+      loader: async () => (await import("../../locales/fa.json")).default,
+    },
+    {
+      locale: "el",
+      key: "",
+      loader: async () => (await import("../../locales/el.json")).default,
+    },
+  ],
 };
 
-export const { t, loading, locales, locale, loadTranslations } = new i18n(config);
+export const { t, loading, locales, locale, loadTranslations } = new i18n(
+  config
+);
diff --git a/src/lib/translations/lang.json b/src/lib/translations/lang.json
index 0acc1de6..d18a67e3 100644
--- a/src/lib/translations/lang.json
+++ b/src/lib/translations/lang.json
@@ -1,10 +1,10 @@
 {
-	"en": "English",
-	"fr": "Français",
-	"es": "Español",
-	"de": "Deutsch",
-	"pt": "Português",
-	"zh": "中国人",
-	"fa": "فارسی ",
-	"el": "Ελληνικά"
+  "en": "English",
+  "fr": "Français",
+  "es": "Español",
+  "de": "Deutsch",
+  "pt": "Português",
+  "zh": "中国人",
+  "fa": "فارسی ",
+  "el": "Ελληνικά"
 }
diff --git a/src/lib/upload.js b/src/lib/upload.js
index 92f5290f..552e4a7a 100644
--- a/src/lib/upload.js
+++ b/src/lib/upload.js
@@ -1,19 +1,19 @@
 export const upload = async (file, type, progress, token) => {
-	let url = `/api/upload/${type}`;
-	let formData = new FormData();
-	formData.append('file', file);
+  let url = `/api/upload/${type}`;
+  let formData = new FormData();
+  formData.append("file", file);
 
-	return new Promise((resolve, reject) => {
-		let ajax = new XMLHttpRequest();
-		ajax.addEventListener('load', () => {
-			if (ajax.readyState === ajax.DONE) {
-				if (ajax.status === 200) resolve(ajax.response);
-				else reject(new Error(`Upload failed: ${ajax.response}`));
-			}
-		});
-		ajax.upload.addEventListener('progress', progress, false);
-		ajax.open('POST', url);
-		//	ajax.setRequestHeader('Authorization', `Bearer ${token}`);
-		ajax.send(formData);
-	});
+  return new Promise((resolve, reject) => {
+    let ajax = new XMLHttpRequest();
+    ajax.addEventListener("load", () => {
+      if (ajax.readyState === ajax.DONE) {
+        if (ajax.status === 200) resolve(ajax.response);
+        else reject(new Error(`Upload failed: ${ajax.response}`));
+      }
+    });
+    ajax.upload.addEventListener("progress", progress, false);
+    ajax.open("POST", url);
+    //	ajax.setRequestHeader('Authorization', `Bearer ${token}`);
+    ajax.send(formData);
+  });
 };
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 9b3e5592..c0df81ae 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -1,266 +1,282 @@
-import { browser } from '$app/environment';
-import { toast } from '@zerodevx/svelte-toast';
-import { goto } from '$app/navigation';
-import { PUBLIC_COINOS_URL } from '$env/static/public';
-import { page } from '$app/stores';
-import { get as getStore } from 'svelte/store';
+import { browser } from "$app/environment";
+import { toast } from "@zerodevx/svelte-toast";
+import { goto } from "$app/navigation";
+import { PUBLIC_COINOS_URL } from "$env/static/public";
+import { page } from "$app/stores";
+import { get as getStore } from "svelte/store";
 
 export function scroll(section) {
-	if (getStore(page).url.pathname !== '/') goto('/');
-	setTimeout(() => section.scrollIntoView({ behavior: 'smooth' }), 500);
+  if (getStore(page).url.pathname !== "/") goto("/");
+  setTimeout(() => section.scrollIntoView({ behavior: "smooth" }), 500);
 }
 
-let base = browser ? '' : PUBLIC_COINOS_URL;
+let base = browser ? "" : PUBLIC_COINOS_URL;
 
-export let punk = (k) => Math.floor((parseInt(k.slice(-2), 16) / 256) * 64) + 1 + '.webp';
+export let punk = (k) =>
+  Math.floor((parseInt(k.slice(-2), 16) / 256) * 64) + 1 + ".webp";
 
 export let g = (url, fetch, headers) =>
-	fetch(base + url, { headers })
-		.then((r) => r.text())
-		.then((body) => {
-			try {
-				return JSON.parse(body);
-			} catch (e) {
-				throw new Error(body);
-			}
-		});
+  fetch(base + url, { headers })
+    .then((r) => r.text())
+    .then((body) => {
+      try {
+        return JSON.parse(body);
+      } catch (e) {
+        throw new Error(body);
+      }
+    });
 
 export let get = (url, headers = {}) => {
-	return fetch(base + url, { headers })
-		.then(async (r) => {
-			if (r.ok) return r.text();
-			throw new Error(await r.text());
-		})
-		.then((body) => {
-			try {
-				return JSON.parse(body);
-			} catch (e) {
-				return body;
-			}
-		});
-}
+  return fetch(base + url, { headers })
+    .then(async (r) => {
+      if (r.ok) return r.text();
+      throw new Error(await r.text());
+    })
+    .then((body) => {
+      try {
+        return JSON.parse(body);
+      } catch (e) {
+        return body;
+      }
+    });
+};
 
 export let post = (url, body, headers) => {
-	headers = { ...headers, 'content-type': 'application/json', accept: 'application/json' };
-	return fetch(base + url, { method: 'POST', body: JSON.stringify(body), headers })
-		.then(async (r) => {
-			if (r.ok) return r.text();
-			let text = await r.text();
-
-			let message;
-			try {
-				({ message } = JSON.parse(text));
-			} catch (e) {}
-
-			if (message) throw new Error(message);
-			throw new Error(text);
-		})
-		.then((body) => {
-			try {
-				body = JSON.parse(body);
-			} catch (e) {
-				throw new Error(body);
-			}
-
-			if (body.error instanceof Error) throw body.error;
-			if (body instanceof Error) throw body;
-			if (body.name === 'Error') throw new Error(body.message);
-
-			return body;
-		});
+  headers = {
+    ...headers,
+    "content-type": "application/json",
+    accept: "application/json",
+  };
+  return fetch(base + url, {
+    method: "POST",
+    body: JSON.stringify(body),
+    headers,
+  })
+    .then(async (r) => {
+      if (r.ok) return r.text();
+      let text = await r.text();
+
+      let message;
+      try {
+        ({ message } = JSON.parse(text));
+      } catch (e) {}
+
+      if (message) throw new Error(message);
+      throw new Error(text);
+    })
+    .then((body) => {
+      try {
+        body = JSON.parse(body);
+      } catch (e) {
+        throw new Error(body);
+      }
+
+      if (body.error instanceof Error) throw body.error;
+      if (body instanceof Error) throw body;
+      if (body.name === "Error") throw new Error(body.message);
+
+      return body;
+    });
 };
 
 export let copy = (text) => {
-	navigator.clipboard.writeText(text);
-	success('Copied!');
+  navigator.clipboard.writeText(text);
+  success("Copied!");
 };
 
 export let copyNoNewlines = (text) => {
-	let stripped = text.replace(/\n/g, ' ').replace(/\s+/g, ' ');
-	navigator.clipboard.writeText(stripped);
-	success('Copied!');
+  let stripped = text.replace(/\n/g, " ").replace(/\s+/g, " ");
+  navigator.clipboard.writeText(stripped);
+  success("Copied!");
 };
 
 export function reverseFormat(val, locale) {
-	let parts = new Intl.NumberFormat(locale).formatToParts(1111.1);
-	let group = parts.find((part) => part.type === 'group').value;
-	let decimal = parts.find((part) => part.type === 'decimal').value;
-	let reversedVal = val.replace(new RegExp('\\' + group, 'g'), '');
-	reversedVal = reversedVal.replace(new RegExp('\\' + decimal, 'g'), '.');
-	return Number.isNaN(reversedVal) ? 0 : +reversedVal;
+  let parts = new Intl.NumberFormat(locale).formatToParts(1111.1);
+  let group = parts.find((part) => part.type === "group").value;
+  let decimal = parts.find((part) => part.type === "decimal").value;
+  let reversedVal = val.replace(new RegExp("\\" + group, "g"), "");
+  reversedVal = reversedVal.replace(new RegExp("\\" + decimal, "g"), ".");
+  return Number.isNaN(reversedVal) ? 0 : +reversedVal;
 }
 
 export let protectedRoutes = [/customers/, /settings/, /payments/];
 
 export let success = (m) => {
-	toast.pop();
-	toast.push(m, {
-		theme: {
-			'--toastBarBackground': '#F5F7FA'
-		}
-	});
+  toast.pop();
+  toast.push(m, {
+    theme: {
+      "--toastBarBackground": "#F5F7FA",
+    },
+  });
 };
 
 export let warning = (m) => {
-	toast.pop();
-	toast.push(m, {
-		theme: {
-			'--toastBarBackground': '#FFCE22'
-		}
-	});
+  toast.pop();
+  toast.push(m, {
+    theme: {
+      "--toastBarBackground": "#FFCE22",
+    },
+  });
 };
 export let fail = (m) => {
-	toast.pop();
-	toast.push(m, {
-		theme: {
-			'--toastBarBackground': '#E93535'
-		}
-	});
+  toast.pop();
+  toast.push(m, {
+    theme: {
+      "--toastBarBackground": "#E93535",
+    },
+  });
 };
 export let info = (m) => {
-	toast.pop();
-	toast.push(m, {
-		theme: {
-			'--toastBarBackground': 'white'
-		}
-	});
+  toast.pop();
+  toast.push(m, {
+    theme: {
+      "--toastBarBackground": "white",
+    },
+  });
 };
 
 export let login = async (user, cookies, ip) => {
-	let maxAge = 380 * 24 * 60 * 60;
-
-	let res = await fetch(base + '/login', {
-		method: 'POST',
-		body: JSON.stringify(user),
-		headers: {
-			'content-type': 'application/json',
-			accept: 'application/json',
-			'cf-connecting-ip': ip
-		}
-	});
-	if (res.status === 401) {
-		let text = await res.text();
-		if (text.startsWith('2fa')) throw new Error('2fa');
-	}
-
-	let { token } = await res.json();
-	if (!token) throw new Error('Login failed');
-
-	let expires = new Date();
-	expires.setSeconds(expires.getSeconds() + maxAge);
-
-	let opts = { path: '/', expires };
-	cookies.set('username', user.username, opts);
-	cookies.set('token', token, opts);
+  let maxAge = 380 * 24 * 60 * 60;
+
+  let res = await fetch(base + "/login", {
+    method: "POST",
+    body: JSON.stringify(user),
+    headers: {
+      "content-type": "application/json",
+      accept: "application/json",
+      "cf-connecting-ip": ip,
+    },
+  });
+  if (res.status === 401) {
+    let text = await res.text();
+    if (text.startsWith("2fa")) throw new Error("2fa");
+  }
+
+  let { token } = await res.json();
+  if (!token) throw new Error("Login failed");
+
+  let expires = new Date();
+  expires.setSeconds(expires.getSeconds() + maxAge);
+
+  let opts = { path: "/", expires };
+  cookies.set("username", user.username, opts);
+  cookies.set("token", token, opts);
 };
 
-export let auth = (cookies) => ({ authorization: `Bearer ${cookies.get('token')}` });
+export let auth = (cookies) => ({
+  authorization: `Bearer ${cookies.get("token")}`,
+});
 
 export let fiat = (amount, rate) => (amount * rate) / sats;
 export let fd = async (req) => {
-	let obj = Object.fromEntries(await req.formData());
-	for (let k in obj)
-		(obj[k] === 'undefined' && (obj[k] = undefined)) || (obj[k] === 'false' && (obj[k] = false));
-	return obj;
+  let obj = Object.fromEntries(await req.formData());
+  for (let k in obj)
+    (obj[k] === "undefined" && (obj[k] = undefined)) ||
+      (obj[k] === "false" && (obj[k] = false));
+  return obj;
 };
 
 export let f = (s, currency) =>
-	new Intl.NumberFormat('en-US', {
-		style: 'currency',
-		currency
-	})
-		.format(s)
-		.replace('CA', '');
-
-export let s = (s) => new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(s);
+  new Intl.NumberFormat("en-US", {
+    style: "currency",
+    currency,
+  })
+    .format(s)
+    .replace("CA", "");
+
+export let s = (s) =>
+  new Intl.NumberFormat("en-US", { maximumFractionDigits: 0 }).format(s);
 export let sat = (s) => {
-	s = Math.abs(s);
-	let p = Math.floor(Math.log(s) / Math.LN10 + 0.000000001);
-	let d = Math.floor((p + 1) / 3);
-
-	return (
-		'⚡️' +
-		(parseInt(s) > 0
-			? new Intl.NumberFormat('en-US', { maximumFractionDigits: 2 }).format(s / Math.pow(1000, d)) +
-			  ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z'][d]
-			: 0
-		).toString()
-	);
+  s = Math.abs(s);
+  let p = Math.floor(Math.log(s) / Math.LN10 + 0.000000001);
+  let d = Math.floor((p + 1) / 3);
+
+  return (
+    "⚡️" +
+    (parseInt(s) > 0
+      ? new Intl.NumberFormat("en-US", { maximumFractionDigits: 2 }).format(
+          s / Math.pow(1000, d)
+        ) + ["", "K", "M", "G", "T", "P", "E", "Z"][d]
+      : 0
+    ).toString()
+  );
 };
 
 export let sats = 100000000;
 
-export let back = () => browser && (history.length ? history.go(-1) : goto('/'));
-export let focus = (el) => browser && screen.width > 1280 && setTimeout(() => el.focus(), 1);
+export let back = () =>
+  browser && (history.length ? history.go(-1) : goto("/"));
+export let focus = (el) =>
+  browser && screen.width > 1280 && setTimeout(() => el.focus(), 1);
 
 export let sleep = (n) => new Promise((r) => setTimeout(r, n));
 export let wait = async (f, n = 100, s = 300) => {
-	let i = 0;
-	while (!(await f()) && i < s) (await sleep(n)) && i++;
-	if (i >= s) throw new Error('timeout');
-	return f();
+  let i = 0;
+  while (!(await f()) && i < s) (await sleep(n)) && i++;
+  if (i >= s) throw new Error("timeout");
+  return f();
 };
 
 export let stretch = async (password, salt) =>
-	crypto.subtle.deriveKey(
-		{
-			name: 'PBKDF2',
-			salt,
-			iterations: 100000,
-			hash: 'SHA-256'
-		},
-		await crypto.subtle.importKey(
-			'raw',
-			new TextEncoder().encode(password),
-			{ name: 'PBKDF2' },
-			false,
-			['deriveBits', 'deriveKey']
-		),
-		{ name: 'AES-GCM', length: 256 },
-		true,
-		['encrypt', 'decrypt']
-	);
+  crypto.subtle.deriveKey(
+    {
+      name: "PBKDF2",
+      salt,
+      iterations: 100000,
+      hash: "SHA-256",
+    },
+    await crypto.subtle.importKey(
+      "raw",
+      new TextEncoder().encode(password),
+      { name: "PBKDF2" },
+      false,
+      ["deriveBits", "deriveKey"]
+    ),
+    { name: "AES-GCM", length: 256 },
+    true,
+    ["encrypt", "decrypt"]
+  );
 
 function get_bigrams(string) {
-	var s = string.toLowerCase();
-	var v = s.split('');
-	for (var i = 0; i < v.length; i++) {
-		v[i] = s.slice(i, i + 2);
-	}
-	return v;
+  var s = string.toLowerCase();
+  var v = s.split("");
+  for (var i = 0; i < v.length; i++) {
+    v[i] = s.slice(i, i + 2);
+  }
+  return v;
 }
 
 export function ss(str1, str2) {
-	if (str1.length > 0 && str2.length > 0) {
-		var pairs1 = get_bigrams(str1);
-		var pairs2 = get_bigrams(str2);
-		var union = pairs1.length + pairs2.length;
-		var hits = 0;
-		for (var x = 0; x < pairs1.length; x++) {
-			for (var y = 0; y < pairs2.length; y++) {
-				if (pairs1[x] == pairs2[y]) hit_count++;
-			}
-		}
-		if (hits > 0) return (2.0 * hits) / union;
-	}
-
-	return 0.0;
+  if (str1.length > 0 && str2.length > 0) {
+    var pairs1 = get_bigrams(str1);
+    var pairs2 = get_bigrams(str2);
+    var union = pairs1.length + pairs2.length;
+    var hits = 0;
+    for (var x = 0; x < pairs1.length; x++) {
+      for (var y = 0; y < pairs2.length; y++) {
+        if (pairs1[x] == pairs2[y]) hit_count++;
+      }
+    }
+    if (hits > 0) return (2.0 * hits) / union;
+  }
+
+  return 0.0;
 }
 
 export let types = {
-	bitcoin: 'bitcoin',
-	lightning: 'lightning',
-	internal: 'internal',
-	fund: 'fund',
-	classic: 'classic'
+  bitcoin: "bitcoin",
+  lightning: "lightning",
+  internal: "internal",
+  fund: "fund",
+  classic: "classic",
 };
 
-export let ease = (t) => (t < 0.5 ? 8 * t * t * t * t : 1 - 8 * --t * t * t * t);
-
-	export function shuffleArray(array) {
-		for (let i = array.length - 1; i > 0; i--) {
-			const j = Math.floor(Math.random() * (i + 1));
-			[array[i], array[j]] = [array[j], array[i]];
-		}
-	}
+export let ease = (t) =>
+  t < 0.5 ? 8 * t * t * t * t : 1 - 8 * --t * t * t * t;
 
+export function shuffleArray(array) {
+  for (let i = array.length - 1; i > 0; i--) {
+    const j = Math.floor(Math.random() * (i + 1));
+    [array[i], array[j]] = [array[j], array[i]];
+  }
+}
diff --git a/src/locales/de.json b/src/locales/de.json
index 73fa778e..652ee218 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -1,300 +1,300 @@
 {
-	"404": {
-		"404": "404",
-		"pageNotFound": "Diese Seite konnte nicht gefunden werden."
-	},
-	"about": {
-		"header": "Über uns",
-		"p1": "Coinos ist eine Open-Source-Bitcoin-Bezahl-App. Im September 2012 starteten wir die Entwicklung in Vancouver, um lokalen Händlern eine bequeme Möglichkeit zu bieten, Bitcoin-Zahlungen zu akzeptieren.",
-		"p2": "Sie können den Quellcode herunterladen, um die Coinos-App mit Ihrem eigenen Bitcoin- und Lightning-Node zu verbinden. Gerne helfen wir Ihnen dabei, ein wertvoller Dienstleister sowie Zahlungsanbieter für Ihre Kunden zu werden.",
-		"p3": "Transaktionen zwischen Nutzerkonten auf unserem Server werden Off-Chain durchgeführt. Diese werden sofort abgewickelt und sind völlig kostenlos sowie unlimitiert.",
-		"team": {
-			"header": "Das Team",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Chief Technical Officer",
-				"bio": "Adam ist ein Webentwickler und Bitcoin-Enthusiast, der davon überzeugt ist, dass hartes Geld der Schlüssel zur Steigerung des globalen Wohlstands ist. Er lebt mit seiner Frau Chelsea und seinen zwei Kindern in North Vancouver."
-			},
-			"secondl1ght": {
-				"name": "secondl1ght",
-				"position": "Web Developer",
-				"bio": "Secondl1ght hat sich das Programmieren selbst beigebracht, ist kopfüber in den Bitcoin-Kaninchenbau gesprungen und hat seinen Fiat-Job aufgegeben, um sich voll und ganz auf die Bitcoin-Entwicklung zu konzentrieren. Er wirkt bei Open-Source-Projekten mit, ist ein Verfechter der Privatsphäre und ein Freiheitsliebhaber."
-			},
+  "404": {
+    "404": "404",
+    "pageNotFound": "Diese Seite konnte nicht gefunden werden."
+  },
+  "about": {
+    "header": "Über uns",
+    "p1": "Coinos ist eine Open-Source-Bitcoin-Bezahl-App. Im September 2012 starteten wir die Entwicklung in Vancouver, um lokalen Händlern eine bequeme Möglichkeit zu bieten, Bitcoin-Zahlungen zu akzeptieren.",
+    "p2": "Sie können den Quellcode herunterladen, um die Coinos-App mit Ihrem eigenen Bitcoin- und Lightning-Node zu verbinden. Gerne helfen wir Ihnen dabei, ein wertvoller Dienstleister sowie Zahlungsanbieter für Ihre Kunden zu werden.",
+    "p3": "Transaktionen zwischen Nutzerkonten auf unserem Server werden Off-Chain durchgeführt. Diese werden sofort abgewickelt und sind völlig kostenlos sowie unlimitiert.",
+    "team": {
+      "header": "Das Team",
+      "adam": {
+        "name": "Adam Soltys",
+        "position": "Chief Technical Officer",
+        "bio": "Adam ist ein Webentwickler und Bitcoin-Enthusiast, der davon überzeugt ist, dass hartes Geld der Schlüssel zur Steigerung des globalen Wohlstands ist. Er lebt mit seiner Frau Chelsea und seinen zwei Kindern in North Vancouver."
+      },
+      "secondl1ght": {
+        "name": "secondl1ght",
+        "position": "Web Developer",
+        "bio": "Secondl1ght hat sich das Programmieren selbst beigebracht, ist kopfüber in den Bitcoin-Kaninchenbau gesprungen und hat seinen Fiat-Job aufgegeben, um sich voll und ganz auf die Bitcoin-Entwicklung zu konzentrieren. Er wirkt bei Open-Source-Projekten mit, ist ein Verfechter der Privatsphäre und ein Freiheitsliebhaber."
+      },
 
-			"karnage": {
-				"name": "Karnage",
-				"position": "Product Designer",
-				"bio": "Meine Mission ist es, Startup-Gründern zum Erfolg zu verhelfen. Ich entwickle Produkte, die dabei helfen, dieses Ziel zu erreichen."
-			},
-			"shauna": {
-				"name": "Shauna",
-				"position": "Operations & Marketing",
-				"bio": "Strategie- & Projektmanagement. Unser Universalgenie in allen Bereichen. Findet immer Zeit, um sich auf einen Kaffee zu treffen."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Bitcoin Experte",
-				"bio": "Als zertifizierter Bitcoin-Experte ist Cole ein engagierter Mensch mit großer Leidenschaft für Freiheit. Er entdeckte Bitcoin im Jahr 2016 und beschäftigte sich eingehend damit. Jetzt möchte er das Lightning-Netzwerk so vielen Nutzern wie möglich näherbringen."
-			},
-			"john": {
-				"name": "John Barratt",
-				"position": "Full Stack Web Developer",
-				"bio": "Wenn er nicht gerade programmiert, findet man John in der Natur beim Entdecken der vielen, großartigen Wanderwege, die BC zu bieten hat."
-			}
-		},
-		"locations": {
-			"header": "Standorte",
-			"description": "Hier finden Sie einige Unternehmen, welche bereits Zahlungen mit Bitcoin über Coinos akzeptieren. Wir hoffen, dass Ihr Unternehmen das nächste sein wird!"
-		}
-	},
-	"error": {
-		"header": "Error",
-		"message": "Bitte versuchen Sie es erneut oder kontaktieren Sie unseren Support.",
-		"signIn": "Bitte melden Sie sich an, um fortzufahren."
-	},
-	"faq": {
-		"header": "FAQ",
-		"why": {
-			"question": "Warum Bitcoin akzeptieren?",
-			"answer": "Mit Bitcoin sparen Händler bei den Gebühren, Verbraucher gewinnen an Privatsphäre und Sparer an Kaufkraft. Wir bewerben Ihr Geschäft bei einer begeisterten Gemeinschaft, die bevorzugt in Geschäften einkauft, die Bitcoin akzeptieren."
-		},
-		"cost": {
-			"question": "Was kostet das?",
-			"answer": "Zahlungen auf Ihr Konto zu erhalten ist kostenlos. Auszahlungen an externe Wallets verursachen eine geringe Gebühr, die je nach Netzwerkbedingungen variiert. Wir berechnen 0,1% für die Umwandlung zwischen Lightning und On-Chain Bitcoin. Das Senden zu anderen Coinos-Konten ist kostenlos."
-		},
-		"individuals": {
-			"question": "Wer kann es nutzen?",
-			"answer": "Jeder, überall auf der Welt. Coinos ist sowohl für Einzelpersonen als auch für Unternehmen geeignet."
-		},
-		"compatibility": {
-			"question": "Benötige ich ein spezielles Gerät oder eine spezielle Software?",
-			"answer": "Nein, Coinos ist eine Web-App, die überall funktioniert, wo es Internet gibt. Händler könnten es auf einem Tablet verwenden oder einen QR-Code anbieten, den Kunden mit ihrem Handy scannen können."
-		},
-		"safety": {
-			"question": "Wann wird mein Guthaben beglichen?",
-			"answer": "Lightning-Zahlungen werden sofort beglichen. Sie können Ihr Guthaben innerhalb von Sekunden auf eine andere Wallet übertragen. On-Chain Einzahlungen dauern im Durchschnitt 5-10 Minuten zur Bestätigung."
-		},
-		"pos": {
-			"question": "Kann Coinos mit meinem vorhandenen PoS integriert werden?",
-			"answer": "Wir empfehlen, Verkäufe in Ihrem vorhandenen PoS als Bartransaktionen einzugeben."
-		},
-		"accounting": {
-			"question": "Was ist mit der Buchhaltung?",
-			"answer": "Wir zeigen alle Zahlungen in Ihrer lokalen Währung an und ermöglichen es Ihnen, nach Datum zu filtern, sodass Sie Ihr Einkommen wie gewohnt melden können. Sie können den Verlauf Ihres Kontos in eine CSV-Datei exportieren. Wenn Sie Bitcoin mit Gewinn verkaufen, möchten Sie vielleicht Kapitalerträge melden."
-		},
-		"offramp": {
-			"question": "Kann ich den erhaltenen Bitcoin in meine lokale Währung umwandeln?",
-			"answer": "Sie können Ihre Gelder jederzeit an eine Börse oder einen Makler abziehen, um Ihren Bitcoin zu verkaufen und eine Banküberweisung zu erhalten. Wir könnten bereit sein, direkte Abrechnungen per E-Transfer für ausgewählte kanadische Händler anzubieten."
-		},
-		"bitcoin": {
-			"question": "Was kann ich mit Bitcoin machen?",
-			"answer": "Geben Sie es bei anderen Händlern aus oder decken Sie damit Ihre Ausgaben, indem Sie Ihr Personal, Ihre Lieferanten und Ihren Vermieter dazu bringen, es zu akzeptieren."
-		}
-	},
-	"footer": {
-		"company": "Unternehmen",
-		"followUs": "Folge uns",
-		"github": "GitHub",
-		"jobs": "Jobs",
-		"support": "Support",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"news": "Neuigkeiten"
-	},
-	"howItWorks": {
-		"header": "So funktioniert's",
-		"step1": {
-			"header": "1. Erstellen Sie Ihr Konto",
-			"description": "Sie benötigen nur einen Benutzernamen und ein Passwort - und schon geht's los!"
-		},
-		"step2": {
-			"header": "2. Zahlungen anfordern",
-			"description": "Ganz gleich, wie Sie es normalerweise machen würden, allerdings mit Bitcoin."
-		},
-		"step3": {
-			"header": "3. Das war's!",
-			"description": "Bezahlen Sie mit Ihrem Bitcoin-Bestand bei anderen Händlern oder sparen Sie diese für schlechtere Zeiten - Sie allein haben die Wahl."
-		}
-	},
-	"invoice": {
-		"addTip": "Trinkgeld hinzufügen",
-		"addTipq": "Trinkgeld hinzufügen?",
-		"done": "Fertig",
-		"paymentSuccessful": "Zahlung erhalten!",
-		"invoice": "Rechnung",
-		"total": "Gesamtbetrag",
-		"tip": "Trinkgeld"
-	},
-	"jobs": {
-		"header": "Jobs",
-		"subheader": "Offene Stellen",
-		"pitch1": "Wir sind stets auf der Suche nach Entwicklern, die unser wachsendes Team verstärken möchten (Vollzeit oder Teilzeit, Homeoffice möglich).",
-		"pitch2": "Möchten Sie mit uns an Open-Source-Bitcoin-Projekten arbeiten? Dann werfen Sie doch einen Blick auf unsere offenen Stellen auf",
-		"github": "GitHub",
-		"pitch3": "Wenn wir Ihr Interesse geweckt haben, würden wir uns freuen, von Ihnen zu hören. Schicken Sie uns gerne Ihren Lebenslauf an"
-	},
-	"landing": {
-		"header_before_icon": "Der",
-		"header_with_icon": "einfachste",
-		"header_after_icon": "Weg um Bitcoin in Ihrem Unternehmen zu akzeptieren.",
-		"subheader": "Erweitern Sie Ihren Kundenstamm und Ihren Umsatz, indem Sie Bitcoin mit einer einfach zu bedienenden Web-App akzeptieren. Keine Software oder Hardware ist dafür erforderlich.",
-		"info1": {
-			"title": "Sofortzahlungen über Lightning",
-			"description": "Unmittelbar nachdem die Zahlung von Ihrem Kunden abgeschlossen wurde, ist diese auch bei Ihnen ersichtlich. Sie müssen sich weder um Rücklastschriften kümmern, noch auf Banküberweisungen warten. Sekundenschnelle Abrechnung - und das Beste daran: Es fallen keine 3% Kreditkartenbearbeitungsgebühren an."
-		},
-		"info2": {
-			"title": "Einfache Handhabung",
-			"description1": "Geben Sie einfach einen Betrag in Ihrer Landeswährung ein, teilen Sie den QR-Code mit Ihrem Kunden und schon sind Sie fertig.",
-			"description2": "Wir nehmen Ihnen die ganze Arbeit ab, damit Sie sich auf Ihr Geschäft konzentrieren können.",
-			"description3": "Sie haben jederzeit die Möglichkeit, selbst über Ihr Geld zu verfügen und es sofort abzuheben."
-		},
-		"info3": {
-			"title": "Gestalten Sie Ihre Übersicht nach Ihrem Geschmack",
-			"description": "Passen Sie die Übersicht dem Branding Ihres Unternehmens an oder nutzen Sie unser Standard-Design."
-		}
-	},
-	"login": {
-		"optional": "Optional",
-		"token": "2FA Token",
-		"username": "Benutzername",
-		"password": "Passwort",
-		"email": "E-Mail",
-		"passwordRecommendation": "Wir empfehlen ein langes, zufälliges Passwort, welches mit einem Passwortgenerator erstellt wurde.",
-		"forgotUserOrPassword": "Benutzername oder Passwort vergessen?",
-		"haveAccount": "Bereits registriert?",
-		"noAccount": "Noch nicht registriert?",
-		"register": "Registrieren",
-		"signIn": "Einloggen",
-		"failed": "Login fehlgeschlagen"
-	},
-	"nav": {
-		"profile": "Profil",
-		"startInSeconds": "Jetzt loslegen",
-		"account": "Konto",
-		"signIn": "Einloggen",
-		"signOut": "Ausloggen",
-		"dashboard": "Übersicht",
-		"settings": "Einstellungen",
-		"support": "Support"
-	},
-	"newSiteHeader": "Kommen Sie zu unserer <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">Eröffnungsfeier</a> in Vancouver am 26. Oktober! Auf der Suche nach der alten Coinos-Version? Besuchen Sie <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
-	"news": {
-		"header": "News",
-		"subheader": "Letzte Updates",
-		"update1": ""
-	},
-	"user": {
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Rechnung",
-		"unfollow": "Nicht mehr folgen",
-		"following": "Folgen",
-		"follow": "Folgen",
-		"remove": "Entfernen",
-		"scanToPayBTC": "Den QR-Code scannen um mit Bitcoin zu zahlen",
-		"this": "Das",
-		"lightningAddress": "Lightning Adresse",
-		"dashboard": {
-			"go": "Los",
-			"dashboard": "Übersicht",
-			"accountBalance": "Kontostand",
-			"bitcoinPrice": "Bitcoin Preis:",
-			"conversionFeeWarning": "Es wird eine Abhebungsgebühr von 1% des Gesambetrags erhoben.",
-			"dataFromBinance": "Daten von <span class=\"text-black\">Binance</span>.",
-			"fetchingRate": "Abfragen...",
-			"optionalNote": "Notiz (optional)",
-			"send": "Senden",
-			"receive": "Erhalten",
-			"withdraw": "Senden",
-			"deposit": "Einzahlung",
-			"voucher": "Beleg"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Bitte geben Sie einen Betrag unter 1 Bitcoin ein.",
-			"showQR": "QR-Code zeigen"
-		},
-		"send": {
-			"contacts": "Kontakte",
-			"scan": "Scannen",
-			"paste": "Einfügen",
-			"next": "Weiter",
-			"placeholder": "Geben Sie eine Bitcoin-Adresse, eine Lightning-Rechnung oder einen Coinos-Benutzernamen ein"
-		},
-		"settings": {
-			"bannerImage": "Logo",
-			"profileImage": "Profilbild",
-			"oneTimeCode": "Code eingeben",
-			"accountId": "Kontoverbindung",
-			"header": "Einstellungen",
-			"ACCOUNT": "KONTO",
-			"POINT_OF_SALE": "VERKAUFSSTELLE",
-			"SECURITY": "SICHERHEIT",
-			"locale": "Sprache",
-			"username": "Benutzername",
-			"email": "E-Mail",
-			"newPassword": "Neues Passwort",
-			"businessAddress": "Unternehmensadresse",
-			"emailNotifications": "E-Mail-Benachrichtigungen",
-			"emailNotificationsDescription": "Sie werden per E-Mail benachrichtigt, wenn eine Änderung auf Ihrem Konto vorgenommen wurde oder Ihnen jemand Zahlungen sendet.",
-			"smsNotifications": "SMS-Benachrichtigungen",
-			"smsNotificationsDescription": "Coinos wird Benachrichtigungen per SMS zusenden, wenn diese Funktion aktiviert ist.",
-			"theme": "Farbdesign",
-			"themeDescription": "Wählen Sie aus unseren Standard-Farbdesigns.",
-			"localCurrency": "Landeswährung",
-			"btcUnit": "Bitcoin anzeigen in:",
-			"bitcoin": "Bitcoin",
-			"satoshis": "Satoshis",
-			"securityPIN": "Sicherheitscode",
-			"securityPINDescription": "Legen Sie einen Sicherheitscode fest, der zum Entsperren Ihrer Einstellungen und zum Senden ausgehender Zahlungen verwendet wird.",
-			"setPIN": "Set PIN",
-			"autoLock": "Timer für automatische Sperre",
-			"autoLockDescription": "Ihr Konto wird nach einer bestimmten Zeit automatisch in einen sicheren Modus versetzt:",
-			"twofa": "2-Faktor Authentifizierung",
-			"twofaDescription": "Erhöhen Sie das Sicherheitslevel Ihres Geräts, indem Sie die 2-Faktor-Authentifizierung aktivieren.",
-			"twofaSetup": "2FA einrichten",
-			"twofaDisable": "2FA deaktivieren",
-			"select": "Auswählen",
-			"verifyPIN": "Sicherheitscode verifizieren",
-			"enablePIN": "PIN aktivieren",
-			"disablePIN": "PIN deaktivieren"
-		},
-		"support": {
-			"header": "Support",
-			"email": "E-Mail",
-			"accountName": "Kontoname",
-			"message": "Nachricht",
-			"send": "Senden"
-		}
-	},
-	"payments": {
-		"header": "Transaktionen",
-		"AMOUNT": "GESAMTBETRAG",
-		"TYPE": "TYP",
-		"TIME": "ZEIT",
-		"sent": "Gesendet",
-		"received": "Erhalten",
-		"empty": "Noch keine Transaktionen erhalten.",
-		"send": "Senden",
-		"next": "Weiter",
-		"sendersChoice": "Absender",
-		"sendTo": "Senden an",
-		"to": "an",
-		"pay": "Bezahlen",
-		"requesting": "ersucht um",
-		"sentInvoiceTo": "Rechnung senden an",
-		"sentRequestTo": "Anfrage senden an",
-		"pleasePay": "Bitte bezahlen Sie",
-		"day": "Tag",
-		"week": "Woche",
-		"month": "Monat",
-		"all": "Alles",
-		"export": "Exportieren",
-		"invoice": "Rechnung",
-		"readyToPay": "Steht zur Zahlung bereit",
-		"describeOrder": "Benutzen Sie dieses Feld um Ihre Bestellung zu beschreiben",
-		"requestAnInvoice": "Rechnung anfordern",
-		"submit": "Übermitteln",
-		"isRequesting": "Anfragen",
-		"awaiting": "Warten auf"
-	}
+      "karnage": {
+        "name": "Karnage",
+        "position": "Product Designer",
+        "bio": "Meine Mission ist es, Startup-Gründern zum Erfolg zu verhelfen. Ich entwickle Produkte, die dabei helfen, dieses Ziel zu erreichen."
+      },
+      "shauna": {
+        "name": "Shauna",
+        "position": "Operations & Marketing",
+        "bio": "Strategie- & Projektmanagement. Unser Universalgenie in allen Bereichen. Findet immer Zeit, um sich auf einen Kaffee zu treffen."
+      },
+      "cole": {
+        "name": "Cole",
+        "position": "Bitcoin Experte",
+        "bio": "Als zertifizierter Bitcoin-Experte ist Cole ein engagierter Mensch mit großer Leidenschaft für Freiheit. Er entdeckte Bitcoin im Jahr 2016 und beschäftigte sich eingehend damit. Jetzt möchte er das Lightning-Netzwerk so vielen Nutzern wie möglich näherbringen."
+      },
+      "john": {
+        "name": "John Barratt",
+        "position": "Full Stack Web Developer",
+        "bio": "Wenn er nicht gerade programmiert, findet man John in der Natur beim Entdecken der vielen, großartigen Wanderwege, die BC zu bieten hat."
+      }
+    },
+    "locations": {
+      "header": "Standorte",
+      "description": "Hier finden Sie einige Unternehmen, welche bereits Zahlungen mit Bitcoin über Coinos akzeptieren. Wir hoffen, dass Ihr Unternehmen das nächste sein wird!"
+    }
+  },
+  "error": {
+    "header": "Error",
+    "message": "Bitte versuchen Sie es erneut oder kontaktieren Sie unseren Support.",
+    "signIn": "Bitte melden Sie sich an, um fortzufahren."
+  },
+  "faq": {
+    "header": "FAQ",
+    "why": {
+      "question": "Warum Bitcoin akzeptieren?",
+      "answer": "Mit Bitcoin sparen Händler bei den Gebühren, Verbraucher gewinnen an Privatsphäre und Sparer an Kaufkraft. Wir bewerben Ihr Geschäft bei einer begeisterten Gemeinschaft, die bevorzugt in Geschäften einkauft, die Bitcoin akzeptieren."
+    },
+    "cost": {
+      "question": "Was kostet das?",
+      "answer": "Zahlungen auf Ihr Konto zu erhalten ist kostenlos. Auszahlungen an externe Wallets verursachen eine geringe Gebühr, die je nach Netzwerkbedingungen variiert. Wir berechnen 0,1% für die Umwandlung zwischen Lightning und On-Chain Bitcoin. Das Senden zu anderen Coinos-Konten ist kostenlos."
+    },
+    "individuals": {
+      "question": "Wer kann es nutzen?",
+      "answer": "Jeder, überall auf der Welt. Coinos ist sowohl für Einzelpersonen als auch für Unternehmen geeignet."
+    },
+    "compatibility": {
+      "question": "Benötige ich ein spezielles Gerät oder eine spezielle Software?",
+      "answer": "Nein, Coinos ist eine Web-App, die überall funktioniert, wo es Internet gibt. Händler könnten es auf einem Tablet verwenden oder einen QR-Code anbieten, den Kunden mit ihrem Handy scannen können."
+    },
+    "safety": {
+      "question": "Wann wird mein Guthaben beglichen?",
+      "answer": "Lightning-Zahlungen werden sofort beglichen. Sie können Ihr Guthaben innerhalb von Sekunden auf eine andere Wallet übertragen. On-Chain Einzahlungen dauern im Durchschnitt 5-10 Minuten zur Bestätigung."
+    },
+    "pos": {
+      "question": "Kann Coinos mit meinem vorhandenen PoS integriert werden?",
+      "answer": "Wir empfehlen, Verkäufe in Ihrem vorhandenen PoS als Bartransaktionen einzugeben."
+    },
+    "accounting": {
+      "question": "Was ist mit der Buchhaltung?",
+      "answer": "Wir zeigen alle Zahlungen in Ihrer lokalen Währung an und ermöglichen es Ihnen, nach Datum zu filtern, sodass Sie Ihr Einkommen wie gewohnt melden können. Sie können den Verlauf Ihres Kontos in eine CSV-Datei exportieren. Wenn Sie Bitcoin mit Gewinn verkaufen, möchten Sie vielleicht Kapitalerträge melden."
+    },
+    "offramp": {
+      "question": "Kann ich den erhaltenen Bitcoin in meine lokale Währung umwandeln?",
+      "answer": "Sie können Ihre Gelder jederzeit an eine Börse oder einen Makler abziehen, um Ihren Bitcoin zu verkaufen und eine Banküberweisung zu erhalten. Wir könnten bereit sein, direkte Abrechnungen per E-Transfer für ausgewählte kanadische Händler anzubieten."
+    },
+    "bitcoin": {
+      "question": "Was kann ich mit Bitcoin machen?",
+      "answer": "Geben Sie es bei anderen Händlern aus oder decken Sie damit Ihre Ausgaben, indem Sie Ihr Personal, Ihre Lieferanten und Ihren Vermieter dazu bringen, es zu akzeptieren."
+    }
+  },
+  "footer": {
+    "company": "Unternehmen",
+    "followUs": "Folge uns",
+    "github": "GitHub",
+    "jobs": "Jobs",
+    "support": "Support",
+    "telegram": "Telegram",
+    "twitter": "Twitter",
+    "news": "Neuigkeiten"
+  },
+  "howItWorks": {
+    "header": "So funktioniert's",
+    "step1": {
+      "header": "1. Erstellen Sie Ihr Konto",
+      "description": "Sie benötigen nur einen Benutzernamen und ein Passwort - und schon geht's los!"
+    },
+    "step2": {
+      "header": "2. Zahlungen anfordern",
+      "description": "Ganz gleich, wie Sie es normalerweise machen würden, allerdings mit Bitcoin."
+    },
+    "step3": {
+      "header": "3. Das war's!",
+      "description": "Bezahlen Sie mit Ihrem Bitcoin-Bestand bei anderen Händlern oder sparen Sie diese für schlechtere Zeiten - Sie allein haben die Wahl."
+    }
+  },
+  "invoice": {
+    "addTip": "Trinkgeld hinzufügen",
+    "addTipq": "Trinkgeld hinzufügen?",
+    "done": "Fertig",
+    "paymentSuccessful": "Zahlung erhalten!",
+    "invoice": "Rechnung",
+    "total": "Gesamtbetrag",
+    "tip": "Trinkgeld"
+  },
+  "jobs": {
+    "header": "Jobs",
+    "subheader": "Offene Stellen",
+    "pitch1": "Wir sind stets auf der Suche nach Entwicklern, die unser wachsendes Team verstärken möchten (Vollzeit oder Teilzeit, Homeoffice möglich).",
+    "pitch2": "Möchten Sie mit uns an Open-Source-Bitcoin-Projekten arbeiten? Dann werfen Sie doch einen Blick auf unsere offenen Stellen auf",
+    "github": "GitHub",
+    "pitch3": "Wenn wir Ihr Interesse geweckt haben, würden wir uns freuen, von Ihnen zu hören. Schicken Sie uns gerne Ihren Lebenslauf an"
+  },
+  "landing": {
+    "header_before_icon": "Der",
+    "header_with_icon": "einfachste",
+    "header_after_icon": "Weg um Bitcoin in Ihrem Unternehmen zu akzeptieren.",
+    "subheader": "Erweitern Sie Ihren Kundenstamm und Ihren Umsatz, indem Sie Bitcoin mit einer einfach zu bedienenden Web-App akzeptieren. Keine Software oder Hardware ist dafür erforderlich.",
+    "info1": {
+      "title": "Sofortzahlungen über Lightning",
+      "description": "Unmittelbar nachdem die Zahlung von Ihrem Kunden abgeschlossen wurde, ist diese auch bei Ihnen ersichtlich. Sie müssen sich weder um Rücklastschriften kümmern, noch auf Banküberweisungen warten. Sekundenschnelle Abrechnung - und das Beste daran: Es fallen keine 3% Kreditkartenbearbeitungsgebühren an."
+    },
+    "info2": {
+      "title": "Einfache Handhabung",
+      "description1": "Geben Sie einfach einen Betrag in Ihrer Landeswährung ein, teilen Sie den QR-Code mit Ihrem Kunden und schon sind Sie fertig.",
+      "description2": "Wir nehmen Ihnen die ganze Arbeit ab, damit Sie sich auf Ihr Geschäft konzentrieren können.",
+      "description3": "Sie haben jederzeit die Möglichkeit, selbst über Ihr Geld zu verfügen und es sofort abzuheben."
+    },
+    "info3": {
+      "title": "Gestalten Sie Ihre Übersicht nach Ihrem Geschmack",
+      "description": "Passen Sie die Übersicht dem Branding Ihres Unternehmens an oder nutzen Sie unser Standard-Design."
+    }
+  },
+  "login": {
+    "optional": "Optional",
+    "token": "2FA Token",
+    "username": "Benutzername",
+    "password": "Passwort",
+    "email": "E-Mail",
+    "passwordRecommendation": "Wir empfehlen ein langes, zufälliges Passwort, welches mit einem Passwortgenerator erstellt wurde.",
+    "forgotUserOrPassword": "Benutzername oder Passwort vergessen?",
+    "haveAccount": "Bereits registriert?",
+    "noAccount": "Noch nicht registriert?",
+    "register": "Registrieren",
+    "signIn": "Einloggen",
+    "failed": "Login fehlgeschlagen"
+  },
+  "nav": {
+    "profile": "Profil",
+    "startInSeconds": "Jetzt loslegen",
+    "account": "Konto",
+    "signIn": "Einloggen",
+    "signOut": "Ausloggen",
+    "dashboard": "Übersicht",
+    "settings": "Einstellungen",
+    "support": "Support"
+  },
+  "newSiteHeader": "Kommen Sie zu unserer <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">Eröffnungsfeier</a> in Vancouver am 26. Oktober! Auf der Suche nach der alten Coinos-Version? Besuchen Sie <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
+  "news": {
+    "header": "News",
+    "subheader": "Letzte Updates",
+    "update1": ""
+  },
+  "user": {
+    "bitcoin": "Bitcoin",
+    "lightning": "Lightning",
+    "invoice": "Rechnung",
+    "unfollow": "Nicht mehr folgen",
+    "following": "Folgen",
+    "follow": "Folgen",
+    "remove": "Entfernen",
+    "scanToPayBTC": "Den QR-Code scannen um mit Bitcoin zu zahlen",
+    "this": "Das",
+    "lightningAddress": "Lightning Adresse",
+    "dashboard": {
+      "go": "Los",
+      "dashboard": "Übersicht",
+      "accountBalance": "Kontostand",
+      "bitcoinPrice": "Bitcoin Preis:",
+      "conversionFeeWarning": "Es wird eine Abhebungsgebühr von 1% des Gesambetrags erhoben.",
+      "dataFromBinance": "Daten von <span class=\"text-black\">Binance</span>.",
+      "fetchingRate": "Abfragen...",
+      "optionalNote": "Notiz (optional)",
+      "send": "Senden",
+      "receive": "Erhalten",
+      "withdraw": "Senden",
+      "deposit": "Einzahlung",
+      "voucher": "Beleg"
+    },
+    "receive": {
+      "lessThan1BTCWarning": "Bitte geben Sie einen Betrag unter 1 Bitcoin ein.",
+      "showQR": "QR-Code zeigen"
+    },
+    "send": {
+      "contacts": "Kontakte",
+      "scan": "Scannen",
+      "paste": "Einfügen",
+      "next": "Weiter",
+      "placeholder": "Geben Sie eine Bitcoin-Adresse, eine Lightning-Rechnung oder einen Coinos-Benutzernamen ein"
+    },
+    "settings": {
+      "bannerImage": "Logo",
+      "profileImage": "Profilbild",
+      "oneTimeCode": "Code eingeben",
+      "accountId": "Kontoverbindung",
+      "header": "Einstellungen",
+      "ACCOUNT": "KONTO",
+      "POINT_OF_SALE": "VERKAUFSSTELLE",
+      "SECURITY": "SICHERHEIT",
+      "locale": "Sprache",
+      "username": "Benutzername",
+      "email": "E-Mail",
+      "newPassword": "Neues Passwort",
+      "businessAddress": "Unternehmensadresse",
+      "emailNotifications": "E-Mail-Benachrichtigungen",
+      "emailNotificationsDescription": "Sie werden per E-Mail benachrichtigt, wenn eine Änderung auf Ihrem Konto vorgenommen wurde oder Ihnen jemand Zahlungen sendet.",
+      "smsNotifications": "SMS-Benachrichtigungen",
+      "smsNotificationsDescription": "Coinos wird Benachrichtigungen per SMS zusenden, wenn diese Funktion aktiviert ist.",
+      "theme": "Farbdesign",
+      "themeDescription": "Wählen Sie aus unseren Standard-Farbdesigns.",
+      "localCurrency": "Landeswährung",
+      "btcUnit": "Bitcoin anzeigen in:",
+      "bitcoin": "Bitcoin",
+      "satoshis": "Satoshis",
+      "securityPIN": "Sicherheitscode",
+      "securityPINDescription": "Legen Sie einen Sicherheitscode fest, der zum Entsperren Ihrer Einstellungen und zum Senden ausgehender Zahlungen verwendet wird.",
+      "setPIN": "Set PIN",
+      "autoLock": "Timer für automatische Sperre",
+      "autoLockDescription": "Ihr Konto wird nach einer bestimmten Zeit automatisch in einen sicheren Modus versetzt:",
+      "twofa": "2-Faktor Authentifizierung",
+      "twofaDescription": "Erhöhen Sie das Sicherheitslevel Ihres Geräts, indem Sie die 2-Faktor-Authentifizierung aktivieren.",
+      "twofaSetup": "2FA einrichten",
+      "twofaDisable": "2FA deaktivieren",
+      "select": "Auswählen",
+      "verifyPIN": "Sicherheitscode verifizieren",
+      "enablePIN": "PIN aktivieren",
+      "disablePIN": "PIN deaktivieren"
+    },
+    "support": {
+      "header": "Support",
+      "email": "E-Mail",
+      "accountName": "Kontoname",
+      "message": "Nachricht",
+      "send": "Senden"
+    }
+  },
+  "payments": {
+    "header": "Transaktionen",
+    "AMOUNT": "GESAMTBETRAG",
+    "TYPE": "TYP",
+    "TIME": "ZEIT",
+    "sent": "Gesendet",
+    "received": "Erhalten",
+    "empty": "Noch keine Transaktionen erhalten.",
+    "send": "Senden",
+    "next": "Weiter",
+    "sendersChoice": "Absender",
+    "sendTo": "Senden an",
+    "to": "an",
+    "pay": "Bezahlen",
+    "requesting": "ersucht um",
+    "sentInvoiceTo": "Rechnung senden an",
+    "sentRequestTo": "Anfrage senden an",
+    "pleasePay": "Bitte bezahlen Sie",
+    "day": "Tag",
+    "week": "Woche",
+    "month": "Monat",
+    "all": "Alles",
+    "export": "Exportieren",
+    "invoice": "Rechnung",
+    "readyToPay": "Steht zur Zahlung bereit",
+    "describeOrder": "Benutzen Sie dieses Feld um Ihre Bestellung zu beschreiben",
+    "requestAnInvoice": "Rechnung anfordern",
+    "submit": "Übermitteln",
+    "isRequesting": "Anfragen",
+    "awaiting": "Warten auf"
+  }
 }
diff --git a/src/locales/el.json b/src/locales/el.json
index d94c2627..198ce457 100644
--- a/src/locales/el.json
+++ b/src/locales/el.json
@@ -1,298 +1,298 @@
 {
-	"404": {
-		"404": "404",
-		"pageNotFound": "Η σελίδα δεν βρέθηκε."
-	},
-	"about": {
-		"header": "Σχετικά με",
-		"team": {
-			"header": "Η Oμάδα",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Επικεφαλής Τεχνικός Διευθυντής",
-				"bio": "Ο Adam είναι προγραμματιστής ιστού και λάτρης του bitcoin που πιστεύει ότι το ισχυρό νόμισμα είναι το κλειδί για την αύξηση της παγκόσμιας ευημερίας. Ζει στο Βόρειο Vancouver με τη σύζυγό του Chelsea και τα δύο παιδιά του."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Πιστοποιημένος Eπαγγελματίας Bitcoin",
-				"bio": "Ο Cole είναι ένα άτομο με πάθος για ελευθερία. Ήρθε σε επαφή με το bitcoin το 2016 και το μελέτησε σε βάθος. Τώρα θέλει να εισαγάγει το δίκτυο lightning σε όσο το δυνατόν περισσότερους χρήστες."
-			}
-		},
-		"locations": {
-			"header": "Τοποθεσίες",
-			"description": "Ακολουθούν ορισμένες επιχειρήσεις που δέχονται bitcoin με Coinos. Ελπίζουμε ότι η δική σας θα είναι η επόμενη!"
-		}
-	},
-	"error": {
-		"header": "Σφάλμα",
-		"message": "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με την υποστήριξη.",
-		"signIn": "Συνδεθείτε για να συνεχίσετε."
-	},
-	"faq": {
-		"header": "Συχνές Ερωτήσεις",
-		"why": {
-			"question": "Γιατί να δεχτώ Bitcoin;",
-			"answer": "Με το Bitcoin, οι εμπόροι εξοικονομούν σε τέλη, οι καταναλωτές αποκτούν ιδιωτικότητα και οι αποταμιευτές αυξάνουν την αγοραστική τους δύναμη. Θα προωθήσουμε την επιχείρησή σας σε μια ενθουσιασμένη κοινότητα που προτιμά να ψωνίζει σε μέρη που δέχονται Bitcoin."
-		},
-		"cost": {
-			"question": "Πόσο κοστίζει;",
-			"answer": "Η λήψη πληρωμών στον λογαριασμό σας είναι δωρεάν. Οι αναλήψεις σε εξωτερικά πορτοφόλια έχουν μικρή χρέωση που διαφέρει ανάλογα με τις συνθήκες του δικτύου. Χρεώνουμε 0,1% για τη μετατροπή μεταξύ lightning και on-chain Bitcoin. Η αποστολή σε άλλους λογαριασμούς Coinos είναι δωρεάν."
-		},
-		"individuals": {
-			"question": "Ποιος μπορεί να το χρησιμοποιήσει;",
-			"answer": "Οποιοσδήποτε, οπουδήποτε στον κόσμο. Το Coinos είναι κατάλληλο τόσο για ιδιώτες όσο και για επιχειρήσεις."
-		},
-		"compatibility": {
-			"question": "Χρειάζομαι κάποια ειδική συσκευή ή λογισμικό;",
-			"answer": "Όχι, το Coinos είναι μια εφαρμογή ιστού που λειτουργεί οπουδήποτε υπάρχει Ίντερνετ. Οι εμπόροι μπορεί να το χρησιμοποιούν σε tablet ή να παρέχουν έναν κώδικα QR για τους πελάτες να σκανάρουν με το τηλέφωνό τους."
-		},
-		"safety": {
-			"question": "Πότε εξοφλούνται τα χρήματά μου;",
-			"answer": "Οι πληρωμές μέσω Lightning εξοφλούνται άμεσα. Μπορείτε να αναλάβετε το υπόλοιπό σας σε άλλο πορτοφόλι μέσα σε δευτερόλεπτα. Οι καταθέσεις on-chain χρειάζονται κατά μέσο όρο 5-10 λεπτά για επιβεβαίωση."
-		},
-		"pos": {
-			"question": "Μπορεί το Coinos να ενσωματωθεί στο υπάρχον PoS μου;",
-			"answer": "Συνιστούμε να καταχωρίσετε τις πωλήσεις στο υπάρχον PoS σας ως συναλλαγές μετρητών."
-		},
-		"accounting": {
-			"question": "Τι γίνεται με τη λογιστική;",
-			"answer": "Εμφανίζουμε όλες τις πληρωμές σε όρους του τοπικού σας νομίσματος και σας επιτρέπουμε να φιλτράρετε ανά ημερομηνία, ώστε να μπορείτε να δηλώνετε το εισόδημά σας κανονικά. Μπορείτε να εξαγάγετε το ιστορικό του λογαριασμού σας σε ένα αρχείο csv. Εάν πουλήσετε Bitcoin με κέρδος, μπορεί να επιθυμείτε να αναφέρετε τα κερδηφόρα κεφάλαια."
-		},
-		"offramp": {
-			"question": "Μπορώ να μετατρέψω το Bitcoin που λαμβάνω στο τοπικό μου νόμισμα;",
-			"answer": "Μπορείτε να αναλάβετε τα χρήματά σας ανά πάσα στιγμή σε ένα χρηματιστήριο ή σε έναν μεσίτη για να πουλήσετε το Bitcoin σας και να λάβετε μια τραπεζική μεταφορά. Ίσως είμαστε πρόθυμοι να προσφέρουμε άμεσες εκκαθαρίσεις μέσω E-Transfer για επιλεγμένους καναδικούς εμπόρους."
-		},
-		"bitcoin": {
-			"question": "Τι μπορώ να κάνω με το Bitcoin;",
-			"answer": "Ξοδέψτε το σε άλλους εμπόρους ή καλύψτε τις δαπάνες σας παίρνοντας το προσωπικό σας, τους προμηθευτές σας και τον ιδιοκτήτη να το δεχτούν."
-		}
+  "404": {
+    "404": "404",
+    "pageNotFound": "Η σελίδα δεν βρέθηκε."
   },
-	"footer": {
-		"company": "Εταιρία",
-		"followUs": "Ακολουθησε μας",
-		"github": "GitHub",
-		"linktree": "Linktree",
-		"jobs": "Linktree",
-		"support": "Υποστήριξη",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"documentation": "Τεκμηρίωση"
-	},
-	"howItWorks": {
-		"header": "Πως δουλεύει",
-		"step1": {
-			"header": "1. Δημιουργήστε τον λογαριασμό σας",
-			"description": "Ένα όνομα χρήστη και κωδικός πρόσβασης είναι όλα όσα χρειάζεστε για να ξεκινήσετε."
-		},
-		"step2": {
-			"header": "2. Ζητήστε πληρωμές",
-			"description": "Ότι θα κάνατε συνήθως, αλλά με το bitcoin."
-		},
-		"step3": {
-			"header": "3. Αυτό είναι όλο!",
-			"description": "Ξοδέψτε το νόμισμά σας αμέσως ή αποθηκεύστε το και δείτε το να αυξάνεται, η επιλογή είναι δική σας."
-		}
-	},
-	"invoice": {
-		"addTip": "Προσθήκη φιλοδωρήματος",
-		"addTipq": "Προσθήκη φιλοδωρήματος;",
-		"done": "Εγινε",
-		"paymentSuccessful": "Η πληρωμή ελήφθη!",
-		"invoice": "Τιμολόγιο",
-		"total": "Σύνολο",
-		"tip": "Φιλοδώρημα"
-	},
-	"jobs": {
-		"header": "Δουλειές",
-		"subheader": "Τρέχουσες θέσεις εργασίας",
-		"pitch1": "«Η Coinos αναζητά ενεργά προγραμματιστές για να ενταχθούν στην αναπτυσσόμενη ομάδα μας (πλήρους ή μερικής απασχόλησης, απομακρυσμένη εργασία αποδεκτή) ",
-		"pitch2": "Είστε ενθουσιασμενοι που εργάζεστε σε bitcoin ανοιχτού κώδικα; Τότε ρίξτε μια ματιά στα αποθετήρια μας στο",
-		"github": "GitHub",
-		"pitch3": "Αν πιστεύετε ότι μπορείτε να ασκήσετε επιρροή, θα θέλαμε να σας ακούσουμε. Στείλτε μας το βιογραφικό σας στ"
-	},
-	"landing": {
-		"header_before_icon": "Ο",
-		"header_with_icon": "πιο εύκολος",
-		"header_after_icon": "τρόπος για να ξεκινήσετε με το bitcoin ",
-		"subheader": "Ένα απλό αλλά ισχυρό πορτοφόλι ιστού για όλους. Δεν απαιτείται software ή hardware",
-		"info1": {
-			"title": "Άμεσες πληρωμές μέσω Lightning",
-			"description": "Διευκολύνουμε τους εμπόρους να λαμβάνουν πληρωμές λιανικής. Χωρίς αναμονή για τραπεζικούς διακανονισμούς ή ανησυχία για αντιστροφές χρεώσεων "
-		},
-		"info2": {
-			"title": "Απλό στη χρήση",
-			"description1": "Απλώς πληκτρολογήστε ένα ποσό στο τοπικό σας νόμισμα, μοιραστείτε τον κωδικό QR και τελειώσατε.",
-			"description2": "Αναλαμβάνουμε τη δύσκολη δουλειά, ώστε να μπορείτε να επικεντρωθείτε στην επιχείρησή σας.",
-			"description3": "Έχετε πάντα τη δυνατότητα να αναλάβετε τη διαχείριση των χρημάτων σας, κάνοντας ανάληψη άμεσα και ανά πάσα στιγμή "
-		},
-		"info3": {
-			"title": "Φτιάξτε το με τον δικό σας τρόπο!",
-			"description": "Προσαρμόστε την εμφάνιση και την αίσθηση της σελίδας του προφίλ σας ή διατηρήστε την ως προεπιλογή - εξαρτάται αποκλειστικά από εσάς "
-		}
-	},
-	"login": {
-		"optional": "Προαιρετικό",
-		"token": "2FA Token",
-		"username": "Όνομα χρήστη",
-		"password": "Κωδικός πρόσβασης",
-		"email": "Διεύθυνση Ηλεκτρονικού Ταχυδρομείου",
-		"passwordRecommendation": "Συνιστούμε ένα μεγάλο, τυχαίο κωδικό πρόσβασης που δημιουργείται με έναν διαχειριστή κωδικών πρόσβασης ",
-		"forgotUserOrPassword": "Ξεχάσατε το όνομα χρήστη ή τον κωδικό πρόσβασης;",
-		"haveAccount": "Εχετε ήδη λογαριασμό;",
-		"noAccount": "Δεν έχετε λογαριασμό;",
-		"register": "Έγγραφη",
-		"signIn": "Σύνδεση",
-		"failed": "Η σύνδεση απέτυχ"
-	},
-	"nav": {
-		"profile": "Προφίλ",
-		"startInSeconds": "Ξεκινήστε σε δευτερόλεπτα",
-		"account": "Λογαριασμός",
-		"signIn": "Σύνδεση",
-		"signOut": "Αποσύνδεση",
-		"dashboard": "Πίνακας Ελέγχου",
-		"settings": "Ρυθμίσεις",
-		"support": "Υποστήριξ"
-	},
-	"news": {
-		"header": "Νέα",
-		"subheader": "Τελευταίες ενημερώσεις"
-	},
-	"user": {
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Τιμολόγιο",
-		"unfollow": "Κατάργηση παρακολούθησης",
-		"following": "Ακολουθείτε",
-		"follow": "Ακολουθήστε",
-		"followers": "Ακόλουθοι",
-		"remove": "Αφαίρεση",
-		"noNotes": "Δεν υπάρχουν σημειώσεις ακόμα",
-		"message": "Μήνυμα",
-		"messages": "Μηνύματα",
-		"feed": "Ροή",
-		"notes": "Σημειώσεις",
-		"pay": "Πληρωμή",
-		"scanToPayBTC": "Σάρωση για πληρωμή με bitcoin",
-		"this": "Αυτό",
-		"lightningAddress": "διεύθυνση lightning",
-		"dashboard": {
-			"go": "Πηγαίνετε",
-			"dashboard": "Πίνακας Ελέγχου",
-			"accountBalance": "Υπόλοιπο Λογαριασμού",
-			"bitcoinPrice": "Τιμή bitcoin:",
-			"conversionFeeWarning": "Θα χρεωθείτε με χρέωση ανάληψης 1% επί του ποσού ",
-			"send": "Αποστολή",
-			"receive": "Λήψη",
-			"withdraw": "Αποστολή",
-			"deposit": "Κατάθεση",
-			"voucher": "Κουπόν"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Παρακαλώ εισάγετε ένα ποσό μικρότερο από 1 bitcoin ",
-			"showQR": "Εμφάνιση Q"
-		},
-		"send": {
-			"contacts": "Επαφές",
-			"scan": "Σάρωση",
-			"paste": "Επικόλληση",
-			"next": "Επόμενο",
-			"placeholder": "Επικολλήστε μια διεύθυνση bitcoin, ένα τιμολόγιο lighting ή ένα όνομα χρήστη coino"
-		},
-		"settings": {
-			"saveSettings": "Αποθήκευση ρυθμίσεων",
-			"bannerImage": "Εικόνα Banner",
-			"profileImage": "Εικόνα Προφίλ",
-			"oneTimeCode": "Εισαγάγετε κωδικό μίας χρήσης",
-			"accountId": "Μυστικός λογαριασμός",
-			"header": "Ρυθμίσεις",
-			"ACCOUNT": "ΛΟΓΑΡΙΑΣΜΟΣ",
-			"POINT_OF_SALE": "ΠΡΟΤΙΜΗΣΕΙΣ",
-			"SECURITY": "ΑΣΦΑΛΕΙΑ",
-			"locale": "Γλώσσα",
-			"username": "Όνομα χρήστη",
-			"email": "Ηλεκτρονικό Ταχυδρομεί",
-			"newPassword": "Αλλαγή κωδικού",
-			"about": "Σχετικά με",
-			"aboutPlaceholder": "Λίγα πράγματα για εσάς ή τη διεύθυνση και τις ώρες της επιχείρησής σας",
-			"emailNotifications": "Ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
-			"emailNotificationsDescription": "Λάβετε ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου όταν συμβαίνει μια αλλαγή στο λογαριασμό σας ή όταν οι άνθρωποι σας στέλνουν πληρωμές ",
-			"smsNotifications": "Ειδοποιήσεις SMS",
-			"smsNotificationsDescription": "Το Coinos θα σας στείλει ειδοποιήσεις κειμένου όταν αυτές είναι ενεργοποιημένες ",
-			"theme": "Χρωματικό θέμα",
-			"tipPrompt": "Προτροπή για φιλοδώρημα",
-			"tipPromptDescription": "Ρωτήστε τους ανθρώπους εάν θέλουν να προσθέσουν ένα φιλοδώρημα πριν πληρώσουν τα τιμολόγιά τους",
-			"displayName": "Εμφανιζόμενο όνομα",
-			"themeDescription": "Επιλέξτε από τα προεπιλεγμένα χρωματικά θέματα.",
-			"localCurrency": "Νόμισμα",
-			"btcUnit": "Εμφάνιση bitcoin σε:",
-			"bitcoin": "bitcoin",
-			"minutes": "λεπτά",
-			"hour": "ώρα",
-			"hours": "ώρες",
-			"satoshis": "Satoshis",
-			"securityPIN": "PIN Ασφαλείας",
-			"securityPINDescription": "Ορίστε μια καρφίτσα ασφαλείας που θα χρησιμοποιείται για το ξεκλείδωμα των ρυθμίσεών σας και για την αποστολή εξερχόμενων πληρωμών ",
-			"setPIN": "Ορισμός PIN",
-			"autoLock": "Αυτόματο κλείδωμα χρονοδιακόπτη",
-			"autoLockDescription": "Ο λογαριασμός σας θα μεταβεί σε ασφαλή λειτουργία, απαιτώντας από εσάς να εισαγάγετε ξανά τα διαπιστευτήριά σας μετά από μια καθορισμένη ώρα:",
-			"twofa": "Έλεγχος ταυτότητας 2 παραγόντων",
-			"twofaDescription": "Προσθέστε ένα επιπλέον επίπεδο ασφάλειας στη συσκευή σας ενεργοποιώντας τον έλεγχο ταυτότητας 2 παραγόντων ",
-			"twofaSetup": "Ρύθμιση 2FA",
-			"twofaDisable": "Απενεργοποίηση 2FA",
-			"select": "Επιλογή",
-			"verifyPIN": "Επαλήθευση PIN",
-			"enablePIN": "Ενεργοποίηση PIN",
-			"disablePIN": "Απενεργοποίηση PI"
-		},
-		"support": {
-			"header": "Υποστήριξη",
-			"email": "Ηλεκτρονικό Ταχυδρομείο",
-			"accountName": "Ονομα λογαριασμού",
-			"message": "Μήνυμα",
-			"send": "Αποστολ"
-		}
-	},
-	"payments": {
-		"amount": "Ποσό",
-		"date": "Ημερομηνία",
-		"id": "Ταυτότητα συναλλαγής",
-		"details": "Λεπτομέρειες Συναλλαγής",
-		"header": "Πληρωμές",
-		"preimage": "Απόδειξη πληρωμής",
-		"type": "Τύπος",
-		"time": "Χρόνος",
-		"sent": "Απεστάλει",
-		"received": "Παραλήφθηκε",
-		"empty": "Αποστολή",
-		"send": "Επόμενο",
-		"next": "Επιλογή αποστολέα",
-		"sendersChoice": "Αποστολή σε",
-		"sendTo": "προς",
-		"to": "προς",
-		"pay": "Πληρωμή",
-		"requesting": "απαιτείται",
-		"sentInvoiceTo": "Εστάλει τιμολόγιο σε",
-		"sentRequestTo": "Αίτημα εστάλει!",
-		"pleasePay": "Παρακαλώ πληρώστε",
-		"day": "Ημέρα",
-		"week": "Εβδομάδ",
-		"month": "Μήνας",
-		"all": "Ολα",
-		"export": "Εξαγωγή",
-		"invoice": "Τιμολόγιο",
-		"readyToPay": "είναι έτοιμο για πληρωμή",
-		"describeOrder": "Χρησιμοποιήστε αυτό το πεδίο για να περιγράψετε την παραγγελία σας",
-		"requestAnInvoice": "Αίτημα Τιμολογίου",
-		"submit": "Υποβολή",
-		"isRequesting": "απαιτείται",
-		"invoiceFrom": "Τιμολόγιο από",
-		"awaiting": "Αναμονή",
-		"tapAnywhere": "Πατήστε οπουδήποτε για να συνεχίσετε",
-		"from": "από",
-		"redeem": "Εξαργύρωση",
-		"redeemed": "Εξαργυρώθηκε",
-		"redeemedBy": "Εξαργυρώθηκε από",
-		"sendMessage": "Γράψτε ένα μήνυμα..."
-	}
+  "about": {
+    "header": "Σχετικά με",
+    "team": {
+      "header": "Η Oμάδα",
+      "adam": {
+        "name": "Adam Soltys",
+        "position": "Επικεφαλής Τεχνικός Διευθυντής",
+        "bio": "Ο Adam είναι προγραμματιστής ιστού και λάτρης του bitcoin που πιστεύει ότι το ισχυρό νόμισμα είναι το κλειδί για την αύξηση της παγκόσμιας ευημερίας. Ζει στο Βόρειο Vancouver με τη σύζυγό του Chelsea και τα δύο παιδιά του."
+      },
+      "cole": {
+        "name": "Cole",
+        "position": "Πιστοποιημένος Eπαγγελματίας Bitcoin",
+        "bio": "Ο Cole είναι ένα άτομο με πάθος για ελευθερία. Ήρθε σε επαφή με το bitcoin το 2016 και το μελέτησε σε βάθος. Τώρα θέλει να εισαγάγει το δίκτυο lightning σε όσο το δυνατόν περισσότερους χρήστες."
+      }
+    },
+    "locations": {
+      "header": "Τοποθεσίες",
+      "description": "Ακολουθούν ορισμένες επιχειρήσεις που δέχονται bitcoin με Coinos. Ελπίζουμε ότι η δική σας θα είναι η επόμενη!"
+    }
+  },
+  "error": {
+    "header": "Σφάλμα",
+    "message": "Παρακαλώ δοκιμάστε ξανά ή επικοινωνήστε με την υποστήριξη.",
+    "signIn": "Συνδεθείτε για να συνεχίσετε."
+  },
+  "faq": {
+    "header": "Συχνές Ερωτήσεις",
+    "why": {
+      "question": "Γιατί να δεχτώ Bitcoin;",
+      "answer": "Με το Bitcoin, οι εμπόροι εξοικονομούν σε τέλη, οι καταναλωτές αποκτούν ιδιωτικότητα και οι αποταμιευτές αυξάνουν την αγοραστική τους δύναμη. Θα προωθήσουμε την επιχείρησή σας σε μια ενθουσιασμένη κοινότητα που προτιμά να ψωνίζει σε μέρη που δέχονται Bitcoin."
+    },
+    "cost": {
+      "question": "Πόσο κοστίζει;",
+      "answer": "Η λήψη πληρωμών στον λογαριασμό σας είναι δωρεάν. Οι αναλήψεις σε εξωτερικά πορτοφόλια έχουν μικρή χρέωση που διαφέρει ανάλογα με τις συνθήκες του δικτύου. Χρεώνουμε 0,1% για τη μετατροπή μεταξύ lightning και on-chain Bitcoin. Η αποστολή σε άλλους λογαριασμούς Coinos είναι δωρεάν."
+    },
+    "individuals": {
+      "question": "Ποιος μπορεί να το χρησιμοποιήσει;",
+      "answer": "Οποιοσδήποτε, οπουδήποτε στον κόσμο. Το Coinos είναι κατάλληλο τόσο για ιδιώτες όσο και για επιχειρήσεις."
+    },
+    "compatibility": {
+      "question": "Χρειάζομαι κάποια ειδική συσκευή ή λογισμικό;",
+      "answer": "Όχι, το Coinos είναι μια εφαρμογή ιστού που λειτουργεί οπουδήποτε υπάρχει Ίντερνετ. Οι εμπόροι μπορεί να το χρησιμοποιούν σε tablet ή να παρέχουν έναν κώδικα QR για τους πελάτες να σκανάρουν με το τηλέφωνό τους."
+    },
+    "safety": {
+      "question": "Πότε εξοφλούνται τα χρήματά μου;",
+      "answer": "Οι πληρωμές μέσω Lightning εξοφλούνται άμεσα. Μπορείτε να αναλάβετε το υπόλοιπό σας σε άλλο πορτοφόλι μέσα σε δευτερόλεπτα. Οι καταθέσεις on-chain χρειάζονται κατά μέσο όρο 5-10 λεπτά για επιβεβαίωση."
+    },
+    "pos": {
+      "question": "Μπορεί το Coinos να ενσωματωθεί στο υπάρχον PoS μου;",
+      "answer": "Συνιστούμε να καταχωρίσετε τις πωλήσεις στο υπάρχον PoS σας ως συναλλαγές μετρητών."
+    },
+    "accounting": {
+      "question": "Τι γίνεται με τη λογιστική;",
+      "answer": "Εμφανίζουμε όλες τις πληρωμές σε όρους του τοπικού σας νομίσματος και σας επιτρέπουμε να φιλτράρετε ανά ημερομηνία, ώστε να μπορείτε να δηλώνετε το εισόδημά σας κανονικά. Μπορείτε να εξαγάγετε το ιστορικό του λογαριασμού σας σε ένα αρχείο csv. Εάν πουλήσετε Bitcoin με κέρδος, μπορεί να επιθυμείτε να αναφέρετε τα κερδηφόρα κεφάλαια."
+    },
+    "offramp": {
+      "question": "Μπορώ να μετατρέψω το Bitcoin που λαμβάνω στο τοπικό μου νόμισμα;",
+      "answer": "Μπορείτε να αναλάβετε τα χρήματά σας ανά πάσα στιγμή σε ένα χρηματιστήριο ή σε έναν μεσίτη για να πουλήσετε το Bitcoin σας και να λάβετε μια τραπεζική μεταφορά. Ίσως είμαστε πρόθυμοι να προσφέρουμε άμεσες εκκαθαρίσεις μέσω E-Transfer για επιλεγμένους καναδικούς εμπόρους."
+    },
+    "bitcoin": {
+      "question": "Τι μπορώ να κάνω με το Bitcoin;",
+      "answer": "Ξοδέψτε το σε άλλους εμπόρους ή καλύψτε τις δαπάνες σας παίρνοντας το προσωπικό σας, τους προμηθευτές σας και τον ιδιοκτήτη να το δεχτούν."
+    }
+  },
+  "footer": {
+    "company": "Εταιρία",
+    "followUs": "Ακολουθησε μας",
+    "github": "GitHub",
+    "linktree": "Linktree",
+    "jobs": "Linktree",
+    "support": "Υποστήριξη",
+    "telegram": "Telegram",
+    "twitter": "Twitter",
+    "documentation": "Τεκμηρίωση"
+  },
+  "howItWorks": {
+    "header": "Πως δουλεύει",
+    "step1": {
+      "header": "1. Δημιουργήστε τον λογαριασμό σας",
+      "description": "Ένα όνομα χρήστη και κωδικός πρόσβασης είναι όλα όσα χρειάζεστε για να ξεκινήσετε."
+    },
+    "step2": {
+      "header": "2. Ζητήστε πληρωμές",
+      "description": "Ότι θα κάνατε συνήθως, αλλά με το bitcoin."
+    },
+    "step3": {
+      "header": "3. Αυτό είναι όλο!",
+      "description": "Ξοδέψτε το νόμισμά σας αμέσως ή αποθηκεύστε το και δείτε το να αυξάνεται, η επιλογή είναι δική σας."
+    }
+  },
+  "invoice": {
+    "addTip": "Προσθήκη φιλοδωρήματος",
+    "addTipq": "Προσθήκη φιλοδωρήματος;",
+    "done": "Εγινε",
+    "paymentSuccessful": "Η πληρωμή ελήφθη!",
+    "invoice": "Τιμολόγιο",
+    "total": "Σύνολο",
+    "tip": "Φιλοδώρημα"
+  },
+  "jobs": {
+    "header": "Δουλειές",
+    "subheader": "Τρέχουσες θέσεις εργασίας",
+    "pitch1": "«Η Coinos αναζητά ενεργά προγραμματιστές για να ενταχθούν στην αναπτυσσόμενη ομάδα μας (πλήρους ή μερικής απασχόλησης, απομακρυσμένη εργασία αποδεκτή) ",
+    "pitch2": "Είστε ενθουσιασμενοι που εργάζεστε σε bitcoin ανοιχτού κώδικα; Τότε ρίξτε μια ματιά στα αποθετήρια μας στο",
+    "github": "GitHub",
+    "pitch3": "Αν πιστεύετε ότι μπορείτε να ασκήσετε επιρροή, θα θέλαμε να σας ακούσουμε. Στείλτε μας το βιογραφικό σας στ"
+  },
+  "landing": {
+    "header_before_icon": "Ο",
+    "header_with_icon": "πιο εύκολος",
+    "header_after_icon": "τρόπος για να ξεκινήσετε με το bitcoin ",
+    "subheader": "Ένα απλό αλλά ισχυρό πορτοφόλι ιστού για όλους. Δεν απαιτείται software ή hardware",
+    "info1": {
+      "title": "Άμεσες πληρωμές μέσω Lightning",
+      "description": "Διευκολύνουμε τους εμπόρους να λαμβάνουν πληρωμές λιανικής. Χωρίς αναμονή για τραπεζικούς διακανονισμούς ή ανησυχία για αντιστροφές χρεώσεων "
+    },
+    "info2": {
+      "title": "Απλό στη χρήση",
+      "description1": "Απλώς πληκτρολογήστε ένα ποσό στο τοπικό σας νόμισμα, μοιραστείτε τον κωδικό QR και τελειώσατε.",
+      "description2": "Αναλαμβάνουμε τη δύσκολη δουλειά, ώστε να μπορείτε να επικεντρωθείτε στην επιχείρησή σας.",
+      "description3": "Έχετε πάντα τη δυνατότητα να αναλάβετε τη διαχείριση των χρημάτων σας, κάνοντας ανάληψη άμεσα και ανά πάσα στιγμή "
+    },
+    "info3": {
+      "title": "Φτιάξτε το με τον δικό σας τρόπο!",
+      "description": "Προσαρμόστε την εμφάνιση και την αίσθηση της σελίδας του προφίλ σας ή διατηρήστε την ως προεπιλογή - εξαρτάται αποκλειστικά από εσάς "
+    }
+  },
+  "login": {
+    "optional": "Προαιρετικό",
+    "token": "2FA Token",
+    "username": "Όνομα χρήστη",
+    "password": "Κωδικός πρόσβασης",
+    "email": "Διεύθυνση Ηλεκτρονικού Ταχυδρομείου",
+    "passwordRecommendation": "Συνιστούμε ένα μεγάλο, τυχαίο κωδικό πρόσβασης που δημιουργείται με έναν διαχειριστή κωδικών πρόσβασης ",
+    "forgotUserOrPassword": "Ξεχάσατε το όνομα χρήστη ή τον κωδικό πρόσβασης;",
+    "haveAccount": "Εχετε ήδη λογαριασμό;",
+    "noAccount": "Δεν έχετε λογαριασμό;",
+    "register": "Έγγραφη",
+    "signIn": "Σύνδεση",
+    "failed": "Η σύνδεση απέτυχ"
+  },
+  "nav": {
+    "profile": "Προφίλ",
+    "startInSeconds": "Ξεκινήστε σε δευτερόλεπτα",
+    "account": "Λογαριασμός",
+    "signIn": "Σύνδεση",
+    "signOut": "Αποσύνδεση",
+    "dashboard": "Πίνακας Ελέγχου",
+    "settings": "Ρυθμίσεις",
+    "support": "Υποστήριξ"
+  },
+  "news": {
+    "header": "Νέα",
+    "subheader": "Τελευταίες ενημερώσεις"
+  },
+  "user": {
+    "bitcoin": "Bitcoin",
+    "lightning": "Lightning",
+    "invoice": "Τιμολόγιο",
+    "unfollow": "Κατάργηση παρακολούθησης",
+    "following": "Ακολουθείτε",
+    "follow": "Ακολουθήστε",
+    "followers": "Ακόλουθοι",
+    "remove": "Αφαίρεση",
+    "noNotes": "Δεν υπάρχουν σημειώσεις ακόμα",
+    "message": "Μήνυμα",
+    "messages": "Μηνύματα",
+    "feed": "Ροή",
+    "notes": "Σημειώσεις",
+    "pay": "Πληρωμή",
+    "scanToPayBTC": "Σάρωση για πληρωμή με bitcoin",
+    "this": "Αυτό",
+    "lightningAddress": "διεύθυνση lightning",
+    "dashboard": {
+      "go": "Πηγαίνετε",
+      "dashboard": "Πίνακας Ελέγχου",
+      "accountBalance": "Υπόλοιπο Λογαριασμού",
+      "bitcoinPrice": "Τιμή bitcoin:",
+      "conversionFeeWarning": "Θα χρεωθείτε με χρέωση ανάληψης 1% επί του ποσού ",
+      "send": "Αποστολή",
+      "receive": "Λήψη",
+      "withdraw": "Αποστολή",
+      "deposit": "Κατάθεση",
+      "voucher": "Κουπόν"
+    },
+    "receive": {
+      "lessThan1BTCWarning": "Παρακαλώ εισάγετε ένα ποσό μικρότερο από 1 bitcoin ",
+      "showQR": "Εμφάνιση Q"
+    },
+    "send": {
+      "contacts": "Επαφές",
+      "scan": "Σάρωση",
+      "paste": "Επικόλληση",
+      "next": "Επόμενο",
+      "placeholder": "Επικολλήστε μια διεύθυνση bitcoin, ένα τιμολόγιο lighting ή ένα όνομα χρήστη coino"
+    },
+    "settings": {
+      "saveSettings": "Αποθήκευση ρυθμίσεων",
+      "bannerImage": "Εικόνα Banner",
+      "profileImage": "Εικόνα Προφίλ",
+      "oneTimeCode": "Εισαγάγετε κωδικό μίας χρήσης",
+      "accountId": "Μυστικός λογαριασμός",
+      "header": "Ρυθμίσεις",
+      "ACCOUNT": "ΛΟΓΑΡΙΑΣΜΟΣ",
+      "POINT_OF_SALE": "ΠΡΟΤΙΜΗΣΕΙΣ",
+      "SECURITY": "ΑΣΦΑΛΕΙΑ",
+      "locale": "Γλώσσα",
+      "username": "Όνομα χρήστη",
+      "email": "Ηλεκτρονικό Ταχυδρομεί",
+      "newPassword": "Αλλαγή κωδικού",
+      "about": "Σχετικά με",
+      "aboutPlaceholder": "Λίγα πράγματα για εσάς ή τη διεύθυνση και τις ώρες της επιχείρησής σας",
+      "emailNotifications": "Ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
+      "emailNotificationsDescription": "Λάβετε ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου όταν συμβαίνει μια αλλαγή στο λογαριασμό σας ή όταν οι άνθρωποι σας στέλνουν πληρωμές ",
+      "smsNotifications": "Ειδοποιήσεις SMS",
+      "smsNotificationsDescription": "Το Coinos θα σας στείλει ειδοποιήσεις κειμένου όταν αυτές είναι ενεργοποιημένες ",
+      "theme": "Χρωματικό θέμα",
+      "tipPrompt": "Προτροπή για φιλοδώρημα",
+      "tipPromptDescription": "Ρωτήστε τους ανθρώπους εάν θέλουν να προσθέσουν ένα φιλοδώρημα πριν πληρώσουν τα τιμολόγιά τους",
+      "displayName": "Εμφανιζόμενο όνομα",
+      "themeDescription": "Επιλέξτε από τα προεπιλεγμένα χρωματικά θέματα.",
+      "localCurrency": "Νόμισμα",
+      "btcUnit": "Εμφάνιση bitcoin σε:",
+      "bitcoin": "bitcoin",
+      "minutes": "λεπτά",
+      "hour": "ώρα",
+      "hours": "ώρες",
+      "satoshis": "Satoshis",
+      "securityPIN": "PIN Ασφαλείας",
+      "securityPINDescription": "Ορίστε μια καρφίτσα ασφαλείας που θα χρησιμοποιείται για το ξεκλείδωμα των ρυθμίσεών σας και για την αποστολή εξερχόμενων πληρωμών ",
+      "setPIN": "Ορισμός PIN",
+      "autoLock": "Αυτόματο κλείδωμα χρονοδιακόπτη",
+      "autoLockDescription": "Ο λογαριασμός σας θα μεταβεί σε ασφαλή λειτουργία, απαιτώντας από εσάς να εισαγάγετε ξανά τα διαπιστευτήριά σας μετά από μια καθορισμένη ώρα:",
+      "twofa": "Έλεγχος ταυτότητας 2 παραγόντων",
+      "twofaDescription": "Προσθέστε ένα επιπλέον επίπεδο ασφάλειας στη συσκευή σας ενεργοποιώντας τον έλεγχο ταυτότητας 2 παραγόντων ",
+      "twofaSetup": "Ρύθμιση 2FA",
+      "twofaDisable": "Απενεργοποίηση 2FA",
+      "select": "Επιλογή",
+      "verifyPIN": "Επαλήθευση PIN",
+      "enablePIN": "Ενεργοποίηση PIN",
+      "disablePIN": "Απενεργοποίηση PI"
+    },
+    "support": {
+      "header": "Υποστήριξη",
+      "email": "Ηλεκτρονικό Ταχυδρομείο",
+      "accountName": "Ονομα λογαριασμού",
+      "message": "Μήνυμα",
+      "send": "Αποστολ"
+    }
+  },
+  "payments": {
+    "amount": "Ποσό",
+    "date": "Ημερομηνία",
+    "id": "Ταυτότητα συναλλαγής",
+    "details": "Λεπτομέρειες Συναλλαγής",
+    "header": "Πληρωμές",
+    "preimage": "Απόδειξη πληρωμής",
+    "type": "Τύπος",
+    "time": "Χρόνος",
+    "sent": "Απεστάλει",
+    "received": "Παραλήφθηκε",
+    "empty": "Αποστολή",
+    "send": "Επόμενο",
+    "next": "Επιλογή αποστολέα",
+    "sendersChoice": "Αποστολή σε",
+    "sendTo": "προς",
+    "to": "προς",
+    "pay": "Πληρωμή",
+    "requesting": "απαιτείται",
+    "sentInvoiceTo": "Εστάλει τιμολόγιο σε",
+    "sentRequestTo": "Αίτημα εστάλει!",
+    "pleasePay": "Παρακαλώ πληρώστε",
+    "day": "Ημέρα",
+    "week": "Εβδομάδ",
+    "month": "Μήνας",
+    "all": "Ολα",
+    "export": "Εξαγωγή",
+    "invoice": "Τιμολόγιο",
+    "readyToPay": "είναι έτοιμο για πληρωμή",
+    "describeOrder": "Χρησιμοποιήστε αυτό το πεδίο για να περιγράψετε την παραγγελία σας",
+    "requestAnInvoice": "Αίτημα Τιμολογίου",
+    "submit": "Υποβολή",
+    "isRequesting": "απαιτείται",
+    "invoiceFrom": "Τιμολόγιο από",
+    "awaiting": "Αναμονή",
+    "tapAnywhere": "Πατήστε οπουδήποτε για να συνεχίσετε",
+    "from": "από",
+    "redeem": "Εξαργύρωση",
+    "redeemed": "Εξαργυρώθηκε",
+    "redeemedBy": "Εξαργυρώθηκε από",
+    "sendMessage": "Γράψτε ένα μήνυμα..."
+  }
 }
diff --git a/src/locales/en.json b/src/locales/en.json
index c0efade3..db25b3fb 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -1,48 +1,48 @@
 {
-	"404": {
-		"404": "404",
-		"pageNotFound": "Page not found."
-	},
-	"about": {
-		"header": "About",
-		"team": {
-			"header": "The Team",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Founder and CTO",
-				"bio": "Adam is a software engineer who believes that the adoption of sound money will drive global prosperity. He lives in North Vancouver with his wife, daughter, and son."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Business Development",
-				"bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible."
-			}
-		},
-		"locations": {
-			"header": "Locations",
-			"description": "Here are some businesses that are accepting bitcoin with Coinos. We hope that yours will be next!"
-		}
-	},
-	"error": {
-		"header": "Error",
-		"message": "Please try again or contact support.",
-		"signIn": "Please sign in to continue.",
+  "404": {
+    "404": "404",
+    "pageNotFound": "Page not found."
+  },
+  "about": {
+    "header": "About",
+    "team": {
+      "header": "The Team",
+      "adam": {
+        "name": "Adam Soltys",
+        "position": "Founder and CTO",
+        "bio": "Adam is a software engineer who believes that the adoption of sound money will drive global prosperity. He lives in North Vancouver with his wife, daughter, and son."
+      },
+      "cole": {
+        "name": "Cole",
+        "position": "Business Development",
+        "bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible."
+      }
+    },
+    "locations": {
+      "header": "Locations",
+      "description": "Here are some businesses that are accepting bitcoin with Coinos. We hope that yours will be next!"
+    }
+  },
+  "error": {
+    "header": "Error",
+    "message": "Please try again or contact support.",
+    "signIn": "Please sign in to continue.",
     "unrecognizedInput": "Unrecognized input"
-	},
-	"faq": {
-		"header": "FAQ",
-		"cost": {
-			"question": "What does it cost?",
-			"answer": "Receiving payments into your account is free. Withdrawals to external wallets incur a small fee that varies depending on network conditions."
-		},
-		"compatibility": {
-			"question": "Do I need any special device or software?",
-			"answer": "No, Coinos works anywhere that has Internet. Merchants might use it on a tablet or put up a QR code for customers to scan with their phone."
-		},
-		"safety": {
-			"question": "When do my funds settle?",
-			"answer": "Lightning payments are settled instantly. You can withdraw your balance to another wallet within seconds. On-chain deposits take 5-10 minutes to confirm on average."
-		},
+  },
+  "faq": {
+    "header": "FAQ",
+    "cost": {
+      "question": "What does it cost?",
+      "answer": "Receiving payments into your account is free. Withdrawals to external wallets incur a small fee that varies depending on network conditions."
+    },
+    "compatibility": {
+      "question": "Do I need any special device or software?",
+      "answer": "No, Coinos works anywhere that has Internet. Merchants might use it on a tablet or put up a QR code for customers to scan with their phone."
+    },
+    "safety": {
+      "question": "When do my funds settle?",
+      "answer": "Lightning payments are settled instantly. You can withdraw your balance to another wallet within seconds. On-chain deposits take 5-10 minutes to confirm on average."
+    },
     "pos": {
       "question": "Can Coinos integrate with my existing PoS?",
       "answer": "We recommend entering sales into your existing PoS as cash transactions."
@@ -51,218 +51,218 @@
       "question": "What can I do with Bitcoin?",
       "answer": "Spend it at other merchants or pay your expenses with it by getting your staff, suppliers and landlord to take it."
     }
-	},
-	"footer": {
-		"company": "Company",
-		"followUs": "Follow Us",
-		"github": "GitHub",
-		"linktree": "Linktree",
-		"jobs": "Jobs",
-		"support": "Support",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"documentation": "Documentation"
-	},
-	"howItWorks": {
-		"header": "How it works",
-		"step1": {
-			"header": "1. Create your account",
-			"description": "A username and password is all you need to get started."
-		},
-		"step2": {
-			"header": "2. Ask for payments",
-			"description": "The same as you normally would, but with bitcoin."
-		},
-		"step3": {
-			"header": "3. That's all!",
-			"description": "Spend your coin immediately or watch it grow in value."
-		}
-	},
-	"invoice": {
-		"addTip": "Add a tip",
-		"addTipq": "Add a tip?",
-		"done": "Done",
-		"paymentSuccessful": "Payment received!",
-		"invoice": "Invoice",
-		"total": "Total",
-		"tip": "Tip"
-	},
-	"jobs": {
-		"header": "Jobs",
-		"subheader": "Current Openings",
-		"pitch1": "Coinos is actively looking for developers to join our growing team (full-time or part-time, remote working OK).",
-		"pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on",
-		"github": "GitHub",
-		"pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to"
-	},
-	"landing": {
-		"header_before_icon": "The",
-		"header_with_icon": "easiest",
-		"header_after_icon": "way to get started with bitcoin.",
-		"subheader": "A free web wallet and payment page for everyone.",
-		"info1": {
-			"title": "Instant payments via Lightning",
-			"description": "We make it easy for merchants to receive retail payments. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% card fees."
-		},
-		"info2": {
-			"title": "Simple to use",
-			"description1": "Just enter an amount in your local currency, share the QR code and you’re done.",
-			"description2": "We do all the heavy lifting so you can focus on your business.",
-			"description3": "You always have the option of taking custody of your funds by withdrawing instantly at any time."
-		},
-		"info3": {
-			"title": "Brand it your way!",
-			"description": "Customize your profile page look and feel, or keep it on default - it's totally up to you."
-		}
-	},
-	"login": {
-		"optional": "Optional",
-		"token": "2FA Token",
-		"username": "Username",
-		"password": "Password",
-		"email": "Email",
-		"passwordRecommendation": "We recommend using a long, random password if you intend to keep funds in your account.",
-		"forgotUserOrPassword": "Forgot Username or Password?",
-		"haveAccount": "Already have an account?",
-		"noAccount": "Don't have an account?",
-		"register": "Register",
-		"signIn": "Sign In",
-		"failed": "Login failed"
-	},
-	"nav": {
+  },
+  "footer": {
+    "company": "Company",
+    "followUs": "Follow Us",
+    "github": "GitHub",
+    "linktree": "Linktree",
+    "jobs": "Jobs",
+    "support": "Support",
+    "telegram": "Telegram",
+    "twitter": "Twitter",
+    "documentation": "Documentation"
+  },
+  "howItWorks": {
+    "header": "How it works",
+    "step1": {
+      "header": "1. Create your account",
+      "description": "A username and password is all you need to get started."
+    },
+    "step2": {
+      "header": "2. Ask for payments",
+      "description": "The same as you normally would, but with bitcoin."
+    },
+    "step3": {
+      "header": "3. That's all!",
+      "description": "Spend your coin immediately or watch it grow in value."
+    }
+  },
+  "invoice": {
+    "addTip": "Add a tip",
+    "addTipq": "Add a tip?",
+    "done": "Done",
+    "paymentSuccessful": "Payment received!",
+    "invoice": "Invoice",
+    "total": "Total",
+    "tip": "Tip"
+  },
+  "jobs": {
+    "header": "Jobs",
+    "subheader": "Current Openings",
+    "pitch1": "Coinos is actively looking for developers to join our growing team (full-time or part-time, remote working OK).",
+    "pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on",
+    "github": "GitHub",
+    "pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to"
+  },
+  "landing": {
+    "header_before_icon": "The",
+    "header_with_icon": "easiest",
+    "header_after_icon": "way to get started with bitcoin.",
+    "subheader": "A free web wallet and payment page for everyone.",
+    "info1": {
+      "title": "Instant payments via Lightning",
+      "description": "We make it easy for merchants to receive retail payments. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% card fees."
+    },
+    "info2": {
+      "title": "Simple to use",
+      "description1": "Just enter an amount in your local currency, share the QR code and you’re done.",
+      "description2": "We do all the heavy lifting so you can focus on your business.",
+      "description3": "You always have the option of taking custody of your funds by withdrawing instantly at any time."
+    },
+    "info3": {
+      "title": "Brand it your way!",
+      "description": "Customize your profile page look and feel, or keep it on default - it's totally up to you."
+    }
+  },
+  "login": {
+    "optional": "Optional",
+    "token": "2FA Token",
+    "username": "Username",
+    "password": "Password",
+    "email": "Email",
+    "passwordRecommendation": "We recommend using a long, random password if you intend to keep funds in your account.",
+    "forgotUserOrPassword": "Forgot Username or Password?",
+    "haveAccount": "Already have an account?",
+    "noAccount": "Don't have an account?",
+    "register": "Register",
+    "signIn": "Sign In",
+    "failed": "Login failed"
+  },
+  "nav": {
     "about": "About",
     "docs": "Docs",
     "messages": "Messages",
     "funds": "Funds",
     "map": "Map",
     "merch": "Swag",
-		"profile": "Profile",
-		"startInSeconds": "Start in Seconds",
-		"account": "Account",
-		"signIn": "Sign In",
-		"signOut": "Sign out",
-		"dashboard": "Dashboard",
-		"settings": "Settings",
-		"support": "Support"
-	},
-	"news": {
-		"header": "News",
-		"subheader": "Latest Updates"
-	},
-	"user": {
+    "profile": "Profile",
+    "startInSeconds": "Start in Seconds",
+    "account": "Account",
+    "signIn": "Sign In",
+    "signOut": "Sign out",
+    "dashboard": "Dashboard",
+    "settings": "Settings",
+    "support": "Support"
+  },
+  "news": {
+    "header": "News",
+    "subheader": "Latest Updates"
+  },
+  "user": {
     "profilePage": "Profile page",
     "nostrPubkey": "Nostr pubkey",
     "requestPayment": "Request Payment",
     "welcome": "Welcome! Your account balance is empty. You can start by making a deposit or by asking someone to pay you.",
     "showBalance": "Show Balance",
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Invoice",
-		"unfollow": "Unfollow",
-		"following": "Following",
-		"follow": "Follow",
-		"followers": "Followers",
-		"remove": "Remove",
-		"noNotes": "No notes yet",
-		"message": "Message",
-		"messages": "Messages",
-		"feed": "Feed",
-		"notes": "Notes",
-		"pay": "Pay",
-		"scanToPayBTC": "Scan to pay with bitcoin",
-		"this": "This",
+    "bitcoin": "Bitcoin",
+    "lightning": "Lightning",
+    "invoice": "Invoice",
+    "unfollow": "Unfollow",
+    "following": "Following",
+    "follow": "Follow",
+    "followers": "Followers",
+    "remove": "Remove",
+    "noNotes": "No notes yet",
+    "message": "Message",
+    "messages": "Messages",
+    "feed": "Feed",
+    "notes": "Notes",
+    "pay": "Pay",
+    "scanToPayBTC": "Scan to pay with bitcoin",
+    "this": "This",
     "lightningAddress": "Lightning address",
-		"dashboard": {
-			"go": "Go",
-			"dashboard": "Dashboard",
-			"accountBalance": "Account Balance",
-			"conversionFeeWarning": "You will be charged a 1% withdrawal fee on the amount.",
-			"fetchingRate": "fetching rate...",
-			"send": "Send",
-			"receive": "Receive",
-			"withdraw": "Send",
-			"deposit": "Deposit",
-			"voucher": "Voucher"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.",
-			"showQR": "Show QR"
-		},
-		"send": {
+    "dashboard": {
+      "go": "Go",
+      "dashboard": "Dashboard",
+      "accountBalance": "Account Balance",
+      "conversionFeeWarning": "You will be charged a 1% withdrawal fee on the amount.",
+      "fetchingRate": "fetching rate...",
+      "send": "Send",
+      "receive": "Receive",
+      "withdraw": "Send",
+      "deposit": "Deposit",
+      "voucher": "Voucher"
+    },
+    "receive": {
+      "lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.",
+      "showQR": "Show QR"
+    },
+    "send": {
       "makeQR": "QR",
-			"contacts": "Contacts",
-			"scan": "Scan",
-			"paste": "Paste",
-			"next": "Next",
-			"placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
-		},
-		"settings": {
+      "contacts": "Contacts",
+      "scan": "Scan",
+      "paste": "Paste",
+      "next": "Next",
+      "placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
+    },
+    "settings": {
       "seedPhrase": "Seed phrase",
       "nostrKeys": "Nostr key",
-      "nostrDescription": "Your nostr key is used to sign and decrypt messages, keep it safe or someone may be able to impersonate you.", 
+      "nostrDescription": "Your nostr key is used to sign and decrypt messages, keep it safe or someone may be able to impersonate you.",
       "seedDescription": "This 12 word seed phrase is used to derive your nostr private key and your self-custodial wallet keys which determine your auto-withdrawal addresses. Back it up and don't let anyone see it.",
       "emailDescription": "For password resets and notifications",
       "hideNsec": "Hide nostr secret key",
       "revealNsec": "Reveal nostr secret key",
       "hideSeed": "Hide seed phrase",
       "revealSeed": "Reveal seed phrase",
-			"saveSettings": "Save Settings",
-			"bannerImage": "Banner Image",
-			"profileImage": "Profile Image",
-			"oneTimeCode": "Enter one-time code",
-			"accountId": "Account Secret",
-			"header": "Settings",
-			"ACCOUNT": "ACCOUNT",
-			"POINT_OF_SALE": "PREFERENCES",
-			"SECURITY": "SECURITY",
-			"locale": "Language",
-			"username": "Username",
-			"email": "Email",
-			"newPassword": "Change Password",
-			"about": "About",
-			"aboutPlaceholder": "A little something about you or your business address and hours",
-			"emailNotifications": "Email Notifications",
-			"emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.",
-			"smsNotifications": "SMS Notifications",
-			"smsNotificationsDescription": "Coinos will send you text notifications when this is enabled.",
-			"theme": "Color Theme",
-			"tipPrompt": "Prompt for tips",
-			"tipPromptDescription": "Ask people if they want to add a tip before paying their invoices",
-			"displayName": "Display name",
-			"themeDescription": "Select from the default color themes.",
-			"localCurrency": "Currency",
-			"btcUnit": "Display bitcoin in:",
-			"bitcoin": "bitcoin",
-			"minutes": "minutes",
-			"hour": "hour",
-			"hours": "hours",
-			"satoshis": "Satoshis",
-			"securityPIN": "Security PIN",
-			"securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.",
-			"setPIN": "Set PIN",
-			"autoLock": "Timeout",
-			"autoLockDescription": "Time after which your PIN needs to be re-entered:",
-			"twofa": "2-Factor Authentication",
-			"twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.",
-			"twofaSetup": "Set up 2FA",
-			"twofaDisable": "Disable 2FA",
-			"select": "Select",
-			"verifyPIN": "Verify PIN",
-			"enablePIN": "Enable PIN",
-			"disablePIN": "Disable PIN",
+      "saveSettings": "Save Settings",
+      "bannerImage": "Banner Image",
+      "profileImage": "Profile Image",
+      "oneTimeCode": "Enter one-time code",
+      "accountId": "Account Secret",
+      "header": "Settings",
+      "ACCOUNT": "ACCOUNT",
+      "POINT_OF_SALE": "PREFERENCES",
+      "SECURITY": "SECURITY",
+      "locale": "Language",
+      "username": "Username",
+      "email": "Email",
+      "newPassword": "Change Password",
+      "about": "About",
+      "aboutPlaceholder": "A little something about you or your business address and hours",
+      "emailNotifications": "Email Notifications",
+      "emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.",
+      "smsNotifications": "SMS Notifications",
+      "smsNotificationsDescription": "Coinos will send you text notifications when this is enabled.",
+      "theme": "Color Theme",
+      "tipPrompt": "Prompt for tips",
+      "tipPromptDescription": "Ask people if they want to add a tip before paying their invoices",
+      "displayName": "Display name",
+      "themeDescription": "Select from the default color themes.",
+      "localCurrency": "Currency",
+      "btcUnit": "Display bitcoin in:",
+      "bitcoin": "bitcoin",
+      "minutes": "minutes",
+      "hour": "hour",
+      "hours": "hours",
+      "satoshis": "Satoshis",
+      "securityPIN": "Security PIN",
+      "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.",
+      "setPIN": "Set PIN",
+      "autoLock": "Timeout",
+      "autoLockDescription": "Time after which your PIN needs to be re-entered:",
+      "twofa": "2-Factor Authentication",
+      "twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.",
+      "twofaSetup": "Set up 2FA",
+      "twofaDisable": "Disable 2FA",
+      "select": "Select",
+      "verifyPIN": "Verify PIN",
+      "enablePIN": "Enable PIN",
+      "disablePIN": "Disable PIN",
       "publishNip5": "Publish nostr identity",
       "nip5a": "Use",
       "nip5b": "as your publicly verified nostr address"
-		},
-		"support": {
-			"header": "Support",
-			"email": "Email",
-			"accountName": "Account Name",
-			"message": "Message",
-			"send": "Send"
-		}
-	},
-	"payments": {
+    },
+    "support": {
+      "header": "Support",
+      "email": "Email",
+      "accountName": "Account Name",
+      "message": "Message",
+      "send": "Send"
+    }
+  },
+  "payments": {
     "create": "Create",
     "fund": "Fund",
     "addFunds": "Add Funds",
@@ -277,46 +277,46 @@
     "total": "Total",
     "gainLoss": "Gain/Loss",
     "presentValue": "Present Value",
-		"amount": "Amount",
-		"date": "Date",
-		"id": "Transaction ID",
-		"details": "Transaction Details",
-		"header": "Payments",
-		"preimage": "Proof of payment",
-		"type": "Type",
-		"time": "Time",
-		"sent": "Sent",
-		"received": "Received",
-		"empty": "No transactions yet.",
-		"send": "Send",
-		"next": "Next",
-		"sendTo": "Send to",
-		"to": "to",
-		"pay": "Pay",
-		"requesting": "is requesting",
-		"sentInvoiceTo": "Sent invoice to",
-		"sentRequestTo": "Request sent!",
-		"pleasePay": "Please pay",
-		"day": "Day",
-		"week": "Week",
-		"month": "Month",
-		"all": "All",
-		"export": "Export",
-		"invoice": "Invoice",
-		"readyToPay": "is ready to pay",
-		"describeOrder": "Use this field to describe your order",
-		"requestAnInvoice": "Request Invoice",
-		"submit": "Submit",
-		"isRequesting": "is requesting",
-		"invoiceFrom": "Invoice from",
-		"awaiting": "Awaiting",
-		"tapAnywhere": "Tap anywhere to continue",
-		"from": "from",
-		"redeem": "Redeem",
-		"redeemed": "Redeemed",
-		"redeemedBy": "Redeemed by",
-		"sendMessage": "Write a message...",
+    "amount": "Amount",
+    "date": "Date",
+    "id": "Transaction ID",
+    "details": "Transaction Details",
+    "header": "Payments",
+    "preimage": "Proof of payment",
+    "type": "Type",
+    "time": "Time",
+    "sent": "Sent",
+    "received": "Received",
+    "empty": "No transactions yet.",
+    "send": "Send",
+    "next": "Next",
+    "sendTo": "Send to",
+    "to": "to",
+    "pay": "Pay",
+    "requesting": "is requesting",
+    "sentInvoiceTo": "Sent invoice to",
+    "sentRequestTo": "Request sent!",
+    "pleasePay": "Please pay",
+    "day": "Day",
+    "week": "Week",
+    "month": "Month",
+    "all": "All",
+    "export": "Export",
+    "invoice": "Invoice",
+    "readyToPay": "is ready to pay",
+    "describeOrder": "Use this field to describe your order",
+    "requestAnInvoice": "Request Invoice",
+    "submit": "Submit",
+    "isRequesting": "is requesting",
+    "invoiceFrom": "Invoice from",
+    "awaiting": "Awaiting",
+    "tapAnywhere": "Tap anywhere to continue",
+    "from": "from",
+    "redeem": "Redeem",
+    "redeemed": "Redeemed",
+    "redeemedBy": "Redeemed by",
+    "sendMessage": "Write a message...",
     "fundsClaimed": "Funds claimed!",
     "print": "Print"
-	}
+  }
 }
diff --git a/src/locales/es.json b/src/locales/es.json
index e506696c..29508b27 100644
--- a/src/locales/es.json
+++ b/src/locales/es.json
@@ -1,36 +1,36 @@
 {
-	"404": {
-		"404": "404",
-		"pageNotFound": "Pagina no encontrada."
-	},
-	"about": {
-		"header": "Sobre Nosotros",
-		"p1": "Coinos es una aplicación de pagos en bitcoin de código abierto. Este desarrollo comenzó en septiembre de 2012 en Vancouver como una forma de proporcionar a los comerciantes locales una forma conveniente de aceptar pagos con bitcoin.",
-		"p2": "Descarga el código fuente para ejecutar una instancia y conectarla a tu propio nodo bitcoin y lightning. Te ayudaremos a convertirte en un excelente custodio y proveedor de pagos para tu comunidad.",
-		"p3": "Las transferencias de bitcoin entre usuarios en nuestro servidor se realizan off-chain, por lo que son completamente gratuitas, instantáneas e ilimitadas.",
-		"team": {
-			"header": "Nuestro Equipo",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Director de Tecnología",
-				"bio": "Adam es un desarrollador web y un entusiasta de bitcoin que cree que el dinero sólido es clave para aumentar la prosperidad global. Vive en la ciudad de North Vancouver con su esposa Chelsea y sus dos hijos."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Profesional de Bitcoin",
-				"bio": "Como profesional certificado de Bitcoin, Cole es una persona motivada y apasionada por la libertad. Conoció el bitcoin en 2016 y lo estudió en profundidad. Ahora quiere presentarle la Red Lightning a tantos usuarios como sea posible."
-			}
-		},
-		"locations": {
-			"header": "Locaciones",
-			"description": "Aquí algunas empresas que aceptan bitcoin con Coinos. ¡Esperamos que el tuyo sea el próximo!"
-		}
-	},
-	"error": {
-		"header": "Error",
-		"message": "Vuelva a intentarlo o póngase en contacto con el soporte.",
-		"signIn": "Por favor inicie sesión para continuar."
-	},
+  "404": {
+    "404": "404",
+    "pageNotFound": "Pagina no encontrada."
+  },
+  "about": {
+    "header": "Sobre Nosotros",
+    "p1": "Coinos es una aplicación de pagos en bitcoin de código abierto. Este desarrollo comenzó en septiembre de 2012 en Vancouver como una forma de proporcionar a los comerciantes locales una forma conveniente de aceptar pagos con bitcoin.",
+    "p2": "Descarga el código fuente para ejecutar una instancia y conectarla a tu propio nodo bitcoin y lightning. Te ayudaremos a convertirte en un excelente custodio y proveedor de pagos para tu comunidad.",
+    "p3": "Las transferencias de bitcoin entre usuarios en nuestro servidor se realizan off-chain, por lo que son completamente gratuitas, instantáneas e ilimitadas.",
+    "team": {
+      "header": "Nuestro Equipo",
+      "adam": {
+        "name": "Adam Soltys",
+        "position": "Director de Tecnología",
+        "bio": "Adam es un desarrollador web y un entusiasta de bitcoin que cree que el dinero sólido es clave para aumentar la prosperidad global. Vive en la ciudad de North Vancouver con su esposa Chelsea y sus dos hijos."
+      },
+      "cole": {
+        "name": "Cole",
+        "position": "Profesional de Bitcoin",
+        "bio": "Como profesional certificado de Bitcoin, Cole es una persona motivada y apasionada por la libertad. Conoció el bitcoin en 2016 y lo estudió en profundidad. Ahora quiere presentarle la Red Lightning a tantos usuarios como sea posible."
+      }
+    },
+    "locations": {
+      "header": "Locaciones",
+      "description": "Aquí algunas empresas que aceptan bitcoin con Coinos. ¡Esperamos que el tuyo sea el próximo!"
+    }
+  },
+  "error": {
+    "header": "Error",
+    "message": "Vuelva a intentarlo o póngase en contacto con el soporte.",
+    "signIn": "Por favor inicie sesión para continuar."
+  },
   "faq": {
     "header": "FAQ",
     "why": {
@@ -70,222 +70,222 @@
       "answer": "Gástalo en otros comerciantes o paga tus gastos con él al conseguir que tu personal, proveedores y arrendador lo acepten."
     }
   },
-	"footer": {
-		"company": "Empresa",
-		"followUs": "Síguenos",
-		"github": "GitHub",
-		"jobs": "Trabaje con nosotros",
-		"support": "Soporte",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"news": "Noticias"
-	},
-	"howItWorks": {
-		"header": "Cómo funciona",
-		"step1": {
-			"header": "1. Crea tu cuenta",
-			"description": "Un nombre de usuario y una contraseña es todo lo que necesita para comenzar."
-		},
-		"step2": {
-			"header": "2. Cobra tus pagos",
-			"description": "Lo mismo que harías normalmente, pero con bitcoin."
-		},
-		"step3": {
-			"header": "3. ¡Eso es todo!",
-			"description": "Haz pagos con otros comerciantes o guarda tu bitcoin para días difíciles, la elección es tuya."
-		}
-	},
-	"invoice": {
-		"addTip": "Añadir propina",
-		"addTipq": "Añadir propina?",
-		"done": "Hecho",
-		"paymentSuccessful": "¡Pago recibido!",
-		"invoice": "Factura",
-		"total": "Total",
-		"tip": "Propina"
-	},
-	"jobs": {
-		"header": "Trabaje con nosotros",
-		"subheader": "Ofertas de Trabajo",
-		"pitch1": "Coinos está activamente buscando desarrolladores para unirse a nuestro equipo en crecimiento (tiempo completo o medio tiempo, trabajo remoto OK).",
-		"pitch2": "¿Emocionado por trabajar en bitcoin de código abierto? Entonces eche un vistazo a nuestros repositorios en",
-		"github": "GitHub",
-		"pitch3": "Si crees que puedes generar impacto, nos encantaría saber de ti. Envíanos tu currículum a"
-	},
-	"landing": {
-		"header_before_icon": "La",
-		"header_with_icon": "manera",
-		"header_after_icon": "más fácil de aceptar bitcoins en tu tienda.",
-		"subheader": "Aumenta tu número de clientes e ingresos al aceptar bitcoin con una aplicación web fácil de usar. No requiere software ni hardware.",
-		"info1": {
-			"title": "Pagos instantáneos a través de Lightning",
-			"description": "El momento en que su cliente envía un pago, este llega inmediatamente. Sin esperar liquidaciones bancarias ni preocuparse por cargos extras. Liquidación instantánea, en segundos. Diga adiós a los cargos del 3% de las tarifas en tarjetas de crédito."
-		},
-		"info2": {
-			"title": "Fácil de usar",
-			"description1": "Solo ingrese una cantidad en su moneda local, comparta el código QR y listo.",
-			"description2": "Hacemos todo el trabajo pesado para que pueda concentrarse en su negocio.",
-			"description3": "Siempre tiene la opción de tomar la custodia de sus fondos al retirarlos instantáneamente en cualquier momento."
-		},
-		"info3": {
-			"title": "Maneja tu marca a tu manera!",
-			"description": "Personalice la apariencia y el estilo del punto de venta de tu negocio a tu gusto: depende totalmente de ti."
-		}
-	},
-	"login": {
-		"optional": "Opcional",
-		"token": "Token 2FA",
-		"username": "Usuario",
-		"password": "Contraseña",
-		"email": "Correo",
-		"passwordRecommendation": "Recomendamos una contraseña larga y aleatoria generada con un administrador de contraseñas.",
-		"forgotUserOrPassword": "¿Olvidaste tu nombre de usuario o contraseña?",
-		"haveAccount": "¿Ya tienes una cuenta?",
-		"noAccount": "¿No tienes una cuenta?",
-		"register": "Registro",
-		"signIn": "Registrarse",
-		"failed": "Fallo en Inicio"
-	},
-	"nav": {
-		"profile": "Perfil",
-		"startInSeconds": "Comience en segundos",
-		"account": "Cuenta",
-		"signIn": "Registrarse",
-		"signOut": "Desconectar",
-		"dashboard": "Panel",
-		"settings": "Ajustes",
-		"support": "Soporte"
-	},
-	"newSiteHeader": "Acompañanos en nuestra <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> en Vancouver el 26 de Octubre! Buscando la version anterior de coinos? Visita <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
-	"news": {
-		"header": "Noticias",
-		"subheader": "Últimas Actualizaciones",
-		"update1": ""
-	},
-	"user": {
+  "footer": {
+    "company": "Empresa",
+    "followUs": "Síguenos",
+    "github": "GitHub",
+    "jobs": "Trabaje con nosotros",
+    "support": "Soporte",
+    "telegram": "Telegram",
+    "twitter": "Twitter",
+    "news": "Noticias"
+  },
+  "howItWorks": {
+    "header": "Cómo funciona",
+    "step1": {
+      "header": "1. Crea tu cuenta",
+      "description": "Un nombre de usuario y una contraseña es todo lo que necesita para comenzar."
+    },
+    "step2": {
+      "header": "2. Cobra tus pagos",
+      "description": "Lo mismo que harías normalmente, pero con bitcoin."
+    },
+    "step3": {
+      "header": "3. ¡Eso es todo!",
+      "description": "Haz pagos con otros comerciantes o guarda tu bitcoin para días difíciles, la elección es tuya."
+    }
+  },
+  "invoice": {
+    "addTip": "Añadir propina",
+    "addTipq": "Añadir propina?",
+    "done": "Hecho",
+    "paymentSuccessful": "¡Pago recibido!",
+    "invoice": "Factura",
+    "total": "Total",
+    "tip": "Propina"
+  },
+  "jobs": {
+    "header": "Trabaje con nosotros",
+    "subheader": "Ofertas de Trabajo",
+    "pitch1": "Coinos está activamente buscando desarrolladores para unirse a nuestro equipo en crecimiento (tiempo completo o medio tiempo, trabajo remoto OK).",
+    "pitch2": "¿Emocionado por trabajar en bitcoin de código abierto? Entonces eche un vistazo a nuestros repositorios en",
+    "github": "GitHub",
+    "pitch3": "Si crees que puedes generar impacto, nos encantaría saber de ti. Envíanos tu currículum a"
+  },
+  "landing": {
+    "header_before_icon": "La",
+    "header_with_icon": "manera",
+    "header_after_icon": "más fácil de aceptar bitcoins en tu tienda.",
+    "subheader": "Aumenta tu número de clientes e ingresos al aceptar bitcoin con una aplicación web fácil de usar. No requiere software ni hardware.",
+    "info1": {
+      "title": "Pagos instantáneos a través de Lightning",
+      "description": "El momento en que su cliente envía un pago, este llega inmediatamente. Sin esperar liquidaciones bancarias ni preocuparse por cargos extras. Liquidación instantánea, en segundos. Diga adiós a los cargos del 3% de las tarifas en tarjetas de crédito."
+    },
+    "info2": {
+      "title": "Fácil de usar",
+      "description1": "Solo ingrese una cantidad en su moneda local, comparta el código QR y listo.",
+      "description2": "Hacemos todo el trabajo pesado para que pueda concentrarse en su negocio.",
+      "description3": "Siempre tiene la opción de tomar la custodia de sus fondos al retirarlos instantáneamente en cualquier momento."
+    },
+    "info3": {
+      "title": "Maneja tu marca a tu manera!",
+      "description": "Personalice la apariencia y el estilo del punto de venta de tu negocio a tu gusto: depende totalmente de ti."
+    }
+  },
+  "login": {
+    "optional": "Opcional",
+    "token": "Token 2FA",
+    "username": "Usuario",
+    "password": "Contraseña",
+    "email": "Correo",
+    "passwordRecommendation": "Recomendamos una contraseña larga y aleatoria generada con un administrador de contraseñas.",
+    "forgotUserOrPassword": "¿Olvidaste tu nombre de usuario o contraseña?",
+    "haveAccount": "¿Ya tienes una cuenta?",
+    "noAccount": "¿No tienes una cuenta?",
+    "register": "Registro",
+    "signIn": "Registrarse",
+    "failed": "Fallo en Inicio"
+  },
+  "nav": {
+    "profile": "Perfil",
+    "startInSeconds": "Comience en segundos",
+    "account": "Cuenta",
+    "signIn": "Registrarse",
+    "signOut": "Desconectar",
+    "dashboard": "Panel",
+    "settings": "Ajustes",
+    "support": "Soporte"
+  },
+  "newSiteHeader": "Acompañanos en nuestra <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> en Vancouver el 26 de Octubre! Buscando la version anterior de coinos? Visita <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
+  "news": {
+    "header": "Noticias",
+    "subheader": "Últimas Actualizaciones",
+    "update1": ""
+  },
+  "user": {
     "requestPayment": "Solicitar pago",
     "welcome": "¡Bienvenido! El saldo de su cuenta está vacío. Puede comenzar haciendo un depósito o pidiéndole a alguien que le pague.",
     "showBalance": "Mostrar saldo",
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Factura",
-		"unfollow": "Dejar de seguir",
-		"following": "Siguiendo",
-		"followers": "Seguidores",
-		"follow": "Seguir",
-		"remove": "Eliminar",
-		"scanToPayBTC": "Escanear para pagar con bitcoin",
-		"this": "Esta",
-		"lightningAddress": "Dirección lightning",
-		"dashboard": {
-			"go": "Ir",
-			"dashboard": "Panel",
-			"accountBalance": "Saldo de la cuenta",
-			"bitcoinPrice": "Precio de Bitcoin:",
-			"conversionFeeWarning": "Se le cobrará una tarifa de retiro del 1% sobre el monto.",
-			"dataFromBinance": "Datos de <span class=\"text-black\">Binance</span>.",
-			"fetchingRate": "calculando tasa...",
-			"optionalNote": "Nota (Opcional)",
-			"send": "Enviar",
-			"receive": "Recibir",
-			"withdraw": "Retirar",
-			"deposit": "Depositar",
-			"voucher": "Comprobante"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Introduzca una cantidad inferior a 1 bitcoin.",
-			"showQR": "Mostrar código QR"
-		},
-		"send": {
-			"contacts": "Contactos",
-			"scan": "Escanear",
-			"paste": "Pegar",
-			"next": "Siguiente",
-			"placeholder": "Asigne una dirección de bitcoin, una factura lightning o un usuario de coinos"
-		},
-		"settings": {
-			"saveSettings": "Guardar ajustes",
-			"tipPrompt": "Solicitar propinas",
-			"tipPromptDescription": "Pregunta a las personas si quieren agregar una propina antes de pagar sus facturas",
-			"bannerImage": "Imagen del Banner",
-			"profileImage": "Imagen de perfil",
-			"oneTimeCode": "Ingrese el código de un solo uso",
-			"accountId": "Id Cuenta",
-			"header": "Ajustes",
-			"ACCOUNT": "CUENTA",
-			"POINT_OF_SALE": "PUNTO DE VENTA",
-			"SECURITY": "SEGURIDAD",
-			"locale": "Idioma",
-			"username": "Usuario",
-			"email": "Correo",
-			"newPassword": "Nueva contraseña",
-			"businessAddress": "Dirección Negocio",
-			"emailNotifications": "Notificaciones de Correo Electrónico",
-			"emailNotificationsDescription": "Reciba notificaciones por correo electrónico cuando se produzca un cambio en su cuenta o cuando las personas le envíen pagos.",
-			"smsNotifications": "Notificaciones SMS",
-			"smsNotificationsDescription": "Coinos enviará notificaciones de texto cuando esto esté habilitado.",
-			"theme": "Color Tema",
-			"themeDescription": "Seleccione entre los temas de color predeterminados.",
-			"localCurrency": "Moneda Local",
-			"btcUnit": "Ver bitcoin en:",
-			"bitcoin": "bitcoin",
-			"satoshis": "Satoshis",
-			"securityPIN": "PIN de Seguridad",
-			"securityPINDescription": "Establezca un pin de seguridad para desbloquear la configuración y enviar pagos.",
-			"setPIN": "Establecer PIN",
-			"autoLock": "Temporizador de bloqueo automático",
-			"autoLockDescription": "Su cuenta entrará en modo seguro automáticamente después del tiempo especificado:",
-			"twofa": "Autenticación de 2 factores",
-			"twofaDescription": "Agregue una capa extra de seguridad a su dispositivo habilitando la autenticación de 2 factores.",
-			"twofaSetup": "Configurar 2FA",
-			"twofaDisable": "Deshabilitar 2FA",
-			"select": "Seleccionar",
-			"verifyPIN": "Verificar PIN",
-			"enablePIN": "Habilitar PIN",
-			"disablePIN": "Deshabilitar PIN"
-		},
-		"support": {
-			"header": "Soporte",
-			"email": "Correo",
-			"accountName": "Nombre Cuenta",
-			"message": "Mensaje",
-			"send": "Enviar"
-		}
-	},
-	"payments": {
-		"header": "Transacciones",
-		"AMOUNT": "CANTIDAD",
-		"TYPE": "TIPO",
-		"TIME": "HORA",
-		"sent": "Enviado",
-		"received": "Recibido",
-		"empty": "Aún no hay transacciones.",
-		"send": "Enviado",
-		"next": "Siguiente",
-		"sendersChoice": "Elección del remitente",
-		"sendTo": "Enviar a",
-		"to": "para",
-		"pay": "Pagar",
-		"requesting": "está solicitando",
-		"sentInvoiceTo": "Enviar factura a",
-		"sentRequestTo": "Enviar solicitud a",
-		"pleasePay": "Por favor pague",
-		"day": "Día",
-		"week": "Semana",
-		"month": "Mes",
-		"all": "Todo",
-		"export": "Exportar",
-		"invoice": "Factura",
-		"readyToPay": "está listo para pagar",
-		"describeOrder": "Utilice este campo para describir su orden",
-		"requestAnInvoice": "Solicitar factura",
-		"submit": "Enviar",
-		"isRequesting": "está solicitando",
-		"awaiting": "Esperando",
-		"tapAnywhere": "Toca en cualquier lugar",
-		"from": "de",
-		"redeem": "Redimir",
-		"redeemed": "Redimido",
-		"redeemedBy": "Redimido por"
-	}
+    "bitcoin": "Bitcoin",
+    "lightning": "Lightning",
+    "invoice": "Factura",
+    "unfollow": "Dejar de seguir",
+    "following": "Siguiendo",
+    "followers": "Seguidores",
+    "follow": "Seguir",
+    "remove": "Eliminar",
+    "scanToPayBTC": "Escanear para pagar con bitcoin",
+    "this": "Esta",
+    "lightningAddress": "Dirección lightning",
+    "dashboard": {
+      "go": "Ir",
+      "dashboard": "Panel",
+      "accountBalance": "Saldo de la cuenta",
+      "bitcoinPrice": "Precio de Bitcoin:",
+      "conversionFeeWarning": "Se le cobrará una tarifa de retiro del 1% sobre el monto.",
+      "dataFromBinance": "Datos de <span class=\"text-black\">Binance</span>.",
+      "fetchingRate": "calculando tasa...",
+      "optionalNote": "Nota (Opcional)",
+      "send": "Enviar",
+      "receive": "Recibir",
+      "withdraw": "Retirar",
+      "deposit": "Depositar",
+      "voucher": "Comprobante"
+    },
+    "receive": {
+      "lessThan1BTCWarning": "Introduzca una cantidad inferior a 1 bitcoin.",
+      "showQR": "Mostrar código QR"
+    },
+    "send": {
+      "contacts": "Contactos",
+      "scan": "Escanear",
+      "paste": "Pegar",
+      "next": "Siguiente",
+      "placeholder": "Asigne una dirección de bitcoin, una factura lightning o un usuario de coinos"
+    },
+    "settings": {
+      "saveSettings": "Guardar ajustes",
+      "tipPrompt": "Solicitar propinas",
+      "tipPromptDescription": "Pregunta a las personas si quieren agregar una propina antes de pagar sus facturas",
+      "bannerImage": "Imagen del Banner",
+      "profileImage": "Imagen de perfil",
+      "oneTimeCode": "Ingrese el código de un solo uso",
+      "accountId": "Id Cuenta",
+      "header": "Ajustes",
+      "ACCOUNT": "CUENTA",
+      "POINT_OF_SALE": "PUNTO DE VENTA",
+      "SECURITY": "SEGURIDAD",
+      "locale": "Idioma",
+      "username": "Usuario",
+      "email": "Correo",
+      "newPassword": "Nueva contraseña",
+      "businessAddress": "Dirección Negocio",
+      "emailNotifications": "Notificaciones de Correo Electrónico",
+      "emailNotificationsDescription": "Reciba notificaciones por correo electrónico cuando se produzca un cambio en su cuenta o cuando las personas le envíen pagos.",
+      "smsNotifications": "Notificaciones SMS",
+      "smsNotificationsDescription": "Coinos enviará notificaciones de texto cuando esto esté habilitado.",
+      "theme": "Color Tema",
+      "themeDescription": "Seleccione entre los temas de color predeterminados.",
+      "localCurrency": "Moneda Local",
+      "btcUnit": "Ver bitcoin en:",
+      "bitcoin": "bitcoin",
+      "satoshis": "Satoshis",
+      "securityPIN": "PIN de Seguridad",
+      "securityPINDescription": "Establezca un pin de seguridad para desbloquear la configuración y enviar pagos.",
+      "setPIN": "Establecer PIN",
+      "autoLock": "Temporizador de bloqueo automático",
+      "autoLockDescription": "Su cuenta entrará en modo seguro automáticamente después del tiempo especificado:",
+      "twofa": "Autenticación de 2 factores",
+      "twofaDescription": "Agregue una capa extra de seguridad a su dispositivo habilitando la autenticación de 2 factores.",
+      "twofaSetup": "Configurar 2FA",
+      "twofaDisable": "Deshabilitar 2FA",
+      "select": "Seleccionar",
+      "verifyPIN": "Verificar PIN",
+      "enablePIN": "Habilitar PIN",
+      "disablePIN": "Deshabilitar PIN"
+    },
+    "support": {
+      "header": "Soporte",
+      "email": "Correo",
+      "accountName": "Nombre Cuenta",
+      "message": "Mensaje",
+      "send": "Enviar"
+    }
+  },
+  "payments": {
+    "header": "Transacciones",
+    "AMOUNT": "CANTIDAD",
+    "TYPE": "TIPO",
+    "TIME": "HORA",
+    "sent": "Enviado",
+    "received": "Recibido",
+    "empty": "Aún no hay transacciones.",
+    "send": "Enviado",
+    "next": "Siguiente",
+    "sendersChoice": "Elección del remitente",
+    "sendTo": "Enviar a",
+    "to": "para",
+    "pay": "Pagar",
+    "requesting": "está solicitando",
+    "sentInvoiceTo": "Enviar factura a",
+    "sentRequestTo": "Enviar solicitud a",
+    "pleasePay": "Por favor pague",
+    "day": "Día",
+    "week": "Semana",
+    "month": "Mes",
+    "all": "Todo",
+    "export": "Exportar",
+    "invoice": "Factura",
+    "readyToPay": "está listo para pagar",
+    "describeOrder": "Utilice este campo para describir su orden",
+    "requestAnInvoice": "Solicitar factura",
+    "submit": "Enviar",
+    "isRequesting": "está solicitando",
+    "awaiting": "Esperando",
+    "tapAnywhere": "Toca en cualquier lugar",
+    "from": "de",
+    "redeem": "Redimir",
+    "redeemed": "Redimido",
+    "redeemedBy": "Redimido por"
+  }
 }
diff --git a/src/locales/fa.json b/src/locales/fa.json
index fb5a4418..22a506d7 100644
--- a/src/locales/fa.json
+++ b/src/locales/fa.json
@@ -1,282 +1,282 @@
 {
-	"404": {
-		"404": "404",
-		"pageNotFound": "Page not found."
-	},
-	"about": {
-		"header": "About",
-		"p1": "Coinos is an open source bitcoin payment app. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.",
-		"p2": "You can download the source code to run an instance and connect it to your own bitcoin and lightning nodes. We'll help you get started being a benevolent custodian and payments provider for your community.",
-		"p3": "Account transfers amongst users on our server are done off-chain so they're completely free, instant, and unlimited.",
-		"team": {
-			"header": "The Team",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Chief Technical Officer",
-				"bio": "Adam is a web developer and bitcoin enthusiast who believes sound money is key to increasing global prosperity. He lives in North Vancouver with his wife Chelsea and two children."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Certified Bitcoin Professional",
-				"bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible."
-			}
-		},
-		"locations": {
-			"header": "Locations",
-			"description": "Here are some businesses that are accepting bitcoin with Coinos. We hope that yours will be next!"
-		}
-	},
-	"error": {
-		"header": "Error",
-		"message": "Please try again or contact support.",
-		"signIn": "Please sign in to continue."
-	},
-	"faq": {
-		"header": "FAQ",
-		"cost": {
-			"question": "What does it cost?",
-			"answer": "It's free to register an account and receive payments. We charge a 0.1% conversion fee if you withdraw regular bitcoin to lightning or vice versa."
-		},
-		"compatibility": {
-			"question": "Do I need any special device or software?",
-			"answer": "No. Coinos is web based, so as long as you have an internet connection and a web browser, it works anywhere. Retail merchants might use it on a phone or a tablet."
-		},
-		"safety": {
-			"question": "When do my funds settle?",
-			"answer": "Lightning payments are settled instantly. You can withdraw your balance to another wallet or exchange immediately once funds are received."
-		}
-	},
-	"footer": {
-		"company": "Company",
-		"followUs": "Follow Us",
-		"github": "GitHub",
-		"linktree": "Linktree",
-		"jobs": "Jobs",
-		"support": "Support",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"documentation": "Documentation"
-	},
-	"howItWorks": {
-		"header": "How it works",
-		"step1": {
-			"header": "1. Create your account",
-			"description": "A username and password is all you need to get started."
-		},
-		"step2": {
-			"header": "2. Ask for payments",
-			"description": "The same as you normally would, but with bitcoin."
-		},
-		"step3": {
-			"header": "3. That's all!",
-			"description": "Spend your coin immediately or save it and watch it grow, the choice is yours."
-		}
-	},
-	"invoice": {
-		"addTip": "Add a tip",
-		"addTipq": "Add a tip?",
-		"done": "Done",
-		"paymentSuccessful": "Payment received!",
-		"invoice": "Invoice",
-		"total": "Total",
-		"tip": "Tip"
-	},
-	"jobs": {
-		"header": "Jobs",
-		"subheader": "Current Openings",
-		"pitch1": "Coinos is actively looking for developers to join our growing team (full-time or part-time, remote working OK).",
-		"pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on",
-		"github": "GitHub",
-		"pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to"
-	},
-	"landing": {
-		"header_before_icon": "The",
-		"header_with_icon": "easiest",
-		"header_after_icon": "way to get started with bitcoin.",
-		"subheader": "A simple but powerful web wallet for everyone. No software or hardware required.",
-		"info1": {
-			"title": "Instant payments via Lightning",
-			"description": "We make it easy for merchants to receive retail payments. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees."
-		},
-		"info2": {
-			"title": "Simple to use",
-			"description1": "Just enter an amount in your local currency, share the QR code and you’re done.",
-			"description2": "We do all the heavy lifting so you can focus on your business.",
-			"description3": "You always have the option of taking custody of your funds by withdrawing instantly at any time."
-		},
-		"info3": {
-			"title": "Brand it your way!",
-			"description": "Customize your profile page look and feel, or keep it on default - it's totally up to you."
-		}
-	},
-	"login": {
-		"optional": "Optional",
-		"token": "2FA Token",
-		"username": "Username",
-		"password": "Password",
-		"email": "Email",
-		"passwordRecommendation": "We recommend a long, random password generated with a password manager.",
-		"forgotUserOrPassword": "Forgot Username or Password?",
-		"haveAccount": "Already have an account?",
-		"noAccount": "Don't have an account?",
-		"register": "Register",
-		"signIn": "Sign In",
-		"failed": "Login failed"
-	},
-	"nav": {
-		"profile": "Profile",
-		"startInSeconds": "Start in Seconds",
-		"account": "Account",
-		"signIn": "Sign In",
-		"signOut": "Sign Out",
-		"dashboard": "Dashboard",
-		"settings": "Settings",
-		"support": "Support"
-	},
-	"newSiteHeader": "Join us at our <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> in Vancouver on October 26! Looking for the old coinos? Visit <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
-	"news": {
-		"header": "News",
-		"subheader": "Latest Updates",
-		"update1": ""
-	},
-	"user": {
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Invoice",
-		"unfollow": "Unfollow",
-		"following": "Following",
-		"follow": "Follow",
-		"followers": "Followers",
-		"remove": "Remove",
-		"noNotes": "No notes yet",
-		"message": "Message",
-		"messages": "Messages",
-		"feed": "Feed",
-		"notes": "Notes",
-		"pay": "Pay",
-		"scanToPayBTC": "Scan to pay with bitcoin",
-		"this": "This",
-		"lightningAddress": "Lightning address",
-		"dashboard": {
-			"go": "Go",
-			"dashboard": "Dashboard",
-			"accountBalance": "Account Balance",
-			"bitcoinPrice": "bitcoin Price:",
-			"conversionFeeWarning": "You will be charged a 1% withdrawal fee on the amount.",
-			"dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.",
-			"fetchingRate": "fetching rate...",
-			"optionalNote": "Note (Optional)",
-			"send": "Send",
-			"receive": "Receive",
-			"withdraw": "Send",
-			"deposit": "Deposit",
-			"voucher": "Voucher"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.",
-			"showQR": "Show QR"
-		},
-		"send": {
-			"contacts": "Contacts",
-			"scan": "Scan",
-			"paste": "Paste",
-			"next": "Next",
-			"placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
-		},
-		"settings": {
-			"saveSettings": "Save Settings",
-			"bannerImage": "Banner Image",
-			"profileImage": "Profile Image",
-			"oneTimeCode": "Enter one-time code",
-			"accountId": "Account Secret",
-			"header": "Settings",
-			"ACCOUNT": "ACCOUNT",
-			"POINT_OF_SALE": "PREFERENCES",
-			"SECURITY": "SECURITY",
-			"locale": "Language",
-			"username": "Username",
-			"email": "Email",
-			"newPassword": "Change Password",
-			"about": "About",
-			"aboutPlaceholder": "A little something about you or your business address and hours",
-			"emailNotifications": "Email Notifications",
-			"emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.",
-			"smsNotifications": "SMS Notifications",
-			"smsNotificationsDescription": "Coinos will send you text notifications when this is enabled.",
-			"theme": "Color Theme",
-			"tipPrompt": "Prompt for tips",
-			"tipPromptDescription": "Ask people if they want to add a tip before paying their invoices",
-			"displayName": "Display name",
-			"themeDescription": "Select from the default color themes.",
-			"localCurrency": "Currency",
-			"btcUnit": "Display bitcoin in:",
-			"bitcoin": "bitcoin",
-			"minutes": "minutes",
-			"hour": "hour",
-			"hours": "hours",
-			"satoshis": "Satoshis",
-			"securityPIN": "Security PIN",
-			"securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.",
-			"setPIN": "Set PIN",
-			"autoLock": "Auto-Lock Timer",
-			"autoLockDescription": "Your account will go into a secure mode, requiring you to re-enter your credentials after a specified time:",
-			"twofa": "2-Factor Authentication",
-			"twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.",
-			"twofaSetup": "Set up 2FA",
-			"twofaDisable": "Disable 2FA",
-			"select": "Select",
-			"verifyPIN": "Verify PIN",
-			"enablePIN": "Enable PIN",
-			"disablePIN": "Disable PIN"
-		},
-		"support": {
-			"header": "Support",
-			"email": "Email",
-			"accountName": "Account Name",
-			"message": "Message",
-			"send": "Send"
-		}
-	},
-	"payments": {
-		"amount": "Amount",
-		"date": "Date",
-		"id": "Transaction ID",
-		"details": "Transaction Details",
-		"header": "Payments",
-		"preimage": "Proof of payment",
-		"type": "Type",
-		"time": "Time",
-		"sent": "Sent",
-		"received": "Received",
-		"empty": "No transactions yet.",
-		"send": "Send",
-		"next": "Next",
-		"sendersChoice": "Sender's choice",
-		"sendTo": "Send to",
-		"to": "to",
-		"pay": "Pay",
-		"requesting": "is requesting",
-		"sentInvoiceTo": "Sent invoice to",
-		"sentRequestTo": "Request sent!",
-		"pleasePay": "Please pay",
-		"day": "Day",
-		"week": "Week",
-		"month": "Month",
-		"all": "All",
-		"export": "Export",
-		"invoice": "Invoice",
-		"readyToPay": "is ready to pay",
-		"describeOrder": "Use this field to describe your order",
-		"requestAnInvoice": "Request Invoice",
-		"submit": "Submit",
-		"isRequesting": "is requesting",
-		"invoiceFrom": "Invoice from",
-		"awaiting": "Awaiting",
-		"tapAnywhere": "Tap anywhere to continue",
-		"from": "from",
-		"redeem": "Redeem",
-		"redeemed": "Redeemed",
-		"redeemedBy": "Redeemed by",
-		"sendMessage": "Write a message..."
-	}
+  "404": {
+    "404": "404",
+    "pageNotFound": "Page not found."
+  },
+  "about": {
+    "header": "About",
+    "p1": "Coinos is an open source bitcoin payment app. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.",
+    "p2": "You can download the source code to run an instance and connect it to your own bitcoin and lightning nodes. We'll help you get started being a benevolent custodian and payments provider for your community.",
+    "p3": "Account transfers amongst users on our server are done off-chain so they're completely free, instant, and unlimited.",
+    "team": {
+      "header": "The Team",
+      "adam": {
+        "name": "Adam Soltys",
+        "position": "Chief Technical Officer",
+        "bio": "Adam is a web developer and bitcoin enthusiast who believes sound money is key to increasing global prosperity. He lives in North Vancouver with his wife Chelsea and two children."
+      },
+      "cole": {
+        "name": "Cole",
+        "position": "Certified Bitcoin Professional",
+        "bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible."
+      }
+    },
+    "locations": {
+      "header": "Locations",
+      "description": "Here are some businesses that are accepting bitcoin with Coinos. We hope that yours will be next!"
+    }
+  },
+  "error": {
+    "header": "Error",
+    "message": "Please try again or contact support.",
+    "signIn": "Please sign in to continue."
+  },
+  "faq": {
+    "header": "FAQ",
+    "cost": {
+      "question": "What does it cost?",
+      "answer": "It's free to register an account and receive payments. We charge a 0.1% conversion fee if you withdraw regular bitcoin to lightning or vice versa."
+    },
+    "compatibility": {
+      "question": "Do I need any special device or software?",
+      "answer": "No. Coinos is web based, so as long as you have an internet connection and a web browser, it works anywhere. Retail merchants might use it on a phone or a tablet."
+    },
+    "safety": {
+      "question": "When do my funds settle?",
+      "answer": "Lightning payments are settled instantly. You can withdraw your balance to another wallet or exchange immediately once funds are received."
+    }
+  },
+  "footer": {
+    "company": "Company",
+    "followUs": "Follow Us",
+    "github": "GitHub",
+    "linktree": "Linktree",
+    "jobs": "Jobs",
+    "support": "Support",
+    "telegram": "Telegram",
+    "twitter": "Twitter",
+    "documentation": "Documentation"
+  },
+  "howItWorks": {
+    "header": "How it works",
+    "step1": {
+      "header": "1. Create your account",
+      "description": "A username and password is all you need to get started."
+    },
+    "step2": {
+      "header": "2. Ask for payments",
+      "description": "The same as you normally would, but with bitcoin."
+    },
+    "step3": {
+      "header": "3. That's all!",
+      "description": "Spend your coin immediately or save it and watch it grow, the choice is yours."
+    }
+  },
+  "invoice": {
+    "addTip": "Add a tip",
+    "addTipq": "Add a tip?",
+    "done": "Done",
+    "paymentSuccessful": "Payment received!",
+    "invoice": "Invoice",
+    "total": "Total",
+    "tip": "Tip"
+  },
+  "jobs": {
+    "header": "Jobs",
+    "subheader": "Current Openings",
+    "pitch1": "Coinos is actively looking for developers to join our growing team (full-time or part-time, remote working OK).",
+    "pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on",
+    "github": "GitHub",
+    "pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to"
+  },
+  "landing": {
+    "header_before_icon": "The",
+    "header_with_icon": "easiest",
+    "header_after_icon": "way to get started with bitcoin.",
+    "subheader": "A simple but powerful web wallet for everyone. No software or hardware required.",
+    "info1": {
+      "title": "Instant payments via Lightning",
+      "description": "We make it easy for merchants to receive retail payments. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees."
+    },
+    "info2": {
+      "title": "Simple to use",
+      "description1": "Just enter an amount in your local currency, share the QR code and you’re done.",
+      "description2": "We do all the heavy lifting so you can focus on your business.",
+      "description3": "You always have the option of taking custody of your funds by withdrawing instantly at any time."
+    },
+    "info3": {
+      "title": "Brand it your way!",
+      "description": "Customize your profile page look and feel, or keep it on default - it's totally up to you."
+    }
+  },
+  "login": {
+    "optional": "Optional",
+    "token": "2FA Token",
+    "username": "Username",
+    "password": "Password",
+    "email": "Email",
+    "passwordRecommendation": "We recommend a long, random password generated with a password manager.",
+    "forgotUserOrPassword": "Forgot Username or Password?",
+    "haveAccount": "Already have an account?",
+    "noAccount": "Don't have an account?",
+    "register": "Register",
+    "signIn": "Sign In",
+    "failed": "Login failed"
+  },
+  "nav": {
+    "profile": "Profile",
+    "startInSeconds": "Start in Seconds",
+    "account": "Account",
+    "signIn": "Sign In",
+    "signOut": "Sign Out",
+    "dashboard": "Dashboard",
+    "settings": "Settings",
+    "support": "Support"
+  },
+  "newSiteHeader": "Join us at our <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> in Vancouver on October 26! Looking for the old coinos? Visit <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
+  "news": {
+    "header": "News",
+    "subheader": "Latest Updates",
+    "update1": ""
+  },
+  "user": {
+    "bitcoin": "Bitcoin",
+    "lightning": "Lightning",
+    "invoice": "Invoice",
+    "unfollow": "Unfollow",
+    "following": "Following",
+    "follow": "Follow",
+    "followers": "Followers",
+    "remove": "Remove",
+    "noNotes": "No notes yet",
+    "message": "Message",
+    "messages": "Messages",
+    "feed": "Feed",
+    "notes": "Notes",
+    "pay": "Pay",
+    "scanToPayBTC": "Scan to pay with bitcoin",
+    "this": "This",
+    "lightningAddress": "Lightning address",
+    "dashboard": {
+      "go": "Go",
+      "dashboard": "Dashboard",
+      "accountBalance": "Account Balance",
+      "bitcoinPrice": "bitcoin Price:",
+      "conversionFeeWarning": "You will be charged a 1% withdrawal fee on the amount.",
+      "dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.",
+      "fetchingRate": "fetching rate...",
+      "optionalNote": "Note (Optional)",
+      "send": "Send",
+      "receive": "Receive",
+      "withdraw": "Send",
+      "deposit": "Deposit",
+      "voucher": "Voucher"
+    },
+    "receive": {
+      "lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.",
+      "showQR": "Show QR"
+    },
+    "send": {
+      "contacts": "Contacts",
+      "scan": "Scan",
+      "paste": "Paste",
+      "next": "Next",
+      "placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
+    },
+    "settings": {
+      "saveSettings": "Save Settings",
+      "bannerImage": "Banner Image",
+      "profileImage": "Profile Image",
+      "oneTimeCode": "Enter one-time code",
+      "accountId": "Account Secret",
+      "header": "Settings",
+      "ACCOUNT": "ACCOUNT",
+      "POINT_OF_SALE": "PREFERENCES",
+      "SECURITY": "SECURITY",
+      "locale": "Language",
+      "username": "Username",
+      "email": "Email",
+      "newPassword": "Change Password",
+      "about": "About",
+      "aboutPlaceholder": "A little something about you or your business address and hours",
+      "emailNotifications": "Email Notifications",
+      "emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.",
+      "smsNotifications": "SMS Notifications",
+      "smsNotificationsDescription": "Coinos will send you text notifications when this is enabled.",
+      "theme": "Color Theme",
+      "tipPrompt": "Prompt for tips",
+      "tipPromptDescription": "Ask people if they want to add a tip before paying their invoices",
+      "displayName": "Display name",
+      "themeDescription": "Select from the default color themes.",
+      "localCurrency": "Currency",
+      "btcUnit": "Display bitcoin in:",
+      "bitcoin": "bitcoin",
+      "minutes": "minutes",
+      "hour": "hour",
+      "hours": "hours",
+      "satoshis": "Satoshis",
+      "securityPIN": "Security PIN",
+      "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.",
+      "setPIN": "Set PIN",
+      "autoLock": "Auto-Lock Timer",
+      "autoLockDescription": "Your account will go into a secure mode, requiring you to re-enter your credentials after a specified time:",
+      "twofa": "2-Factor Authentication",
+      "twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.",
+      "twofaSetup": "Set up 2FA",
+      "twofaDisable": "Disable 2FA",
+      "select": "Select",
+      "verifyPIN": "Verify PIN",
+      "enablePIN": "Enable PIN",
+      "disablePIN": "Disable PIN"
+    },
+    "support": {
+      "header": "Support",
+      "email": "Email",
+      "accountName": "Account Name",
+      "message": "Message",
+      "send": "Send"
+    }
+  },
+  "payments": {
+    "amount": "Amount",
+    "date": "Date",
+    "id": "Transaction ID",
+    "details": "Transaction Details",
+    "header": "Payments",
+    "preimage": "Proof of payment",
+    "type": "Type",
+    "time": "Time",
+    "sent": "Sent",
+    "received": "Received",
+    "empty": "No transactions yet.",
+    "send": "Send",
+    "next": "Next",
+    "sendersChoice": "Sender's choice",
+    "sendTo": "Send to",
+    "to": "to",
+    "pay": "Pay",
+    "requesting": "is requesting",
+    "sentInvoiceTo": "Sent invoice to",
+    "sentRequestTo": "Request sent!",
+    "pleasePay": "Please pay",
+    "day": "Day",
+    "week": "Week",
+    "month": "Month",
+    "all": "All",
+    "export": "Export",
+    "invoice": "Invoice",
+    "readyToPay": "is ready to pay",
+    "describeOrder": "Use this field to describe your order",
+    "requestAnInvoice": "Request Invoice",
+    "submit": "Submit",
+    "isRequesting": "is requesting",
+    "invoiceFrom": "Invoice from",
+    "awaiting": "Awaiting",
+    "tapAnywhere": "Tap anywhere to continue",
+    "from": "from",
+    "redeem": "Redeem",
+    "redeemed": "Redeemed",
+    "redeemedBy": "Redeemed by",
+    "sendMessage": "Write a message..."
+  }
 }
diff --git a/src/locales/fr.json b/src/locales/fr.json
index b79f5d54..ad5478f6 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -1,312 +1,312 @@
 {
-	"404": {
-		"404": "404",
-		"pageNotFound": "Page non trouvée."
-	},
-	"about": {
-		"header": "À Propos",
-		"locations": {
-			"header": "Établissements",
-			"description": "Il y a des entreprises qui acceptent bitcoin utilisant le point de vente coinos. Si vous utilisez notre appli, s'il vous plait <a href=\"mailto:contact@coinos.io\" class=\"underline underline-offset-4\">fais-le-nous savoir!</a>"
-		},
-		"team": {
-			"header": "L'Équipe",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Officier Technique Principal",
-				"bio": "Adam est développeur web et passionné de bitcoin.  Il croit que l'argent sûr est la clé pour augmenter la prospérité planétaire.  Il habite en Vancouver de Nord avec sa femme Chelsea et deux enfants."
-			},
-			"cole": {
-				"name": "Cole Goodwin",
-				"position": "Professionel de Bitcoin",
-				"bio": "Cole est un professionel de bitcoin diplômé et un homme motivé avec passion pour la liberté.  Il a découvert bitcoin en 2016 et l'a etudié en détail.  Maintenant, il veux introduire le réseau Lightning à autant d'utilisateurs que possible."
-			}
-		}
-	},
-	"error": {
-		"header": "Erreur",
-		"message": "S'il vous plait réessayez ou contactez l'assistance.",
-		"signIn": "Vous devez connecter pour continuer.",
-		"unrecognizedInput": "Donnée non reconnu"
-	},
-	"faq": {
-		"header": "FAQ",
-		"cost": {
-			"question": "Combien cela coûte-t-il?",
-			"answer": "Recevoir des paiements sur votre compte est gratuit. Les retraits vers des portefeuilles externes entraînent des frais minimes qui varient en fonction des conditions du réseau. Nous facturons 0,1% pour convertir entre le Bitcoin lightning et le Bitcoin on-chain. Envoyer à d'autres comptes Coinos est gratuit."
-		},
-		"compatibility": {
-			"question": "Ai-je besoin d'un dispositif ou d'un logiciel spécial?",
-			"answer": "Non, Coinos est une application web qui fonctionne partout où il y a Internet. Les commerçants pourraient l'utiliser sur une tablette ou afficher un code QR pour que les clients puissent le scanner avec leur téléphone."
-		},
-		"safety": {
-			"question": "Quand mes fonds sont-ils réglés?",
-			"answer": "Les paiements lightning sont réglés instantanément. Vous pouvez retirer votre solde vers un autre portefeuille en quelques secondes. Les dépôts on-chain prennent en moyenne 5-10 minutes pour être confirmés."
-		},
-		"pos": {
-			"question": "Coinos peut-il s'intégrer à mon PoS existant?",
-			"answer": "Nous recommandons d'entrer les ventes dans votre PoS existant comme des transactions en espèces."
-		},
-		"bitcoin": {
-			"question": "Que puis-je faire avec le Bitcoin?",
-			"answer": "Dépensez-le chez d'autres commerçants ou payez vos dépenses avec en incitant votre personnel, vos fournisseurs et votre propriétaire à l'accepter."
-		}
-	},
-	"footer": {
-		"followUs": "Suivez-Nous",
-		"twitter": "Twitter",
-		"github": "GitHub",
-		"company": "Entreprise",
-		"telegram": "Telegram",
-		"support": "Assistance",
-		"jobs": "Jobs",
-		"linktree": "Linktree",
-		"documentation": "Documentation"
-	},
-	"howItWorks": {
-		"header": "Comment cela Fonctionne",
-		"step1": {
-			"header": "1. Créez votre compte",
-			"description": "Un nom d'utilateur et mot de passe est tout ce dont vous avez besoin pour commencer."
-		},
-		"step2": {
-			"header": "2. Demande pour des paiements",
-			"description": "Comme vous faisiez normalement, mais avec bitcoin."
-		},
-		"step3": {
-			"header": "3. C'est tout!",
-			"description": "Vous pouvez convertir en monnaie local n'importe quand."
-		}
-	},
-	"landing": {
-		"header_before_icon": "Le",
-		"header_with_icon": "façon",
-		"header_after_icon": "le plus façile d'accepter bitcoin dans votre magasin.",
-		"subheader": "Agrandir votre clientèle et chiffre d'affaires en acceptant bitcoin avec un point de vente façile à utiliser et géré. Logiciel et matériel informatique non obligatoire.",
-		"info1": {
-			"title": "Paiements instantanés avec Lightning",
-			"description": "Le moment où votre client envoie un paiment, c'est là. Vous ne devez pas attendre les décisions des banques ou vous inquiéter pour des rejets de débit. Décisions instantanées, en secondes. Dites au revoir aux frais de transactions de 3% des cartes de crédit."
-		},
-		"info2": {
-			"title": "Simple à utiliser, en garde par défaut",
-			"description1": "Juste entrer une quantité, partager le code QR et c'est tout!",
-			"description2": "Tes comptes sont en garde par défaut, qui élimine le nécessité de comprendre comment bitcoin/lightning fonctionnent. Nous réalisons le plus gros du travail pour que vous puissiez vous concentrer sur votre entreprise.",
-			"description3": "Vous avez toujours l'option de <span class=\"underline undeline-offset-4\">gérer</span> vos clés."
-		},
-		"info3": {
-			"title": "Personalisez-le comme vous voulez",
-			"description": "Personalisez votre point de vente, ou utilisez les réglages par défaut - c'est votre chois."
-		}
-	},
-	"login": {
-		"username": "Nom d'utilisateur",
-		"password": "Mot de passe",
-		"email": "Courriel",
-		"passwordRecommendation": "Nous recommendons un mot de passe long et aléatoire, généré par un gestionnaire de mots de passe.",
-		"forgotUserOrPassword": "Oublié votre nom d'utilisateur ou mot de passe ?",
-		"haveAccount": "Avez-vous déjà un compte ?",
-		"noAccount": "Pas encore de compte ?",
-		"register": "Enregistrer",
-		"signIn": "Connexion",
-		"failed": "Echec de Connexion",
-		"optional": "Optionnel",
-		"token": "Jeton 2FA"
-	},
-	"nav": {
-		"startInSeconds": "Commence en Secondes",
-		"account": "Compte",
-		"signIn": "Connexion",
-		"signOut": "Déconnexion",
-		"dashboard": "Tableau de bord",
-		"settings": "Préférences",
-		"support": "Assistance",
-		"profile": "Profil",
-		"map": "Carte",
-		"merch": "Marchandise",
-		"about": "À Propos",
-		"docs": "Documents",
-		"messages": "Messages",
-		"funds": "Fonds"
-	},
-	"invoice": {
-		"addTip": "Ajoutez un pourboire",
-		"addTipq": "Ajouter un pourboire?",
-		"done": "Fini",
-		"paymentSuccessful": "Paiement réussi!",
-		"invoice": "Facture",
-		"total": "Total",
-		"tip": "Pourboire"
-	},
-	"jobs": {
-		"header": "Emplois",
-		"subheader": "Postes disponibles actuels",
-		"pitch1": "coinos recherche pour des développeurs pour joindre notre équipe croissant (temps plein ou partiel, télétravail OK)",
-		"pitch2": "Avez-vous hâte de travailler sur bitcoin open source? Regardez sur nos dépôts sur",
-		"github": "GitHub",
-		"pitch3": "Si vous pensez que vous pouvez exercer une influence positive, nous voulons que vous contribuez. Envoyer votre CV à"
-	},
-	"user": {
-		"follow": "Suivre",
-		"remove": "Enlève",
-		"scanToPayBTC": "Scanner pour payer avec bitcoin",
-		"dashboard": {
-			"dashboard": "Tableau de bord",
-			"accountBalance": "Solde",
-			"conversionFeeWarning": "Il y a des frais de 1% pour convertir entre bitcoin, Liquid et Lightning.",
-			"fetchingRate": "cherchant taut de change...",
-			"send": "Envoie",
-			"withdraw": "Retire",
-			"go": "Allez",
-			"receive": "Reçois un Paiement",
-			"deposit": "Déposer",
-			"voucher": "Bon"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "S'il vous plaît utilisez moins d'un bitcoin.",
-			"showQR": "Voire le QR code"
-		},
-		"settings": {
-			"header": "Préférences",
-			"ACCOUNT": "COMPTE",
-			"POINT_OF_SALE": "POINT DE VENTE",
-			"SECURITY": "SÉCURITÉ",
-			"locale": "Langue",
-			"username": "Nom d'Utilisateur",
-			"email": "Courriel",
-			"newPassword": "Nouveau Mot de Passe",
-			"emailNotifications": "Notifications par Courriel",
-			"emailNotificationsDescription": "Nous pouvons vous notifier par courriel quand votre compte change ou quand vous recevez des paiements",
-			"smsNotifications": "Notifications par SMS",
-			"smsNotificationsDescription": "Nous vous envoyons des notifications par texte quand c'est activé",
-			"theme": "Thème",
-			"themeDescription": "Sélectionnez des thèmes dèfauts.",
-			"localCurrency": "Monnaie Local",
-			"btcUnit": "Voire bitcoin en:",
-			"bitcoin": "bitcoin",
-			"satoshis": "Satoshis",
-			"securityPIN": "NIP de Sécurité",
-			"securityPINDescription": "Choisir un NIP de sécurité qui sera necessaire pour ouvrir tes préférences et pour envoyer des paiements sortants.",
-			"setPIN": "Choisir Votre NIP",
-			"autoLock": "Auto-Verouillage",
-			"autoLockDescription": "Ta conte activera une mode sécuritaire après une durée spécifiée:",
-			"twofa": "Authentification à 2 Facteurs",
-			"twofaDescription": "Ajoutez un autre niveau de sécurité par activez l'authentication à deux facteurs.",
-			"twofaSetup": "Activer A2F",
-			"bannerImage": "Image de Bandeau",
-			"profileImage": "Image de Profil",
-			"oneTimeCode": "Entrez mot de passe à usage unique",
-			"accountId": "Secret de conte",
-			"twofaDisable": "Désactivez A2F",
-			"about": "À Propos",
-			"aboutPlaceholder": "Un description court de vous ou votre entreprise (adresse, bio, etc.)",
-			"select": "Choisir",
-			"verifyPIN": "Verifiez votre NIP",
-			"enablePIN": "Activer NIP",
-			"disablePIN": "Désactiver NIP",
-			"saveSettings": "Sauvegarder Paramètres",
-			"tipPrompt": "Demande pour Pourboires",
-			"tipPromptDescription": "Demander les gens s'ils voulent ajouter un pourboire avant payer leurs factures",
-			"displayName": "Nom d'Utilisateur",
-			"minutes": "minutes",
-			"hour": "heure",
-			"hours": "heures",
-			"hideSeed": "Cache phrase mnémotechnique",
-			"revealSeed": "Montre phrase mnémotechnique"
-		},
-		"support": {
-			"header": "Assistance",
-			"email": "Courriel",
-			"accountName": "Nom d'utilisateur",
-			"message": "Message",
-			"send": "Envoie"
-		},
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Facture",
-		"unfollow": "Ne plus suivre",
-		"following": "Vous suivez",
-		"this": "Cette",
-		"lightningAddress": "Adresse de lightning",
-		"send": {
-			"contacts": "Contacts",
-			"scan": "Scannez",
-			"paste": "Collez",
-			"next": "Prochain",
-			"placeholder": "Collez une adresse de bitcoin, facture de lightning ou nom d'utilisateur coinos",
-			"makeQR": "QR"
-		},
-		"requestPayment": "Demander un Paiement",
-		"welcome": "Bienvenue! Le solde de votre conte est vide. Vous pouvez commencer par déposer ou recevoir un paiement.",
-		"showBalance": "Montrer Solde",
-		"followers": "Abonnés",
-		"noNotes": "Pas de notes",
-		"message": "Envoyer",
-		"messages": "Messages",
-		"feed": "Flux",
-		"notes": "Notes",
-		"pay": "Payer",
-		"profilePage": "Page de profil",
-		"nostrPubkey": "Clé publique nostr"
-	},
-	"news": {
-		"header": "Nouvelles",
-		"subheader": "Dernières Informations"
-	},
-	"payments": {
-		"addFunds": "Ajouter d'argent",
-		"takeFunds": "Prendre d'argent",
-		"show": "Démontrer",
-		"hide": "Cacher",
-		"qr": "QR",
-		"copyLink": "Copier le Lien",
-		"copyText": "Copier le Texte",
-		"openLink": "Ouvrer le Portefeuille",
-		"moreOptions": "Plus d'options",
-		"total": "Total",
-		"gainLoss": "Hausse/Perte",
-		"presentValue": "Valuer au présent",
-		"amount": "Quantité",
-		"date": "Date",
-		"id": "ID de Transaction",
-		"details": "Détails de Transaction",
-		"header": "Paiements",
-		"preimage": "Preuve de paiement",
-		"type": "Type",
-		"time": "Heure",
-		"sent": "Envoyé",
-		"received": "Reçu",
-		"empty": "Vous n'avez pas de transactions.",
-		"send": "Envoyer",
-		"next": "Prochain",
-		"sendTo": "Envoyer à",
-		"to": "à",
-		"pay": "Payer",
-		"requesting": "demande",
-		"sentInvoiceTo": "Envoyé une facture à",
-		"sentRequestTo": "Demande envoyé!",
-		"pleasePay": "S'il vous plait payez",
-		"day": "Jour",
-		"week": "Semaine",
-		"month": "Mois",
-		"all": "Toutes",
-		"export": "Exporter",
-		"invoice": "Facture",
-		"readyToPay": "est prêt a payer",
-		"describeOrder": "Utiliser ce champ pour décrire votre commande",
-		"requestAnInvoice": "Demander une facture",
-		"submit": "Soumettre",
-		"isRequesting": "demande",
-		"invoiceFrom": "Facture de",
-		"awaiting": "Attendant",
-		"tapAnywhere": "Taper n'importe où pour continuer",
-		"from": "de",
-		"redeem": "Racheter",
-		"redeemed": "Racheté",
-		"redeemedBy": "Racheté par",
-		"sendMessage": "Écrire une message...",
-		"fundsClaimed": "Les fonds sont réclamés!",
-		"print": "Imprime",
-		"create": "Crée",
-		"fund": "Finance"
-	}
+  "404": {
+    "404": "404",
+    "pageNotFound": "Page non trouvée."
+  },
+  "about": {
+    "header": "À Propos",
+    "locations": {
+      "header": "Établissements",
+      "description": "Il y a des entreprises qui acceptent bitcoin utilisant le point de vente coinos. Si vous utilisez notre appli, s'il vous plait <a href=\"mailto:contact@coinos.io\" class=\"underline underline-offset-4\">fais-le-nous savoir!</a>"
+    },
+    "team": {
+      "header": "L'Équipe",
+      "adam": {
+        "name": "Adam Soltys",
+        "position": "Officier Technique Principal",
+        "bio": "Adam est développeur web et passionné de bitcoin.  Il croit que l'argent sûr est la clé pour augmenter la prospérité planétaire.  Il habite en Vancouver de Nord avec sa femme Chelsea et deux enfants."
+      },
+      "cole": {
+        "name": "Cole Goodwin",
+        "position": "Professionel de Bitcoin",
+        "bio": "Cole est un professionel de bitcoin diplômé et un homme motivé avec passion pour la liberté.  Il a découvert bitcoin en 2016 et l'a etudié en détail.  Maintenant, il veux introduire le réseau Lightning à autant d'utilisateurs que possible."
+      }
+    }
+  },
+  "error": {
+    "header": "Erreur",
+    "message": "S'il vous plait réessayez ou contactez l'assistance.",
+    "signIn": "Vous devez connecter pour continuer.",
+    "unrecognizedInput": "Donnée non reconnu"
+  },
+  "faq": {
+    "header": "FAQ",
+    "cost": {
+      "question": "Combien cela coûte-t-il?",
+      "answer": "Recevoir des paiements sur votre compte est gratuit. Les retraits vers des portefeuilles externes entraînent des frais minimes qui varient en fonction des conditions du réseau. Nous facturons 0,1% pour convertir entre le Bitcoin lightning et le Bitcoin on-chain. Envoyer à d'autres comptes Coinos est gratuit."
+    },
+    "compatibility": {
+      "question": "Ai-je besoin d'un dispositif ou d'un logiciel spécial?",
+      "answer": "Non, Coinos est une application web qui fonctionne partout où il y a Internet. Les commerçants pourraient l'utiliser sur une tablette ou afficher un code QR pour que les clients puissent le scanner avec leur téléphone."
+    },
+    "safety": {
+      "question": "Quand mes fonds sont-ils réglés?",
+      "answer": "Les paiements lightning sont réglés instantanément. Vous pouvez retirer votre solde vers un autre portefeuille en quelques secondes. Les dépôts on-chain prennent en moyenne 5-10 minutes pour être confirmés."
+    },
+    "pos": {
+      "question": "Coinos peut-il s'intégrer à mon PoS existant?",
+      "answer": "Nous recommandons d'entrer les ventes dans votre PoS existant comme des transactions en espèces."
+    },
+    "bitcoin": {
+      "question": "Que puis-je faire avec le Bitcoin?",
+      "answer": "Dépensez-le chez d'autres commerçants ou payez vos dépenses avec en incitant votre personnel, vos fournisseurs et votre propriétaire à l'accepter."
+    }
+  },
+  "footer": {
+    "followUs": "Suivez-Nous",
+    "twitter": "Twitter",
+    "github": "GitHub",
+    "company": "Entreprise",
+    "telegram": "Telegram",
+    "support": "Assistance",
+    "jobs": "Jobs",
+    "linktree": "Linktree",
+    "documentation": "Documentation"
+  },
+  "howItWorks": {
+    "header": "Comment cela Fonctionne",
+    "step1": {
+      "header": "1. Créez votre compte",
+      "description": "Un nom d'utilateur et mot de passe est tout ce dont vous avez besoin pour commencer."
+    },
+    "step2": {
+      "header": "2. Demande pour des paiements",
+      "description": "Comme vous faisiez normalement, mais avec bitcoin."
+    },
+    "step3": {
+      "header": "3. C'est tout!",
+      "description": "Vous pouvez convertir en monnaie local n'importe quand."
+    }
+  },
+  "landing": {
+    "header_before_icon": "Le",
+    "header_with_icon": "façon",
+    "header_after_icon": "le plus façile d'accepter bitcoin dans votre magasin.",
+    "subheader": "Agrandir votre clientèle et chiffre d'affaires en acceptant bitcoin avec un point de vente façile à utiliser et géré. Logiciel et matériel informatique non obligatoire.",
+    "info1": {
+      "title": "Paiements instantanés avec Lightning",
+      "description": "Le moment où votre client envoie un paiment, c'est là. Vous ne devez pas attendre les décisions des banques ou vous inquiéter pour des rejets de débit. Décisions instantanées, en secondes. Dites au revoir aux frais de transactions de 3% des cartes de crédit."
+    },
+    "info2": {
+      "title": "Simple à utiliser, en garde par défaut",
+      "description1": "Juste entrer une quantité, partager le code QR et c'est tout!",
+      "description2": "Tes comptes sont en garde par défaut, qui élimine le nécessité de comprendre comment bitcoin/lightning fonctionnent. Nous réalisons le plus gros du travail pour que vous puissiez vous concentrer sur votre entreprise.",
+      "description3": "Vous avez toujours l'option de <span class=\"underline undeline-offset-4\">gérer</span> vos clés."
+    },
+    "info3": {
+      "title": "Personalisez-le comme vous voulez",
+      "description": "Personalisez votre point de vente, ou utilisez les réglages par défaut - c'est votre chois."
+    }
+  },
+  "login": {
+    "username": "Nom d'utilisateur",
+    "password": "Mot de passe",
+    "email": "Courriel",
+    "passwordRecommendation": "Nous recommendons un mot de passe long et aléatoire, généré par un gestionnaire de mots de passe.",
+    "forgotUserOrPassword": "Oublié votre nom d'utilisateur ou mot de passe ?",
+    "haveAccount": "Avez-vous déjà un compte ?",
+    "noAccount": "Pas encore de compte ?",
+    "register": "Enregistrer",
+    "signIn": "Connexion",
+    "failed": "Echec de Connexion",
+    "optional": "Optionnel",
+    "token": "Jeton 2FA"
+  },
+  "nav": {
+    "startInSeconds": "Commence en Secondes",
+    "account": "Compte",
+    "signIn": "Connexion",
+    "signOut": "Déconnexion",
+    "dashboard": "Tableau de bord",
+    "settings": "Préférences",
+    "support": "Assistance",
+    "profile": "Profil",
+    "map": "Carte",
+    "merch": "Marchandise",
+    "about": "À Propos",
+    "docs": "Documents",
+    "messages": "Messages",
+    "funds": "Fonds"
+  },
+  "invoice": {
+    "addTip": "Ajoutez un pourboire",
+    "addTipq": "Ajouter un pourboire?",
+    "done": "Fini",
+    "paymentSuccessful": "Paiement réussi!",
+    "invoice": "Facture",
+    "total": "Total",
+    "tip": "Pourboire"
+  },
+  "jobs": {
+    "header": "Emplois",
+    "subheader": "Postes disponibles actuels",
+    "pitch1": "coinos recherche pour des développeurs pour joindre notre équipe croissant (temps plein ou partiel, télétravail OK)",
+    "pitch2": "Avez-vous hâte de travailler sur bitcoin open source? Regardez sur nos dépôts sur",
+    "github": "GitHub",
+    "pitch3": "Si vous pensez que vous pouvez exercer une influence positive, nous voulons que vous contribuez. Envoyer votre CV à"
+  },
+  "user": {
+    "follow": "Suivre",
+    "remove": "Enlève",
+    "scanToPayBTC": "Scanner pour payer avec bitcoin",
+    "dashboard": {
+      "dashboard": "Tableau de bord",
+      "accountBalance": "Solde",
+      "conversionFeeWarning": "Il y a des frais de 1% pour convertir entre bitcoin, Liquid et Lightning.",
+      "fetchingRate": "cherchant taut de change...",
+      "send": "Envoie",
+      "withdraw": "Retire",
+      "go": "Allez",
+      "receive": "Reçois un Paiement",
+      "deposit": "Déposer",
+      "voucher": "Bon"
+    },
+    "receive": {
+      "lessThan1BTCWarning": "S'il vous plaît utilisez moins d'un bitcoin.",
+      "showQR": "Voire le QR code"
+    },
+    "settings": {
+      "header": "Préférences",
+      "ACCOUNT": "COMPTE",
+      "POINT_OF_SALE": "POINT DE VENTE",
+      "SECURITY": "SÉCURITÉ",
+      "locale": "Langue",
+      "username": "Nom d'Utilisateur",
+      "email": "Courriel",
+      "newPassword": "Nouveau Mot de Passe",
+      "emailNotifications": "Notifications par Courriel",
+      "emailNotificationsDescription": "Nous pouvons vous notifier par courriel quand votre compte change ou quand vous recevez des paiements",
+      "smsNotifications": "Notifications par SMS",
+      "smsNotificationsDescription": "Nous vous envoyons des notifications par texte quand c'est activé",
+      "theme": "Thème",
+      "themeDescription": "Sélectionnez des thèmes dèfauts.",
+      "localCurrency": "Monnaie Local",
+      "btcUnit": "Voire bitcoin en:",
+      "bitcoin": "bitcoin",
+      "satoshis": "Satoshis",
+      "securityPIN": "NIP de Sécurité",
+      "securityPINDescription": "Choisir un NIP de sécurité qui sera necessaire pour ouvrir tes préférences et pour envoyer des paiements sortants.",
+      "setPIN": "Choisir Votre NIP",
+      "autoLock": "Auto-Verouillage",
+      "autoLockDescription": "Ta conte activera une mode sécuritaire après une durée spécifiée:",
+      "twofa": "Authentification à 2 Facteurs",
+      "twofaDescription": "Ajoutez un autre niveau de sécurité par activez l'authentication à deux facteurs.",
+      "twofaSetup": "Activer A2F",
+      "bannerImage": "Image de Bandeau",
+      "profileImage": "Image de Profil",
+      "oneTimeCode": "Entrez mot de passe à usage unique",
+      "accountId": "Secret de conte",
+      "twofaDisable": "Désactivez A2F",
+      "about": "À Propos",
+      "aboutPlaceholder": "Un description court de vous ou votre entreprise (adresse, bio, etc.)",
+      "select": "Choisir",
+      "verifyPIN": "Verifiez votre NIP",
+      "enablePIN": "Activer NIP",
+      "disablePIN": "Désactiver NIP",
+      "saveSettings": "Sauvegarder Paramètres",
+      "tipPrompt": "Demande pour Pourboires",
+      "tipPromptDescription": "Demander les gens s'ils voulent ajouter un pourboire avant payer leurs factures",
+      "displayName": "Nom d'Utilisateur",
+      "minutes": "minutes",
+      "hour": "heure",
+      "hours": "heures",
+      "hideSeed": "Cache phrase mnémotechnique",
+      "revealSeed": "Montre phrase mnémotechnique"
+    },
+    "support": {
+      "header": "Assistance",
+      "email": "Courriel",
+      "accountName": "Nom d'utilisateur",
+      "message": "Message",
+      "send": "Envoie"
+    },
+    "bitcoin": "Bitcoin",
+    "lightning": "Lightning",
+    "invoice": "Facture",
+    "unfollow": "Ne plus suivre",
+    "following": "Vous suivez",
+    "this": "Cette",
+    "lightningAddress": "Adresse de lightning",
+    "send": {
+      "contacts": "Contacts",
+      "scan": "Scannez",
+      "paste": "Collez",
+      "next": "Prochain",
+      "placeholder": "Collez une adresse de bitcoin, facture de lightning ou nom d'utilisateur coinos",
+      "makeQR": "QR"
+    },
+    "requestPayment": "Demander un Paiement",
+    "welcome": "Bienvenue! Le solde de votre conte est vide. Vous pouvez commencer par déposer ou recevoir un paiement.",
+    "showBalance": "Montrer Solde",
+    "followers": "Abonnés",
+    "noNotes": "Pas de notes",
+    "message": "Envoyer",
+    "messages": "Messages",
+    "feed": "Flux",
+    "notes": "Notes",
+    "pay": "Payer",
+    "profilePage": "Page de profil",
+    "nostrPubkey": "Clé publique nostr"
+  },
+  "news": {
+    "header": "Nouvelles",
+    "subheader": "Dernières Informations"
+  },
+  "payments": {
+    "addFunds": "Ajouter d'argent",
+    "takeFunds": "Prendre d'argent",
+    "show": "Démontrer",
+    "hide": "Cacher",
+    "qr": "QR",
+    "copyLink": "Copier le Lien",
+    "copyText": "Copier le Texte",
+    "openLink": "Ouvrer le Portefeuille",
+    "moreOptions": "Plus d'options",
+    "total": "Total",
+    "gainLoss": "Hausse/Perte",
+    "presentValue": "Valuer au présent",
+    "amount": "Quantité",
+    "date": "Date",
+    "id": "ID de Transaction",
+    "details": "Détails de Transaction",
+    "header": "Paiements",
+    "preimage": "Preuve de paiement",
+    "type": "Type",
+    "time": "Heure",
+    "sent": "Envoyé",
+    "received": "Reçu",
+    "empty": "Vous n'avez pas de transactions.",
+    "send": "Envoyer",
+    "next": "Prochain",
+    "sendTo": "Envoyer à",
+    "to": "à",
+    "pay": "Payer",
+    "requesting": "demande",
+    "sentInvoiceTo": "Envoyé une facture à",
+    "sentRequestTo": "Demande envoyé!",
+    "pleasePay": "S'il vous plait payez",
+    "day": "Jour",
+    "week": "Semaine",
+    "month": "Mois",
+    "all": "Toutes",
+    "export": "Exporter",
+    "invoice": "Facture",
+    "readyToPay": "est prêt a payer",
+    "describeOrder": "Utiliser ce champ pour décrire votre commande",
+    "requestAnInvoice": "Demander une facture",
+    "submit": "Soumettre",
+    "isRequesting": "demande",
+    "invoiceFrom": "Facture de",
+    "awaiting": "Attendant",
+    "tapAnywhere": "Taper n'importe où pour continuer",
+    "from": "de",
+    "redeem": "Racheter",
+    "redeemed": "Racheté",
+    "redeemedBy": "Racheté par",
+    "sendMessage": "Écrire une message...",
+    "fundsClaimed": "Les fonds sont réclamés!",
+    "print": "Imprime",
+    "create": "Crée",
+    "fund": "Finance"
+  }
 }
diff --git a/src/locales/pt.json b/src/locales/pt.json
index f4fb5408..dcf6ecdb 100644
--- a/src/locales/pt.json
+++ b/src/locales/pt.json
@@ -1,36 +1,36 @@
 {
-	"404": {
-		"404": "404",
-		"pageNotFound": "Página não encontrada."
-	},
-	"about": {
-		"header": "Sobre",
-		"p1": "O Coinos é uma aplicação de pagamento de bitcoin de código aberto. O desenvolvimento começou em Vancouver em Setembro de 2012 como forma de fornecer aos comerciantes locais uma forma conveniente de aceitar pagamentos de bitcoin.",
-		"p2": "Você pode baixar o código fonte para executar uma instância e ligá-lo aos seus próprios nós de bitcoin e da Lightning Network. Vamos ajudá-lo a começar a ser um depositário benevolente e fornecedor de pagamentos para a sua comunidade..",
-		"p3": "As transferências de conta entre utilizadores no nosso servidor são feitas off-chain, por isso são completamente gratuitas, instantâneas e ilimitadas.",
-		"team": {
-			"header": "O time",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Responsável Técnico Principal",
-				"bio": "Adam é um desenvolvedor web e um entusiasta do bitcoin que acredita que o dinheiro sólido é a chave para aumentar a prosperidade global. Ele vive em North Vancouver com a sua esposa Chelsea e dois filhos."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Profissional Certificado de Bitcoin",
-				"bio": "Cole é um indivíduo motivado com uma paixão pela liberdade. Encontrou-se com o bitcoin em 2016 e estudou-o em profundidade. Agora quer introduzir a rede lightning ao maior número de utilizadores possível."
-			}
-		},
-		"locations": {
-			"header": "Locais",
-			"description": "Aqui estão algumas empresas que estão aceitando bitcoin com a Coinos. Esperamos que o seu seja o próximo!"
-		}
-	},
-	"error": {
-		"header": "Erro",
-		"message": "Por favor tente novamente ou contate o suporte.",
-		"signIn": "Por favor, faça o login para continuar."
-	},
+  "404": {
+    "404": "404",
+    "pageNotFound": "Página não encontrada."
+  },
+  "about": {
+    "header": "Sobre",
+    "p1": "O Coinos é uma aplicação de pagamento de bitcoin de código aberto. O desenvolvimento começou em Vancouver em Setembro de 2012 como forma de fornecer aos comerciantes locais uma forma conveniente de aceitar pagamentos de bitcoin.",
+    "p2": "Você pode baixar o código fonte para executar uma instância e ligá-lo aos seus próprios nós de bitcoin e da Lightning Network. Vamos ajudá-lo a começar a ser um depositário benevolente e fornecedor de pagamentos para a sua comunidade..",
+    "p3": "As transferências de conta entre utilizadores no nosso servidor são feitas off-chain, por isso são completamente gratuitas, instantâneas e ilimitadas.",
+    "team": {
+      "header": "O time",
+      "adam": {
+        "name": "Adam Soltys",
+        "position": "Responsável Técnico Principal",
+        "bio": "Adam é um desenvolvedor web e um entusiasta do bitcoin que acredita que o dinheiro sólido é a chave para aumentar a prosperidade global. Ele vive em North Vancouver com a sua esposa Chelsea e dois filhos."
+      },
+      "cole": {
+        "name": "Cole",
+        "position": "Profissional Certificado de Bitcoin",
+        "bio": "Cole é um indivíduo motivado com uma paixão pela liberdade. Encontrou-se com o bitcoin em 2016 e estudou-o em profundidade. Agora quer introduzir a rede lightning ao maior número de utilizadores possível."
+      }
+    },
+    "locations": {
+      "header": "Locais",
+      "description": "Aqui estão algumas empresas que estão aceitando bitcoin com a Coinos. Esperamos que o seu seja o próximo!"
+    }
+  },
+  "error": {
+    "header": "Erro",
+    "message": "Por favor tente novamente ou contate o suporte.",
+    "signIn": "Por favor, faça o login para continuar."
+  },
   "faq": {
     "header": "FAQ",
     "why": {
@@ -70,240 +70,240 @@
       "answer": "Gástalo en otros comerciantes o paga tus gastos con él al conseguir que tu personal, proveedores y arrendador lo acepten."
     }
   },
-	"footer": {
-		"company": "Empresa",
-		"followUs": "Siga-nos",
-		"github": "GitHub",
-		"linktree": "Linktree",
-		"jobs": "Empregos",
-		"support": "Suporte",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"documentation": "Documentação"
-	},
-	"howItWorks": {
-		"header": "Como funciona",
-		"step1": {
-			"header": "1. Crie sua conta",
-			"description": "Um nome de usuário e senha é tudo o que você precisa para começar."
-		},
-		"step2": {
-			"header": "2. Solicite pagamentos",
-			"description": "O mesmo que você normalmente faria, mas com bitcoin."
-		},
-		"step3": {
-			"header": "3. Pronto!",
-			"description": "Gaste sua moeda imediatamente ou guarde-a e veja-a crescer, a escolha é sua."
-		}
-	},
-	"invoice": {
-		"addTip": "Adicionar gorjeta",
-		"addTipq": "Adicionar gorjeta?",
-		"done": "Feito",
-		"paymentSuccessful": "Pagamento recebido!",
-		"invoice": "Fatura",
-		"total": "Total",
-		"tip": "Gorjeta"
-	},
-	"jobs": {
-		"header": "Vagas de emprego",
-		"subheader": "Atualmente abertas",
-		"pitch1": "Coinos está procurando ativamente desenvolvedores para se juntar à nossa crescente equipe (tempo integral ou meio-período, trabalho remoto OK).",
-		"pitch2": "Entusiasmado com o trabalho em bitcoin open source? Então dê uma olhada em nossos repositórios em",
-		"github": "GitHub",
-		"pitch3": "Se você acha que pode causar um impacto, gostaríamos muito de ouvir de você. Envie-nos seu currículo para"
-	},
-	"landing": {
-		"header_before_icon": "O",
-		"header_with_icon": "jeito mais fácil",
-		"header_after_icon": "de iniciar no Bitcoin.",
-		"subheader": "Uma carteira web simples, mas poderosa para todos. Não requer software nem hardware.",
-		"info1": {
-			"title": "Pagamentos instantâneos via Lightning",
-			"description": "Facilitamos para os comerciantes o recebimento de pagamentos de varejo. Nada de esperar por liquidações bancárias ou se preocupar com chargebacks. Liquidação instantânea, em segundos. Diga adeus a 3% de taxas de processamento de cartão de crédito.."
-		},
-		"info2": {
-			"title": "Simples de usar",
-			"description1": "Basta inserir a quantia em sua moeda local, compartilhar o QR code e pronto..",
-			"description2": "Nós fazemos todo o trabalho pesado para que você possa se concentrar no seu negócio.",
-			"description3": "Você sempre tem a opção de tomar para sí a custódia de seus fundos, retirando-se imediatamente a qualquer momento."
-		},
-		"info3": {
-			"title": "Personalise do seu jeito!",
-			"description": "Personalize a aparência de sua página de perfil, ou mantenha o padrão - você escolhe."
-		}
-	},
-	"login": {
-		"optional": "Opcional",
-		"token": "2FA Token",
-		"username": "Usuário",
-		"password": "Senha",
-		"email": "Email",
-		"passwordRecommendation": "Recomendamos uma senha longa e aleatória gerada com um gerenciador de senhas.",
-		"forgotUserOrPassword": "Esqueceu o usuário ou senha?",
-		"haveAccount": "Já tem uma conta?",
-		"noAccount": "Não tem uma conta?",
-		"register": "Registre",
-		"signIn": "Entrar",
-		"failed": "Falha no login"
-	},
-	"nav": {
-		"profile": "Perfil",
-		"startInSeconds": "Inicie em segundos",
-		"account": "Conta",
-		"signIn": "Entrar",
-		"signOut": "Sair",
-		"dashboard": "Painel de controle",
-		"settings": "Ajustes",
-		"support": "Suporte"
-	},
-	"newSiteHeader": "Join us at our <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> in Vancouver on October 26! Looking for the old coinos? Visit <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
-	"news": {
-		"header": "Notícias",
-		"subheader": "Últimos Updates",
-		"update1": ""
-	},
-	"user": {
+  "footer": {
+    "company": "Empresa",
+    "followUs": "Siga-nos",
+    "github": "GitHub",
+    "linktree": "Linktree",
+    "jobs": "Empregos",
+    "support": "Suporte",
+    "telegram": "Telegram",
+    "twitter": "Twitter",
+    "documentation": "Documentação"
+  },
+  "howItWorks": {
+    "header": "Como funciona",
+    "step1": {
+      "header": "1. Crie sua conta",
+      "description": "Um nome de usuário e senha é tudo o que você precisa para começar."
+    },
+    "step2": {
+      "header": "2. Solicite pagamentos",
+      "description": "O mesmo que você normalmente faria, mas com bitcoin."
+    },
+    "step3": {
+      "header": "3. Pronto!",
+      "description": "Gaste sua moeda imediatamente ou guarde-a e veja-a crescer, a escolha é sua."
+    }
+  },
+  "invoice": {
+    "addTip": "Adicionar gorjeta",
+    "addTipq": "Adicionar gorjeta?",
+    "done": "Feito",
+    "paymentSuccessful": "Pagamento recebido!",
+    "invoice": "Fatura",
+    "total": "Total",
+    "tip": "Gorjeta"
+  },
+  "jobs": {
+    "header": "Vagas de emprego",
+    "subheader": "Atualmente abertas",
+    "pitch1": "Coinos está procurando ativamente desenvolvedores para se juntar à nossa crescente equipe (tempo integral ou meio-período, trabalho remoto OK).",
+    "pitch2": "Entusiasmado com o trabalho em bitcoin open source? Então dê uma olhada em nossos repositórios em",
+    "github": "GitHub",
+    "pitch3": "Se você acha que pode causar um impacto, gostaríamos muito de ouvir de você. Envie-nos seu currículo para"
+  },
+  "landing": {
+    "header_before_icon": "O",
+    "header_with_icon": "jeito mais fácil",
+    "header_after_icon": "de iniciar no Bitcoin.",
+    "subheader": "Uma carteira web simples, mas poderosa para todos. Não requer software nem hardware.",
+    "info1": {
+      "title": "Pagamentos instantâneos via Lightning",
+      "description": "Facilitamos para os comerciantes o recebimento de pagamentos de varejo. Nada de esperar por liquidações bancárias ou se preocupar com chargebacks. Liquidação instantânea, em segundos. Diga adeus a 3% de taxas de processamento de cartão de crédito.."
+    },
+    "info2": {
+      "title": "Simples de usar",
+      "description1": "Basta inserir a quantia em sua moeda local, compartilhar o QR code e pronto..",
+      "description2": "Nós fazemos todo o trabalho pesado para que você possa se concentrar no seu negócio.",
+      "description3": "Você sempre tem a opção de tomar para sí a custódia de seus fundos, retirando-se imediatamente a qualquer momento."
+    },
+    "info3": {
+      "title": "Personalise do seu jeito!",
+      "description": "Personalize a aparência de sua página de perfil, ou mantenha o padrão - você escolhe."
+    }
+  },
+  "login": {
+    "optional": "Opcional",
+    "token": "2FA Token",
+    "username": "Usuário",
+    "password": "Senha",
+    "email": "Email",
+    "passwordRecommendation": "Recomendamos uma senha longa e aleatória gerada com um gerenciador de senhas.",
+    "forgotUserOrPassword": "Esqueceu o usuário ou senha?",
+    "haveAccount": "Já tem uma conta?",
+    "noAccount": "Não tem uma conta?",
+    "register": "Registre",
+    "signIn": "Entrar",
+    "failed": "Falha no login"
+  },
+  "nav": {
+    "profile": "Perfil",
+    "startInSeconds": "Inicie em segundos",
+    "account": "Conta",
+    "signIn": "Entrar",
+    "signOut": "Sair",
+    "dashboard": "Painel de controle",
+    "settings": "Ajustes",
+    "support": "Suporte"
+  },
+  "newSiteHeader": "Join us at our <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> in Vancouver on October 26! Looking for the old coinos? Visit <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
+  "news": {
+    "header": "Notícias",
+    "subheader": "Últimos Updates",
+    "update1": ""
+  },
+  "user": {
     "requestPayment": "Gerar fatura",
     "welcome": "Bem-vindo! O saldo da sua conta está vazio. Você pode começar fazendo um depósito ou recebendo um pagamento.",
     "showBalance": "Mostrar Saldo",
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Fatura",
-		"unfollow": "Deixar de seguir",
-		"following": "Seguindo",
-		"follow": "Seguir",
-		"followers": "Seguidores",
-		"remove": "Remover",
-		"noNotes": "Nenhuma nota ainda",
-		"message": "Mensagem",
-		"messages": "Mensagens",
-		"feed": "Feed",
-		"notes": "Notas",
-		"pay": "Pagar",
-		"scanToPayBTC": "Escaneie para pagar com bitcoin",
-		"this": "Este",
-		"lightningAddress": "Endereço lightning",
-		"dashboard": {
-			"go": "Ir",
-			"dashboard": "Painel de controle",
-			"accountBalance": "Saldo na conta",
-			"bitcoinPrice": "Preço do bitcoin:",
-			"conversionFeeWarning": "Será cobrada uma taxa de retirada de 1% sobre o valor.",
-			"dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.",
-			"fetchingRate": "buscando taxa...",
-			"optionalNote": "Nota (Opcional)",
-			"send": "Enviar",
-			"receive": "Receber",
-			"withdraw": "Enviar",
-			"deposit": "Deposit",
-			"voucher": "Voucher"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Favor inserir uma quantidade inferior a 1 bitcoin.",
-			"showQR": "Mostrar QR code"
-		},
-		"send": {
-			"contacts": "Contatos",
-			"scan": "Escanear",
-			"paste": "Colar",
-			"next": "Continuar",
-			"placeholder": "Colar um endereço de bitcoin, fatura lightning ou nome de usuário na coinos"
-		},
-		"settings": {
-			"saveSettings": "Salvar ajustes",
-			"bannerImage": "Imagem do banner",
-			"profileImage": "Imagem do perfil",
-			"oneTimeCode": "Entre com o código único",
-			"accountId": "ID da conta",
-			"header": "Ajustes",
-			"ACCOUNT": "CONTA",
-			"POINT_OF_SALE": "PREFERÊNCIAS",
-			"SECURITY": "SEGURANÇA",
-			"locale": "Idioma",
-			"username": "Usuário",
-			"email": "Email",
-			"newPassword": "Alterar senhar",
-			"about": "Sobre",
-			"aboutPlaceholder": "Um pouco sobre você ou seu endereço comercial e horários",
-			"emailNotifications": "Notificações por email",
-			"emailNotificationsDescription": "Ser notificado por e-mail quando ocorrer uma mudança em sua conta ou quando as pessoas lhe enviarem pagamentos.",
-			"smsNotifications": "Notificações por SMS",
-			"smsNotificationsDescription": "A Coinos lhe enviará notificações por SMS quando isto estiver habilitado.",
-			"theme": "Cor do tema",
-			"tipPrompt": "Mostrar opção gorjetas",
-			"tipPromptDescription": "Pergunte às pessoas se elas querem acrescentar uma gorjeta antes de pagar sua fatura",
-			"displayName": "Mostrar nome",
-			"themeDescription": "Selecionar entre os temas de cor padrão.",
-			"localCurrency": "Moeda",
-			"btcUnit": "Mostrar bitcoin em:",
-			"bitcoin": "bitcoin",
-			"minutes": "minutos",
-			"hour": "hora",
-			"hours": "horas",
-			"satoshis": "Satoshis",
-			"securityPIN": "PIN de segurança",
-			"securityPINDescription": "Estabeleça um PIN de segurança que será usado para desbloquear suas configurações e para enviar pagamentos.",
-			"setPIN": "Insira o PIN",
-			"autoLock": "Bloqueio automático",
-			"autoLockDescription": "Sua conta entrará em um modo seguro, exigindo que você reentre suas credenciais após um tempo especificado:",
-			"twofa": "Eutenticação de 2 fatores",
-			"twofaDescription": "Adicione um nível extra de segurança ao seu dispositivo, permitindo autenticação de 2 fatores.",
-			"twofaSetup": "Habilitar o 2FA",
-			"twofaDisable": "Desabilitar o 2FA",
-			"select": "Selecionar",
-			"verifyPIN": "Verificar PIN",
-			"enablePIN": "Habilitar PIN",
-			"disablePIN": "Desabilitar PIN"
-		},
-		"support": {
-			"header": "Suporte",
-			"email": "Email",
-			"accountName": "Usuário",
-			"message": "Mensagem",
-			"send": "Enviar"
-		}
-	},
-	"payments": {
-		"amount": "Quantidade",
-		"date": "Data",
-		"id": "ID de transação",
-		"details": "Details da transação",
-		"header": "Pagamentos",
-		"preimage": "Prova de pagamento",
-		"type": "Tipo",
-		"time": "Hora",
-		"sent": "Enviado",
-		"received": "Recebido",
-		"empty": "Nenhuma transação ainda.",
-		"send": "Enviar",
-		"next": "Continuar",
-		"sendersChoice": "A escolha do remetente",
-		"sendTo": "Enviar para",
-		"to": "para",
-		"pay": "Pagar",
-		"requesting": "solicitando",
-		"sentInvoiceTo": "Fatura enviada para",
-		"sentRequestTo": "Solicitação enviada!",
-		"pleasePay": "Por favor pague",
-		"day": "Dia",
-		"week": "Semana",
-		"month": "Mês",
-		"all": "Todos",
-		"export": "Exportar",
-		"invoice": "Fatura",
-		"readyToPay": "está pronta para pagar",
-		"describeOrder": "Use este campo para descrever seu pedido",
-		"requestAnInvoice": "Solicitar Fatura",
-		"submit": "O envio",
-		"isRequesting": "foi solicitado",
-		"invoiceFrom": "Fatura de",
-		"awaiting": "Aguardando",
-		"tapAnywhere": "Toque em qualquer lugar para continuar",
-		"from": "de",
-		"redeem": "Resgatar",
-		"redeemed": "Resgatado",
-		"redeemedBy": "Resgatado por",
-		"sendMessage": "Escreva uma mensagem..."
-	}
+    "bitcoin": "Bitcoin",
+    "lightning": "Lightning",
+    "invoice": "Fatura",
+    "unfollow": "Deixar de seguir",
+    "following": "Seguindo",
+    "follow": "Seguir",
+    "followers": "Seguidores",
+    "remove": "Remover",
+    "noNotes": "Nenhuma nota ainda",
+    "message": "Mensagem",
+    "messages": "Mensagens",
+    "feed": "Feed",
+    "notes": "Notas",
+    "pay": "Pagar",
+    "scanToPayBTC": "Escaneie para pagar com bitcoin",
+    "this": "Este",
+    "lightningAddress": "Endereço lightning",
+    "dashboard": {
+      "go": "Ir",
+      "dashboard": "Painel de controle",
+      "accountBalance": "Saldo na conta",
+      "bitcoinPrice": "Preço do bitcoin:",
+      "conversionFeeWarning": "Será cobrada uma taxa de retirada de 1% sobre o valor.",
+      "dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.",
+      "fetchingRate": "buscando taxa...",
+      "optionalNote": "Nota (Opcional)",
+      "send": "Enviar",
+      "receive": "Receber",
+      "withdraw": "Enviar",
+      "deposit": "Deposit",
+      "voucher": "Voucher"
+    },
+    "receive": {
+      "lessThan1BTCWarning": "Favor inserir uma quantidade inferior a 1 bitcoin.",
+      "showQR": "Mostrar QR code"
+    },
+    "send": {
+      "contacts": "Contatos",
+      "scan": "Escanear",
+      "paste": "Colar",
+      "next": "Continuar",
+      "placeholder": "Colar um endereço de bitcoin, fatura lightning ou nome de usuário na coinos"
+    },
+    "settings": {
+      "saveSettings": "Salvar ajustes",
+      "bannerImage": "Imagem do banner",
+      "profileImage": "Imagem do perfil",
+      "oneTimeCode": "Entre com o código único",
+      "accountId": "ID da conta",
+      "header": "Ajustes",
+      "ACCOUNT": "CONTA",
+      "POINT_OF_SALE": "PREFERÊNCIAS",
+      "SECURITY": "SEGURANÇA",
+      "locale": "Idioma",
+      "username": "Usuário",
+      "email": "Email",
+      "newPassword": "Alterar senhar",
+      "about": "Sobre",
+      "aboutPlaceholder": "Um pouco sobre você ou seu endereço comercial e horários",
+      "emailNotifications": "Notificações por email",
+      "emailNotificationsDescription": "Ser notificado por e-mail quando ocorrer uma mudança em sua conta ou quando as pessoas lhe enviarem pagamentos.",
+      "smsNotifications": "Notificações por SMS",
+      "smsNotificationsDescription": "A Coinos lhe enviará notificações por SMS quando isto estiver habilitado.",
+      "theme": "Cor do tema",
+      "tipPrompt": "Mostrar opção gorjetas",
+      "tipPromptDescription": "Pergunte às pessoas se elas querem acrescentar uma gorjeta antes de pagar sua fatura",
+      "displayName": "Mostrar nome",
+      "themeDescription": "Selecionar entre os temas de cor padrão.",
+      "localCurrency": "Moeda",
+      "btcUnit": "Mostrar bitcoin em:",
+      "bitcoin": "bitcoin",
+      "minutes": "minutos",
+      "hour": "hora",
+      "hours": "horas",
+      "satoshis": "Satoshis",
+      "securityPIN": "PIN de segurança",
+      "securityPINDescription": "Estabeleça um PIN de segurança que será usado para desbloquear suas configurações e para enviar pagamentos.",
+      "setPIN": "Insira o PIN",
+      "autoLock": "Bloqueio automático",
+      "autoLockDescription": "Sua conta entrará em um modo seguro, exigindo que você reentre suas credenciais após um tempo especificado:",
+      "twofa": "Eutenticação de 2 fatores",
+      "twofaDescription": "Adicione um nível extra de segurança ao seu dispositivo, permitindo autenticação de 2 fatores.",
+      "twofaSetup": "Habilitar o 2FA",
+      "twofaDisable": "Desabilitar o 2FA",
+      "select": "Selecionar",
+      "verifyPIN": "Verificar PIN",
+      "enablePIN": "Habilitar PIN",
+      "disablePIN": "Desabilitar PIN"
+    },
+    "support": {
+      "header": "Suporte",
+      "email": "Email",
+      "accountName": "Usuário",
+      "message": "Mensagem",
+      "send": "Enviar"
+    }
+  },
+  "payments": {
+    "amount": "Quantidade",
+    "date": "Data",
+    "id": "ID de transação",
+    "details": "Details da transação",
+    "header": "Pagamentos",
+    "preimage": "Prova de pagamento",
+    "type": "Tipo",
+    "time": "Hora",
+    "sent": "Enviado",
+    "received": "Recebido",
+    "empty": "Nenhuma transação ainda.",
+    "send": "Enviar",
+    "next": "Continuar",
+    "sendersChoice": "A escolha do remetente",
+    "sendTo": "Enviar para",
+    "to": "para",
+    "pay": "Pagar",
+    "requesting": "solicitando",
+    "sentInvoiceTo": "Fatura enviada para",
+    "sentRequestTo": "Solicitação enviada!",
+    "pleasePay": "Por favor pague",
+    "day": "Dia",
+    "week": "Semana",
+    "month": "Mês",
+    "all": "Todos",
+    "export": "Exportar",
+    "invoice": "Fatura",
+    "readyToPay": "está pronta para pagar",
+    "describeOrder": "Use este campo para descrever seu pedido",
+    "requestAnInvoice": "Solicitar Fatura",
+    "submit": "O envio",
+    "isRequesting": "foi solicitado",
+    "invoiceFrom": "Fatura de",
+    "awaiting": "Aguardando",
+    "tapAnywhere": "Toque em qualquer lugar para continuar",
+    "from": "de",
+    "redeem": "Resgatar",
+    "redeemed": "Resgatado",
+    "redeemedBy": "Resgatado por",
+    "sendMessage": "Escreva uma mensagem..."
+  }
 }
diff --git a/src/locales/zh.json b/src/locales/zh.json
index 8fc41c38..cd606216 100644
--- a/src/locales/zh.json
+++ b/src/locales/zh.json
@@ -1,290 +1,290 @@
 {
-	"404": {
-		"404": "404",
-		"pageNotFound": "Page not found."
-	},
-	"about": {
-		"header": "About",
-		"p1": "Coinos is an open source bitcoin payment app. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.",
-		"p2": "You can download the source code to run an instance and connect it to your own bitcoin and lightning nodes. We'll help you get started being a benevolent custodian and payments provider for your community.",
-		"p3": "Account transfers amongst users on our server are done off-chain so they're completely free, instant, and unlimited.",
-		"team": {
-			"header": "The Team",
-			"adam": {
-				"name": "Adam Soltys",
-				"position": "Chief Technical Officer",
-				"bio": "Adam is a web developer and bitcoin enthusiast who believes sound money is key to increasing global prosperity. He lives in North Vancouver with his wife Chelsea and two children."
-			},
-			"shauna": {
-				"name": "Shauna",
-				"position": "Operations & Marketing",
-				"bio": "Strategic & Project Management. Jack of all Trades. Can always find time to meet for coffee."
-			},
-			"cole": {
-				"name": "Cole",
-				"position": "Certified Bitcoin Professional",
-				"bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible."
-			},
-			"john": {
-				"name": "John Barratt",
-				"position": "Full Stack Web Developer",
-				"bio": "When not coding you can find John out in the woods hiking all the great trails that BC has to offer."
-			}
-		},
-		"locations": {
-			"header": "Locations",
-			"description": "Here are some businesses that are accepting bitcoin with Coinos. We hope that yours will be next!"
-		}
-	},
-	"error": {
-		"header": "Error",
-		"message": "Please try again or contact support.",
-		"signIn": "Please sign in to continue."
-	},
-	"faq": {
-		"header": "FAQ",
-		"cost": {
-			"question": "What does it cost?",
-			"answer": "It's free to register an account and receive payments over the lightning network. We charge a 0.1% fee to convert from lightning to bitcoin."
-		},
-		"compatibility": {
-			"question": "Do I need any special device or software?",
-			"answer": "No. Coinos is web-based, so as long as you have an internet connection, you can use it on any device. Retail merchants might use it on a phone or a tablet."
-		},
-		"safety": {
-			"question": "When do my funds settle?",
-			"answer": "Lightning payments are settled instantly. You can withdraw your balance to another wallet or exchange right after payments are received."
-		}
-	},
-	"footer": {
-		"company": "Company",
-		"followUs": "Follow Us",
-		"github": "GitHub",
-		"jobs": "Jobs",
-		"support": "Support",
-		"telegram": "Telegram",
-		"twitter": "Twitter",
-		"documentation": "Documentation"
-	},
-	"howItWorks": {
-		"header": "How it works",
-		"step1": {
-			"header": "1. Create your account",
-			"description": "A username and password is all you need to get started."
-		},
-		"step2": {
-			"header": "2. Ask for payments",
-			"description": "The same as you normally would, but with bitcoin."
-		},
-		"step3": {
-			"header": "3. That's all!",
-			"description": "Spend your coin at other merchants or save it for a rainy day, the choice is yours."
-		}
-	},
-	"invoice": {
-		"addTip": "Add a tip",
-		"addTipq": "Add a tip?",
-		"done": "Done",
-		"paymentSuccessful": "Payment received!",
-		"invoice": "Invoice",
-		"total": "Total",
-		"tip": "Tip"
-	},
-	"jobs": {
-		"header": "Jobs",
-		"subheader": "Current Openings",
-		"pitch1": "Coinos is actively looking for developers to join our growing team (full-time or part-time, remote working OK).",
-		"pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on",
-		"github": "GitHub",
-		"pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to"
-	},
-	"landing": {
-		"header_before_icon": "The",
-		"header_with_icon": "easiest",
-		"header_after_icon": "way to accept bitcoin in your store.",
-		"subheader": "Grow your customer base and revenue by accepting bitcoin with an easy-to-use web app. No software or hardware required.",
-		"info1": {
-			"title": "Instant payments via Lightning",
-			"description": "The moment your customer sends a payment, it’s there. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees."
-		},
-		"info2": {
-			"title": "Simple to use",
-			"description1": "Just enter an amount in your local currency, share the QR code and you’re done.",
-			"description2": "We do all the heavy lifting so you can focus on your business.",
-			"description3": "You always have the option of taking custody of your funds by withdrawing instantly at any time."
-		},
-		"info3": {
-			"title": "Brand it your way!",
-			"description": "Customize your point of sale look and feel, or keep it on default - it's totally up to you."
-		}
-	},
-	"login": {
-		"optional": "Optional",
-		"token": "2FA Token",
-		"username": "Username",
-		"password": "Password",
-		"email": "Email",
-		"passwordRecommendation": "We recommend a long, random password generated with a password manager.",
-		"forgotUserOrPassword": "Forgot Username or Password?",
-		"haveAccount": "Already have an account?",
-		"noAccount": "Don't have an account?",
-		"register": "Register",
-		"signIn": "Sign In",
-		"failed": "Login failed"
-	},
-	"nav": {
-		"profile": "Profile",
-		"startInSeconds": "Start in Seconds",
-		"account": "Account",
-		"signIn": "Sign In",
-		"signOut": "Sign Out",
-		"dashboard": "Dashboard",
-		"settings": "Settings",
-		"support": "Support"
-	},
-	"newSiteHeader": "Join us at our <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> in Vancouver on October 26! Looking for the old coinos? Visit <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
-	"news": {
-		"header": "News",
-		"subheader": "Latest Updates",
-		"update1": ""
-	},
-	"user": {
-		"bitcoin": "Bitcoin",
-		"lightning": "Lightning",
-		"invoice": "Invoice",
-		"unfollow": "Unfollow",
-		"following": "Following",
-		"follow": "Follow",
-		"followers": "Followers",
-		"remove": "Remove",
-		"noNotes": "No notes yet",
-		"message": "Message",
-		"messages": "Messages",
-		"feed": "Feed",
-		"notes": "Notes",
-		"pay": "Pay",
-		"scanToPayBTC": "Scan to pay with bitcoin",
-		"this": "This",
-		"lightningAddress": "Lightning address",
-		"dashboard": {
-			"go": "Go",
-			"dashboard": "Dashboard",
-			"accountBalance": "Account Balance",
-			"bitcoinPrice": "bitcoin Price:",
-			"conversionFeeWarning": "You will be charged a 1% withdrawal fee on the amount.",
-			"dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.",
-			"fetchingRate": "fetching rate...",
-			"optionalNote": "Note (Optional)",
-			"send": "Send",
-			"receive": "Receive",
-			"withdraw": "Send",
-			"deposit": "Deposit",
-			"voucher": "Voucher"
-		},
-		"receive": {
-			"lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.",
-			"showQR": "Show QR"
-		},
-		"send": {
-			"contacts": "Contacts",
-			"scan": "Scan",
-			"paste": "Paste",
-			"next": "Next",
-			"placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
-		},
-		"settings": {
-			"bannerImage": "Banner Image",
-			"profileImage": "Profile Image",
-			"oneTimeCode": "Enter one-time code",
-			"accountId": "Account Secret",
-			"header": "Settings",
-			"ACCOUNT": "ACCOUNT",
-			"POINT_OF_SALE": "PREFERENCES",
-			"SECURITY": "SECURITY",
-			"locale": "Language",
-			"username": "Username",
-			"email": "Email",
-			"newPassword": "Change Password",
-			"about": "About",
-			"aboutPlaceholder": "A little something about you or your business address and hours",
-			"emailNotifications": "Email Notifications",
-			"emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.",
-			"smsNotifications": "SMS Notifications",
-			"smsNotificationsDescription": "Coinos will send you text notifications when this is enabled.",
-			"theme": "Color Theme",
-			"tipPrompt": "Prompt for tips",
-			"tipPromptDescription": "Ask people if they want to add a tip before paying their invoices",
-			"displayName": "Display name",
-			"themeDescription": "Select from the default color themes.",
-			"localCurrency": "Currency",
-			"btcUnit": "Display bitcoin in:",
-			"bitcoin": "bitcoin",
-			"minutes": "minutes",
-			"hour": "hour",
-			"hours": "hours",
-			"satoshis": "Satoshis",
-			"securityPIN": "Security PIN",
-			"securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.",
-			"setPIN": "Set PIN",
-			"autoLock": "Auto-Lock Timer",
-			"autoLockDescription": "Your account will go into a secure mode, requiring you to re-enter your credentials after a specified time:",
-			"twofa": "2-Factor Authentication",
-			"twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.",
-			"twofaSetup": "Set up 2FA",
-			"twofaDisable": "Disable 2FA",
-			"select": "Select",
-			"verifyPIN": "Verify PIN",
-			"enablePIN": "Enable PIN",
-			"disablePIN": "Disable PIN"
-		},
-		"support": {
-			"header": "Support",
-			"email": "Email",
-			"accountName": "Account Name",
-			"message": "Message",
-			"send": "Send"
-		}
-	},
-	"payments": {
-		"amount": "Amount",
-		"date": "Date",
-		"id": "Transaction ID",
-		"details": "Transaction Details",
-		"header": "Payments",
-		"preimage": "Proof of payment",
-		"type": "Type",
-		"time": "Time",
-		"sent": "Sent",
-		"received": "Received",
-		"empty": "No transactions yet.",
-		"send": "Send",
-		"next": "Next",
-		"sendersChoice": "Sender's choice",
-		"sendTo": "Send to",
-		"to": "to",
-		"pay": "Pay",
-		"requesting": "is requesting",
-		"sentInvoiceTo": "Sent invoice to",
-		"sentRequestTo": "Request sent!",
-		"pleasePay": "Please pay",
-		"day": "Day",
-		"week": "Week",
-		"month": "Month",
-		"all": "All",
-		"export": "Export",
-		"invoice": "Invoice",
-		"readyToPay": "is ready to pay",
-		"describeOrder": "Use this field to describe your order",
-		"requestAnInvoice": "Request Invoice",
-		"submit": "Submit",
-		"isRequesting": "is requesting",
-		"invoiceFrom": "Invoice from",
-		"awaiting": "Awaiting",
-		"tapAnywhere": "Tap anywhere to continue",
-		"from": "from",
-		"redeem": "Redeem",
-		"redeemed": "Redeemed",
-		"redeemedBy": "Redeemed by",
-		"sendMessage": "Write a message..."
-	}
+  "404": {
+    "404": "404",
+    "pageNotFound": "Page not found."
+  },
+  "about": {
+    "header": "About",
+    "p1": "Coinos is an open source bitcoin payment app. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.",
+    "p2": "You can download the source code to run an instance and connect it to your own bitcoin and lightning nodes. We'll help you get started being a benevolent custodian and payments provider for your community.",
+    "p3": "Account transfers amongst users on our server are done off-chain so they're completely free, instant, and unlimited.",
+    "team": {
+      "header": "The Team",
+      "adam": {
+        "name": "Adam Soltys",
+        "position": "Chief Technical Officer",
+        "bio": "Adam is a web developer and bitcoin enthusiast who believes sound money is key to increasing global prosperity. He lives in North Vancouver with his wife Chelsea and two children."
+      },
+      "shauna": {
+        "name": "Shauna",
+        "position": "Operations & Marketing",
+        "bio": "Strategic & Project Management. Jack of all Trades. Can always find time to meet for coffee."
+      },
+      "cole": {
+        "name": "Cole",
+        "position": "Certified Bitcoin Professional",
+        "bio": "Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. Now he wants to introduce the lightning network to as many users as possible."
+      },
+      "john": {
+        "name": "John Barratt",
+        "position": "Full Stack Web Developer",
+        "bio": "When not coding you can find John out in the woods hiking all the great trails that BC has to offer."
+      }
+    },
+    "locations": {
+      "header": "Locations",
+      "description": "Here are some businesses that are accepting bitcoin with Coinos. We hope that yours will be next!"
+    }
+  },
+  "error": {
+    "header": "Error",
+    "message": "Please try again or contact support.",
+    "signIn": "Please sign in to continue."
+  },
+  "faq": {
+    "header": "FAQ",
+    "cost": {
+      "question": "What does it cost?",
+      "answer": "It's free to register an account and receive payments over the lightning network. We charge a 0.1% fee to convert from lightning to bitcoin."
+    },
+    "compatibility": {
+      "question": "Do I need any special device or software?",
+      "answer": "No. Coinos is web-based, so as long as you have an internet connection, you can use it on any device. Retail merchants might use it on a phone or a tablet."
+    },
+    "safety": {
+      "question": "When do my funds settle?",
+      "answer": "Lightning payments are settled instantly. You can withdraw your balance to another wallet or exchange right after payments are received."
+    }
+  },
+  "footer": {
+    "company": "Company",
+    "followUs": "Follow Us",
+    "github": "GitHub",
+    "jobs": "Jobs",
+    "support": "Support",
+    "telegram": "Telegram",
+    "twitter": "Twitter",
+    "documentation": "Documentation"
+  },
+  "howItWorks": {
+    "header": "How it works",
+    "step1": {
+      "header": "1. Create your account",
+      "description": "A username and password is all you need to get started."
+    },
+    "step2": {
+      "header": "2. Ask for payments",
+      "description": "The same as you normally would, but with bitcoin."
+    },
+    "step3": {
+      "header": "3. That's all!",
+      "description": "Spend your coin at other merchants or save it for a rainy day, the choice is yours."
+    }
+  },
+  "invoice": {
+    "addTip": "Add a tip",
+    "addTipq": "Add a tip?",
+    "done": "Done",
+    "paymentSuccessful": "Payment received!",
+    "invoice": "Invoice",
+    "total": "Total",
+    "tip": "Tip"
+  },
+  "jobs": {
+    "header": "Jobs",
+    "subheader": "Current Openings",
+    "pitch1": "Coinos is actively looking for developers to join our growing team (full-time or part-time, remote working OK).",
+    "pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on",
+    "github": "GitHub",
+    "pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to"
+  },
+  "landing": {
+    "header_before_icon": "The",
+    "header_with_icon": "easiest",
+    "header_after_icon": "way to accept bitcoin in your store.",
+    "subheader": "Grow your customer base and revenue by accepting bitcoin with an easy-to-use web app. No software or hardware required.",
+    "info1": {
+      "title": "Instant payments via Lightning",
+      "description": "The moment your customer sends a payment, it’s there. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees."
+    },
+    "info2": {
+      "title": "Simple to use",
+      "description1": "Just enter an amount in your local currency, share the QR code and you’re done.",
+      "description2": "We do all the heavy lifting so you can focus on your business.",
+      "description3": "You always have the option of taking custody of your funds by withdrawing instantly at any time."
+    },
+    "info3": {
+      "title": "Brand it your way!",
+      "description": "Customize your point of sale look and feel, or keep it on default - it's totally up to you."
+    }
+  },
+  "login": {
+    "optional": "Optional",
+    "token": "2FA Token",
+    "username": "Username",
+    "password": "Password",
+    "email": "Email",
+    "passwordRecommendation": "We recommend a long, random password generated with a password manager.",
+    "forgotUserOrPassword": "Forgot Username or Password?",
+    "haveAccount": "Already have an account?",
+    "noAccount": "Don't have an account?",
+    "register": "Register",
+    "signIn": "Sign In",
+    "failed": "Login failed"
+  },
+  "nav": {
+    "profile": "Profile",
+    "startInSeconds": "Start in Seconds",
+    "account": "Account",
+    "signIn": "Sign In",
+    "signOut": "Sign Out",
+    "dashboard": "Dashboard",
+    "settings": "Settings",
+    "support": "Support"
+  },
+  "newSiteHeader": "Join us at our <a href=\"/launch\" class=\"underline underline-offset-4 text-black hover:opacity-80\">launch party</a> in Vancouver on October 26! Looking for the old coinos? Visit <a href=\"https://classic.coinos.io\" class=\"underline underline-offset-4 text-black hover:opacity-80\">classic.coinos.io</a>",
+  "news": {
+    "header": "News",
+    "subheader": "Latest Updates",
+    "update1": ""
+  },
+  "user": {
+    "bitcoin": "Bitcoin",
+    "lightning": "Lightning",
+    "invoice": "Invoice",
+    "unfollow": "Unfollow",
+    "following": "Following",
+    "follow": "Follow",
+    "followers": "Followers",
+    "remove": "Remove",
+    "noNotes": "No notes yet",
+    "message": "Message",
+    "messages": "Messages",
+    "feed": "Feed",
+    "notes": "Notes",
+    "pay": "Pay",
+    "scanToPayBTC": "Scan to pay with bitcoin",
+    "this": "This",
+    "lightningAddress": "Lightning address",
+    "dashboard": {
+      "go": "Go",
+      "dashboard": "Dashboard",
+      "accountBalance": "Account Balance",
+      "bitcoinPrice": "bitcoin Price:",
+      "conversionFeeWarning": "You will be charged a 1% withdrawal fee on the amount.",
+      "dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.",
+      "fetchingRate": "fetching rate...",
+      "optionalNote": "Note (Optional)",
+      "send": "Send",
+      "receive": "Receive",
+      "withdraw": "Send",
+      "deposit": "Deposit",
+      "voucher": "Voucher"
+    },
+    "receive": {
+      "lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.",
+      "showQR": "Show QR"
+    },
+    "send": {
+      "contacts": "Contacts",
+      "scan": "Scan",
+      "paste": "Paste",
+      "next": "Next",
+      "placeholder": "Paste a bitcoin address, lightning invoice or coinos username"
+    },
+    "settings": {
+      "bannerImage": "Banner Image",
+      "profileImage": "Profile Image",
+      "oneTimeCode": "Enter one-time code",
+      "accountId": "Account Secret",
+      "header": "Settings",
+      "ACCOUNT": "ACCOUNT",
+      "POINT_OF_SALE": "PREFERENCES",
+      "SECURITY": "SECURITY",
+      "locale": "Language",
+      "username": "Username",
+      "email": "Email",
+      "newPassword": "Change Password",
+      "about": "About",
+      "aboutPlaceholder": "A little something about you or your business address and hours",
+      "emailNotifications": "Email Notifications",
+      "emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.",
+      "smsNotifications": "SMS Notifications",
+      "smsNotificationsDescription": "Coinos will send you text notifications when this is enabled.",
+      "theme": "Color Theme",
+      "tipPrompt": "Prompt for tips",
+      "tipPromptDescription": "Ask people if they want to add a tip before paying their invoices",
+      "displayName": "Display name",
+      "themeDescription": "Select from the default color themes.",
+      "localCurrency": "Currency",
+      "btcUnit": "Display bitcoin in:",
+      "bitcoin": "bitcoin",
+      "minutes": "minutes",
+      "hour": "hour",
+      "hours": "hours",
+      "satoshis": "Satoshis",
+      "securityPIN": "Security PIN",
+      "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.",
+      "setPIN": "Set PIN",
+      "autoLock": "Auto-Lock Timer",
+      "autoLockDescription": "Your account will go into a secure mode, requiring you to re-enter your credentials after a specified time:",
+      "twofa": "2-Factor Authentication",
+      "twofaDescription": "Add an extra level of security to your device by enabling 2-factor authentication.",
+      "twofaSetup": "Set up 2FA",
+      "twofaDisable": "Disable 2FA",
+      "select": "Select",
+      "verifyPIN": "Verify PIN",
+      "enablePIN": "Enable PIN",
+      "disablePIN": "Disable PIN"
+    },
+    "support": {
+      "header": "Support",
+      "email": "Email",
+      "accountName": "Account Name",
+      "message": "Message",
+      "send": "Send"
+    }
+  },
+  "payments": {
+    "amount": "Amount",
+    "date": "Date",
+    "id": "Transaction ID",
+    "details": "Transaction Details",
+    "header": "Payments",
+    "preimage": "Proof of payment",
+    "type": "Type",
+    "time": "Time",
+    "sent": "Sent",
+    "received": "Received",
+    "empty": "No transactions yet.",
+    "send": "Send",
+    "next": "Next",
+    "sendersChoice": "Sender's choice",
+    "sendTo": "Send to",
+    "to": "to",
+    "pay": "Pay",
+    "requesting": "is requesting",
+    "sentInvoiceTo": "Sent invoice to",
+    "sentRequestTo": "Request sent!",
+    "pleasePay": "Please pay",
+    "day": "Day",
+    "week": "Week",
+    "month": "Month",
+    "all": "All",
+    "export": "Export",
+    "invoice": "Invoice",
+    "readyToPay": "is ready to pay",
+    "describeOrder": "Use this field to describe your order",
+    "requestAnInvoice": "Request Invoice",
+    "submit": "Submit",
+    "isRequesting": "is requesting",
+    "invoiceFrom": "Invoice from",
+    "awaiting": "Awaiting",
+    "tapAnywhere": "Tap anywhere to continue",
+    "from": "from",
+    "redeem": "Redeem",
+    "redeemed": "Redeemed",
+    "redeemedBy": "Redeemed by",
+    "sendMessage": "Write a message..."
+  }
 }
diff --git a/src/params/uuid.js b/src/params/uuid.js
index 1278e59e..bd32b496 100644
--- a/src/params/uuid.js
+++ b/src/params/uuid.js
@@ -1 +1 @@
-export let match = (p) => p.split('-').length > 4;
+export let match = (p) => p.split("-").length > 4;
diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte
index 36726e26..ed0bec3e 100644
--- a/src/routes/(app)/+error.svelte
+++ b/src/routes/(app)/+error.svelte
@@ -1,38 +1,38 @@
 <script>
-	import { back } from '$lib/utils';
-	import { Icon } from '$comp';
-	import { page } from '$app/stores';
+  import { back } from "$lib/utils";
+  import { Icon } from "$comp";
+  import { page } from "$app/stores";
 
-	export let data;
-	let { user } = data;
+  export let data;
+  let { user } = data;
 
-	let link = user ? `/${user.username}` : '/';
+  let link = user ? `/${user.username}` : "/";
 </script>
 
 <div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
-	<div class="w-full flex">
-		<a href="/" class="mx-auto">
-			<Icon icon="logo" />
-		</a>
-	</div>
+  <div class="w-full flex">
+    <a href="/" class="mx-auto">
+      <Icon icon="logo" />
+    </a>
+  </div>
 
-	<div class="flex justify-center items-center">
-		<div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
-			<div class="relative">
-				<h1 class="text-2xl md:text-3xl font-semibold text-center">Error</h1>
-			</div>
-			<p class="text-secondary text-center">Something went wrong</p>
-			<p class="text-secondary text-center">{$page.error.message}</p>
+  <div class="flex justify-center items-center">
+    <div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
+      <div class="relative">
+        <h1 class="text-2xl md:text-3xl font-semibold text-center">Error</h1>
+      </div>
+      <p class="text-secondary text-center">Something went wrong</p>
+      <p class="text-secondary text-center">{$page.error.message}</p>
 
-			<div class="flex justify-center py-24">
-				<a href={link}>
-					<button
-						class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 text-xl"
-					>
-						Back
-					</button>
-				</a>
-			</div>
-		</div>
-	</div>
+      <div class="flex justify-center py-24">
+        <a href={link}>
+          <button
+            class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 text-xl"
+          >
+            Back
+          </button>
+        </a>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/src/routes/(app)/+layout.server.js b/src/routes/(app)/+layout.server.js
index e80e1e64..9fcf6411 100644
--- a/src/routes/(app)/+layout.server.js
+++ b/src/routes/(app)/+layout.server.js
@@ -1,44 +1,48 @@
-import { error, redirect } from '@sveltejs/kit';
-import { get, post, auth, protectedRoutes } from '$lib/utils';
-import { PUBLIC_BTC as btc } from '$env/static/public';
+import { error, redirect } from "@sveltejs/kit";
+import { get, post, auth, protectedRoutes } from "$lib/utils";
+import { PUBLIC_BTC as btc } from "$env/static/public";
 
 export async function load({ cookies, request, url, params }) {
-	let { pathname } = url;
-	let token = cookies.get('token');
-	let rate,
-		rates = { USD: 1 };
-
-	let user;
-	if (token) {
-		try {
-			user = await get('/me', auth(cookies));
-		} catch (e) {}
-	}
-
-	if (user?.needsMigration) {
-		throw redirect(307, `/migrate`);
-	}
-
-	if (user && ['/login', '/register'].includes(pathname) && request.method === 'GET') {
-		throw redirect(307, `/${user.username}`);
-	}
-
-	if (
-		protectedRoutes.find((p) => pathname.match(p)) &&
-		(!user || user.username !== params.username)
-	) {
-		throw redirect(307, '/login');
-	}
-
-	if (user && !user.pubkey && !pathname.includes('generate'))
-		throw redirect(307, `/${user.username}/generate`);
-
-	try {
-		rate = await get('/rate');
-		rates = await get('/rates');
-	} catch (e) {
-		console.log(e);
-	}
-
-	return { user, token, rate, rates };
+  let { pathname } = url;
+  let token = cookies.get("token");
+  let rate,
+    rates = { USD: 1 };
+
+  let user;
+  if (token) {
+    try {
+      user = await get("/me", auth(cookies));
+    } catch (e) {}
+  }
+
+  if (user?.needsMigration) {
+    throw redirect(307, `/migrate`);
+  }
+
+  if (
+    user &&
+    ["/login", "/register"].includes(pathname) &&
+    request.method === "GET"
+  ) {
+    throw redirect(307, `/${user.username}`);
+  }
+
+  if (
+    protectedRoutes.find((p) => pathname.match(p)) &&
+    (!user || user.username !== params.username)
+  ) {
+    throw redirect(307, "/login");
+  }
+
+  if (user && !user.pubkey && !pathname.includes("generate"))
+    throw redirect(307, `/${user.username}/generate`);
+
+  try {
+    rate = await get("/rate");
+    rates = await get("/rates");
+  } catch (e) {
+    console.log(e);
+  }
+
+  return { user, token, rate, rates };
 }
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 51ade9c7..c5a312e1 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -1,167 +1,174 @@
 <script>
-	import { SvelteToast } from '@zerodevx/svelte-toast';
-	import { onDestroy, onMount } from 'svelte';
-	import { close, connect, send } from '$lib/socket';
-	import { last, invoice, request, ndef, passwordPrompt, pin } from '$lib/store';
-	import { page } from '$app/stores';
-	import { browser } from '$app/environment';
-	import { goto } from '$app/navigation';
-	import { LoadingSplash, Invoice, Password, Request } from '$comp';
-	import { warning, protectedRoutes } from '$lib/utils';
-	import { t, locale } from '$lib/translations';
-	import { onNavigate } from '$app/navigation';
-
-	export let data;
-
-	onNavigate((navigation) => {
-		if (!document.startViewTransition) return;
-
-		return new Promise((resolve) => {
-			document.startViewTransition(async () => {
-				resolve();
-				await navigation.complete;
-			});
-		});
-	});
-
-	let { rate, user, subject, token, rates } = data;
-
-	$: update(data);
-	let update = (data) => {
-		({ rate, user, subject, token, rates } = data);
-	};
-
-	onMount(async () => {
-		let localeLocalStorageKey = 'sveltekit-i18n-locale';
-		let localStorageLocale = localStorage.getItem(localeLocalStorageKey);
-		if (localStorageLocale) locale.set(localStorageLocale);
-
-		locale.subscribe((lng) => {
-			if (lng) localStorage.setItem(localeLocalStorageKey, lng);
-		});
-
-		if (browser) {
-			checkSocket();
-			let locktime = user && user.locktime ? user.locktime : 300;
-			expireTimer = setTimeout(expirePin, locktime * 1000);
-
-			// if (window.NDEFReader) {
-			// 	try {
-			// 		$ndef = new NDEFReader();
-			// 		await $ndef.scan();
-			//
-			// 		$ndef.addEventListener('readingerror', (e) => {
-			// 			console.log('nfc error', e);
-			// 		});
-			//
-			// 		$ndef.addEventListener('reading', ({ message, serialNumber }) => {
-			// 			goto(`/${user.username}/card/${serialNumber.replace(/:/g, '-')}`);
-			// 		});
-			// 	} catch (error) {
-			// 		console.log('Argh! ' + error);
-			// 	}
-			// }
-		}
-	});
-
-	$: browser && connect(token);
-
-	let lost,
-		checkTimer,
-		expireTimer,
-		counter = 0;
-
-	let checkSocket = () => {
-		counter++;
-		lost = Date.now() - $last > 30000;
-		if (lost) connect(token);
-		if (counter > 5) {
-			send('heartbeat', token);
-			counter = 0;
-		}
-
-		checkTimer = setTimeout(checkSocket, 1000);
-	};
-
-	let expirePin = () => {
-		$pin = null;
-		expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000);
-	};
-
-	onDestroy(() => {
-		if (browser) {
-			close();
-			clearTimeout(checkTimer);
-			clearTimeout(expireTimer);
-		}
-	});
+  import { SvelteToast } from "@zerodevx/svelte-toast";
+  import { onDestroy, onMount } from "svelte";
+  import { close, connect, send } from "$lib/socket";
+  import {
+    last,
+    invoice,
+    request,
+    ndef,
+    passwordPrompt,
+    pin,
+  } from "$lib/store";
+  import { page } from "$app/stores";
+  import { browser } from "$app/environment";
+  import { goto } from "$app/navigation";
+  import { LoadingSplash, Invoice, Password, Request } from "$comp";
+  import { warning, protectedRoutes } from "$lib/utils";
+  import { t, locale } from "$lib/translations";
+  import { onNavigate } from "$app/navigation";
+
+  export let data;
+
+  onNavigate((navigation) => {
+    if (!document.startViewTransition) return;
+
+    return new Promise((resolve) => {
+      document.startViewTransition(async () => {
+        resolve();
+        await navigation.complete;
+      });
+    });
+  });
+
+  let { rate, user, subject, token, rates } = data;
+
+  $: update(data);
+  let update = (data) => {
+    ({ rate, user, subject, token, rates } = data);
+  };
+
+  onMount(async () => {
+    let localeLocalStorageKey = "sveltekit-i18n-locale";
+    let localStorageLocale = localStorage.getItem(localeLocalStorageKey);
+    if (localStorageLocale) locale.set(localStorageLocale);
+
+    locale.subscribe((lng) => {
+      if (lng) localStorage.setItem(localeLocalStorageKey, lng);
+    });
+
+    if (browser) {
+      checkSocket();
+      let locktime = user && user.locktime ? user.locktime : 300;
+      expireTimer = setTimeout(expirePin, locktime * 1000);
+
+      // if (window.NDEFReader) {
+      // 	try {
+      // 		$ndef = new NDEFReader();
+      // 		await $ndef.scan();
+      //
+      // 		$ndef.addEventListener('readingerror', (e) => {
+      // 			console.log('nfc error', e);
+      // 		});
+      //
+      // 		$ndef.addEventListener('reading', ({ message, serialNumber }) => {
+      // 			goto(`/${user.username}/card/${serialNumber.replace(/:/g, '-')}`);
+      // 		});
+      // 	} catch (error) {
+      // 		console.log('Argh! ' + error);
+      // 	}
+      // }
+    }
+  });
+
+  $: browser && connect(token);
+
+  let lost,
+    checkTimer,
+    expireTimer,
+    counter = 0;
+
+  let checkSocket = () => {
+    counter++;
+    lost = Date.now() - $last > 30000;
+    if (lost) connect(token);
+    if (counter > 5) {
+      send("heartbeat", token);
+      counter = 0;
+    }
+
+    checkTimer = setTimeout(checkSocket, 1000);
+  };
+
+  let expirePin = () => {
+    $pin = null;
+    expireTimer = setTimeout(expirePin, user.locktime * 1000 || 300000);
+  };
+
+  onDestroy(() => {
+    if (browser) {
+      close();
+      clearTimeout(checkTimer);
+      clearTimeout(expireTimer);
+    }
+  });
 </script>
 
 {#if browser && $passwordPrompt}
-	<Password {user} />
+  <Password {user} />
 {/if}
 
 <svelte:head>
-	{#if subject}
-		<title>coinos - {subject.username}</title>
-		<meta name="lightning" content={`lnurlp:${subject.username}@coinos.io`} />
-	{:else}
-		<title>coinos</title>
-	{/if}
-
-	{#if subject?.profile}
-		<meta name="og:image" content={`/api/public/${subject.profile}.webp`} />
-	{:else}
-		<meta property="og:image" content="/icons/logo.svg" />
-	{/if}
+  {#if subject}
+    <title>coinos - {subject.username}</title>
+    <meta name="lightning" content={`lnurlp:${subject.username}@coinos.io`} />
+  {:else}
+    <title>coinos</title>
+  {/if}
+
+  {#if subject?.profile}
+    <meta name="og:image" content={`/api/public/${subject.profile}.webp`} />
+  {:else}
+    <meta property="og:image" content="/icons/logo.svg" />
+  {/if}
 </svelte:head>
 
 <SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
 
 <main class="pb-20">
-	<slot />
+  <slot />
 </main>
 
 {#if $invoice}
-	<Invoice {user} />
+  <Invoice {user} />
 {/if}
 
 {#if $request}
-	<Request {user} />
+  <Request {user} />
 {/if}
 
 <style>
-	@keyframes fade-in {
-		from {
-			opacity: 0;
-		}
-	}
-
-	@keyframes fade-out {
-		to {
-			opacity: 0;
-		}
-	}
-
-	@keyframes slide-from-right {
-		from {
-			transform: translateX(60px);
-		}
-	}
-
-	@keyframes slide-to-left {
-		to {
-			transform: translateX(-60px);
-		}
-	}
-
-	:root::view-transition-old(root) {
-		animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
-			180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
-	}
-
-	:root::view-transition-new(root) {
-		animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
-			180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
-	}
+  @keyframes fade-in {
+    from {
+      opacity: 0;
+    }
+  }
+
+  @keyframes fade-out {
+    to {
+      opacity: 0;
+    }
+  }
+
+  @keyframes slide-from-right {
+    from {
+      transform: translateX(60px);
+    }
+  }
+
+  @keyframes slide-to-left {
+    to {
+      transform: translateX(-60px);
+    }
+  }
+
+  :root::view-transition-old(root) {
+    animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
+      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
+  }
+
+  :root::view-transition-new(root) {
+    animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
+      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
+  }
 </style>
diff --git a/src/routes/(app)/[username]/(profile)/+layout.server.js b/src/routes/(app)/[username]/(profile)/+layout.server.js
index f4f2ca0a..a508de92 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.server.js
+++ b/src/routes/(app)/[username]/(profile)/+layout.server.js
@@ -1,26 +1,26 @@
-import { get } from '$lib/utils';
+import { get } from "$lib/utils";
 
 export async function load({ parent }) {
-	let { subject, user } = await parent();
+  let { subject, user } = await parent();
 
-	subject.follows = [];
-	subject.followers = [];
+  subject.follows = [];
+  subject.followers = [];
 
-	try {
-		subject.follows = await get(`/${subject.pubkey}/follows`);
-	} catch (e) {
-		console.log('problem fetching follows', e);
-	}
+  try {
+    subject.follows = await get(`/${subject.pubkey}/follows`);
+  } catch (e) {
+    console.log("problem fetching follows", e);
+  }
 
-	try {
-		subject.followers = await get(`/${subject.pubkey}/followers`);
-	} catch (e) {
-		console.log('problem fetching followers', e);
-	}
+  try {
+    subject.followers = await get(`/${subject.pubkey}/followers`);
+  } catch (e) {
+    console.log("problem fetching followers", e);
+  }
 
-	if (user) {
-		user.follows = await get(`/${user.pubkey}/follows?tagsonly=true`);
-	}
+  if (user) {
+    user.follows = await get(`/${user.pubkey}/follows?tagsonly=true`);
+  }
 
-	return { subject, user };
+  return { subject, user };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 55c22bdb..6b166e2c 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -1,236 +1,246 @@
 <script>
-	import { hexToUint8Array } from 'uint8array-extras';
-	import { copy, f, s, sats } from '$lib/utils';
-	import { animatedRate } from '$lib/store';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-	import { sign, send } from '$lib/nostr';
-	import { bech32m } from '@scure/base';
-	import { page } from '$app/stores';
-
-	export let data;
-
-	let { encode, toWords } = bech32m;
-	let events, user, subject, rates, src, text;
-
-	$: ({ events, user, rates, subject, src, text } = data);
-	$: ({ currency, username: n, display } = subject);
-
-	$: username = n.length > 60 ? n.substr(0, 6) : display || n;
-	$: npub = bech32m.encode('npub', toWords(hexToUint8Array(subject.pubkey)), 180);
-	$: lnaddr = `${n}@${$page.url.host}`;
-	$: profile = `${$page.url.host}/${n}`;
-
-	let follow = async () => {
-		user.follows.push(['p', subject.pubkey, 'wss://nostr.coinos.io', subject.username]);
-		update();
-	};
-
-	let unfollow = async () => {
-		user.follows.splice(
-			user.follows.findIndex((t) => t[1] === subject.pubkey),
-			1
-		);
-		update();
-	};
-
-	let update = async () => {
-		let event = {
-			pubkey: user.pubkey,
-			created_at: Math.floor(Date.now() / 1000),
-			kind: 3,
-			content: '',
-			tags: user.follows
-		};
-
-		await sign({ event, user });
-		await send(event);
-
-		user.follows = user.follows;
-	};
-
-	$: following = !!user?.follows.find((t) => t.includes(subject.pubkey));
-
-	let showBio;
-	let toggleBio = () => (showBio = !showBio);
-
-	let showDetails;
-	let toggleDetails = () => (showDetails = !showDetails);
+  import { hexToUint8Array } from "uint8array-extras";
+  import { copy, f, s, sats } from "$lib/utils";
+  import { animatedRate } from "$lib/store";
+  import { Icon } from "$comp";
+  import { t } from "$lib/translations";
+  import { sign, send } from "$lib/nostr";
+  import { bech32m } from "@scure/base";
+  import { page } from "$app/stores";
+
+  export let data;
+
+  let { encode, toWords } = bech32m;
+  let events, user, subject, rates, src, text;
+
+  $: ({ events, user, rates, subject, src, text } = data);
+  $: ({ currency, username: n, display } = subject);
+
+  $: username = n.length > 60 ? n.substr(0, 6) : display || n;
+  $: npub = bech32m.encode(
+    "npub",
+    toWords(hexToUint8Array(subject.pubkey)),
+    180
+  );
+  $: lnaddr = `${n}@${$page.url.host}`;
+  $: profile = `${$page.url.host}/${n}`;
+
+  let follow = async () => {
+    user.follows.push([
+      "p",
+      subject.pubkey,
+      "wss://nostr.coinos.io",
+      subject.username,
+    ]);
+    update();
+  };
+
+  let unfollow = async () => {
+    user.follows.splice(
+      user.follows.findIndex((t) => t[1] === subject.pubkey),
+      1
+    );
+    update();
+  };
+
+  let update = async () => {
+    let event = {
+      pubkey: user.pubkey,
+      created_at: Math.floor(Date.now() / 1000),
+      kind: 3,
+      content: "",
+      tags: user.follows,
+    };
+
+    await sign({ event, user });
+    await send(event);
+
+    user.follows = user.follows;
+  };
+
+  $: following = !!user?.follows.find((t) => t.includes(subject.pubkey));
+
+  let showBio;
+  let toggleBio = () => (showBio = !showBio);
+
+  let showDetails;
+  let toggleDetails = () => (showDetails = !showDetails);
 </script>
 
 <div class="container mx-auto w-full px-4 flex flex-wrap lg:flex-nowrap">
-	<div class="hidden lg:block lg:w-[300px]" />
-	<div class="lg:w-[300px] lg:absolute space-y-5 left-20 mx-auto max-w-sm">
-		<div class="flex text-3xl font-bold text-center mx-auto justify-center gap-2">
-			<div class="my-auto">{display || username}</div>
-			<button on:click={toggleDetails}>
-				<Icon icon="stats" style="w-12" />
-			</button>
-		</div>
-
-		{#if showDetails}
-			<div>
-				<div class="font-bold">{$t('user.profilePage')}</div>
-				<div class="flex gap-4">
-					<div class="break-all grow text-secondary text-lg">
-						{profile}
-					</div>
-					<div class="flex mb-auto gap-1">
-						<button class="my-auto" on:click={() => copy(profile)}
-							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
-						>
-						<a
-							href={`/qr/${encodeURIComponent(profile)}`}
-							class="my-auto"
-						>
-							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
-						</a>
-					</div>
-				</div>
-			</div>
-			<div>
-				<div class="font-bold">{$t('user.lightningAddress')}</div>
-				<div class="flex gap-4">
-					<div class="break-all grow text-secondary text-lg">
-						{lnaddr}
-					</div>
-					<div class="flex mb-auto gap-1">
-						<button class="my-auto" on:click={() => copy(lnaddr)}
-							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
-						>
-						<a
-							href={`/qr/${encodeURIComponent(lnaddr)}`}
-							class="my-auto"
-						>
-							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
-						</a>
-					</div>
-				</div>
-			</div>
-			<div>
-				<div class="font-bold">{$t('user.nostrPubkey')}</div>
-				<div class="flex gap-4">
-					<div class="break-all grow text-secondary text-lg">
-						{npub}
-					</div>
-					<div class="flex my-auto gap-1">
-						<button class="my-auto" on:click={() => copy(npub)}
-							><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
-						>
-						<a
-							href={`/qr/${encodeURIComponent(npub)}`}
-							class="my-auto"
-						>
-							<Icon icon="qr" style="invert max-w-max min-w-[32px]" />
-						</a>
-					</div>
-				</div>
-			</div>
-		{/if}
-
-		{#if subject.address && subject.id !== user?.id}
-			<div
-				class="text-secondary mx-auto text-center lg:text-left lg:mx-0"
-				class:line-clamp-3={showBio}
-				on:click={toggleBio}
-				on:keydown={toggleBio}
-			>
-				{subject.address}
-			</div>
-		{/if}
-
-		<div class="flex justify-center gap-2">
-			<a href={`/${subject.pubkey}/follows`}
-				><b>{subject.follows.length}</b>
-				<span class="text-secondary">{$t('user.following')}</span></a
-			>
-			<a href={`/${subject.pubkey}/followers`}
-				><b>{subject.followers.length}</b>
-				<span class="text-secondary">{$t('user.followers')}</span></a
-			>
-		</div>
-
-		<div class="flex flex-wrap gap-2 w-full">
-			{#if user && user.username !== subject.username && subject.pubkey}
-				{#if following}
-					<div class="w-full flex">
-						<button
-							class="mx-auto rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white"
-							on:click={unfollow}
-						>
-							<div class="mx-auto flex">
-								<Icon icon={'profile'} style="my-auto h-6 mr-2 invert" />
-								<div class="my-auto">{$t('user.following')}</div>
-							</div>
-						</button>
-					</div>
-				{:else}
-					<div class="w-full flex">
-						<button
-							class="mx-auto rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"
-							on:click={follow}
-						>
-							<div class="mx-auto flex">
-								<Icon icon={'profile'} style="my-auto h-6 mr-2" />
-								<div class="my-auto">{$t('user.follow')}</div>
-							</div>
-						</button>
-					</div>
-				{/if}
-			{/if}
-
-			{#if user && user.username !== subject.username && subject.pubkey}
-				<div class="w-full flex">
-					<a href={`/${subject.username}/messages`} class="mx-auto">
-						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
-							<div class="mx-auto flex">
-								<Icon icon="message" style="mr-2 my-auto" />
-								<div class="mt-1 my-auto">{$t('user.message')}</div>
-							</div>
-						</button>
-					</a>
-				</div>
-			{/if}
-
-			{#if !subject.anon && subject.username !== user?.username}
-				<div class="w-full flex">
-					<a
-						href={user ? `/send/${subject.username}` : `/${subject.username}/receive`}
-						class="mx-auto"
-					>
-						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
-							<div class="mx-auto flex">
-								<Icon icon="send" style="mr-2" />
-								<div class="mt-1">{$t('user.pay')}</div>
-							</div>
-						</button>
-					</a>
-				</div>
-			{/if}
-		</div>
-	</div>
-
-	<div class="w-full">
-		<div class="mx-auto space-y-5 lg:max-w-xl lg:pl-10 xl:max-w-2xl lg:pl-10">
-			<slot />
-		</div>
-	</div>
+  <div class="hidden lg:block lg:w-[300px]" />
+  <div class="lg:w-[300px] lg:absolute space-y-5 left-20 mx-auto max-w-sm">
+    <div
+      class="flex text-3xl font-bold text-center mx-auto justify-center gap-2"
+    >
+      <div class="my-auto">{display || username}</div>
+      <button on:click={toggleDetails}>
+        <Icon icon="stats" style="w-12" />
+      </button>
+    </div>
+
+    {#if showDetails}
+      <div>
+        <div class="font-bold">{$t("user.profilePage")}</div>
+        <div class="flex gap-4">
+          <div class="break-all grow text-secondary text-lg">
+            {profile}
+          </div>
+          <div class="flex mb-auto gap-1">
+            <button class="my-auto" on:click={() => copy(profile)}
+              ><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
+            >
+            <a href={`/qr/${encodeURIComponent(profile)}`} class="my-auto">
+              <Icon icon="qr" style="invert max-w-max min-w-[32px]" />
+            </a>
+          </div>
+        </div>
+      </div>
+      <div>
+        <div class="font-bold">{$t("user.lightningAddress")}</div>
+        <div class="flex gap-4">
+          <div class="break-all grow text-secondary text-lg">
+            {lnaddr}
+          </div>
+          <div class="flex mb-auto gap-1">
+            <button class="my-auto" on:click={() => copy(lnaddr)}
+              ><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
+            >
+            <a href={`/qr/${encodeURIComponent(lnaddr)}`} class="my-auto">
+              <Icon icon="qr" style="invert max-w-max min-w-[32px]" />
+            </a>
+          </div>
+        </div>
+      </div>
+      <div>
+        <div class="font-bold">{$t("user.nostrPubkey")}</div>
+        <div class="flex gap-4">
+          <div class="break-all grow text-secondary text-lg">
+            {npub}
+          </div>
+          <div class="flex my-auto gap-1">
+            <button class="my-auto" on:click={() => copy(npub)}
+              ><Icon icon="copy" style="max-w-max min-w-[32px]" /></button
+            >
+            <a href={`/qr/${encodeURIComponent(npub)}`} class="my-auto">
+              <Icon icon="qr" style="invert max-w-max min-w-[32px]" />
+            </a>
+          </div>
+        </div>
+      </div>
+    {/if}
+
+    {#if subject.address && subject.id !== user?.id}
+      <div
+        class="text-secondary mx-auto text-center lg:text-left lg:mx-0"
+        class:line-clamp-3={showBio}
+        on:click={toggleBio}
+        on:keydown={toggleBio}
+      >
+        {subject.address}
+      </div>
+    {/if}
+
+    <div class="flex justify-center gap-2">
+      <a href={`/${subject.pubkey}/follows`}
+        ><b>{subject.follows.length}</b>
+        <span class="text-secondary">{$t("user.following")}</span></a
+      >
+      <a href={`/${subject.pubkey}/followers`}
+        ><b>{subject.followers.length}</b>
+        <span class="text-secondary">{$t("user.followers")}</span></a
+      >
+    </div>
+
+    <div class="flex flex-wrap gap-2 w-full">
+      {#if user && user.username !== subject.username && subject.pubkey}
+        {#if following}
+          <div class="w-full flex">
+            <button
+              class="mx-auto rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white"
+              on:click={unfollow}
+            >
+              <div class="mx-auto flex">
+                <Icon icon={"profile"} style="my-auto h-6 mr-2 invert" />
+                <div class="my-auto">{$t("user.following")}</div>
+              </div>
+            </button>
+          </div>
+        {:else}
+          <div class="w-full flex">
+            <button
+              class="mx-auto rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"
+              on:click={follow}
+            >
+              <div class="mx-auto flex">
+                <Icon icon={"profile"} style="my-auto h-6 mr-2" />
+                <div class="my-auto">{$t("user.follow")}</div>
+              </div>
+            </button>
+          </div>
+        {/if}
+      {/if}
+
+      {#if user && user.username !== subject.username && subject.pubkey}
+        <div class="w-full flex">
+          <a href={`/${subject.username}/messages`} class="mx-auto">
+            <button
+              class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"
+            >
+              <div class="mx-auto flex">
+                <Icon icon="message" style="mr-2 my-auto" />
+                <div class="mt-1 my-auto">{$t("user.message")}</div>
+              </div>
+            </button>
+          </a>
+        </div>
+      {/if}
+
+      {#if !subject.anon && subject.username !== user?.username}
+        <div class="w-full flex">
+          <a
+            href={user
+              ? `/send/${subject.username}`
+              : `/${subject.username}/receive`}
+            class="mx-auto"
+          >
+            <button
+              class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"
+            >
+              <div class="mx-auto flex">
+                <Icon icon="send" style="mr-2" />
+                <div class="mt-1">{$t("user.pay")}</div>
+              </div>
+            </button>
+          </a>
+        </div>
+      {/if}
+    </div>
+  </div>
+
+  <div class="w-full">
+    <div class="mx-auto space-y-5 lg:max-w-xl lg:pl-10 xl:max-w-2xl lg:pl-10">
+      <slot />
+    </div>
+  </div>
 </div>
 
 {#if currency && !isNaN($animatedRate)}
-	<div class="flex fixed w-full px-4 bg-white py-2 pb-3 bottom-0 bg-opacity-90 tabular-nums">
-		<div class="text-secondary flex mr-auto">
-			<div class="flex mr-1">
-				<div class="my-auto mr-1">1</div>
-				<img src="/images/bitcoin.svg" class="w-5 my-auto" alt="Bitcoin" />
-			</div>
-			<div>= {f($animatedRate, currency)}</div>
-		</div>
-		<div class="text-secondary flex ml-auto">
-			<div class="flex">
-				<div class="mr-1">⚡️{s((1 * sats) / $animatedRate)} =</div>
-				<div>{f(1, currency)}</div>
-			</div>
-		</div>
-	</div>
+  <div
+    class="flex fixed w-full px-4 bg-white py-2 pb-3 bottom-0 bg-opacity-90 tabular-nums"
+  >
+    <div class="text-secondary flex mr-auto">
+      <div class="flex mr-1">
+        <div class="my-auto mr-1">1</div>
+        <img src="/images/bitcoin.svg" class="w-5 my-auto" alt="Bitcoin" />
+      </div>
+      <div>= {f($animatedRate, currency)}</div>
+    </div>
+    <div class="text-secondary flex ml-auto">
+      <div class="flex">
+        <div class="mr-1">⚡️{s((1 * sats) / $animatedRate)} =</div>
+        <div>{f(1, currency)}</div>
+      </div>
+    </div>
+  </div>
 {/if}
diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index e37db1fe..3110ec40 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -1,35 +1,35 @@
-import { auth, get } from '$lib/utils';
+import { auth, get } from "$lib/utils";
 
 export async function load({ cookies, params, parent, url }) {
-	let { user, subject } = await parent();
-	let { pubkey } = subject;
-	let { since = 0 } = params;
+  let { user, subject } = await parent();
+  let { pubkey } = subject;
+  let { since = 0 } = params;
 
-	let messages, invoices, sent, received, notes;
-	messages = invoices = sent = received = notes = [];
+  let messages, invoices, sent, received, notes;
+  messages = invoices = sent = received = notes = [];
 
-	if (pubkey) {
-		if (user) {
-			try {
-				messages = await get(`/${user.pubkey}/${since}/messages`);
-				messages = messages.sort((a, b) => b.created_at - a.created_at);
-			} catch (e) {
-				console.log(`failed to fetch nostr messages`, e);
-			}
+  if (pubkey) {
+    if (user) {
+      try {
+        messages = await get(`/${user.pubkey}/${since}/messages`);
+        messages = messages.sort((a, b) => b.created_at - a.created_at);
+      } catch (e) {
+        console.log(`failed to fetch nostr messages`, e);
+      }
 
-			({ invoices, sent, received } = await get('/requests', auth(cookies)));
-		}
+      ({ invoices, sent, received } = await get("/requests", auth(cookies)));
+    }
 
-		try {
-			notes = await get(`/${pubkey}/notes`);
-		} catch (e) {
-			console.log(`failed to fetch nostr notes for ${pubkey}`, e);
-		}
+    try {
+      notes = await get(`/${pubkey}/notes`);
+    } catch (e) {
+      console.log(`failed to fetch nostr notes for ${pubkey}`, e);
+    }
 
-		notes.map((e) => {
-			e.seen = e.created_at;
-		});
-	}
+    notes.map((e) => {
+      e.seen = e.created_at;
+    });
+  }
 
-	return { invoices, messages, notes, sent, received };
+  return { invoices, messages, notes, sent, received };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 32a1f2cb..b0e36090 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -1,227 +1,245 @@
 <script>
-	import { onMount } from 'svelte';
-	import { Icon, Avatar, Balance, Feed } from '$comp';
-	import { t } from '$lib/translations';
-	import { ease, f, sat, sats } from '$lib/utils';
-	import { sign, send, encrypt, decrypt } from '$lib/nostr';
-	import { event as e, password, rate, animatedRate } from '$lib/store';
-	import { browser } from '$app/environment';
-
-	export let data;
-	let { messages, notes, invoices, sent, received, subject, user, rates } = data;
-	$: refresh(data);
-	let refresh = (d) => ({ messages, notes, invoices, sent, received, subject, user, rates } = d);
-
-	let keys = new Set();
-	let latest = [];
-	let ready;
-
-	e.subscribe(async (event) => {
-		if (!(event && ready)) return;
-		if (event.recipient?.id === user.id && !~latest.findIndex((m) => m.id === event.id)) {
-			event.content = await decrypt({ event, user });
-
-			let i = latest.findIndex((m) => m.pubkey === event.pubkey);
-			let popped;
-			if (~i) popped = latest.splice(i, 1);
-			else popped = latest.pop();
-
-			latest.unshift(event);
-			latest = latest;
-		}
-	});
-
-	$: initialize($password);
-	let initialize = async (p) => {
-		let i = 0;
-		ready = false;
-		if (!p || !user) return;
-		while (i < messages.length) {
-			let event = messages[i];
-			i++;
-
-			if (!(event.author && event.recipient)) continue;
-
-			let k = event.author.id === user.id ? event.recipient?.pubkey : event.author.pubkey;
-			if (!keys.has(k)) {
-				keys.add(k);
-				event.content = await decrypt({ event, user });
-				if (event.content) latest.push(event);
-			}
-		}
-
-		latest = latest;
-		ready = true;
-	};
-
-	let i;
-	let o;
-
-	rate.subscribe((n) => {
-		if (!user?.currency) return;
-		clearInterval(i);
-
-		let r = ((rates[user.currency] / rates['USD']) * n).toFixed(2);
-
-		if (!r || isNaN(r)) return;
-		if (!o) o = r;
-
-		let t = 0;
-		let d = o - r;
-
-		i = setInterval(() => {
-			if (!r) return;
-			$animatedRate = (o - d * ease(t / 100)).toFixed(2);
-			if (t > 80) (o = r) && clearInterval(i);
-			t++;
-		}, 10);
-	});
+  import { onMount } from "svelte";
+  import { Icon, Avatar, Balance, Feed } from "$comp";
+  import { t } from "$lib/translations";
+  import { ease, f, sat, sats } from "$lib/utils";
+  import { sign, send, encrypt, decrypt } from "$lib/nostr";
+  import { event as e, password, rate, animatedRate } from "$lib/store";
+  import { browser } from "$app/environment";
+
+  export let data;
+  let { messages, notes, invoices, sent, received, subject, user, rates } =
+    data;
+  $: refresh(data);
+  let refresh = (d) =>
+    ({ messages, notes, invoices, sent, received, subject, user, rates } = d);
+
+  let keys = new Set();
+  let latest = [];
+  let ready;
+
+  e.subscribe(async (event) => {
+    if (!(event && ready)) return;
+    if (
+      event.recipient?.id === user.id &&
+      !~latest.findIndex((m) => m.id === event.id)
+    ) {
+      event.content = await decrypt({ event, user });
+
+      let i = latest.findIndex((m) => m.pubkey === event.pubkey);
+      let popped;
+      if (~i) popped = latest.splice(i, 1);
+      else popped = latest.pop();
+
+      latest.unshift(event);
+      latest = latest;
+    }
+  });
+
+  $: initialize($password);
+  let initialize = async (p) => {
+    let i = 0;
+    ready = false;
+    if (!p || !user) return;
+    while (i < messages.length) {
+      let event = messages[i];
+      i++;
+
+      if (!(event.author && event.recipient)) continue;
+
+      let k =
+        event.author.id === user.id
+          ? event.recipient?.pubkey
+          : event.author.pubkey;
+      if (!keys.has(k)) {
+        keys.add(k);
+        event.content = await decrypt({ event, user });
+        if (event.content) latest.push(event);
+      }
+    }
+
+    latest = latest;
+    ready = true;
+  };
+
+  let i;
+  let o;
+
+  rate.subscribe((n) => {
+    if (!user?.currency) return;
+    clearInterval(i);
+
+    let r = ((rates[user.currency] / rates["USD"]) * n).toFixed(2);
+
+    if (!r || isNaN(r)) return;
+    if (!o) o = r;
+
+    let t = 0;
+    let d = o - r;
+
+    i = setInterval(() => {
+      if (!r) return;
+      $animatedRate = (o - d * ease(t / 100)).toFixed(2);
+      if (t > 80) (o = r) && clearInterval(i);
+      t++;
+    }, 10);
+  });
 </script>
 
 <div class="space-y-5">
-	{#if user?.id === subject.id}
-		<div class="space-y-5">
-			<div class="flex justify-center lg:justify-start">
-				<Balance {user} />
-			</div>
-
-			{#if !user.balance}
-				<div class="mb-8">
-					<p class="text-secondary text-lg">
-						{$t('user.welcome')}
-					</p>
-				</div>
-			{/if}
-
-			<div class="flex flex-wrap gap-2 justify-center w-full">
-				<a href={`/${user.username}/receive`} class="w-full md:w-60">
-					<button
-						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
-					>
-						<div class="mx-auto flex">
-							<Icon icon="numpad" style="my-auto h-6 mr-2" />
-							<div class="my-auto">{$t('user.dashboard.receive')}</div>
-						</div>
-					</button>
-				</a>
-				<a href={`/send`} class="w-full md:w-60">
-					<button
-						class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
-					>
-						<div class="mx-auto flex">
-							<Icon icon="send" style="my-auto h-6 mr-2" />
-							<div class="my-auto">{$t('user.dashboard.send')}</div>
-						</div>
-					</button>
-				</a>
-
-				{#if user.eligible}
-					<a href={`/buy`}>
-						<button class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60">
-							<div class="mx-auto flex">
-								<!-- <Icon icon="plus" style="my-auto h-6 mr-2" /> -->
-
-								<img
-									src="/images/bitcoin.svg"
-									class="w-8 border-4 border-transparent mr-2"
-									alt="Bitcoin"
-								/>
-								<div class="my-auto mt-1">Buy Bitcoin</div>
-							</div>
-						</button>
-					</a>
-				{/if}
-			</div>
-		</div>
-	{/if}
-
-	{#if invoices.length}
-		<div>
-			<h1 class="text-secondary text-xl">Invoices</h1>
-			{#each invoices as { amount, currency, rate, request: { requester, recipient }, hash }}
-				{@const requested = user.username === requester?.username}
-				<a href={`/${recipient.username}/invoice/${hash}` + (requested ? '/tip' : '')}>
-					<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
-						<div class="flex gap-2">
-							<div>
-								{#if requested}
-									<div class="flex">
-										<Avatar user={recipient} size={20} />
-										<div class="my-auto text-left">
-											<p class="text-secondary">{$t('payments.invoiceFrom')}</p>
-											<p class="ml-1 text-lg break-words">{recipient.username}</p>
-										</div>
-									</div>
-								{:else}
-									<div class="flex">
-										<Avatar user={requester} size={20} />
-										<div class="my-auto text-left">
-											<p class="text-secondary">{$t('payments.awaiting')}</p>
-											<p class="ml-1 text-lg break-words">{requester.username}</p>
-										</div>
-									</div>
-								{/if}
-							</div>
-							<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
-								<div class="font-bold">
-									{f(amount * (rate / sats), currency)}
-								</div>
-
-								<div class="text-secondary">{sat(amount)}</div>
-							</div>
-						</div>
-					</div>
-				</a>
-			{/each}
-		</div>
-	{/if}
-	{#if received.length}
-		<div>
-			<h1 class="text-secondary text-xl">Requests</h1>
-
-			{#each received as { id, invoice, memo, requester: r }}
-				<a href={`/${user.username}/receive/${id}`}>
-					<div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
-						<div class="flex">
-							<div>
-								<div class="flex">
-									<Avatar user={r} size={20} />
-									<div class="my-auto text-left">
-										<p class="ml-1 text-lg break-words">{r.username}</p>
-										<p class="ml-1 text-secondary">{memo}</p>
-									</div>
-								</div>
-							</div>
-							<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
-								<button class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
-									>Invoice</button
-								>
-							</div>
-						</div>
-					</div>
-				</a>
-			{/each}
-		</div>
-	{/if}
-
-	{#if latest.length && user?.id === subject.id}
-		<div class="relative">
-			{#each latest as { content, pubkey, author, recipient }}
-				{@const user = author.id === user.id ? recipient : author}
-				<a href={`/${user.username}/messages`}>
-					<div class="flex hover:bg-gray-100 p-4 rounded-2xl">
-						<div class="my-auto">
-							<Avatar {user} size={'20'} disabled={true} />
-						</div>
-						<div class="my-auto truncate">
-							<div class="my-auto ml-1 text-lg font-bold">{user.username}</div>
-							<div class="my-auto ml-1 text-secondary text-lg truncate">
-								{content}
-							</div>
-						</div>
-					</div>
-				</a>
-			{/each}
-		</div>
-	{/if}
+  {#if user?.id === subject.id}
+    <div class="space-y-5">
+      <div class="flex justify-center lg:justify-start">
+        <Balance {user} />
+      </div>
+
+      {#if !user.balance}
+        <div class="mb-8">
+          <p class="text-secondary text-lg">
+            {$t("user.welcome")}
+          </p>
+        </div>
+      {/if}
+
+      <div class="flex flex-wrap gap-2 justify-center w-full">
+        <a href={`/${user.username}/receive`} class="w-full md:w-60">
+          <button
+            class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
+          >
+            <div class="mx-auto flex">
+              <Icon icon="numpad" style="my-auto h-6 mr-2" />
+              <div class="my-auto">{$t("user.dashboard.receive")}</div>
+            </div>
+          </button>
+        </a>
+        <a href={`/send`} class="w-full md:w-60">
+          <button
+            class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-full"
+          >
+            <div class="mx-auto flex">
+              <Icon icon="send" style="my-auto h-6 mr-2" />
+              <div class="my-auto">{$t("user.dashboard.send")}</div>
+            </div>
+          </button>
+        </a>
+
+        {#if user.eligible}
+          <a href={`/buy`}>
+            <button
+              class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60"
+            >
+              <div class="mx-auto flex">
+                <!-- <Icon icon="plus" style="my-auto h-6 mr-2" /> -->
+
+                <img
+                  src="/images/bitcoin.svg"
+                  class="w-8 border-4 border-transparent mr-2"
+                  alt="Bitcoin"
+                />
+                <div class="my-auto mt-1">Buy Bitcoin</div>
+              </div>
+            </button>
+          </a>
+        {/if}
+      </div>
+    </div>
+  {/if}
+
+  {#if invoices.length}
+    <div>
+      <h1 class="text-secondary text-xl">Invoices</h1>
+      {#each invoices as { amount, currency, rate, request: { requester, recipient }, hash }}
+        {@const requested = user.username === requester?.username}
+        <a
+          href={`/${recipient.username}/invoice/${hash}` +
+            (requested ? "/tip" : "")}
+        >
+          <div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
+            <div class="flex gap-2">
+              <div>
+                {#if requested}
+                  <div class="flex">
+                    <Avatar user={recipient} size={20} />
+                    <div class="my-auto text-left">
+                      <p class="text-secondary">{$t("payments.invoiceFrom")}</p>
+                      <p class="ml-1 text-lg break-words">
+                        {recipient.username}
+                      </p>
+                    </div>
+                  </div>
+                {:else}
+                  <div class="flex">
+                    <Avatar user={requester} size={20} />
+                    <div class="my-auto text-left">
+                      <p class="text-secondary">{$t("payments.awaiting")}</p>
+                      <p class="ml-1 text-lg break-words">
+                        {requester.username}
+                      </p>
+                    </div>
+                  </div>
+                {/if}
+              </div>
+              <div class="whitespace-nowrap my-auto ml-auto flex gap-2">
+                <div class="font-bold">
+                  {f(amount * (rate / sats), currency)}
+                </div>
+
+                <div class="text-secondary">{sat(amount)}</div>
+              </div>
+            </div>
+          </div>
+        </a>
+      {/each}
+    </div>
+  {/if}
+  {#if received.length}
+    <div>
+      <h1 class="text-secondary text-xl">Requests</h1>
+
+      {#each received as { id, invoice, memo, requester: r }}
+        <a href={`/${user.username}/receive/${id}`}>
+          <div class="border-b p-2 last:border-b-0 hover:bg-gray-100">
+            <div class="flex">
+              <div>
+                <div class="flex">
+                  <Avatar user={r} size={20} />
+                  <div class="my-auto text-left">
+                    <p class="ml-1 text-lg break-words">{r.username}</p>
+                    <p class="ml-1 text-secondary">{memo}</p>
+                  </div>
+                </div>
+              </div>
+              <div class="whitespace-nowrap my-auto ml-auto flex gap-2">
+                <button
+                  class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
+                  >Invoice</button
+                >
+              </div>
+            </div>
+          </div>
+        </a>
+      {/each}
+    </div>
+  {/if}
+
+  {#if latest.length && user?.id === subject.id}
+    <div class="relative">
+      {#each latest as { content, pubkey, author, recipient }}
+        {@const user = author.id === user.id ? recipient : author}
+        <a href={`/${user.username}/messages`}>
+          <div class="flex hover:bg-gray-100 p-4 rounded-2xl">
+            <div class="my-auto">
+              <Avatar {user} size={"20"} disabled={true} />
+            </div>
+            <div class="my-auto truncate">
+              <div class="my-auto ml-1 text-lg font-bold">{user.username}</div>
+              <div class="my-auto ml-1 text-secondary text-lg truncate">
+                {content}
+              </div>
+            </div>
+          </div>
+        </a>
+      {/each}
+    </div>
+  {/if}
 </div>
diff --git a/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js b/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js
index 6182de17..ec4da865 100644
--- a/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/event/[id]/+page.server.js
@@ -1,12 +1,12 @@
-import { get } from '$lib/utils';
-import { error } from '@sveltejs/kit';
+import { get } from "$lib/utils";
+import { error } from "@sveltejs/kit";
 
 export async function load({ params: { id } }) {
-	try {
-		let event = await get(`/event/${id}`);
-		if (!event) throw error(500, 'Event not found');
-		return { event };
-	} catch (e) {
-		throw error(500, e.message);
-	}
+  try {
+    let event = await get(`/event/${id}`);
+    if (!event) throw error(500, "Event not found");
+    return { event };
+  } catch (e) {
+    throw error(500, e.message);
+  }
 }
diff --git a/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte b/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
index 85fc815a..1347947f 100644
--- a/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
@@ -1,7 +1,7 @@
 <script>
-	import { Event } from '$comp';
-	export let data;
-	let { event } = data;
+  import { Event } from "$comp";
+  export let data;
+  let { event } = data;
 </script>
 
 <Event {event} />
diff --git a/src/routes/(app)/[username]/(profile)/followers/+page.svelte b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
index 56b3ba16..f51af86b 100644
--- a/src/routes/(app)/[username]/(profile)/followers/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
@@ -1,51 +1,52 @@
 <script>
-	import { t } from '$lib/translations';
-	import { Avatar } from '$comp';
-	import { browser } from '$app/environment';
-	import VirtualScroll from 'svelte-virtual-scroll-list';
+  import { t } from "$lib/translations";
+  import { Avatar } from "$comp";
+  import { browser } from "$app/environment";
+  import VirtualScroll from "svelte-virtual-scroll-list";
 
-	export let data;
-	let {
-		subject: { followers }
-	} = data;
+  export let data;
+  let {
+    subject: { followers },
+  } = data;
 
-	let w;
+  let w;
 </script>
 
 <svelte:window bind:innerWidth={w} />
 
 <div class="px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-		{$t('user.followers')}
-	</h1>
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
+    {$t("user.followers")}
+  </h1>
 
-	{#if browser}
-		{#if followers.length}
-			<VirtualScroll data={followers} key="pubkey" let:data pageMode={true}>
-				<a href={`/${data.pubkey}`}>
-					<div
-						class="flex border-b last:border-b-0 py-4 text-sm lg:text-lg text-secondary"
-						:key={data.pubkey}
-					>
-						<div class="mb-auto mr-2">
-							<div class="md:hidden">
-								<Avatar size={12} user={data} disabled={true} />
-							</div>
-							<div class="hidden md:block">
-								<Avatar size={20} user={data} disabled={true} />
-							</div>
-						</div>
+  {#if browser}
+    {#if followers.length}
+      <VirtualScroll data={followers} key="pubkey" let:data pageMode={true}>
+        <a href={`/${data.pubkey}`}>
+          <div
+            class="flex border-b last:border-b-0 py-4 text-sm lg:text-lg text-secondary"
+            :key={data.pubkey}
+          >
+            <div class="mb-auto mr-2">
+              <div class="md:hidden">
+                <Avatar size={12} user={data} disabled={true} />
+              </div>
+              <div class="hidden md:block">
+                <Avatar size={20} user={data} disabled={true} />
+              </div>
+            </div>
 
-						<div class="w-full flex pb-1 text-black my-auto">
-							<div>
-								{data.display_name || ''} <span class="text-secondary">@{data.username}</span>
-							</div>
-						</div>
-					</div>
-				</a>
-			</VirtualScroll>
-		{:else}
-			<div>No followers</div>
-		{/if}
-	{/if}
+            <div class="w-full flex pb-1 text-black my-auto">
+              <div>
+                {data.display_name || ""}
+                <span class="text-secondary">@{data.username}</span>
+              </div>
+            </div>
+          </div>
+        </a>
+      </VirtualScroll>
+    {:else}
+      <div>No followers</div>
+    {/if}
+  {/if}
 </div>
diff --git a/src/routes/(app)/[username]/(profile)/follows/+page.svelte b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
index b238c3a7..4f1bf32b 100644
--- a/src/routes/(app)/[username]/(profile)/follows/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
@@ -1,47 +1,51 @@
 <script>
-	import { t } from '$lib/translations';
-	import { Avatar } from '$comp';
-	import { browser } from '$app/environment';
-	import VirtualScroll from 'svelte-virtual-scroll-list';
+  import { t } from "$lib/translations";
+  import { Avatar } from "$comp";
+  import { browser } from "$app/environment";
+  import VirtualScroll from "svelte-virtual-scroll-list";
 
-	export let data;
-	let {
-		subject: { follows }
-	} = data;
-	let w;
+  export let data;
+  let {
+    subject: { follows },
+  } = data;
+  let w;
 </script>
 
 <svelte:window bind:innerWidth={w} />
 
 <div class="px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-		{$t('user.following')}
-	</h1>
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
+    {$t("user.following")}
+  </h1>
 
-	{#if browser}
-		{#if follows.length}
-			<VirtualScroll data={follows} key="pubkey" let:data pageMode={true}>
-				<a href={`/${data.pubkey}`}>
-					<div class="flex py-4 text-sm lg:text-lg text-secondary" :key={data.pubkey}>
-						<div class="mb-auto mr-2">
-							<div class="md:hidden">
-								<Avatar size={12} user={data} disabled={true} />
-							</div>
-							<div class="hidden md:block">
-								<Avatar size={20} user={data} disabled={true} />
-							</div>
-						</div>
+  {#if browser}
+    {#if follows.length}
+      <VirtualScroll data={follows} key="pubkey" let:data pageMode={true}>
+        <a href={`/${data.pubkey}`}>
+          <div
+            class="flex py-4 text-sm lg:text-lg text-secondary"
+            :key={data.pubkey}
+          >
+            <div class="mb-auto mr-2">
+              <div class="md:hidden">
+                <Avatar size={12} user={data} disabled={true} />
+              </div>
+              <div class="hidden md:block">
+                <Avatar size={20} user={data} disabled={true} />
+              </div>
+            </div>
 
-						<div class="w-full flex pb-1 text-black my-auto">
-							<div>
-								{data.display_name || ''} <span class="text-secondary">@{data.username}</span>
-							</div>
-						</div>
-					</div>
-				</a>
-			</VirtualScroll>
-		{:else}
-			<div>No follows</div>
-		{/if}
-	{/if}
+            <div class="w-full flex pb-1 text-black my-auto">
+              <div>
+                {data.display_name || ""}
+                <span class="text-secondary">@{data.username}</span>
+              </div>
+            </div>
+          </div>
+        </a>
+      </VirtualScroll>
+    {:else}
+      <div>No follows</div>
+    {/if}
+  {/if}
 </div>
diff --git a/src/routes/(app)/[username]/(profile)/request/+page.server.js b/src/routes/(app)/[username]/(profile)/request/+page.server.js
index e7ad6a8f..754c5805 100644
--- a/src/routes/(app)/[username]/(profile)/request/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/request/+page.server.js
@@ -1,15 +1,15 @@
-import { redirect } from '@sveltejs/kit';
-import { fd, auth, post } from '$lib/utils';
+import { redirect } from "@sveltejs/kit";
+import { fd, auth, post } from "$lib/utils";
 
 export const actions = {
-	create: async ({ cookies, params, request, url }) => {
-		let form = await fd(request);
-		let { id, requester } = await post('/requests', form, auth(cookies));
-		throw redirect(307, `/${params.username}/request/${id}`);
-	},
+  create: async ({ cookies, params, request, url }) => {
+    let form = await fd(request);
+    let { id, requester } = await post("/requests", form, auth(cookies));
+    throw redirect(307, `/${params.username}/request/${id}`);
+  },
 
-	delete: async ({ cookies, request }) => {
-		let form = await fd(request);
-		let r = await post('/requests/delete', form, auth(cookies));
-	}
+  delete: async ({ cookies, request }) => {
+    let form = await fd(request);
+    let r = await post("/requests/delete", form, auth(cookies));
+  },
 };
diff --git a/src/routes/(app)/[username]/(profile)/request/+page.svelte b/src/routes/(app)/[username]/(profile)/request/+page.svelte
index 75117ff4..5727c3d4 100644
--- a/src/routes/(app)/[username]/(profile)/request/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/request/+page.svelte
@@ -1,35 +1,35 @@
 <script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon } from '$comp';
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { Icon } from "$comp";
 
-	export let data;
+  export let data;
 
-	let { subject, user } = data;
+  let { subject, user } = data;
 </script>
 
 <div class="container max-w-lg px-4 mx-auto mt-10 space-y-5">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-		{$t('payments.requestAnInvoice')}
-	</h1>
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
+    {$t("payments.requestAnInvoice")}
+  </h1>
 
-	<form action="?/create" method="POST" use:enhance class="space-y-5">
-		<input type="hidden" name="requester_id" value={user.id} />
-		<input type="hidden" name="recipient" value={subject.username} />
+  <form action="?/create" method="POST" use:enhance class="space-y-5">
+    <input type="hidden" name="requester_id" value={user.id} />
+    <input type="hidden" name="recipient" value={subject.username} />
 
-		<textarea
-			name="memo"
-			placeholder={$t('payments.describeOrder')}
-			class="w-full p-4 border rounded-xl h-48"
-		/>
+    <textarea
+      name="memo"
+      placeholder={$t("payments.describeOrder")}
+      class="w-full p-4 border rounded-xl h-48"
+    />
 
-		<div class="w-full flex">
-			<button
-				type="submit"
-				class="bg-black text-white border rounded-full px-6 py-2 font-bold mx-auto"
-			>
-				{$t('payments.submit')}
-			</button>
-		</div>
-	</form>
+    <div class="w-full flex">
+      <button
+        type="submit"
+        class="bg-black text-white border rounded-full px-6 py-2 font-bold mx-auto"
+      >
+        {$t("payments.submit")}
+      </button>
+    </div>
+  </form>
 </div>
diff --git a/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte b/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
index 4995bfb2..6ce0c9f6 100644
--- a/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
@@ -1,18 +1,21 @@
 <script>
-	import { scale } from 'svelte/transition';
-	import { Icon } from '$comp';
+  import { scale } from "svelte/transition";
+  import { Icon } from "$comp";
 
-	export let data;
-	let { subject } = data;
+  export let data;
+  let { subject } = data;
 </script>
 
 <div class="container px-4 text-center mx-auto">
-	<div class="flex w-full py-20 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">Request sent</h1>
+  <div
+    class="flex w-full py-20 max-w-[200px] mx-auto"
+    in:scale={{ start: 0.5 }}
+  >
+    <Icon icon="check" style="mx-auto" />
+  </div>
+  <h1 class="text-3xl md:text-4xl font-bold mb-6">Request sent</h1>
 </div>
 
 <a href={`/${subject.username}`}>
-	<div class="opacity-0 w-screen h-screen fixed top-24 left-0 z-50" />
+  <div class="opacity-0 w-screen h-screen fixed top-24 left-0 z-50" />
 </a>
diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js
index 8df75f0f..0e962173 100644
--- a/src/routes/(app)/[username]/+layout.server.js
+++ b/src/routes/(app)/[username]/+layout.server.js
@@ -1,13 +1,13 @@
-import { get } from '$lib/utils';
-import { error } from '@sveltejs/kit';
+import { get } from "$lib/utils";
+import { error } from "@sveltejs/kit";
 
 export let load = async ({ depends, params: { username } }) => {
-	depends('app:user');
+  depends("app:user");
 
-	try {
-		let subject = await get(`/users/${username}`);
-		return { subject };
-	} catch (e) {
-		throw error(500, 'Unable to retrieve user account data');
-	}
+  try {
+    let subject = await get(`/users/${username}`);
+    return { subject };
+  } catch (e) {
+    throw error(500, "Unable to retrieve user account data");
+  }
 };
diff --git a/src/routes/(app)/[username]/+layout.svelte b/src/routes/(app)/[username]/+layout.svelte
index 54fcd600..3a351e48 100644
--- a/src/routes/(app)/[username]/+layout.svelte
+++ b/src/routes/(app)/[username]/+layout.svelte
@@ -1,57 +1,57 @@
 <script>
-	import { AppHeader } from '$comp';
-	import { onNavigate } from '$app/navigation';
-	export let data;
-
-	onNavigate((navigation) => {
-		if (!document.startViewTransition) return;
-
-		return new Promise((resolve) => {
-			document.startViewTransition(async () => {
-				resolve();
-				await navigation.complete;
-			});
-		});
-	});
+  import { AppHeader } from "$comp";
+  import { onNavigate } from "$app/navigation";
+  export let data;
+
+  onNavigate((navigation) => {
+    if (!document.startViewTransition) return;
+
+    return new Promise((resolve) => {
+      document.startViewTransition(async () => {
+        resolve();
+        await navigation.complete;
+      });
+    });
+  });
 </script>
 
 <AppHeader {data} />
 <div class="content">
-	<slot />
+  <slot />
 </div>
 
 <style>
-	@keyframes fade-in {
-		from {
-			opacity: 0;
-		}
-	}
-
-	@keyframes fade-out {
-		to {
-			opacity: 0;
-		}
-	}
-
-	@keyframes slide-from-right {
-		from {
-			transform: translateX(60px);
-		}
-	}
-
-	@keyframes slide-to-left {
-		to {
-			transform: translateX(-60px);
-		}
-	}
-
-	:root::view-transition-old(root) {
-		animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
-			180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
-	}
-
-	:root::view-transition-new(root) {
-		animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
-			180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
-	}
+  @keyframes fade-in {
+    from {
+      opacity: 0;
+    }
+  }
+
+  @keyframes fade-out {
+    to {
+      opacity: 0;
+    }
+  }
+
+  @keyframes slide-from-right {
+    from {
+      transform: translateX(60px);
+    }
+  }
+
+  @keyframes slide-to-left {
+    to {
+      transform: translateX(-60px);
+    }
+  }
+
+  :root::view-transition-old(root) {
+    animation: 280ms cubic-bezier(0.4, 0, 1, 1) both fade-out,
+      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-to-left;
+  }
+
+  :root::view-transition-new(root) {
+    animation: 280ms cubic-bezier(0, 0, 0.2, 1) 80ms both fade-in,
+      180ms cubic-bezier(0.4, 0, 0.2, 1) both slide-from-right;
+  }
 </style>
diff --git a/src/routes/(app)/[username]/address/+page.server.js b/src/routes/(app)/[username]/address/+page.server.js
index 247a33a2..1a782f9d 100644
--- a/src/routes/(app)/[username]/address/+page.server.js
+++ b/src/routes/(app)/[username]/address/+page.server.js
@@ -1,10 +1,10 @@
-import { auth, get, post } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
+import { auth, get, post } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export async function load({ cookies, params, parent }) {
-	let user = (await parent()).subject;
-	let rates = await get('/rates');
-	let invoice = { type: 'bitcoin' };
-	let { hash } = await post(`/invoice`, { invoice, user }, auth(cookies));
-	throw redirect(307, `/${user.username}/invoice/${hash}`);
+  let user = (await parent()).subject;
+  let rates = await get("/rates");
+  let invoice = { type: "bitcoin" };
+  let { hash } = await post(`/invoice`, { invoice, user }, auth(cookies));
+  throw redirect(307, `/${user.username}/invoice/${hash}`);
 }
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.server.js b/src/routes/(app)/[username]/card/[serial]/+page.server.js
index 40e375aa..20b657a1 100644
--- a/src/routes/(app)/[username]/card/[serial]/+page.server.js
+++ b/src/routes/(app)/[username]/card/[serial]/+page.server.js
@@ -1,16 +1,16 @@
-import { auth, get } from '$lib/utils';
-import { redirect } from "@sveltejs/kit"
+import { auth, get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export let load = async ({ cookies, params }) => {
-	let { serial } = params;
-	let fund;
-	try {
-		fund = await get(`/fund/${serial}`, auth(cookies));
-	} catch (e) {
-		console.log(e);
-	}
+  let { serial } = params;
+  let fund;
+  try {
+    fund = await get(`/fund/${serial}`, auth(cookies));
+  } catch (e) {
+    console.log(e);
+  }
 
-	if (fund) throw redirect(307, `/fund/${serial}`);
+  if (fund) throw redirect(307, `/fund/${serial}`);
 
-	return params;
+  return params;
 };
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.svelte b/src/routes/(app)/[username]/card/[serial]/+page.svelte
index afdaf65d..a2e17dfc 100644
--- a/src/routes/(app)/[username]/card/[serial]/+page.svelte
+++ b/src/routes/(app)/[username]/card/[serial]/+page.svelte
@@ -1,35 +1,35 @@
 <script>
-	import { Card, Icon } from '$comp';
-	export let data;
-	let { serial } = data;
-	let balance = 0;
+  import { Card, Icon } from "$comp";
+  export let data;
+  let { serial } = data;
+  let balance = 0;
 </script>
 
 <div class="space-y-5">
-	<div class="relative flex justify-center gap-2">
-		<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {serial}</h1>
-	</div>
-	<div class="flex justify-center">
-		<a href={`/send/pot/${serial}`}>
-			<button
-				class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white justify-center gap-2"
-			>
-				<svg
-					xmlns="http://www.w3.org/2000/svg"
-					class="invert text-black peer-placeholder-shown:text-gray-300 h-6 w-6 my-auto"
-					fill="none"
-					viewBox="0 0 24 24"
-					stroke="currentColor"
-				>
-					<path
-						stroke-linecap="round"
-						stroke-linejoin="round"
-						stroke-width="2"
-						d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z"
-					/>
-				</svg>
-				<div class="my-auto">Add Funds</div>
-			</button>
-		</a>
-	</div>
+  <div class="relative flex justify-center gap-2">
+    <h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {serial}</h1>
+  </div>
+  <div class="flex justify-center">
+    <a href={`/send/pot/${serial}`}>
+      <button
+        class="rounded-full border py-3 px-6 font-bold hover:opacity-80 flex w-60 bg-black text-white justify-center gap-2"
+      >
+        <svg
+          xmlns="http://www.w3.org/2000/svg"
+          class="invert text-black peer-placeholder-shown:text-gray-300 h-6 w-6 my-auto"
+          fill="none"
+          viewBox="0 0 24 24"
+          stroke="currentColor"
+        >
+          <path
+            stroke-linecap="round"
+            stroke-linejoin="round"
+            stroke-width="2"
+            d="M3 10h18M7 15h1m4 0h1m-7 4h12a3 3 0 003-3V8a3 3 0 00-3-3H6a3 3 0 00-3 3v8a3 3 0 003 3z"
+          />
+        </svg>
+        <div class="my-auto">Add Funds</div>
+      </button>
+    </a>
+  </div>
 </div>
diff --git a/src/routes/(app)/[username]/funds/+page.svelte b/src/routes/(app)/[username]/funds/+page.svelte
index 6479fb8b..667176e1 100644
--- a/src/routes/(app)/[username]/funds/+page.svelte
+++ b/src/routes/(app)/[username]/funds/+page.svelte
@@ -1,6 +1,6 @@
 <script>
-	import { Avatar, Icon } from '$comp';
-	import { t } from '$lib/translations';
+  import { Avatar, Icon } from "$comp";
+  import { t } from "$lib/translations";
 
   export let data;
 
@@ -8,49 +8,44 @@
 </script>
 
 <div class="mt-24 mb-20">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-		Funds
-	</h1>
-
-	<div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-		<div class="text-base">
-					<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
-						<div class="whitespace-nowrap my-auto">
-
-							<div class="text-secondary">
-								
-							</div>
-						</div>
-
-						<div class="flex my-auto">
-									<div class="text-secondary flex">
-										<div class="my-auto mr-1">
-											<img src="/images/moneypot.png" class="w-12" alt="Pot" />
-										</div>
-
-										<div class="my-auto">Pot</div>
-									</div>
-						</div>
-
-						<div class="text-secondary text-right text-sm my-auto">
-							<div>
-							
-							</div>
-						</div>
-					</div>
-		</div>
-
-		<button
-			class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
-		>
-			<Icon icon="plus" style="opacity-50 mr-2 my-auto" />
-			<div class="my-auto">{$t('payments.create')}</div>
-		</button>
-	</div>
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+    Funds
+  </h1>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    <div class="text-base">
+      <div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
+        <div class="whitespace-nowrap my-auto">
+          <div class="text-secondary" />
+        </div>
+
+        <div class="flex my-auto">
+          <div class="text-secondary flex">
+            <div class="my-auto mr-1">
+              <img src="/images/moneypot.png" class="w-12" alt="Pot" />
+            </div>
+
+            <div class="my-auto">Pot</div>
+          </div>
+        </div>
+
+        <div class="text-secondary text-right text-sm my-auto">
+          <div />
+        </div>
+      </div>
+    </div>
+
+    <button
+      class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
+    >
+      <Icon icon="plus" style="opacity-50 mr-2 my-auto" />
+      <div class="my-auto">{$t("payments.create")}</div>
+    </button>
+  </div>
 </div>
 
 <style>
-	.active * {
-		@apply bg-black text-white border-black;
-	}
+  .active * {
+    @apply bg-black text-white border-black;
+  }
 </style>
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
index b9274434..4ebb5eae 100644
--- a/src/routes/(app)/[username]/generate/+page.svelte
+++ b/src/routes/(app)/[username]/generate/+page.svelte
@@ -1,62 +1,62 @@
 <script>
-	import { fail, post, wait } from '$lib/utils';
-	import { onMount } from 'svelte';
-	import { goto, invalidate } from '$app/navigation';
-	import { Pin } from '$comp';
-	import { loginRedirect, pin, password, passwordPrompt } from '$lib/store';
-	import { generate } from '$lib/nostr';
-	import { browser } from '$app/environment';
-
-	export let data;
-	let { user } = data;
-
-	let loaded;
-	let gen = async () => {
-		if (!browser) return;
-
-		if (user.pubkey) {
-			goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
-			return;
-		}
-
-		if (!$password) $passwordPrompt = true;
-
-		try {
-			await post('/password', { password: $password });
-		} catch (e) {
-			$passwordPrompt = true;
-		}
-
-		await wait(() => $password);
-
-		try {
-			await generate(user);
-		} catch (e) {
-			console.log('error generating', e);
-		}
-
-		try {
-			user.pin = $pin;
-			await post(`/${user.username}/generate`, user);
-			goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
-		} catch (e) {
-			$pin = '';
-			if (e.message?.startsWith('Pin')) {
-				fail('Wrong pin, try again');
-			} else {
-				fail('Failed to generate keys');
-				goto('/');
-			}
-		}
-	};
-
-	onMount(() => browser && setTimeout(() => (loaded = true) && gen(), 50));
-
-	$: $pin?.length === 6 && gen(user);
+  import { fail, post, wait } from "$lib/utils";
+  import { onMount } from "svelte";
+  import { goto, invalidate } from "$app/navigation";
+  import { Pin } from "$comp";
+  import { loginRedirect, pin, password, passwordPrompt } from "$lib/store";
+  import { generate } from "$lib/nostr";
+  import { browser } from "$app/environment";
+
+  export let data;
+  let { user } = data;
+
+  let loaded;
+  let gen = async () => {
+    if (!browser) return;
+
+    if (user.pubkey) {
+      goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
+      return;
+    }
+
+    if (!$password) $passwordPrompt = true;
+
+    try {
+      await post("/password", { password: $password });
+    } catch (e) {
+      $passwordPrompt = true;
+    }
+
+    await wait(() => $password);
+
+    try {
+      await generate(user);
+    } catch (e) {
+      console.log("error generating", e);
+    }
+
+    try {
+      user.pin = $pin;
+      await post(`/${user.username}/generate`, user);
+      goto($loginRedirect || `/${user.username}`, { invalidateAll: true });
+    } catch (e) {
+      $pin = "";
+      if (e.message?.startsWith("Pin")) {
+        fail("Wrong pin, try again");
+      } else {
+        fail("Failed to generate keys");
+        goto("/");
+      }
+    }
+  };
+
+  onMount(() => browser && setTimeout(() => (loaded = true) && gen(), 50));
+
+  $: $pin?.length === 6 && gen(user);
 </script>
 
 {#if loaded && user?.haspin && $pin?.length !== 6}
-	<Pin />
+  <Pin />
 {/if}
 {loaded}
 {JSON.stringify(user)}
diff --git a/src/routes/(app)/[username]/generate/+server.js b/src/routes/(app)/[username]/generate/+server.js
index e1df08e3..1dca1ece 100644
--- a/src/routes/(app)/[username]/generate/+server.js
+++ b/src/routes/(app)/[username]/generate/+server.js
@@ -1,11 +1,11 @@
-import { auth, post } from '$lib/utils';
-import { error, json } from '@sveltejs/kit';
+import { auth, post } from "$lib/utils";
+import { error, json } from "@sveltejs/kit";
 
 export async function POST({ cookies, request }) {
-	try {
-		let body = await request.json();
-		return json(await post(`/user`, body, auth(cookies)));
-	} catch (e) {
-		throw error(500, e.message);
-	}
+  try {
+    let body = await request.json();
+    return json(await post(`/user`, body, auth(cookies)));
+  } catch (e) {
+    throw error(500, e.message);
+  }
 }
diff --git a/src/routes/(app)/[username]/invoice/+server.js b/src/routes/(app)/[username]/invoice/+server.js
index 461d380c..5e3d0300 100644
--- a/src/routes/(app)/[username]/invoice/+server.js
+++ b/src/routes/(app)/[username]/invoice/+server.js
@@ -1,7 +1,7 @@
-import { auth, post } from '$lib/utils';
-import { json } from '@sveltejs/kit';
+import { auth, post } from "$lib/utils";
+import { json } from "@sveltejs/kit";
 
 export let POST = async ({ cookies: c, request: r }) => {
-	let j = await r.json();
-	return json(await post('/invoice', j, auth(c)));
+  let j = await r.json();
+  return json(await post("/invoice", j, auth(c)));
 };
diff --git a/src/routes/(app)/[username]/invoice/[id]/+layout.server.js b/src/routes/(app)/[username]/invoice/[id]/+layout.server.js
index 4d7fd3b8..b9d1c43d 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+layout.server.js
+++ b/src/routes/(app)/[username]/invoice/[id]/+layout.server.js
@@ -1,31 +1,39 @@
-import Qr from 'qrcode-base64';
-import { get } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
+import Qr from "qrcode-base64";
+import { get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export async function load({ depends, params, url, parent }) {
-	depends('app:invoice');
+  depends("app:invoice");
 
-	let { user } = await parent();
-	let { id } = params;
-	let invoice = await get(`/invoice/${id}`);
-	let options = !!url.searchParams.get('options');
+  let { user } = await parent();
+  let { id } = params;
+  let invoice = await get(`/invoice/${id}`);
+  let options = !!url.searchParams.get("options");
 
-	if (user && invoice.uid !== user.id && !url.pathname.includes('tip') && !options) {
-		throw redirect(307, `/send/invoice/${id}`);
-	}
+  if (
+    user &&
+    invoice.uid !== user.id &&
+    !url.pathname.includes("tip") &&
+    !options
+  ) {
+    throw redirect(307, `/send/invoice/${id}`);
+  }
 
-	let { amount, pending, received } = invoice;
-	amount = parseInt(amount);
+  let { amount, pending, received } = invoice;
+  amount = parseInt(amount);
 
-	let paid = (!amount && received) || (amount > 0 && (pending >= amount || received >= amount));
-	if (paid && !url.pathname.endsWith('paid')) {
-		throw redirect(
-			307,
-			`/${params.username}/invoice/${id}/paid` + (options ? '?options=true' : '')
-		);
-	}
+  let paid =
+    (!amount && received) ||
+    (amount > 0 && (pending >= amount || received >= amount));
+  if (paid && !url.pathname.endsWith("paid")) {
+    throw redirect(
+      307,
+      `/${params.username}/invoice/${id}/paid` +
+        (options ? "?options=true" : "")
+    );
+  }
 
-	let sm = Qr.drawImg(invoice.text || '', { size: 300 });
+  let sm = Qr.drawImg(invoice.text || "", { size: 300 });
 
-	return { id, invoice, sm, lg: sm };
+  return { id, invoice, sm, lg: sm };
 }
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.server.js b/src/routes/(app)/[username]/invoice/[id]/+page.server.js
index 1068f273..a57efa64 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.server.js
@@ -1,5 +1,5 @@
-import invoice from '$lib/invoice';
+import invoice from "$lib/invoice";
 
 export const actions = {
-	default: invoice
+  default: invoice,
 };
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index a0894dd1..b6bf70b7 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -1,217 +1,235 @@
 <script>
-	import { enhance } from '$app/forms';
-	import { send } from '$lib/socket';
-	import { post, back, copy, f, get, types, sat, reverseFormat, s, sats } from '$lib/utils';
-	import { tick, onMount, onDestroy } from 'svelte';
-	import { browser } from '$app/environment';
-	import { last } from '$lib/store';
-	import { Avatar, Icon, Heart, Image } from '$comp';
-	import { t } from '$lib/translations';
-	import { goto, invalidate } from '$app/navigation';
-
-	export let data;
-
-	let ndef;
-
-	let reading = async ({ message, serialNumber }) => {
-		let name = serialNumber.replace(/:/g, '-');
-		let result = await post(`/fund/${name}/withdraw`, { amount, hash, name });
-	};
-
-	let readingerror = (e) => console.log('nfc error', e);
-
-	$: refresh(data);
-	let { invoice, id, user, sm, lg } = data;
-	let {
-		amount,
-		hash,
-		type,
-		rate,
-		received,
-		prompt,
-		text,
-		tip,
-		request_id,
-		user: { username, currency }
-	} = invoice;
-
-	$: showQr = invoice.uid === user?.id;
-
-	$: src = sm;
-
-	let qr;
-	let tipPercent = 0;
-
-	let refresh = async (data) => {
-		({ invoice, id, user, sm, lg } = data);
-		({
-			amount,
-			hash,
-			type,
-			rate,
-			received,
-			prompt,
-			text,
-			tip,
-			user: { username, currency }
-		} = invoice);
-
-		tipPercent = (tip / amount) * 100;
-
-		// if (browser && window.NDEFReader) {
-		// 	try {
-		// 		ndef = new NDEFReader();
-		// 		await ndef.scan();
-		//
-		// 		ndef.removeEventListener('readingerror', readingerror);
-		// 		ndef.removeEventListener('reading', reading);
-		//
-		// 		ndef.addEventListener('readingerror', readingerror);
-		// 		ndef.addEventListener('reading', reading);
-		// 	} catch (e) {
-		// 		console.log(e);
-		// 	}
-		// }
-	};
-
-	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-	$: tipAmount = ((tip * rate) / sats).toFixed(2);
-
-	let subbed;
-
-	onMount(async () => {
-		if (browser) {
-			last.subscribe((v) => {
-				if (!v || subbed) return;
-				subbed = true;
-				send('subscribe', invoice);
-			});
-		}
-	});
-
-	onDestroy(() => {
-		if (ndef) {
-			ndef.removeEventListener('readingerror', readingerror);
-			ndef.removeEventListener('reading', reading);
-		}
-	});
-
-	$: link = type === 'bitcoin' ? text : `lightning:${text}`;
-	$: txt = type === 'bitcoin' ? hash : text;
-
-	let toggleType = async () => {
-		invoice.type = invoice.type === types.lightning ? types.bitcoin : types.lightning;
-		({ id } = await post(`/${username}/invoice`, {
-			invoice,
-			user: { username, currency }
-		}));
-
-		goto(`./${id}`, { invalidateAll: true });
-	};
+  import { enhance } from "$app/forms";
+  import { send } from "$lib/socket";
+  import {
+    post,
+    back,
+    copy,
+    f,
+    get,
+    types,
+    sat,
+    reverseFormat,
+    s,
+    sats,
+  } from "$lib/utils";
+  import { tick, onMount, onDestroy } from "svelte";
+  import { browser } from "$app/environment";
+  import { last } from "$lib/store";
+  import { Avatar, Icon, Heart, Image } from "$comp";
+  import { t } from "$lib/translations";
+  import { goto, invalidate } from "$app/navigation";
+
+  export let data;
+
+  let ndef;
+
+  let reading = async ({ message, serialNumber }) => {
+    let name = serialNumber.replace(/:/g, "-");
+    let result = await post(`/fund/${name}/withdraw`, { amount, hash, name });
+  };
+
+  let readingerror = (e) => console.log("nfc error", e);
+
+  $: refresh(data);
+  let { invoice, id, user, sm, lg } = data;
+  let {
+    amount,
+    hash,
+    type,
+    rate,
+    received,
+    prompt,
+    text,
+    tip,
+    request_id,
+    user: { username, currency },
+  } = invoice;
+
+  $: showQr = invoice.uid === user?.id;
+
+  $: src = sm;
+
+  let qr;
+  let tipPercent = 0;
+
+  let refresh = async (data) => {
+    ({ invoice, id, user, sm, lg } = data);
+    ({
+      amount,
+      hash,
+      type,
+      rate,
+      received,
+      prompt,
+      text,
+      tip,
+      user: { username, currency },
+    } = invoice);
+
+    tipPercent = (tip / amount) * 100;
+
+    // if (browser && window.NDEFReader) {
+    // 	try {
+    // 		ndef = new NDEFReader();
+    // 		await ndef.scan();
+    //
+    // 		ndef.removeEventListener('readingerror', readingerror);
+    // 		ndef.removeEventListener('reading', reading);
+    //
+    // 		ndef.addEventListener('readingerror', readingerror);
+    // 		ndef.addEventListener('reading', reading);
+    // 	} catch (e) {
+    // 		console.log(e);
+    // 	}
+    // }
+  };
+
+  $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+  $: tipAmount = ((tip * rate) / sats).toFixed(2);
+
+  let subbed;
+
+  onMount(async () => {
+    if (browser) {
+      last.subscribe((v) => {
+        if (!v || subbed) return;
+        subbed = true;
+        send("subscribe", invoice);
+      });
+    }
+  });
+
+  onDestroy(() => {
+    if (ndef) {
+      ndef.removeEventListener("readingerror", readingerror);
+      ndef.removeEventListener("reading", reading);
+    }
+  });
+
+  $: link = type === "bitcoin" ? text : `lightning:${text}`;
+  $: txt = type === "bitcoin" ? hash : text;
+
+  let toggleType = async () => {
+    invoice.type =
+      invoice.type === types.lightning ? types.bitcoin : types.lightning;
+    ({ id } = await post(`/${username}/invoice`, {
+      invoice,
+      user: { username, currency },
+    }));
+
+    goto(`./${id}`, { invalidateAll: true });
+  };
 </script>
 
 <div class="container mx-auto max-w-lg px-4 space-y-8">
-	<div class="whitespace-nowrap my-auto ml-auto flex gap-2">
-		<button
-			class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
-			class:bg-black={type === types.lightning}
-			class:text-white={type === types.lightning}
-			on:click={toggleType}
-		>
-			⚡️ Lightning
-		</button>
-
-		<button
-			class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full flex justify-center "
-			class:bg-black={type === types.bitcoin}
-			class:text-white={type === types.bitcoin}
-			on:click={toggleType}
-		>
-			<img
-				src="/images/bitcoin.svg"
-				class="my-auto w-8 border-4 border-transparent"
-				alt="Bitcoin"
-			/>
-			<div class="my-auto">Bitcoin</div>
-		</button>
-	</div>
-
-	{#if showQr}
-		<div>
-			<a href={invoice.type === 'bitcoin' ? invoice.text : 'lightning:' + invoice.text}>
-				<div class="relative flex">
-					<div class="flex mx-auto w-[360px] h-[360px]">
-						<img
-							{src}
-							class="w-[300px] h-[300px] mx-auto z-10 mt-[20px]"
-							bind:this={qr}
-							alt={txt}
-						/>
-					</div>
-					<div
-						class="absolute m-auto left-0 right-0 w-[340px] h-[340px] rounded-full bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] z-0"
-					/>
-				</div>
-			</a>
-		</div>
-	{/if}
-
-	{#if amount > 0}
-		<div class="text-center font-bold text-2xl">
-			<div>
-				{f(amountFiat, currency)}
-
-				{#if tip}
-					<span class="text-sm">
-						+{f(tip * (rate / sats), currency)}
-					</span>
-				{/if}
-			</div>
-			<div>
-				<span class="text-secondary font-normal text-lg">{`${sat(amount)}`}</span>
-
-				{#if tip}
-					<span class="text-sm text-secondary font-normal">
-						+{sat(tip)}
-					</span>
-				{/if}
-			</div>
-		</div>
-	{/if}
-
-	<div class="text-center break-all">
-		<a href={link}>
-			{txt}
-		</a>
-	</div>
-
-	<div class="w-full flex justify-center gap-2 flex-wrap">
-		<a href={link} class="w-full md:w-auto">
-			<button
-				class="w-full md:w-auto flex justify-center rounded-full border py-3 px-5 hover:opacity-80"
-			>
-				<Icon icon="mobile" style="mr-1 w-6" />
-				<div class="text-secondary">{$t('payments.openLink')}</div>
-			</button>
-		</a>
-
-		<button
-			class="flex rounded-full justify-center border py-3 px-5 hover:opacity-80 w-full md:w-auto"
-			on:click={() => copy(txt)}
-		>
-			<Icon icon="copy" style="mr-1" />
-			<div class="text-secondary">{$t('payments.copyText')}</div></button
-		>
-
-		<button
-			class="w-full md:w-auto flex justify-center rounded-full border py-3 px-5 hover:opacity-80"
-			on:click={() => (showQr = !showQr)}
-		>
-			<Icon icon="qr" style="mr-1 invert" />
-			<div class="text-secondary">
-				{showQr ? $t('payments.hide') : $t('payments.show')}
-				{$t('payments.qr')}
-			</div></button
-		>
-	</div>
+  <div class="whitespace-nowrap my-auto ml-auto flex gap-2">
+    <button
+      class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full"
+      class:bg-black={type === types.lightning}
+      class:text-white={type === types.lightning}
+      on:click={toggleType}
+    >
+      ⚡️ Lightning
+    </button>
+
+    <button
+      class="rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full flex justify-center"
+      class:bg-black={type === types.bitcoin}
+      class:text-white={type === types.bitcoin}
+      on:click={toggleType}
+    >
+      <img
+        src="/images/bitcoin.svg"
+        class="my-auto w-8 border-4 border-transparent"
+        alt="Bitcoin"
+      />
+      <div class="my-auto">Bitcoin</div>
+    </button>
+  </div>
+
+  {#if showQr}
+    <div>
+      <a
+        href={invoice.type === "bitcoin"
+          ? invoice.text
+          : "lightning:" + invoice.text}
+      >
+        <div class="relative flex">
+          <div class="flex mx-auto w-[360px] h-[360px]">
+            <img
+              {src}
+              class="w-[300px] h-[300px] mx-auto z-10 mt-[20px]"
+              bind:this={qr}
+              alt={txt}
+            />
+          </div>
+          <div
+            class="absolute m-auto left-0 right-0 w-[340px] h-[340px] rounded-full bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] z-0"
+          />
+        </div>
+      </a>
+    </div>
+  {/if}
+
+  {#if amount > 0}
+    <div class="text-center font-bold text-2xl">
+      <div>
+        {f(amountFiat, currency)}
+
+        {#if tip}
+          <span class="text-sm">
+            +{f(tip * (rate / sats), currency)}
+          </span>
+        {/if}
+      </div>
+      <div>
+        <span class="text-secondary font-normal text-lg"
+          >{`${sat(amount)}`}</span
+        >
+
+        {#if tip}
+          <span class="text-sm text-secondary font-normal">
+            +{sat(tip)}
+          </span>
+        {/if}
+      </div>
+    </div>
+  {/if}
+
+  <div class="text-center break-all">
+    <a href={link}>
+      {txt}
+    </a>
+  </div>
+
+  <div class="w-full flex justify-center gap-2 flex-wrap">
+    <a href={link} class="w-full md:w-auto">
+      <button
+        class="w-full md:w-auto flex justify-center rounded-full border py-3 px-5 hover:opacity-80"
+      >
+        <Icon icon="mobile" style="mr-1 w-6" />
+        <div class="text-secondary">{$t("payments.openLink")}</div>
+      </button>
+    </a>
+
+    <button
+      class="flex rounded-full justify-center border py-3 px-5 hover:opacity-80 w-full md:w-auto"
+      on:click={() => copy(txt)}
+    >
+      <Icon icon="copy" style="mr-1" />
+      <div class="text-secondary">{$t("payments.copyText")}</div></button
+    >
+
+    <button
+      class="w-full md:w-auto flex justify-center rounded-full border py-3 px-5 hover:opacity-80"
+      on:click={() => (showQr = !showQr)}
+    >
+      <Icon icon="qr" style="mr-1 invert" />
+      <div class="text-secondary">
+        {showQr ? $t("payments.hide") : $t("payments.show")}
+        {$t("payments.qr")}
+      </div></button
+    >
+  </div>
 </div>
diff --git a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
index 84e493d9..655bc3e4 100644
--- a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
@@ -1,64 +1,70 @@
 <script>
-	import { scale } from 'svelte/transition';
-	import { Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { browser } from '$app/environment';
-	import { t } from '$lib/translations';
-	import { fiat, f, s, sat, sats } from '$lib/utils';
+  import { scale } from "svelte/transition";
+  import { Icon } from "$comp";
+  import { toast } from "@zerodevx/svelte-toast";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import { fiat, f, s, sat, sats } from "$lib/utils";
 
-	export let data;
-	let amount, currency, rate, received, pending, tip, user, id;
-	$: data && ({ amount, currency, rate, received, pending, tip, user, id } = data.invoice);
+  export let data;
+  let amount, currency, rate, received, pending, tip, user, id;
+  $: data &&
+    ({ amount, currency, rate, received, pending, tip, user, id } =
+      data.invoice);
 
-	toast.pop(0);
+  toast.pop(0);
 </script>
 
 <div class="container px-4 text-center mx-auto">
-	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	{#if received}
-		<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('invoice.paymentSuccessful')}</h1>
-		<h2 class="text-2xl md:text-3xl font-semibold">
-			{f(fiat(received - tip, rate), currency)}
-			{#if tip}
-				<span class="text-lg">
-					+ {f(fiat(tip, rate), currency)}
-				</span>
-			{/if}
-		</h2>
-		<h3 class="text-secondary md:text-lg mb-6 mt-1">
-			⚡️{s(received - tip)}
+  <div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
+    <Icon icon="check" style="mx-auto" />
+  </div>
+  {#if received}
+    <h1 class="text-3xl md:text-4xl font-bold mb-6">
+      {$t("invoice.paymentSuccessful")}
+    </h1>
+    <h2 class="text-2xl md:text-3xl font-semibold">
+      {f(fiat(received - tip, rate), currency)}
+      {#if tip}
+        <span class="text-lg">
+          + {f(fiat(tip, rate), currency)}
+        </span>
+      {/if}
+    </h2>
+    <h3 class="text-secondary md:text-lg mb-6 mt-1">
+      ⚡️{s(received - tip)}
 
-			{#if tip}
-				<span class="text-lg">
-					+ ⚡️{s(tip)}
-				</span>
-			{/if}
-		</h3>
-	{/if}
+      {#if tip}
+        <span class="text-lg">
+          + ⚡️{s(tip)}
+        </span>
+      {/if}
+    </h3>
+  {/if}
 
-	{#if pending}
-		<h1 class="text-3xl md:text-4xl font-bold mb-6">Payment detected</h1>
-		<h2 class="text-2xl md:text-3xl font-semibold">
-			{f(fiat(pending - tip, rate), currency)}
-			{#if tip}
-				+ {f(fiat(tip, rate), currency)}
-			{/if}
-		</h2>
-		<h3 class="text-secondary md:text-lg mb-6 mt-1">
-			⚡️{s(pending - tip)}
-			{#if tip}
-				<span class="text-lg">
-					+ ⚡️{s(tip)}
-				</span>
-			{/if}
-		</h3>
-	{/if}
+  {#if pending}
+    <h1 class="text-3xl md:text-4xl font-bold mb-6">Payment detected</h1>
+    <h2 class="text-2xl md:text-3xl font-semibold">
+      {f(fiat(pending - tip, rate), currency)}
+      {#if tip}
+        + {f(fiat(tip, rate), currency)}
+      {/if}
+    </h2>
+    <h3 class="text-secondary md:text-lg mb-6 mt-1">
+      ⚡️{s(pending - tip)}
+      {#if tip}
+        <span class="text-lg">
+          + ⚡️{s(tip)}
+        </span>
+      {/if}
+    </h3>
+  {/if}
 </div>
 
 <a href={`/${user.username}/payments`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
+<div class="fixed bottom-10 w-full text-center">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js
index 814900fb..c9377e36 100644
--- a/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js
+++ b/src/routes/(app)/[username]/invoice/[id]/tip/+page.server.js
@@ -1,11 +1,12 @@
-import invoice from '$lib/invoice';
-import { redirect } from '@sveltejs/kit';
+import invoice from "$lib/invoice";
+import { redirect } from "@sveltejs/kit";
 
 export async function load({ parent, params }) {
-	let { invoice } = await parent();
-	if (!invoice.amount) throw redirect(307, `/${params.username}/invoice/${invoice.id}`);
+  let { invoice } = await parent();
+  if (!invoice.amount)
+    throw redirect(307, `/${params.username}/invoice/${invoice.id}`);
 }
 
 export const actions = {
-	default: invoice
+  default: invoice,
 };
diff --git a/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
index fe6c67be..87e48f01 100644
--- a/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
@@ -1,201 +1,203 @@
 <script>
-	import { onMount } from 'svelte';
-	import { browser } from '$app/environment';
-	import { invoice as inv, request } from '$lib/store';
-	import { copy, focus, f, sat, get, reverseFormat, s, sats } from '$lib/utils';
-	import { Icon, Slider } from '$comp';
-	import { goto } from '$app/navigation';
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { tick } from 'svelte';
-
-	const tipAmounts = ['No', '10%', '15%', '20%'];
-	let showCustomAmount;
-
-	let customInput;
-	let customTipAmount;
-
-	let apply = async () => {
-		if (customTipAmount > 0) {
-			tipPercent = (customTipAmount / amountFiat) * 100;
-			showCustomAmount = false;
-		}
-	};
-
-	let active = (amount) =>
-		!customTipAmount && Math.round(tipPercent) === parseInt(amount.slice(0, 2));
-
-	const handleCustomTipAmount = (e) => {
-		tipPercent = 0;
-		customTipAmount = e.target.value;
-	};
-
-	let timeout;
-	const handleSlide = (e) => {
-		customTipAmount = '';
-		if (customInput) {
-			customInput.value = '';
-		}
-		tipPercent = e.target.value;
-	};
-
-	let submitting;
-	const handleTipButtonClick = async (amount) => {
-		submitting = true;
-		if (amount === 'No') {
-			tipPercent = 0;
-		} else {
-			tipPercent = parseInt(amount.slice(0, 2));
-		}
-
-		await tick();
-		submit.click();
-	};
-
-	let submit;
-
-	export let data;
-	$: refresh(data);
-	let { invoice, id, user, rates } = data;
-	let {
-		amount,
-		hash,
-		type,
-		rate,
-		received,
-		prompt,
-		text,
-		tip,
-		user: { username, currency }
-	} = invoice;
-
-	let qr;
-	let tipPercent = 0;
-
-	let fullscreen;
-
-	let refresh = (data) => {
-		$inv = null;
-
-		({ invoice, id } = data);
-		({
-			amount,
-			hash,
-			type,
-			received,
-			prompt,
-			text,
-			tip,
-			user: { username }
-		} = invoice);
-
-		tipPercent = (tip / amount) * 100;
-	};
-
-	$: currency = user?.currency || invoice.currency;
-	$: rate = invoice.rate * (rates[currency] / rates[invoice.currency]);
-
-	$: tip = Math.round((amount / 100) * tipPercent);
-
-	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-
-	$: tipAmount = ((tip * rate) / sats).toFixed(2);
-
-	$: invoiceAmountFiatFormatted = f(amountFiat, currency);
-
-	onMount(() => ($request = undefined));
+  import { onMount } from "svelte";
+  import { browser } from "$app/environment";
+  import { invoice as inv, request } from "$lib/store";
+  import { copy, focus, f, sat, get, reverseFormat, s, sats } from "$lib/utils";
+  import { Icon, Slider } from "$comp";
+  import { goto } from "$app/navigation";
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { tick } from "svelte";
+
+  const tipAmounts = ["No", "10%", "15%", "20%"];
+  let showCustomAmount;
+
+  let customInput;
+  let customTipAmount;
+
+  let apply = async () => {
+    if (customTipAmount > 0) {
+      tipPercent = (customTipAmount / amountFiat) * 100;
+      showCustomAmount = false;
+    }
+  };
+
+  let active = (amount) =>
+    !customTipAmount && Math.round(tipPercent) === parseInt(amount.slice(0, 2));
+
+  const handleCustomTipAmount = (e) => {
+    tipPercent = 0;
+    customTipAmount = e.target.value;
+  };
+
+  let timeout;
+  const handleSlide = (e) => {
+    customTipAmount = "";
+    if (customInput) {
+      customInput.value = "";
+    }
+    tipPercent = e.target.value;
+  };
+
+  let submitting;
+  const handleTipButtonClick = async (amount) => {
+    submitting = true;
+    if (amount === "No") {
+      tipPercent = 0;
+    } else {
+      tipPercent = parseInt(amount.slice(0, 2));
+    }
+
+    await tick();
+    submit.click();
+  };
+
+  let submit;
+
+  export let data;
+  $: refresh(data);
+  let { invoice, id, user, rates } = data;
+  let {
+    amount,
+    hash,
+    type,
+    rate,
+    received,
+    prompt,
+    text,
+    tip,
+    user: { username, currency },
+  } = invoice;
+
+  let qr;
+  let tipPercent = 0;
+
+  let fullscreen;
+
+  let refresh = (data) => {
+    $inv = null;
+
+    ({ invoice, id } = data);
+    ({
+      amount,
+      hash,
+      type,
+      received,
+      prompt,
+      text,
+      tip,
+      user: { username },
+    } = invoice);
+
+    tipPercent = (tip / amount) * 100;
+  };
+
+  $: currency = user?.currency || invoice.currency;
+  $: rate = invoice.rate * (rates[currency] / rates[invoice.currency]);
+
+  $: tip = Math.round((amount / 100) * tipPercent);
+
+  $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+
+  $: tipAmount = ((tip * rate) / sats).toFixed(2);
+
+  $: invoiceAmountFiatFormatted = f(amountFiat, currency);
+
+  onMount(() => ($request = undefined));
 </script>
 
 <div class="container px-4 max-w-lg text-center mx-auto">
-	<form method="POST" use:enhance class:invisible={submitting}>
-		<input type="hidden" name="amount" value={amount} />
-		<input type="hidden" name="tip" value={tip} />
-		<input type="hidden" name="username" value={username} />
-		<input type="hidden" name="rate" value={invoice.rate} />
-		<input type="hidden" name="prompt" value="false" />
-		<input type="hidden" name="type" value={type} />
-		<input type="hidden" name="hash" value={hash} />
-
-		<input type="hidden" name="request_id" value={invoice.request?.id} />
-
-		<h1 class="text-4xl font-semibold my-8">{$t('invoice.addTipq')}</h1>
-		{#if !showCustomAmount}
-			<div class="my-2 text-xl">{Math.round(tipPercent)}%</div>
-
-			<Slider handle={handleSlide} bind:value={tipPercent} />
-
-			<div class="flex mb-8 text-lg">
-				<div>
-					<span class="mr-1">
-						{f(amountFiat, currency)}
-						<span class="font-semibold">+{f(tipAmount, currency)}</span>
-					</span>
-				</div>
-
-				<div class="ml-auto text-lg">
-					{sat(amount)}
-					<span class="font-semibold">+{sat(tip)}</span>
-				</div>
-			</div>
-
-			{#if tip}
-				<div>
-					<button type="button" on:click={() => submit.click()}>Next</button>
-					<button type="button" on:click={() => (tipPercent = 0)}>Reset</button>
-				</div>
-			{:else}
-				{#each tipAmounts as amount}
-					<button
-						type="button"
-						class:active={active(amount, tipPercent)}
-						on:click={() => handleTipButtonClick(amount)}>{amount}</button
-					>
-				{/each}
-			{/if}
-
-			<div>
-				<button type="button" on:click={() => (showCustomAmount = true)}>Custom</button>
-			</div>
-		{/if}
-
-		<button type="submit" bind:this={submit} />
-	</form>
-
-	{#if showCustomAmount}
-		<form on:submit|preventDefault={apply}>
-			<div class="relative">
-				<span
-					class="absolute top-[18px] left-5 font-semibold {!customTipAmount
-						? 'opacity-50'
-						: 'opacity-100'}">$</span
-				>
-				<input
-					bind:this={customInput}
-					type="number"
-					step="0.01"
-					on:input={(e) => handleCustomTipAmount(e)}
-					class="pl-10"
-					placeholder="Custom amount"
-					use:focus
-				/>
-				<button
-					type="submit"
-					class="w-full mt-2 bg-black text-white font-semibold py-3 px-7 rounded-2xl {!customTipAmount
-						? 'opacity-50'
-						: 'opacity-100 hover:opacity-80'}"
-					disabled={!customTipAmount}>Apply</button
-				>
-			</div>
-		</form>
-	{/if}
+  <form method="POST" use:enhance class:invisible={submitting}>
+    <input type="hidden" name="amount" value={amount} />
+    <input type="hidden" name="tip" value={tip} />
+    <input type="hidden" name="username" value={username} />
+    <input type="hidden" name="rate" value={invoice.rate} />
+    <input type="hidden" name="prompt" value="false" />
+    <input type="hidden" name="type" value={type} />
+    <input type="hidden" name="hash" value={hash} />
+
+    <input type="hidden" name="request_id" value={invoice.request?.id} />
+
+    <h1 class="text-4xl font-semibold my-8">{$t("invoice.addTipq")}</h1>
+    {#if !showCustomAmount}
+      <div class="my-2 text-xl">{Math.round(tipPercent)}%</div>
+
+      <Slider handle={handleSlide} bind:value={tipPercent} />
+
+      <div class="flex mb-8 text-lg">
+        <div>
+          <span class="mr-1">
+            {f(amountFiat, currency)}
+            <span class="font-semibold">+{f(tipAmount, currency)}</span>
+          </span>
+        </div>
+
+        <div class="ml-auto text-lg">
+          {sat(amount)}
+          <span class="font-semibold">+{sat(tip)}</span>
+        </div>
+      </div>
+
+      {#if tip}
+        <div>
+          <button type="button" on:click={() => submit.click()}>Next</button>
+          <button type="button" on:click={() => (tipPercent = 0)}>Reset</button>
+        </div>
+      {:else}
+        {#each tipAmounts as amount}
+          <button
+            type="button"
+            class:active={active(amount, tipPercent)}
+            on:click={() => handleTipButtonClick(amount)}>{amount}</button
+          >
+        {/each}
+      {/if}
+
+      <div>
+        <button type="button" on:click={() => (showCustomAmount = true)}
+          >Custom</button
+        >
+      </div>
+    {/if}
+
+    <button type="submit" bind:this={submit} />
+  </form>
+
+  {#if showCustomAmount}
+    <form on:submit|preventDefault={apply}>
+      <div class="relative">
+        <span
+          class="absolute top-[18px] left-5 font-semibold {!customTipAmount
+            ? 'opacity-50'
+            : 'opacity-100'}">$</span
+        >
+        <input
+          bind:this={customInput}
+          type="number"
+          step="0.01"
+          on:input={(e) => handleCustomTipAmount(e)}
+          class="pl-10"
+          placeholder="Custom amount"
+          use:focus
+        />
+        <button
+          type="submit"
+          class="w-full mt-2 bg-black text-white font-semibold py-3 px-7 rounded-2xl {!customTipAmount
+            ? 'opacity-50'
+            : 'opacity-100 hover:opacity-80'}"
+          disabled={!customTipAmount}>Apply</button
+        >
+      </div>
+    </form>
+  {/if}
 </div>
 
 <style>
-	.active {
-		@apply !bg-black !text-white;
-	}
+  .active {
+    @apply !bg-black !text-white;
+  }
 
-	.container button[type='button'] {
-		@apply w-full mt-2 bg-primary text-black hover:bg-black hover:text-white font-semibold py-5 px-7 rounded-2xl;
-	}
+  .container button[type="button"] {
+    @apply w-full mt-2 bg-primary text-black hover:bg-black hover:text-white font-semibold py-5 px-7 rounded-2xl;
+  }
 </style>
diff --git a/src/routes/(app)/[username]/invoice/sent/+page.svelte b/src/routes/(app)/[username]/invoice/sent/+page.svelte
index ae71eb2e..8583de09 100644
--- a/src/routes/(app)/[username]/invoice/sent/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/sent/+page.svelte
@@ -1,10 +1,10 @@
 <script>
-	import { Avatar, Icon } from '$comp';
-	import { request } from '$lib/store';
+  import { Avatar, Icon } from "$comp";
+  import { request } from "$lib/store";
 </script>
 
 Invoice sent to
 <div class="flex">
-	<Avatar user={$request.requester} size={12} />
-	<h1 class="my-auto"><b>{$request.requester.username}</b> is ready to pay</h1>
+  <Avatar user={$request.requester} size={12} />
+  <h1 class="my-auto"><b>{$request.requester.username}</b> is ready to pay</h1>
 </div>
diff --git a/src/routes/(app)/[username]/map/+page.server.js b/src/routes/(app)/[username]/map/+page.server.js
index 7936e88b..616d28f6 100644
--- a/src/routes/(app)/[username]/map/+page.server.js
+++ b/src/routes/(app)/[username]/map/+page.server.js
@@ -1,12 +1,12 @@
-import { get } from '$lib/utils';
+import { get } from "$lib/utils";
 
 // export const prerender = true;
 export let load = async () => {
-	let data = { locations: [] };
+  let data = { locations: [] };
 
-	try {
-		data = await get('/locations');
-	} catch (e) {}
+  try {
+    data = await get("/locations");
+  } catch (e) {}
 
-	return data;
+  return data;
 };
diff --git a/src/routes/(app)/[username]/map/+page.svelte b/src/routes/(app)/[username]/map/+page.svelte
index 99c822d3..a2ae657c 100644
--- a/src/routes/(app)/[username]/map/+page.svelte
+++ b/src/routes/(app)/[username]/map/+page.svelte
@@ -1,8 +1,8 @@
 <script>
-	import { LocationsMap } from '$comp';
-	export let data;
+  import { LocationsMap } from "$comp";
+  export let data;
 
-	let { locations } = data;
+  let { locations } = data;
 </script>
 
 <LocationsMap {locations} />
diff --git a/src/routes/(app)/[username]/messages/+page.server.js b/src/routes/(app)/[username]/messages/+page.server.js
index ec5c5eee..f0148be7 100644
--- a/src/routes/(app)/[username]/messages/+page.server.js
+++ b/src/routes/(app)/[username]/messages/+page.server.js
@@ -1,22 +1,25 @@
-import { get } from '$lib/utils';
+import { get } from "$lib/utils";
 
 export async function load({ params, parent, url }) {
-	let { user, subject } = await parent();
-	let { since = 0 } = params;
+  let { user, subject } = await parent();
+  let { since = 0 } = params;
 
-	let messages = [];
+  let messages = [];
 
-	try {
-		messages = await get(`/${user.pubkey}/${since}/messages`);
+  try {
+    messages = await get(`/${user.pubkey}/${since}/messages`);
 
-		messages = messages
-			.filter((m) => m.recipient?.id === subject.id || m.author?.id === subject.id)
-			.sort((a, b) => a.created_at - b.created_at);
+    messages = messages
+      .filter(
+        (m) => m.recipient?.id === subject.id || m.author?.id === subject.id
+      )
+      .sort((a, b) => a.created_at - b.created_at);
 
-		if (user.id === subject.id) messages = messages.filter((m) => m.recipient.id === m.author.id);
-	} catch (e) {
-		console.log(`failed to fetch nostr messages`, e);
-	}
+    if (user.id === subject.id)
+      messages = messages.filter((m) => m.recipient.id === m.author.id);
+  } catch (e) {
+    console.log(`failed to fetch nostr messages`, e);
+  }
 
-	return { messages, user };
+  return { messages, user };
 }
diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index cfa7f741..16b82679 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -1,171 +1,182 @@
 <script>
-	import { cubicInOut } from 'svelte/easing';
-	import { browser } from '$app/environment';
-	import { t } from '$lib/translations';
-	import { format } from 'date-fns';
-	import { scale, fade, fly } from 'svelte/transition';
-	import { enhance } from '$app/forms';
-	import { Avatar, Icon } from '$comp';
-	import { back, fail, focus } from '$lib/utils';
-	import { sign, send, encrypt, decrypt } from '$lib/nostr';
-	import { event as e, password } from '$lib/store';
-	import { tick, onMount } from 'svelte';
-	import { getEventHash } from 'nostr-tools';
-
-	export let data;
-
-	function fadeScale(node, { delay = 0, duration = 200, easing = (x) => x, baseScale = 0 }) {
-		const o = +getComputedStyle(node).opacity;
-		const m = getComputedStyle(node).transform.match(/scale\(([0-9.]+)\)/);
-		const s = m ? m[1] : 1;
-		const is = 1 - baseScale;
-
-		return {
-			delay,
-			duration,
-			css: (t) => {
-				const eased = easing(t);
-				return `opacity: ${eased * o}; transform: scale(${eased * s * is + baseScale})`;
-			}
-		};
-	}
-
-	let { messages, subject, user } = data;
-	let input, pane;
-
-	$: initialize($password);
-	let initialize = async (p) => {
-		if (!p) return;
-		await Promise.all(
-			messages.map(async (event) => (event.message = await decrypt({ event, user })))
-		);
-
-		messages = messages;
-		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-	};
-
-	e.subscribe(async (event) => {
-		let found = ~messages.findIndex((m) => m.id === event?.id);
-		if (event?.recipient.id === user.id && !found) {
-			event.message = await decrypt({ event, user });
-			messages.push(event);
-			messages = messages;
-			tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-		}
-	});
-
-	let sent, submitting, message;
-	let submit = async () => {
-		submitting = true;
-
-		let event = {
-			pubkey: user.pubkey,
-			created_at: Math.floor(Date.now() / 1000),
-			kind: 4,
-			tags: [['p', subject.pubkey]]
-		};
-
-		event.message = message;
-
-		message = '';
-
-		event.author = user;
-		event.recipient = subject;
-
-		messages.push(event);
-		messages = messages;
-		tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
-
-		try {
-			event.content = await encrypt({ message: event.message, recipient: subject.pubkey, user });
-			event.id = getEventHash(event);
-			await sign({ event, user });
-			await send(event);
-
-			sent = true;
-		} catch (e) {
-			console.log(e);
-			fail('Failed to send message');
-		}
-
-		message = '';
-		submitting = false;
-	};
-
-	let keydown = (e) => {
-		if (e.key === 'Enter') {
-			e.preventDefault();
-			submit();
-		}
-	};
+  import { cubicInOut } from "svelte/easing";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import { format } from "date-fns";
+  import { scale, fade, fly } from "svelte/transition";
+  import { enhance } from "$app/forms";
+  import { Avatar, Icon } from "$comp";
+  import { back, fail, focus } from "$lib/utils";
+  import { sign, send, encrypt, decrypt } from "$lib/nostr";
+  import { event as e, password } from "$lib/store";
+  import { tick, onMount } from "svelte";
+  import { getEventHash } from "nostr-tools";
+
+  export let data;
+
+  function fadeScale(
+    node,
+    { delay = 0, duration = 200, easing = (x) => x, baseScale = 0 }
+  ) {
+    const o = +getComputedStyle(node).opacity;
+    const m = getComputedStyle(node).transform.match(/scale\(([0-9.]+)\)/);
+    const s = m ? m[1] : 1;
+    const is = 1 - baseScale;
+
+    return {
+      delay,
+      duration,
+      css: (t) => {
+        const eased = easing(t);
+        return `opacity: ${eased * o}; transform: scale(${
+          eased * s * is + baseScale
+        })`;
+      },
+    };
+  }
+
+  let { messages, subject, user } = data;
+  let input, pane;
+
+  $: initialize($password);
+  let initialize = async (p) => {
+    if (!p) return;
+    await Promise.all(
+      messages.map(
+        async (event) => (event.message = await decrypt({ event, user }))
+      )
+    );
+
+    messages = messages;
+    tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+  };
+
+  e.subscribe(async (event) => {
+    let found = ~messages.findIndex((m) => m.id === event?.id);
+    if (event?.recipient.id === user.id && !found) {
+      event.message = await decrypt({ event, user });
+      messages.push(event);
+      messages = messages;
+      tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+    }
+  });
+
+  let sent, submitting, message;
+  let submit = async () => {
+    submitting = true;
+
+    let event = {
+      pubkey: user.pubkey,
+      created_at: Math.floor(Date.now() / 1000),
+      kind: 4,
+      tags: [["p", subject.pubkey]],
+    };
+
+    event.message = message;
+
+    message = "";
+
+    event.author = user;
+    event.recipient = subject;
+
+    messages.push(event);
+    messages = messages;
+    tick().then(() => pane && (pane.scrollTop = pane.scrollHeight));
+
+    try {
+      event.content = await encrypt({
+        message: event.message,
+        recipient: subject.pubkey,
+        user,
+      });
+      event.id = getEventHash(event);
+      await sign({ event, user });
+      await send(event);
+
+      sent = true;
+    } catch (e) {
+      console.log(e);
+      fail("Failed to send message");
+    }
+
+    message = "";
+    submitting = false;
+  };
+
+  let keydown = (e) => {
+    if (e.key === "Enter") {
+      e.preventDefault();
+      submit();
+    }
+  };
 </script>
 
 <div class="container max-w-xl mx-auto px-4 space-y-5">
-	<div
-		class="h-[50vh] max-h-[50vh] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
-		bind:this={pane}
-	>
-		{#each messages as { id, author, message, created_at, pubkey }}
-			{@const ours = pubkey === user.pubkey}
-			{@const theirs = !ours}
-
-			{#if message}
-				<div
-					class="flex gap-2"
-					class:flex-row-reverse={theirs}
-					class:justify-end={theirs}
-					in:fadeScale={{
-						easing: cubicInOut,
-						baseScale: 0.5
-					}}
-				>
-					<div
-						class="rounded-2xl px-4 py-2 max-w-[300px] mb-1 text-lg"
-						class:ours
-						class:theirs
-						:key={id}
-					>
-						{message}
-					</div>
-					<div class="mt-auto">
-						<Avatar user={author} size={'12'} />
-					</div>
-				</div>
-				<div class="text-sm text-gray-400 mb-6" class:text-right={ours}>
-					{format(new Date(created_at * 1000), 'MMM d')},
-					{format(new Date(created_at * 1000), 'h:mm aa')}
-				</div>
-			{/if}
-		{/each}
-	</div>
-
-	<form
-		method="POST"
-		class="w-full border rounded-xl outline-none gap-4 flex p-0 pr-2"
-		on:submit|preventDefault={submit}
-	>
-		<input type="hidden" name="requester_id" value={user.id} />
-		<input type="hidden" name="recipient" value={subject.username} />
-
-		<div
-			use:focus
-			contenteditable
-			class="grow break-all py-4 outline-none mt-0 pl-4"
-			bind:innerHTML={message}
-			on:keydown={keydown}
-		/>
-		<button type="submit" class="my-auto shrink-0">
-			<Icon icon="send" style="w-8" />
-		</button>
-	</form>
+  <div
+    class="h-[50vh] max-h-[50vh] overflow-y-scroll scrollbar-thin scrollbar-thumb-[#F2F6FC] scrollbar-track-white pr-8"
+    bind:this={pane}
+  >
+    {#each messages as { id, author, message, created_at, pubkey }}
+      {@const ours = pubkey === user.pubkey}
+      {@const theirs = !ours}
+
+      {#if message}
+        <div
+          class="flex gap-2"
+          class:flex-row-reverse={theirs}
+          class:justify-end={theirs}
+          in:fadeScale={{
+            easing: cubicInOut,
+            baseScale: 0.5,
+          }}
+        >
+          <div
+            class="rounded-2xl px-4 py-2 max-w-[300px] mb-1 text-lg"
+            class:ours
+            class:theirs
+            :key={id}
+          >
+            {message}
+          </div>
+          <div class="mt-auto">
+            <Avatar user={author} size={"12"} />
+          </div>
+        </div>
+        <div class="text-sm text-gray-400 mb-6" class:text-right={ours}>
+          {format(new Date(created_at * 1000), "MMM d")},
+          {format(new Date(created_at * 1000), "h:mm aa")}
+        </div>
+      {/if}
+    {/each}
+  </div>
+
+  <form
+    method="POST"
+    class="w-full border rounded-xl outline-none gap-4 flex p-0 pr-2"
+    on:submit|preventDefault={submit}
+  >
+    <input type="hidden" name="requester_id" value={user.id} />
+    <input type="hidden" name="recipient" value={subject.username} />
+
+    <div
+      use:focus
+      contenteditable
+      class="grow break-all py-4 outline-none mt-0 pl-4"
+      bind:innerHTML={message}
+      on:keydown={keydown}
+    />
+    <button type="submit" class="my-auto shrink-0">
+      <Icon icon="send" style="w-8" />
+    </button>
+  </form>
 </div>
 
 <style>
-	.ours {
-		@apply bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] text-black rounded-br-none ml-auto;
-	}
+  .ours {
+    @apply bg-gradient-to-r from-[#F2F6FC] to-[#E1E3FF] text-black rounded-br-none ml-auto;
+  }
 
-	.theirs {
-		@apply bg-gray-100 text-black rounded-bl-none;
-	}
+  .theirs {
+    @apply bg-gray-100 text-black rounded-bl-none;
+  }
 </style>
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.server.js b/src/routes/(app)/[username]/payments/[...page]/+page.server.js
index a3b0ad6f..7a3bc179 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.server.js
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.server.js
@@ -1,26 +1,26 @@
-import { get, auth } from '$lib/utils';
+import { get, auth } from "$lib/utils";
 
 let limit = 25;
 
 export async function load({ cookies, depends, params, request }) {
-	depends('app:payments');
+  depends("app:payments");
 
-	let parts = params.page.split('/');
+  let parts = params.page.split("/");
 
-	let start, end, page;
-	if (parts.length === 1) [page] = parts;
-	if (parts.length === 2) [start, page] = parts;
-	if (parts.length === 3) [start, end, page] = parts;
-	if (!parseInt(page)) page = 1;
+  let start, end, page;
+  if (parts.length === 1) [page] = parts;
+  if (parts.length === 2) [start, page] = parts;
+  if (parts.length === 3) [start, end, page] = parts;
+  if (!parseInt(page)) page = 1;
 
-	let offset = (page - 1) * limit;
-	if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
+  let offset = (page - 1) * limit;
+  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
 
-	let url = `/payments?start=${start * 1000}&limit=${limit}&offset=${offset}`;
-	if (end) url += `&end=${end * 1000}`;
+  let url = `/payments?start=${start * 1000}&limit=${limit}&offset=${offset}`;
+  if (end) url += `&end=${end * 1000}`;
 
-	let { count, payments, totals } = await get(url, auth(cookies));
-	let pages = new Array(Math.ceil(count / limit));
+  let { count, payments, totals } = await get(url, auth(cookies));
+  let pages = new Array(Math.ceil(count / limit));
 
-	return { payments, page, pages, start, end, totals };
+  return { payments, page, pages, start, end, totals };
 }
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index 2ea225ad..e61e156c 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -1,249 +1,281 @@
 <script>
-	import { Avatar, Icon } from '$comp';
-	import { onMount } from 'svelte';
-	import { format } from 'date-fns';
-	import { newPayment } from '$lib/store';
-	import { t } from '$lib/translations';
-	import { get, f, s, sat, sats, types } from '$lib/utils';
-	import { page } from '$app/stores';
-	import { differenceInDays, getUnixTime, sub } from 'date-fns';
-	import { goto, invalidate } from '$app/navigation';
-
-	export let data;
-
-	let { start, end, user, rates, payments } = data;
-
-	let change = ({ target: { value } }) => goto(value);
-	let link = (p) => {
-		if (p.pot) return `/pot/${p.pot}`;
-		if (p.with) return '/' + p.with.username;
-		return `/p/${p.id}`;
-	};
-
-	$: presets = [
-		{ title: $t('payments.day'), start: sub(new Date(), { days: 1 }), end: null },
-		{ title: $t('payments.week'), start: sub(new Date(), { days: 7 }), end: null },
-		{ title: $t('payments.month'), start: sub(new Date(), { months: 1 }), end: null },
-		{ title: $t('payments.all'), start: sub(new Date(), { years: 5 }), end: null }
-	];
-
-	$: selection = start
-		? presets.findIndex((p) => Math.abs(differenceInDays(new Date(start * 1000), p.start)) < 1)
-		: 0;
-
-	let p,
-		totals,
-		pages = [];
-	$: data && ({ page: p, pages, start, end, totals, payments } = data);
-
-	$: $page && ($newPayment = false);
-	$: $newPayment && invalidate(`/users/${user.username}`);
-
-	$: path = $page.params.page
-		? $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf('/'))
-		: $page.url.pathname;
-
-	let csv = async () => {
-		let url = `/${user.username}/payments`;
-		if (start) url += `/${start}`;
-		if (end) url += `/${end}`;
-
-		let { payments } = await get(url);
-
-		payments = payments.map((p) => ({
-			...p,
-			created: new Date(p.created),
-			total: p.amount + (p.tip || 0),
-			amount_fiat: f((p.amount * p.rate) / sats, p.currency),
-			fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null,
-			tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null,
-			total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency)
-		}));
-
-		let keys = [
-			'type',
-			'id',
-			'created',
-			'rate',
-			'currency',
-			'amount',
-			'tip',
-			'total',
-			'fee',
-			'amount_fiat',
-			'tip_fiat',
-			'total_fiat',
-			'fee_fiat'
-		];
-
-		let csv =
-			keys.map((k) => `"${k}"`).join(',') +
-			'\n' +
-			payments.map((r) => keys.map((k) => `"${r[k] || ''}"`).join(',')).join('\n');
-
-		let filename = 'payments.csv';
-		let blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
-		if (navigator.msSaveBlob) {
-			navigator.msSaveBlob(blob, filename);
-		} else {
-			let link = document.createElement('a');
-			if (link.download !== undefined) {
-				let url = URL.createObjectURL(blob);
-				link.setAttribute('href', url);
-				link.setAttribute('download', filename);
-				link.style.visibility = 'hidden';
-				document.body.appendChild(link);
-				link.click();
-				document.body.removeChild(link);
-			}
-		}
-	};
+  import { Avatar, Icon } from "$comp";
+  import { onMount } from "svelte";
+  import { format } from "date-fns";
+  import { newPayment } from "$lib/store";
+  import { t } from "$lib/translations";
+  import { get, f, s, sat, sats, types } from "$lib/utils";
+  import { page } from "$app/stores";
+  import { differenceInDays, getUnixTime, sub } from "date-fns";
+  import { goto, invalidate } from "$app/navigation";
+
+  export let data;
+
+  let { start, end, user, rates, payments } = data;
+
+  let change = ({ target: { value } }) => goto(value);
+  let link = (p) => {
+    if (p.pot) return `/pot/${p.pot}`;
+    if (p.with) return "/" + p.with.username;
+    return `/p/${p.id}`;
+  };
+
+  $: presets = [
+    {
+      title: $t("payments.day"),
+      start: sub(new Date(), { days: 1 }),
+      end: null,
+    },
+    {
+      title: $t("payments.week"),
+      start: sub(new Date(), { days: 7 }),
+      end: null,
+    },
+    {
+      title: $t("payments.month"),
+      start: sub(new Date(), { months: 1 }),
+      end: null,
+    },
+    {
+      title: $t("payments.all"),
+      start: sub(new Date(), { years: 5 }),
+      end: null,
+    },
+  ];
+
+  $: selection = start
+    ? presets.findIndex(
+        (p) => Math.abs(differenceInDays(new Date(start * 1000), p.start)) < 1
+      )
+    : 0;
+
+  let p,
+    totals,
+    pages = [];
+  $: data && ({ page: p, pages, start, end, totals, payments } = data);
+
+  $: $page && ($newPayment = false);
+  $: $newPayment && invalidate(`/users/${user.username}`);
+
+  $: path = $page.params.page
+    ? $page.url.pathname.substring(0, $page.url.pathname.lastIndexOf("/"))
+    : $page.url.pathname;
+
+  let csv = async () => {
+    let url = `/${user.username}/payments`;
+    if (start) url += `/${start}`;
+    if (end) url += `/${end}`;
+
+    let { payments } = await get(url);
+
+    payments = payments.map((p) => ({
+      ...p,
+      created: new Date(p.created),
+      total: p.amount + (p.tip || 0),
+      amount_fiat: f((p.amount * p.rate) / sats, p.currency),
+      fee_fiat: p.fee ? f((p.fee * p.rate) / sats, p.currency) : null,
+      tip_fiat: p.tip ? f((p.tip * p.rate) / sats, p.currency) : null,
+      total_fiat: f(((p.amount + (p.tip || 0)) * p.rate) / sats, p.currency),
+    }));
+
+    let keys = [
+      "type",
+      "id",
+      "created",
+      "rate",
+      "currency",
+      "amount",
+      "tip",
+      "total",
+      "fee",
+      "amount_fiat",
+      "tip_fiat",
+      "total_fiat",
+      "fee_fiat",
+    ];
+
+    let csv =
+      keys.map((k) => `"${k}"`).join(",") +
+      "\n" +
+      payments
+        .map((r) => keys.map((k) => `"${r[k] || ""}"`).join(","))
+        .join("\n");
+
+    let filename = "payments.csv";
+    let blob = new Blob([csv], { type: "text/csv;charset=utf-8;" });
+    if (navigator.msSaveBlob) {
+      navigator.msSaveBlob(blob, filename);
+    } else {
+      let link = document.createElement("a");
+      if (link.download !== undefined) {
+        let url = URL.createObjectURL(blob);
+        link.setAttribute("href", url);
+        link.setAttribute("download", filename);
+        link.style.visibility = "hidden";
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      }
+    }
+  };
 </script>
 
 <div class="mt-24 mb-20">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-		{$t('payments.header')}
-	</h1>
-
-	<div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
-		<div class="flex text-md text-secondary relative">
-			<div class="mx-auto flex justify-center w-full gap-1">
-				{#each presets as { start, end, title }, i}
-					<a
-						class:active={selection === i}
-						href={`/${user.username}/payments/${getUnixTime(start) + '/'}1`}
-					>
-						<button
-							class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]"
-						>
-							<div class="my-auto">{title}</div>
-						</button>
-					</a>
-				{/each}
-			</div>
-		</div>
-
-		<div class="flex flex-wrap justify-center mb-8">
-			{#if pages.length > 1}
-				{#each pages as _, i}
-					<a class="mr-1 last:mr-0" href={`${path}/${i + 1}`} class:active={parseInt(p) === i + 1}>
-						<div class="border py-2 rounded-full border-2 w-12 h-12 hover:opacity-80 text-center">
-							{i + 1}
-						</div>
-					</a>
-				{/each}
-			{/if}
-		</div>
-
-		<div class="text-base">
-			{#each payments as p}
-				<a href={`/payment/${p.id}`}>
-					<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
-						<div class="whitespace-nowrap my-auto">
-							<div class="font-bold" class:text-red-800={p.amount < 0}>
-								{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
-								{#if p.tip}
-									<span class="text-sm text-secondary">
-										+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
-									</span>
-								{/if}
-							</div>
-
-							<div class="text-secondary">
-								{sat(Math.abs(p.amount) + (p.tip || 0))}
-							</div>
-						</div>
-
-						<div class="flex my-auto">
-							{#if p.type === types.pot}
-								<a href={`/pot/${p.memo}`}>
-									<div class="text-secondary flex">
-										<div class="my-auto mr-1">
-											<img src="/images/moneypot.png" class="w-12" alt="Pot" />
-										</div>
-
-										<div class="my-auto">Pot</div>
-									</div>
-								</a>
-							{:else if p.with}
-								<div class="flex">
-									<div class="my-auto">
-										<Avatar user={p.with} size={16} disabled={true} />
-									</div>
-									<div class="my-auto ml-1 text-secondary">{p.with.username}</div>
-								</div>
-							{:else if p.type === types.classic}
-								<img
-									src="/images/classic.png"
-									class="w-24 border-4 border-transparent mr-1"
-									alt="Bitcoin"
-								/>
-								<div class="my-auto text-secondary">{p.memo}</div>
-							{:else}
-								<div class="text-secondary flex">
-									{#if p.type === types.lightning}
-										<div class="text-3xl">⚡️</div>
-									{:else if p.type === types.bitcoin}
-										<div class="my-auto mr-1">
-											<img
-												src="/images/bitcoin.svg"
-												class="w-12 border-4 border-transparent"
-												alt="Bitcoin"
-											/>
-										</div>
-									{/if}
-
-									<div class="my-auto">
-										{p.amount > 0 ? (p.confirmed ? 'Received' : 'Pending') : 'Sent'}
-									</div>
-								</div>
-							{/if}
-						</div>
-
-						<div class="text-secondary text-right text-sm my-auto">
-							<div>
-								{format(new Date(p.created), 'h:mm aaa')}
-							</div>
-							<div>
-								{format(new Date(p.created), 'MMM d')}
-							</div>
-						</div>
-					</div>
-				</a>
-			{:else}
-				<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
-			{/each}
-		</div>
-
-		<div class="grid grid-cols-3 w-full text-center">
-			<span class="text-lg text-secondary">{$t('payments.total')}</span>
-			<span class="text-lg text-secondary">{$t('payments.presentValue')}</span>
-			<span class="text-lg text-secondary">{$t('payments.gainLoss')}</span>
-
-			{#each Object.keys(totals) as c}
-				{@const total = totals[c]['fiat']}
-				{@const pv = (totals[c]['sats'] * rates[c]) / sats}
-				{@const gain = (pv * 100) / total - 100}
-				<span class="text-lg"><b>{f(total, c)}</b></span>
-				<span class="text-lg"><b>{f(pv, c)}</b></span>
-				<span class="text-lg" class:text-red-800={gain < 0}
-					><b>{Math.abs(gain).toFixed(2)}%</b></span
-				>
-			{/each}
-		</div>
-
-		<button
-			class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
-			on:click={csv}
-		>
-			<Icon icon="save" style="opacity-50 mr-2 my-auto" />
-			<div class="my-auto">{$t('payments.export')}</div>
-		</button>
-	</div>
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+    {$t("payments.header")}
+  </h1>
+
+  <div class="container w-full mx-auto text-lg px-4 max-w-xl space-y-5">
+    <div class="flex text-md text-secondary relative">
+      <div class="mx-auto flex justify-center w-full gap-1">
+        {#each presets as { start, end, title }, i}
+          <a
+            class:active={selection === i}
+            href={`/${user.username}/payments/${getUnixTime(start) + "/"}1`}
+          >
+            <button
+              class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px]"
+            >
+              <div class="my-auto">{title}</div>
+            </button>
+          </a>
+        {/each}
+      </div>
+    </div>
+
+    <div class="flex flex-wrap justify-center mb-8">
+      {#if pages.length > 1}
+        {#each pages as _, i}
+          <a
+            class="mr-1 last:mr-0"
+            href={`${path}/${i + 1}`}
+            class:active={parseInt(p) === i + 1}
+          >
+            <div
+              class="border py-2 rounded-full border-2 w-12 h-12 hover:opacity-80 text-center"
+            >
+              {i + 1}
+            </div>
+          </a>
+        {/each}
+      {/if}
+    </div>
+
+    <div class="text-base">
+      {#each payments as p}
+        <a href={`/payment/${p.id}`}>
+          <div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
+            <div class="whitespace-nowrap my-auto">
+              <div class="font-bold" class:text-red-800={p.amount < 0}>
+                {f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+                {#if p.tip}
+                  <span class="text-sm text-secondary">
+                    +{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
+                  </span>
+                {/if}
+              </div>
+
+              <div class="text-secondary">
+                {sat(Math.abs(p.amount) + (p.tip || 0))}
+              </div>
+            </div>
+
+            <div class="flex my-auto">
+              {#if p.type === types.pot}
+                <a href={`/pot/${p.memo}`}>
+                  <div class="text-secondary flex">
+                    <div class="my-auto mr-1">
+                      <img src="/images/moneypot.png" class="w-12" alt="Pot" />
+                    </div>
+
+                    <div class="my-auto">Pot</div>
+                  </div>
+                </a>
+              {:else if p.with}
+                <div class="flex">
+                  <div class="my-auto">
+                    <Avatar user={p.with} size={16} disabled={true} />
+                  </div>
+                  <div class="my-auto ml-1 text-secondary">
+                    {p.with.username}
+                  </div>
+                </div>
+              {:else if p.type === types.classic}
+                <img
+                  src="/images/classic.png"
+                  class="w-24 border-4 border-transparent mr-1"
+                  alt="Bitcoin"
+                />
+                <div class="my-auto text-secondary">{p.memo}</div>
+              {:else}
+                <div class="text-secondary flex">
+                  {#if p.type === types.lightning}
+                    <div class="text-3xl">⚡️</div>
+                  {:else if p.type === types.bitcoin}
+                    <div class="my-auto mr-1">
+                      <img
+                        src="/images/bitcoin.svg"
+                        class="w-12 border-4 border-transparent"
+                        alt="Bitcoin"
+                      />
+                    </div>
+                  {/if}
+
+                  <div class="my-auto">
+                    {p.amount > 0
+                      ? p.confirmed
+                        ? "Received"
+                        : "Pending"
+                      : "Sent"}
+                  </div>
+                </div>
+              {/if}
+            </div>
+
+            <div class="text-secondary text-right text-sm my-auto">
+              <div>
+                {format(new Date(p.created), "h:mm aaa")}
+              </div>
+              <div>
+                {format(new Date(p.created), "MMM d")}
+              </div>
+            </div>
+          </div>
+        </a>
+      {:else}
+        <p class="text-secondary text-lg text-center">{$t("payments.empty")}</p>
+      {/each}
+    </div>
+
+    <div class="grid grid-cols-3 w-full text-center">
+      <span class="text-lg text-secondary">{$t("payments.total")}</span>
+      <span class="text-lg text-secondary">{$t("payments.presentValue")}</span>
+      <span class="text-lg text-secondary">{$t("payments.gainLoss")}</span>
+
+      {#each Object.keys(totals) as c}
+        {@const total = totals[c]["fiat"]}
+        {@const pv = (totals[c]["sats"] * rates[c]) / sats}
+        {@const gain = (pv * 100) / total - 100}
+        <span class="text-lg"><b>{f(total, c)}</b></span>
+        <span class="text-lg"><b>{f(pv, c)}</b></span>
+        <span class="text-lg" class:text-red-800={gain < 0}
+          ><b>{Math.abs(gain).toFixed(2)}%</b></span
+        >
+      {/each}
+    </div>
+
+    <button
+      class="ml-auto rounded-full border py-2 px-4 w-36 hover:opacity-80 flex mx-auto"
+      on:click={csv}
+    >
+      <Icon icon="save" style="opacity-50 mr-2 my-auto" />
+      <div class="my-auto">{$t("payments.export")}</div>
+    </button>
+  </div>
 </div>
 
 <style>
-	.active * {
-		@apply bg-black text-white border-black;
-	}
+  .active * {
+    @apply bg-black text-white border-black;
+  }
 </style>
diff --git a/src/routes/(app)/[username]/payments/[...page]/+server.js b/src/routes/(app)/[username]/payments/[...page]/+server.js
index c7c5222d..a81faaf3 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+server.js
+++ b/src/routes/(app)/[username]/payments/[...page]/+server.js
@@ -1,18 +1,18 @@
-import { get, auth } from '$lib/utils';
-import { json } from '@sveltejs/kit';
+import { get, auth } from "$lib/utils";
+import { json } from "@sveltejs/kit";
 
 export async function GET({ cookies, params }) {
-	let parts = params.page.split('/');
+  let parts = params.page.split("/");
 
-	let start, end;
-	if (parts.length === 1) [start] = parts;
-	if (parts.length === 2) [start, end] = parts;
+  let start, end;
+  if (parts.length === 1) [start] = parts;
+  if (parts.length === 2) [start, end] = parts;
 
-	if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
+  if (!start) start = Date.now() / 1000 - 24 * 60 * 60;
 
-	let url = `/payments?start=${start * 1000}`;
-	if (end) url += `&end=${end * 1000}`;
+  let url = `/payments?start=${start * 1000}`;
+  if (end) url += `&end=${end * 1000}`;
 
-	let { payments } = await get(url, auth(cookies));
-	return json({ payments });
+  let { payments } = await get(url, auth(cookies));
+  return json({ payments });
 }
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.server.js b/src/routes/(app)/[username]/receive/[...param]/+page.server.js
index cdd89c8b..a6e59175 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.server.js
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.server.js
@@ -1,15 +1,15 @@
-import { auth, get } from '$lib/utils';
-import invoice from '$lib/invoice';
+import { auth, get } from "$lib/utils";
+import invoice from "$lib/invoice";
 
 export let load = async ({ cookies, params }) => {
-	let id = params.param;
+  let id = params.param;
 
-	let request;
-	if (id) ({ request } = await get(`/request/${id}`, auth(cookies)));
+  let request;
+  if (id) ({ request } = await get(`/request/${id}`, auth(cookies)));
 
-	return { ...params, request };
+  return { ...params, request };
 };
 
 export const actions = {
-	default: invoice
+  default: invoice,
 };
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
index d7001079..085a6f6d 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
@@ -1,50 +1,54 @@
 <script>
-	import { Icon, Numpad, Toggle } from '$comp';
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { page } from '$app/stores';
-	import { requestRedirect } from '$lib/store';
-	import { browser } from '$app/environment';
+  import { Icon, Numpad, Toggle } from "$comp";
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { page } from "$app/stores";
+  import { requestRedirect } from "$lib/store";
+  import { browser } from "$app/environment";
 
-	export let data;
-	let type = 'lightning';
+  export let data;
+  let type = "lightning";
 
-	if ($page.params.param === 'bitcoin') type = 'bitcoin';
+  if ($page.params.param === "bitcoin") type = "bitcoin";
 
-	let { request } = data;
+  let { request } = data;
 
-	let amount;
+  let amount;
 
-	let lightning = true;
-	let { currency, username, prompt } = data.subject;
-	let { rates, user } = data;
-	let submit;
+  let lightning = true;
+  let { currency, username, prompt } = data.subject;
+  let { rates, user } = data;
+  let submit;
 
-	$: rate = rates[currency];
-	$: type = lightning ? 'lightning' : 'bitcoin';
+  $: rate = rates[currency];
+  $: type = lightning ? "lightning" : "bitcoin";
 </script>
 
-<form method="POST" class="flex justify-center items-center mt-24 mb-3 px-3" use:enhance>
-	<input type="hidden" name="amount" value={amount} />
-	<input type="hidden" name="currency" value={currency} />
-	<input type="hidden" name="username" value={username} />
-	<input type="hidden" name="type" value={type} />
-
-	{#if request}
-		<input type="hidden" name="request_id" value={request.id} />
-	{/if}
-
-	<input type="hidden" name="prompt" value={prompt} />
-
-	<div class="space-y-3 w-[300px] mx-auto">
-		<Numpad bind:amount bind:currency bind:rate {submit} />
-		<button
-			bind:this={submit}
-			type="submit"
-			class="bg-black text-white rounded-xl w-full h-[48px] flex justify-center items-center font-semibold
+<form
+  method="POST"
+  class="flex justify-center items-center mt-24 mb-3 px-3"
+  use:enhance
+>
+  <input type="hidden" name="amount" value={amount} />
+  <input type="hidden" name="currency" value={currency} />
+  <input type="hidden" name="username" value={username} />
+  <input type="hidden" name="type" value={type} />
+
+  {#if request}
+    <input type="hidden" name="request_id" value={request.id} />
+  {/if}
+
+  <input type="hidden" name="prompt" value={prompt} />
+
+  <div class="space-y-3 w-[300px] mx-auto">
+    <Numpad bind:amount bind:currency bind:rate {submit} />
+    <button
+      bind:this={submit}
+      type="submit"
+      class="bg-black text-white rounded-xl w-full h-[48px] flex justify-center items-center font-semibold
 				opacity-100 hover:opacity-80"
-		>
-			{$t('payments.next')}
-		</button>
-	</div>
+    >
+      {$t("payments.next")}
+    </button>
+  </div>
 </form>
diff --git a/src/routes/(app)/[username]/request/[id]/+page.server.js b/src/routes/(app)/[username]/request/[id]/+page.server.js
index 89792ab8..09cce465 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.server.js
+++ b/src/routes/(app)/[username]/request/[id]/+page.server.js
@@ -1,25 +1,26 @@
-import { auth, get } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
+import { auth, get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export let load = async ({ cookies, depends, params, parent }) => {
-	depends('app:invoice');
+  depends("app:invoice");
 
-	let { user } = await parent();
-	if (!user) throw redirect(307, '/login');
+  let { user } = await parent();
+  if (!user) throw redirect(307, "/login");
 
-	let { request } = await get(`/request/${params.id}`, auth(cookies));
-	let { invoice } = request;
+  let { request } = await get(`/request/${params.id}`, auth(cookies));
+  let { invoice } = request;
 
-	if (invoice) {
-		let { amount, received, id } = invoice;
-		if (
-			request.recipient.username === user.username &&
-			((received && !amount) || received >= amount)
-		)
-			throw redirect(307, `/${user.username}/invoice/${id}/paid`);
+  if (invoice) {
+    let { amount, received, id } = invoice;
+    if (
+      request.recipient.username === user.username &&
+      ((received && !amount) || received >= amount)
+    )
+      throw redirect(307, `/${user.username}/invoice/${id}/paid`);
 
-		if (request.requester.username === user.username) throw redirect(307, `/send/${id}`);
-	}
+    if (request.requester.username === user.username)
+      throw redirect(307, `/send/${id}`);
+  }
 
-	return { request };
+  return { request };
 };
diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte
index bdd14f4a..f9672c6f 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/request/[id]/+page.svelte
@@ -1,52 +1,57 @@
 <script>
-	import { scale } from 'svelte/transition';
-	import { t } from '$lib/translations';
-	import { Avatar, Icon } from '$comp';
-	import { f, sat, sats } from '$lib/utils';
-	import { request as req, requestRedirect } from '$lib/store';
-	import { onMount } from 'svelte';
+  import { scale } from "svelte/transition";
+  import { t } from "$lib/translations";
+  import { Avatar, Icon } from "$comp";
+  import { f, sat, sats } from "$lib/utils";
+  import { request as req, requestRedirect } from "$lib/store";
+  import { onMount } from "svelte";
 
-	export let data;
-	let { request, user } = data;
+  export let data;
+  let { request, user } = data;
 
-	let amount, currency, rate, fiat;
-	if (request.invoice) {
-		({ amount, rate, currency } = request.invoice);
-		fiat = (amount * rate) / sats;
-	}
+  let amount, currency, rate, fiat;
+  if (request.invoice) {
+    ({ amount, rate, currency } = request.invoice);
+    fiat = (amount * rate) / sats;
+  }
 
-	onMount(() => req.set());
+  onMount(() => req.set());
 </script>
 
 <div class="container px-4 max-w-xl mx-auto space-y-8">
-	<div class="text-center mb-8 space-y-5">
-		{#if request.recipient_id === user.id}
-			<p class="text-4xl break-words">
-				<span class="text-xl md:text-2xl">{$t('payments.sentInvoiceTo')}</span>
-			</p>
-			<div class="flex p-1 gap-2 justify-center">
-				<Avatar user={request.requester} size={20} />
-				<p class="text-4xl break-words my-auto">{request.requester.username}</p>
-			</div>
-			<div>
-				<h2 class="text-2xl md:text-3xl font-semibold">
-					{f(fiat, currency)}
-				</h2>
-				<h3 class="text-secondary md:text-lg mb-6 mt-1">{sat(amount)}</h3>
-			</div>
-		{:else}
-			<div class="flex w-full max-w-[200px] mx-auto py-20" in:scale={{ start: 0.5 }}>
-				<Icon icon="check" style="mx-auto" />
-			</div>
-			<p class="text-3xl">
-				{$t('payments.sentRequestTo')}
-			</p>
-		{/if}
-	</div>
+  <div class="text-center mb-8 space-y-5">
+    {#if request.recipient_id === user.id}
+      <p class="text-4xl break-words">
+        <span class="text-xl md:text-2xl">{$t("payments.sentInvoiceTo")}</span>
+      </p>
+      <div class="flex p-1 gap-2 justify-center">
+        <Avatar user={request.requester} size={20} />
+        <p class="text-4xl break-words my-auto">{request.requester.username}</p>
+      </div>
+      <div>
+        <h2 class="text-2xl md:text-3xl font-semibold">
+          {f(fiat, currency)}
+        </h2>
+        <h3 class="text-secondary md:text-lg mb-6 mt-1">{sat(amount)}</h3>
+      </div>
+    {:else}
+      <div
+        class="flex w-full max-w-[200px] mx-auto py-20"
+        in:scale={{ start: 0.5 }}
+      >
+        <Icon icon="check" style="mx-auto" />
+      </div>
+      <p class="text-3xl">
+        {$t("payments.sentRequestTo")}
+      </p>
+    {/if}
+  </div>
 </div>
 
 <a href={$requestRedirect || `/${user.username}`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-<div class="fixed bottom-10 left-0 text-center w-full">{$t('payments.tapAnywhere')}</div>
+<div class="fixed bottom-10 left-0 text-center w-full">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/src/routes/(app)/[username]/reset/+server.js b/src/routes/(app)/[username]/reset/+server.js
index 52fff367..f7dba02c 100644
--- a/src/routes/(app)/[username]/reset/+server.js
+++ b/src/routes/(app)/[username]/reset/+server.js
@@ -1,10 +1,10 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { json } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
 
 export async function POST({ cookies, request, params }) {
-	let { username } = params;
-	let r = await request.json();
-	let { password } = r;
-	let result = await post('/reset', { password, username }, auth(cookies));
-	return json(result);
+  let { username } = params;
+  let r = await request.json();
+  let { password } = r;
+  let result = await post("/reset", { password, username }, auth(cookies));
+  return json(result);
 }
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
index b0c849d0..156b6062 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
@@ -1,23 +1,24 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { fd, auth, get, post } from '$lib/utils';
+import { fail, redirect } from "@sveltejs/kit";
+import { fd, auth, get, post } from "$lib/utils";
 
 export function load({ params, url }) {
-	if (url.pathname.endsWith('settings')) throw redirect(307, url.pathname + '/account');
-	return params;
+  if (url.pathname.endsWith("settings"))
+    throw redirect(307, url.pathname + "/account");
+  return params;
 }
 
 export const actions = {
-	default: async ({ cookies, request }) => {
-		let form = await fd(request);
-		if (form.prompt) form.prompt = form.prompt === 'on';
-		let user = { ...(await get('/me', auth(cookies))), ...form };
+  default: async ({ cookies, request }) => {
+    let form = await fd(request);
+    if (form.prompt) form.prompt = form.prompt === "on";
+    let user = { ...(await get("/me", auth(cookies))), ...form };
 
-		try {
-			({ user } = await post(`/user`, user, auth(cookies)));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
+    try {
+      ({ user } = await post(`/user`, user, auth(cookies)));
+    } catch (e) {
+      return fail(400, { message: e.message });
+    }
 
-		return { user, success: true };
-	}
+    return { user, success: true };
+  },
 };
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 933fa1f6..92772f43 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -1,206 +1,218 @@
 <script>
-	import { browser } from '$app/environment';
-	import { onMount, tick } from 'svelte';
-	import { fly } from 'svelte/transition';
-	import { applyAction, deserialize } from '$app/forms';
-
-	import { Icon, Spinner, Pin } from '$comp';
-	import { t } from '$lib/translations';
-	import { fail, post, warning, success } from '$lib/utils';
-	import { avatar, banner, password, pin } from '$lib/store';
-	import { upload } from '$lib/upload';
-	import { page } from '$app/stores';
-	import { sign, send, reEncryptEntropy } from '$lib/nostr';
-	import { invalidateAll } from '$app/navigation';
-
-	import Account from './_account.svelte';
-	import Pos from './_pos.svelte';
-	import Security from './_security.svelte';
-	import Shopify from './_shopify.svelte';
-
-	import { PUBLIC_COINOS_URL } from '$env/static/public';
-
-	export let data;
-	export let form;
-
-	let submit;
-	let formElement;
-
-	let { user, token, rates, tab } = data;
-	let prev;
-
-	$: update(data);
-	let update = () => {
-		({ user, token, rates, tab } = data);
-		prev = { ...user };
-	};
-
-	$: form?.user && ({ user } = form);
-
-	$: form?.success && success('Settings saved!');
-
-	$: form?.message && fail(form.message);
-
-	$: if (form?.message?.startsWith('Pin')) {
-		fail('Wrong pin, try again');
-		$pin = '';
-	}
-
-	let tabs = [
-		{ name: 'account', key: 'ACCOUNT', comp: Account },
-		{ name: 'pos', key: 'POINT_OF_SALE', comp: Pos },
-		{ name: 'security', key: 'SECURITY', comp: Security },
-		{ name: 'shopify', key: 'SHOPIFY', comp: Shopify }
-	];
-
-	$: ({ comp } = tabs.find((t) => t.name === tab));
-
-	let { address, id, username } = user;
-	let loading;
-
-	async function handleSubmit() {
-		try {
-			loading = true;
-			let data = new FormData(formElement);
-
-			if (data.get('password')) {
-				try {
-					data.set('cipher', await reEncryptEntropy(user, data.get('password')));
-				} catch (e) {
-					console.log('Failed to encrypt keys with new password');
-					throw e;
-				}
-			}
-
-			if ($avatar) {
-				try {
-					let { hash } = JSON.parse(
-						await upload($avatar.file, $avatar.type, $avatar.progress, token)
-					);
-
-					data.set('profile', hash);
-
-					await fetch(`/api/public/${hash}.webp`, { cache: 'reload', mode: 'no-cors' });
-				} catch (e) {
-					console.log('problem uploading avatar', e);
-				}
-			}
-
-			if ($banner) {
-				try {
-					let { hash } = JSON.parse(
-						await upload($banner.file, $banner.type, $banner.progress, token)
-					);
-
-					data.set('banner', hash);
-
-					await fetch(`/api/public/${hash}.webp`, { cache: 'reload', mode: 'no-cors' });
-				} catch (e) {
-					console.log('problem uploading banner', e);
-				}
-			}
-
-			if (['username', 'address', 'profile'].some((a) => user[a] !== prev[a])) {
-				let event = {
-					pubkey: user.pubkey,
-					created_at: Math.floor(Date.now() / 1000),
-					kind: 0,
-					content: JSON.stringify({
-						name: user.username,
-						about: user.address,
-						picture: `${PUBLIC_COINOS_URL}/public/${user.profile}.webp`
-					}),
-					tags: []
-				};
-
-				try {
-					await sign({ event, user });
-					await send(event);
-				} catch (e) {
-					warning('nostr profile could not be updated');
-				}
-			}
-
-			if (user.email !== prev.email) {
-				await post('/api/verify', { test: true });
-			}
-
-			const response = await fetch(formElement.action, {
-				method: 'POST',
-				body: data
-			});
-
-			const result = deserialize(await response.text());
-
-			if (result.type === 'success') {
-				await invalidateAll();
-				if (data.get('password')) $password = data.get('password');
-			}
-
-			applyAction(result);
-		} catch (e) {
-			console.log(e);
-			fail('Something went wrong');
-		}
-
-		loading = false;
-	}
+  import { browser } from "$app/environment";
+  import { onMount, tick } from "svelte";
+  import { fly } from "svelte/transition";
+  import { applyAction, deserialize } from "$app/forms";
+
+  import { Icon, Spinner, Pin } from "$comp";
+  import { t } from "$lib/translations";
+  import { fail, post, warning, success } from "$lib/utils";
+  import { avatar, banner, password, pin } from "$lib/store";
+  import { upload } from "$lib/upload";
+  import { page } from "$app/stores";
+  import { sign, send, reEncryptEntropy } from "$lib/nostr";
+  import { invalidateAll } from "$app/navigation";
+
+  import Account from "./_account.svelte";
+  import Pos from "./_pos.svelte";
+  import Security from "./_security.svelte";
+  import Shopify from "./_shopify.svelte";
+
+  import { PUBLIC_COINOS_URL } from "$env/static/public";
+
+  export let data;
+  export let form;
+
+  let submit;
+  let formElement;
+
+  let { user, token, rates, tab } = data;
+  let prev;
+
+  $: update(data);
+  let update = () => {
+    ({ user, token, rates, tab } = data);
+    prev = { ...user };
+  };
+
+  $: form?.user && ({ user } = form);
+
+  $: form?.success && success("Settings saved!");
+
+  $: form?.message && fail(form.message);
+
+  $: if (form?.message?.startsWith("Pin")) {
+    fail("Wrong pin, try again");
+    $pin = "";
+  }
+
+  let tabs = [
+    { name: "account", key: "ACCOUNT", comp: Account },
+    { name: "pos", key: "POINT_OF_SALE", comp: Pos },
+    { name: "security", key: "SECURITY", comp: Security },
+    { name: "shopify", key: "SHOPIFY", comp: Shopify },
+  ];
+
+  $: ({ comp } = tabs.find((t) => t.name === tab));
+
+  let { address, id, username } = user;
+  let loading;
+
+  async function handleSubmit() {
+    try {
+      loading = true;
+      let data = new FormData(formElement);
+
+      if (data.get("password")) {
+        try {
+          data.set(
+            "cipher",
+            await reEncryptEntropy(user, data.get("password"))
+          );
+        } catch (e) {
+          console.log("Failed to encrypt keys with new password");
+          throw e;
+        }
+      }
+
+      if ($avatar) {
+        try {
+          let { hash } = JSON.parse(
+            await upload($avatar.file, $avatar.type, $avatar.progress, token)
+          );
+
+          data.set("profile", hash);
+
+          await fetch(`/api/public/${hash}.webp`, {
+            cache: "reload",
+            mode: "no-cors",
+          });
+        } catch (e) {
+          console.log("problem uploading avatar", e);
+        }
+      }
+
+      if ($banner) {
+        try {
+          let { hash } = JSON.parse(
+            await upload($banner.file, $banner.type, $banner.progress, token)
+          );
+
+          data.set("banner", hash);
+
+          await fetch(`/api/public/${hash}.webp`, {
+            cache: "reload",
+            mode: "no-cors",
+          });
+        } catch (e) {
+          console.log("problem uploading banner", e);
+        }
+      }
+
+      if (["username", "address", "profile"].some((a) => user[a] !== prev[a])) {
+        let event = {
+          pubkey: user.pubkey,
+          created_at: Math.floor(Date.now() / 1000),
+          kind: 0,
+          content: JSON.stringify({
+            name: user.username,
+            about: user.address,
+            picture: `${PUBLIC_COINOS_URL}/public/${user.profile}.webp`,
+          }),
+          tags: [],
+        };
+
+        try {
+          await sign({ event, user });
+          await send(event);
+        } catch (e) {
+          warning("nostr profile could not be updated");
+        }
+      }
+
+      if (user.email !== prev.email) {
+        await post("/api/verify", { test: true });
+      }
+
+      const response = await fetch(formElement.action, {
+        method: "POST",
+        body: data,
+      });
+
+      const result = deserialize(await response.text());
+
+      if (result.type === "success") {
+        await invalidateAll();
+        if (data.get("password")) $password = data.get("password");
+      }
+
+      applyAction(result);
+    } catch (e) {
+      console.log(e);
+      fail("Something went wrong");
+    }
+
+    loading = false;
+  }
 </script>
 
 {#if user.haspin && $pin?.length !== 6}
-	<Pin />
+  <Pin />
 {/if}
 
 <form
-	method="POST"
-	class="mb-[154px]"
-	on:submit|preventDefault={handleSubmit}
-	bind:this={formElement}
+  method="POST"
+  class="mb-[154px]"
+  on:submit|preventDefault={handleSubmit}
+  bind:this={formElement}
 >
-	<input type="hidden" name="pin" value={$pin} />
-
-	<div class="mt-24 mb-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
-		<div class="header">
-			<h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">
-				{$t('user.settings.header')}
-			</h1>
-
-			<div class="font-bold flex justify-around items-center border-b pb-3 text-secondary">
-				{#each tabs.filter((t) => t.name !== 'shopify') as { name, key }}
-					<a href={`/${user.username}/settings/${name}`}>
-						<button
-							class="hover:opacity-80"
-							class:text-black={tab === name || (tab === 'shopify' && name === 'pos')}
-							>{$t(`user.settings.${key}`)}</button
-						>
-					</a>
-				{/each}
-			</div>
-		</div>
-
-		<svelte:component this={comp} {user} {rates} {submit} />
-	</div>
-
-	<div
-		class="z-10 fixed bottom-0 bg-white shadow border-t w-full flex justify-center items-center py-3"
-	>
-		<button
-			bind:this={submit}
-			type="submit"
-			class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80"
-			class:bg-black={loading}
-		>
-			{#if loading}
-				<Spinner />
-			{:else}
-				<div class="my-auto">{$t('user.settings.saveSettings')}</div>
-			{/if}
-		</button>
-	</div>
+  <input type="hidden" name="pin" value={$pin} />
+
+  <div class="mt-24 mb-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8">
+    <div class="header">
+      <h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">
+        {$t("user.settings.header")}
+      </h1>
+
+      <div
+        class="font-bold flex justify-around items-center border-b pb-3 text-secondary"
+      >
+        {#each tabs.filter((t) => t.name !== "shopify") as { name, key }}
+          <a href={`/${user.username}/settings/${name}`}>
+            <button
+              class="hover:opacity-80"
+              class:text-black={tab === name ||
+                (tab === "shopify" && name === "pos")}
+              >{$t(`user.settings.${key}`)}</button
+            >
+          </a>
+        {/each}
+      </div>
+    </div>
+
+    <svelte:component this={comp} {user} {rates} {submit} />
+  </div>
+
+  <div
+    class="z-10 fixed bottom-0 bg-white shadow border-t w-full flex justify-center items-center py-3"
+  >
+    <button
+      bind:this={submit}
+      type="submit"
+      class="border-2 border-black rounded-xl font-semibold mx-auto py-3 w-40 hover:opacity-80"
+      class:bg-black={loading}
+    >
+      {#if loading}
+        <Spinner />
+      {:else}
+        <div class="my-auto">{$t("user.settings.saveSettings")}</div>
+      {/if}
+    </button>
+  </div>
 </form>
 
 <style>
-	.header {
-		view-transition-name: tabs;
-	}
+  .header {
+    view-transition-name: tabs;
+  }
 </style>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
index 2a06b31d..64ab669f 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
@@ -1,183 +1,193 @@
 <script>
-	import { tick } from 'svelte';
-	import { colorTheme, avatar, banner } from '$lib/store';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-	import { page } from '$app/stores';
-
-	export let user, rates, submit;
-
-	let { id } = user;
-
-	let selectedTheme = 1;
-	let avatarFile, avatarInput, bannerFile, bannerInput;
-
-	let colorThemes = [
-		{ theme: 1, color1: 'from-[#F5F7FA]', color2: 'to-[#C3CFE2]' },
-		{ theme: 2, color1: 'from-[#FDFCFB]', color2: 'to-[#E2D1C3]' },
-		{ theme: 3, color1: 'from-[#E6E9F0]', color2: 'to-[#EEF1F5]' },
-		{ theme: 4, color1: 'from-[#D5D4D0]', color2: 'to-[#EEEEEC]' },
-		{ theme: 5, color1: 'from-[#F3E7E9]', color2: 'to-[#E3EEFF]' },
-		{ theme: 6, color1: 'from-[#F5F7FA]', color2: 'via-[#EAF2FF] to-[#DEDFFF]' }
-	];
-
-	let handleThemeClick = (colors) => {
-		selectedTheme = colors.theme;
-		$colorTheme = colors.color1 + ' ' + colors.color2;
-	};
-
-	let selectAvatar = () => avatarInput.click();
-	let selectBanner = () => bannerInput.click();
-
-	let percent;
-	let progress = async (event) => {
-		percent = Math.round((event.loaded / event.total) * 100);
-	};
-
-	let tooLarge = {};
-
-	let handleFile = async ({ target }, type) => {
-		tooLarge[type] = false;
-		let file = target.files[0];
-		if (!file) return;
-
-		if (file.size > 10000000) return (tooLarge[type] = true);
-
-		if (type === 'profile') {
-			$avatar = { id, file, type, progress };
-		} else if (type === 'banner') {
-			$banner = { id, file, type, progress };
-		}
-
-		var reader = new FileReader();
-		reader.onload = async (e) => {
-			if (type === 'profile') {
-				$avatar.src = e.target.result;
-			} else if (type === 'banner') {
-				$banner.src = e.target.result;
-			}
-		};
-
-		reader.readAsDataURL(file);
-	};
-
-	if (!user.display) user.display = user.username;
-
-	$: url = `${$page.url.host}/${user.username}`;
-	$: full = `${$page.url.protocol}//${url}`;
-	$: addr = `${user.username}@${$page.url.host}`;
+  import { tick } from "svelte";
+  import { colorTheme, avatar, banner } from "$lib/store";
+  import { Icon } from "$comp";
+  import { t } from "$lib/translations";
+  import { page } from "$app/stores";
+
+  export let user, rates, submit;
+
+  let { id } = user;
+
+  let selectedTheme = 1;
+  let avatarFile, avatarInput, bannerFile, bannerInput;
+
+  let colorThemes = [
+    { theme: 1, color1: "from-[#F5F7FA]", color2: "to-[#C3CFE2]" },
+    { theme: 2, color1: "from-[#FDFCFB]", color2: "to-[#E2D1C3]" },
+    { theme: 3, color1: "from-[#E6E9F0]", color2: "to-[#EEF1F5]" },
+    { theme: 4, color1: "from-[#D5D4D0]", color2: "to-[#EEEEEC]" },
+    { theme: 5, color1: "from-[#F3E7E9]", color2: "to-[#E3EEFF]" },
+    {
+      theme: 6,
+      color1: "from-[#F5F7FA]",
+      color2: "via-[#EAF2FF] to-[#DEDFFF]",
+    },
+  ];
+
+  let handleThemeClick = (colors) => {
+    selectedTheme = colors.theme;
+    $colorTheme = colors.color1 + " " + colors.color2;
+  };
+
+  let selectAvatar = () => avatarInput.click();
+  let selectBanner = () => bannerInput.click();
+
+  let percent;
+  let progress = async (event) => {
+    percent = Math.round((event.loaded / event.total) * 100);
+  };
+
+  let tooLarge = {};
+
+  let handleFile = async ({ target }, type) => {
+    tooLarge[type] = false;
+    let file = target.files[0];
+    if (!file) return;
+
+    if (file.size > 10000000) return (tooLarge[type] = true);
+
+    if (type === "profile") {
+      $avatar = { id, file, type, progress };
+    } else if (type === "banner") {
+      $banner = { id, file, type, progress };
+    }
+
+    var reader = new FileReader();
+    reader.onload = async (e) => {
+      if (type === "profile") {
+        $avatar.src = e.target.result;
+      } else if (type === "banner") {
+        $banner.src = e.target.result;
+      }
+    };
+
+    reader.readAsDataURL(file);
+  };
+
+  if (!user.display) user.display = user.username;
+
+  $: url = `${$page.url.host}/${user.username}`;
+  $: full = `${$page.url.protocol}//${url}`;
+  $: addr = `${user.username}@${$page.url.host}`;
 </script>
 
 <div>
-	<label for="username" class="font-bold mb-1 block">{$t('user.settings.username')}</label>
-	<div class="flex mb-2">
-		<input
-			type="text"
-			name="username"
-			bind:value={user.username}
-			class="w-auto min-w-0 pr-1 grow"
-		/>
-	</div>
+  <label for="username" class="font-bold mb-1 block"
+    >{$t("user.settings.username")}</label
+  >
+  <div class="flex mb-2">
+    <input
+      type="text"
+      name="username"
+      bind:value={user.username}
+      class="w-auto min-w-0 pr-1 grow"
+    />
+  </div>
 </div>
 
 <div>
-	<label for="display" class="font-bold mb-1 block">{$t('user.settings.displayName')}</label>
-	<input type="text" name="display" bind:value={user.display} />
+  <label for="display" class="font-bold mb-1 block"
+    >{$t("user.settings.displayName")}</label
+  >
+  <input type="text" name="display" bind:value={user.display} />
 </div>
 
 <div>
-	<span class="font-bold">{$t('user.settings.profileImage')}</span>
-
-	<div class="flex">
-		{#if $avatar || user.profile}
-			<div
-				class="relative rounded-full overflow-hidden text-center w-20 h-20 my-auto hover:opacity-80 cursor-pointer"
-				on:click={selectAvatar}
-				on:keydown={selectAvatar}
-			>
-				<img
-					src={$avatar?.src || `/api/public/${user.profile}.webp`}
-					class="absolute w-full h-full object-cover object-center visible overflow-hidden"
-					alt={user.username}
-				/>
-			</div>
-		{:else}
-			<div
-				class="rounded-full border-4 border-white p-4 bg-gradient-to-r {$colorTheme} w-24 my-auto hover:opacity-80 cursor-pointer"
-				on:click={selectAvatar}
-				on:keydown={selectAvatar}
-			>
-				<Icon icon="logo-symbol-white" style="mx-auto" />
-			</div>
-		{/if}
-		<div class="ml-2 p-2">
-			<!-- found missing translation -->
-			<button
-				type="button"
-				class="border rounded-2xl font-bold w-24 text-center px-0 py-2 hover:opacity-80"
-				on:click={selectAvatar}
-				on:keydown={selectAvatar}>{$t('user.settings.select')}</button
-			>
-			<input
-				type="file"
-				class="hidden"
-				bind:this={avatarInput}
-				on:change={(e) => handleFile(e, 'profile')}
-			/>
-		</div>
-	</div>
-
-	{#if tooLarge['avatar']}
-		<div class="text-red-600">Max file size 10MB</div>
-	{/if}
+  <span class="font-bold">{$t("user.settings.profileImage")}</span>
+
+  <div class="flex">
+    {#if $avatar || user.profile}
+      <div
+        class="relative rounded-full overflow-hidden text-center w-20 h-20 my-auto hover:opacity-80 cursor-pointer"
+        on:click={selectAvatar}
+        on:keydown={selectAvatar}
+      >
+        <img
+          src={$avatar?.src || `/api/public/${user.profile}.webp`}
+          class="absolute w-full h-full object-cover object-center visible overflow-hidden"
+          alt={user.username}
+        />
+      </div>
+    {:else}
+      <div
+        class="rounded-full border-4 border-white p-4 bg-gradient-to-r {$colorTheme} w-24 my-auto hover:opacity-80 cursor-pointer"
+        on:click={selectAvatar}
+        on:keydown={selectAvatar}
+      >
+        <Icon icon="logo-symbol-white" style="mx-auto" />
+      </div>
+    {/if}
+    <div class="ml-2 p-2">
+      <!-- found missing translation -->
+      <button
+        type="button"
+        class="border rounded-2xl font-bold w-24 text-center px-0 py-2 hover:opacity-80"
+        on:click={selectAvatar}
+        on:keydown={selectAvatar}>{$t("user.settings.select")}</button
+      >
+      <input
+        type="file"
+        class="hidden"
+        bind:this={avatarInput}
+        on:change={(e) => handleFile(e, "profile")}
+      />
+    </div>
+  </div>
+
+  {#if tooLarge["avatar"]}
+    <div class="text-red-600">Max file size 10MB</div>
+  {/if}
 </div>
 
 <div>
-	<div class="flex justify-between items-center">
-		<span class="font-bold">{$t('user.settings.bannerImage')}</span>
-	</div>
-
-	{#if $banner || user.banner}
-		<img
-			src={$banner ? $banner.src : `/api/public/${user.banner}.webp`}
-			class="w-full object-cover object-center visible overflow-hidden h-48 mb-4 hover:opacity-80"
-			on:click={selectBanner}
-			on:keydown={selectBanner}
-			alt="Banner"
-		/>
-	{:else}
-		<div
-			class="bg-gradient-to-r {$colorTheme} w-full h-48 mb-4 cursor-pointer hover:opacity-80"
-			on:click={selectBanner}
-			on:keydown={selectBanner}
-			alt="Banner"
-		/>
-	{/if}
-
-	<button
-		type="button"
-		class="border rounded-2xl font-bold w-24 text-center px-0 py-2 hover:opacity-80"
-		on:click={selectBanner}
-		on:keydown={selectBanner}>{$t('user.settings.select')}</button
-	>
-	<input
-		type="file"
-		class="hidden"
-		bind:this={bannerInput}
-		on:change={(e) => handleFile(e, 'banner')}
-	/>
-
-	{#if tooLarge['banner']}
-		<div class="text-red-600">Max file size 10MB</div>
-	{/if}
+  <div class="flex justify-between items-center">
+    <span class="font-bold">{$t("user.settings.bannerImage")}</span>
+  </div>
+
+  {#if $banner || user.banner}
+    <img
+      src={$banner ? $banner.src : `/api/public/${user.banner}.webp`}
+      class="w-full object-cover object-center visible overflow-hidden h-48 mb-4 hover:opacity-80"
+      on:click={selectBanner}
+      on:keydown={selectBanner}
+      alt="Banner"
+    />
+  {:else}
+    <div
+      class="bg-gradient-to-r {$colorTheme} w-full h-48 mb-4 cursor-pointer hover:opacity-80"
+      on:click={selectBanner}
+      on:keydown={selectBanner}
+      alt="Banner"
+    />
+  {/if}
+
+  <button
+    type="button"
+    class="border rounded-2xl font-bold w-24 text-center px-0 py-2 hover:opacity-80"
+    on:click={selectBanner}
+    on:keydown={selectBanner}>{$t("user.settings.select")}</button
+  >
+  <input
+    type="file"
+    class="hidden"
+    bind:this={bannerInput}
+    on:change={(e) => handleFile(e, "banner")}
+  />
+
+  {#if tooLarge["banner"]}
+    <div class="text-red-600">Max file size 10MB</div>
+  {/if}
 </div>
 
 <div>
-	<label for="address" class="font-bold mb-1 block">{$t('user.settings.about')}</label>
-	<textarea
-		type="text"
-		name="address"
-		bind:value={user.address}
-		placeholder={$t('user.settings.aboutPlaceholder')}
-	/>
+  <label for="address" class="font-bold mb-1 block"
+    >{$t("user.settings.about")}</label
+  >
+  <textarea
+    type="text"
+    name="address"
+    bind:value={user.address}
+    placeholder={$t("user.settings.aboutPlaceholder")}
+  />
 </div>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index 9100401a..94a35493 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -1,61 +1,71 @@
 <script>
-	import { Icon, LocaleSelector, Toggle } from '$comp';
-	import { t } from '$lib/translations';
-	import { success, fail } from '$lib/utils';
-	import { page } from '$app/stores';
+  import { Icon, LocaleSelector, Toggle } from "$comp";
+  import { t } from "$lib/translations";
+  import { success, fail } from "$lib/utils";
+  import { page } from "$app/stores";
 
-	export let user, rates, submit;
+  export let user, rates, submit;
 
-	let fiats = Object.keys(rates);
+  let fiats = Object.keys(rates);
 </script>
 
 <div>
-	<label for="language" class="font-bold block mb-1">{$t('user.settings.locale')}</label>
-	<LocaleSelector style="select-styles block py-3 w-full" />
+  <label for="language" class="font-bold block mb-1"
+    >{$t("user.settings.locale")}</label
+  >
+  <LocaleSelector style="select-styles block py-3 w-full" />
 </div>
 
 <div>
-	<label for="currency" class="font-bold block mb-1">{$t('user.settings.localCurrency')}</label>
-	<select name="currency" class="select-styles block py-3 w-full" value={user.currency}>
-		{#each fiats as fiat}
-			<option value={fiat}>{fiat}</option>
-		{/each}
-	</select>
+  <label for="currency" class="font-bold block mb-1"
+    >{$t("user.settings.localCurrency")}</label
+  >
+  <select
+    name="currency"
+    class="select-styles block py-3 w-full"
+    value={user.currency}
+  >
+    {#each fiats as fiat}
+      <option value={fiat}>{fiat}</option>
+    {/each}
+  </select>
 </div>
 
 <div class="space-y-1">
-	<label for="email" class="font-bold block">{$t('user.settings.email')}</label>
+  <label for="email" class="font-bold block">{$t("user.settings.email")}</label>
   <p class="text-secondary">
-    {$t('user.settings.emailDescription')}
+    {$t("user.settings.emailDescription")}
   </p>
-	<input type="text" name="email" bind:value={user.email} />
+  <input type="text" name="email" bind:value={user.email} />
 </div>
 
 <div>
-	<div class="flex justify-between items-center">
-		<span class="font-bold">{$t('user.settings.tipPrompt')}</span>
-		<Toggle id="prompt" bind:value={user.prompt} />
-	</div>
-	<p class="text-secondary mt-1 w-9/12">
-		{$t('user.settings.tipPromptDescription')}
-	</p>
+  <div class="flex justify-between items-center">
+    <span class="font-bold">{$t("user.settings.tipPrompt")}</span>
+    <Toggle id="prompt" bind:value={user.prompt} />
+  </div>
+  <p class="text-secondary mt-1 w-9/12">
+    {$t("user.settings.tipPromptDescription")}
+  </p>
 </div>
 
 <div>
-	<div class="flex justify-between items-center">
-		<span class="font-bold">{$t('user.settings.publishNip5')}</span>
-		<Toggle id="nip5" bind:value={user.nip5} />
-	</div>
-	<p class="text-secondary mt-1 w-9/12">
-  {$t('user.settings.nip5a')} <span class="font-bold">{user.username}@{$page.url.host}</span> {$t('user.settings.nip5b')}
-	</p>
+  <div class="flex justify-between items-center">
+    <span class="font-bold">{$t("user.settings.publishNip5")}</span>
+    <Toggle id="nip5" bind:value={user.nip5} />
+  </div>
+  <p class="text-secondary mt-1 w-9/12">
+    {$t("user.settings.nip5a")}
+    <span class="font-bold">{user.username}@{$page.url.host}</span>
+    {$t("user.settings.nip5b")}
+  </p>
 </div>
 
 <a href="./shopify">
-	<button
-		class="flex rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full gap-2 my-5 justify-center"
-	>
-		<img src="/icons/shopify.svg" class="w-8" />
-		<div class="my-auto">Shopify Integration</div>
-	</button>
+  <button
+    class="flex rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full gap-2 my-5 justify-center"
+  >
+    <img src="/icons/shopify.svg" class="w-8" />
+    <div class="my-auto">Shopify Integration</div>
+  </button>
 </a>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index 3cd0480e..f8c14e7b 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -1,290 +1,317 @@
 <script>
-	import { getMnemonic, getNsec } from '$lib/nostr';
-	import { tick } from 'svelte';
-	import { t } from '$lib/translations';
-	import { Pin, Icon, Qr } from '$comp';
-	import { copy, post, success, fail } from '$lib/utils';
-	import { pin as current } from '$lib/store';
-	import { invalidate } from '$app/navigation';
-	import { page } from '$app/stores';
-
-	export let user, rates, submit;
-
-	let confirming2fa,
-		disabling2fa,
-		locked,
-		mnemonic,
-		nsec,
-		old,
-		otp,
-		password,
-		pin,
-		revealPassword,
-		revealSeed,
-		revealNsec,
-		token = '',
-		setting2fa,
-		settingPin,
-		verify;
-
-	let toggleNsec = async () => {
-		try {
-			nsec = await getNsec(user);
-			revealNsec = !revealNsec;
-		} catch (e) {
-			console.log(e);
-		}
-	};
-
-	let togglePassword = () => (revealPassword = !revealPassword);
-	let toggleSeed = async () => {
-		try {
-			mnemonic = await getMnemonic(user);
-			revealSeed = !revealSeed;
-		} catch (e) {
-			console.log(e);
-		}
-	};
-
-	$: verifying = pin?.length > 5;
-	$: verify && checkPin(pin);
-	let checkPin = async () => {
-		old = $current;
-
-		try {
-			if (pin.length > 5 && pin === verify) {
-				user.haspin = true;
-				$current = pin;
-				pin = '';
-				verify = '';
-				submit.click();
-				settingPin = false;
-				verifying = false;
-			} else {
-				fail('Pin mismatch, try again');
-				pin = '';
-				verify = '';
-				verifying = false;
-				settingPin = true;
-			}
-		} catch (e) {
-			console.log(e);
-			fail('Problem setting PIN');
-		}
-	};
-
-	let reset = () => {
-		token = '';
-		return true;
-	};
-
-	let disablingPin = false;
-
-	let togglePin = async () => {
-		if (user.haspin) {
-			try {
-				disablingPin = true;
-				await tick();
-				submit.click();
-			} catch (e) {
-				console.log(e);
-				fail('Failed to disable pin');
-			}
-		} else {
-			settingPin = true;
+  import { getMnemonic, getNsec } from "$lib/nostr";
+  import { tick } from "svelte";
+  import { t } from "$lib/translations";
+  import { Pin, Icon, Qr } from "$comp";
+  import { copy, post, success, fail } from "$lib/utils";
+  import { pin as current } from "$lib/store";
+  import { invalidate } from "$app/navigation";
+  import { page } from "$app/stores";
+
+  export let user, rates, submit;
+
+  let confirming2fa,
+    disabling2fa,
+    locked,
+    mnemonic,
+    nsec,
+    old,
+    otp,
+    password,
+    pin,
+    revealPassword,
+    revealSeed,
+    revealNsec,
+    token = "",
+    setting2fa,
+    settingPin,
+    verify;
+
+  let toggleNsec = async () => {
+    try {
+      nsec = await getNsec(user);
+      revealNsec = !revealNsec;
+    } catch (e) {
+      console.log(e);
+    }
+  };
+
+  let togglePassword = () => (revealPassword = !revealPassword);
+  let toggleSeed = async () => {
+    try {
+      mnemonic = await getMnemonic(user);
+      revealSeed = !revealSeed;
+    } catch (e) {
+      console.log(e);
+    }
+  };
+
+  $: verifying = pin?.length > 5;
+  $: verify && checkPin(pin);
+  let checkPin = async () => {
+    old = $current;
+
+    try {
+      if (pin.length > 5 && pin === verify) {
+        user.haspin = true;
+        $current = pin;
+        pin = "";
+        verify = "";
+        submit.click();
+        settingPin = false;
+        verifying = false;
+      } else {
+        fail("Pin mismatch, try again");
+        pin = "";
+        verify = "";
+        verifying = false;
+        settingPin = true;
+      }
+    } catch (e) {
+      console.log(e);
+      fail("Problem setting PIN");
+    }
+  };
+
+  let reset = () => {
+    token = "";
+    return true;
+  };
+
+  let disablingPin = false;
+
+  let togglePin = async () => {
+    if (user.haspin) {
+      try {
+        disablingPin = true;
+        await tick();
+        submit.click();
+      } catch (e) {
+        console.log(e);
+        fail("Failed to disable pin");
+      }
+    } else {
+      settingPin = true;
       disablingPin = false;
-		}
-	};
-
-	let startEnabling2fa = async () => {
-		reset();
-		try {
-			if (!otp) otp = await post('/otpsecret', { pin: $current });
-		} catch (e) {
-			console.log(e);
-		}
-
-		setting2fa = true;
-	};
-
-	let startDisabling2fa = () => (disabling2fa = true);
-	let startConfirming2fa = () => (confirming2fa = true);
-	let cancel = () => {
-		pin = null;
-		token = null;
-		verifying = false;
-		settingPin = false;
-		setting2fa = false;
-		confirming2fa = false;
-		disabling2fa = false;
-	};
-
-	$: enable2fa(token);
-	let enable2fa = async (twoFa) => {
-		try {
-			if (setting2fa && token.length === 6) {
-				await post('/enable2fa', { token });
-				success('2FA enabled');
-				user.twofa = 1;
-				cancel();
-			}
-		} catch (e) {
-			fail('Failed to enable 2FA, try again');
-		}
-	};
-
-	$: disable2fa(token);
-	let disable2fa = async () => {
-		try {
-			if (disabling2fa && token.length === 6) {
-				await post('/disable2fa', { token });
-				success('2FA disabled');
-				delete user.twofa;
-				disabling2fa = false;
-			}
-		} catch (e) {
-			console.log(e);
-			fail('Failed to disable 2FA, try again');
-		}
-	};
+    }
+  };
+
+  let startEnabling2fa = async () => {
+    reset();
+    try {
+      if (!otp) otp = await post("/otpsecret", { pin: $current });
+    } catch (e) {
+      console.log(e);
+    }
+
+    setting2fa = true;
+  };
+
+  let startDisabling2fa = () => (disabling2fa = true);
+  let startConfirming2fa = () => (confirming2fa = true);
+  let cancel = () => {
+    pin = null;
+    token = null;
+    verifying = false;
+    settingPin = false;
+    setting2fa = false;
+    confirming2fa = false;
+    disabling2fa = false;
+  };
+
+  $: enable2fa(token);
+  let enable2fa = async (twoFa) => {
+    try {
+      if (setting2fa && token.length === 6) {
+        await post("/enable2fa", { token });
+        success("2FA enabled");
+        user.twofa = 1;
+        cancel();
+      }
+    } catch (e) {
+      fail("Failed to enable 2FA, try again");
+    }
+  };
+
+  $: disable2fa(token);
+  let disable2fa = async () => {
+    try {
+      if (disabling2fa && token.length === 6) {
+        await post("/disable2fa", { token });
+        success("2FA disabled");
+        delete user.twofa;
+        disabling2fa = false;
+      }
+    } catch (e) {
+      console.log(e);
+      fail("Failed to disable 2FA, try again");
+    }
+  };
 </script>
 
-<input type="hidden" name="newpin" value={disablingPin ? 'delete' : pin} />
+<input type="hidden" name="newpin" value={disablingPin ? "delete" : pin} />
 <input type="hidden" name="confirm" bind:value={password} />
 
 <div class="relative mb-5">
-	<label for="password" class="block font-bold block mb-1">{$t('user.settings.newPassword')}</label>
-	{#if revealPassword}
-		<input name="password" type="text" bind:value={password} />
-	{:else}
-		<input name="password" type="password" bind:value={password} />
-	{/if}
-	<button
-		type="button"
-		on:click={togglePassword}
-		on:keydown={togglePassword}
-		class="absolute right-5 top-11"
-	>
-		<Icon icon={revealPassword ? 'eye' : 'eye-off'} />
-	</button>
+  <label for="password" class="block font-bold block mb-1"
+    >{$t("user.settings.newPassword")}</label
+  >
+  {#if revealPassword}
+    <input name="password" type="text" bind:value={password} />
+  {:else}
+    <input name="password" type="password" bind:value={password} />
+  {/if}
+  <button
+    type="button"
+    on:click={togglePassword}
+    on:keydown={togglePassword}
+    class="absolute right-5 top-11"
+  >
+    <Icon icon={revealPassword ? "eye" : "eye-off"} />
+  </button>
 </div>
 
 <div>
-	<span class="font-bold mb-1"
-		>{verifying ? $t('user.settings.verifyPIN') : $t('user.settings.securityPIN')}</span
-	>
-	<p class="text-secondary mb-1">
-		{$t('user.settings.securityPINDescription')}
-	</p>
-	{#if verifying}
-		<Pin bind:value={verify} {cancel} notify={false} />
-	{:else if settingPin}
-		<Pin bind:value={pin} title={$t('user.settings.setPIN')} {cancel} notify={false} />
-	{:else}
-		<button type="button" class="primary" on:click={togglePin}
-			><Icon icon="lock" style="mr-1" />
-			{user.haspin ? $t('user.settings.disablePIN') : $t('user.settings.enablePIN')}</button
-		>
-	{/if}
+  <span class="font-bold mb-1"
+    >{verifying
+      ? $t("user.settings.verifyPIN")
+      : $t("user.settings.securityPIN")}</span
+  >
+  <p class="text-secondary mb-1">
+    {$t("user.settings.securityPINDescription")}
+  </p>
+  {#if verifying}
+    <Pin bind:value={verify} {cancel} notify={false} />
+  {:else if settingPin}
+    <Pin
+      bind:value={pin}
+      title={$t("user.settings.setPIN")}
+      {cancel}
+      notify={false}
+    />
+  {:else}
+    <button type="button" class="primary" on:click={togglePin}
+      ><Icon icon="lock" style="mr-1" />
+      {user.haspin
+        ? $t("user.settings.disablePIN")
+        : $t("user.settings.enablePIN")}</button
+    >
+  {/if}
 </div>
 
 {#if user.haspin}
-	<div>
-		<label for="locktime" class="font-bold mb-1">{$t('user.settings.autoLock')}</label>
-		<p class="text-secondary mb-1">
-			{$t('user.settings.autoLockDescription')}
-		</p>
-		<select name="locktime" class="select-styles block py-3 w-full" value={parseInt(user.locktime)}>
-			<option value={5 * 60}>5 {$t('user.settings.minutes')}</option>
-			<option value={10 * 60}>10 {$t('user.settings.minutes')}</option>
-			<option value={30 * 60}>30 {$t('user.settings.minutes')}</option>
-			<option value={60 * 60}>1 {$t('user.settings.hour')}</option>
-			<option value={8 * 60 * 60}>8 {$t('user.settings.hours')}</option>
-		</select>
-	</div>
+  <div>
+    <label for="locktime" class="font-bold mb-1"
+      >{$t("user.settings.autoLock")}</label
+    >
+    <p class="text-secondary mb-1">
+      {$t("user.settings.autoLockDescription")}
+    </p>
+    <select
+      name="locktime"
+      class="select-styles block py-3 w-full"
+      value={parseInt(user.locktime)}
+    >
+      <option value={5 * 60}>5 {$t("user.settings.minutes")}</option>
+      <option value={10 * 60}>10 {$t("user.settings.minutes")}</option>
+      <option value={30 * 60}>30 {$t("user.settings.minutes")}</option>
+      <option value={60 * 60}>1 {$t("user.settings.hour")}</option>
+      <option value={8 * 60 * 60}>8 {$t("user.settings.hours")}</option>
+    </select>
+  </div>
 {/if}
 
 <div>
-	<span class="font-bold mb-1">{$t('user.settings.twofa')}</span>
-	<p class="text-secondary mb-4">
-		{$t('user.settings.twofaDescription')}
-	</p>
-
-	{#if setting2fa}
-		<a href={otp.uri}>
-			<Qr src={otp.qr} />
-		</a>
-
-		<div class="text-center my-4">
-			{$t('user.settings.accountId')}<br />
-			<b>{otp.secret}</b>
-		</div>
-
-		<button type="button" class="primary" on:click={startConfirming2fa}>
-			<Icon icon="mobile" style="mr-1" />
-			Confirm
-		</button>
-	{:else if user.twofa}
-		<button type="button" class="primary" on:click={startDisabling2fa}>
-			<Icon icon="mobile" style="mr-1" />
-			{$t('user.settings.twofaDisable')}
-		</button>
-	{:else}
-		<button type="button" class="primary" on:click={startEnabling2fa}>
-			<Icon icon="mobile" style="mr-1" />
-			{$t('user.settings.twofaSetup')}
-		</button>
-	{/if}
-
-	{#if confirming2fa || disabling2fa}
-		<Pin bind:value={token} title="Enter 2FA Code" {cancel} persist={false} notify={false} />
-	{/if}
+  <span class="font-bold mb-1">{$t("user.settings.twofa")}</span>
+  <p class="text-secondary mb-4">
+    {$t("user.settings.twofaDescription")}
+  </p>
+
+  {#if setting2fa}
+    <a href={otp.uri}>
+      <Qr src={otp.qr} />
+    </a>
+
+    <div class="text-center my-4">
+      {$t("user.settings.accountId")}<br />
+      <b>{otp.secret}</b>
+    </div>
+
+    <button type="button" class="primary" on:click={startConfirming2fa}>
+      <Icon icon="mobile" style="mr-1" />
+      Confirm
+    </button>
+  {:else if user.twofa}
+    <button type="button" class="primary" on:click={startDisabling2fa}>
+      <Icon icon="mobile" style="mr-1" />
+      {$t("user.settings.twofaDisable")}
+    </button>
+  {:else}
+    <button type="button" class="primary" on:click={startEnabling2fa}>
+      <Icon icon="mobile" style="mr-1" />
+      {$t("user.settings.twofaSetup")}
+    </button>
+  {/if}
+
+  {#if confirming2fa || disabling2fa}
+    <Pin
+      bind:value={token}
+      title="Enter 2FA Code"
+      {cancel}
+      persist={false}
+      notify={false}
+    />
+  {/if}
 </div>
 
 <div>
-	<label for="seedphrase" class="font-bold">{$t('user.settings.seedPhrase')}</label>
-
-	<p class="text-secondary mb-1">
-		{$t('user.settings.seedDescription')}
-	</p>
-
-	<button type="button" class="primary" on:click={toggleSeed}>
-		<Icon icon="warning" style="mr-1 w-6 my-auto" />
-		{revealSeed ? $t('user.settings.hideSeed') : $t('user.settings.revealSeed')}
-	</button>
-
-	{#if revealSeed}
-		<div class="text-lg">
-			{mnemonic}
-		</div>
-
-		<button type="button" class="primary" on:click={() => copy(mnemonic)}>
-			<Icon icon="copy" style="mr-1 w-6 my-auto" />
-			Copy
-		</button>
-	{/if}
+  <label for="seedphrase" class="font-bold"
+    >{$t("user.settings.seedPhrase")}</label
+  >
+
+  <p class="text-secondary mb-1">
+    {$t("user.settings.seedDescription")}
+  </p>
+
+  <button type="button" class="primary" on:click={toggleSeed}>
+    <Icon icon="warning" style="mr-1 w-6 my-auto" />
+    {revealSeed ? $t("user.settings.hideSeed") : $t("user.settings.revealSeed")}
+  </button>
+
+  {#if revealSeed}
+    <div class="text-lg">
+      {mnemonic}
+    </div>
+
+    <button type="button" class="primary" on:click={() => copy(mnemonic)}>
+      <Icon icon="copy" style="mr-1 w-6 my-auto" />
+      Copy
+    </button>
+  {/if}
 </div>
 
 <div>
-	<label for="seedphrase" class="font-bold">{$t('user.settings.nostrKeys')}</label>
-
-	<p class="text-secondary mb-1">
-		{$t('user.settings.nostrDescription')}
-	</p>
-
-	<button type="button" class="primary" on:click={toggleNsec}>
-		<Icon icon="warning" style="mr-1 w-6 my-auto" />
-		{revealNsec ? $t('user.settings.hideNsec') : $t('user.settings.revealNsec')}
-	</button>
-
-	{#if revealNsec}
-		<div class="text-lg break-all">
-			{nsec}
-		</div>
-
-		<button type="button" class="primary" on:click={() => copy(nsec)}>
-			<Icon icon="copy" style="mr-1 w-6 my-auto" />
-			Copy
-		</button>
-	{/if}
+  <label for="seedphrase" class="font-bold"
+    >{$t("user.settings.nostrKeys")}</label
+  >
+
+  <p class="text-secondary mb-1">
+    {$t("user.settings.nostrDescription")}
+  </p>
+
+  <button type="button" class="primary" on:click={toggleNsec}>
+    <Icon icon="warning" style="mr-1 w-6 my-auto" />
+    {revealNsec ? $t("user.settings.hideNsec") : $t("user.settings.revealNsec")}
+  </button>
+
+  {#if revealNsec}
+    <div class="text-lg break-all">
+      {nsec}
+    </div>
+
+    <button type="button" class="primary" on:click={() => copy(nsec)}>
+      <Icon icon="copy" style="mr-1 w-6 my-auto" />
+      Copy
+    </button>
+  {/if}
 </div>
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
index aeecc4d7..3e2a8dae 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
@@ -1,69 +1,92 @@
 <script>
-	import { t } from '$lib/translations';
-	import { Icon } from '$comp';
-	import { page } from '$app/stores';
+  import { t } from "$lib/translations";
+  import { Icon } from "$comp";
+  import { page } from "$app/stores";
 
-	export let user;
-	$: paymentsUrl =
-		user.shopifyStore &&
-		'https://admin.shopify.com/store/' + user.shopifyStore + '/settings/payments';
-	$: checkoutUrl =
-		user.shopifyStore &&
-		'https://admin.shopify.com/store/' + user.shopifyStore + '/settings/checkout';
-	$: appsUrl =
-		user.shopifyStore &&
-		'https://admin.shopify.com/store/' + user.shopifyStore + '/settings/apps/development';
+  export let user;
+  $: paymentsUrl =
+    user.shopifyStore &&
+    "https://admin.shopify.com/store/" +
+      user.shopifyStore +
+      "/settings/payments";
+  $: checkoutUrl =
+    user.shopifyStore &&
+    "https://admin.shopify.com/store/" +
+      user.shopifyStore +
+      "/settings/checkout";
+  $: appsUrl =
+    user.shopifyStore &&
+    "https://admin.shopify.com/store/" +
+      user.shopifyStore +
+      "/settings/apps/development";
+
+  let script = `<script src="${$page.url.protocol}//${$page.url.host}/${user.username}/shopify.js"><\/script>`;
 </script>
 
 <div>
-	<label for="shopifyStore" class="font-bold mb-1 block">Store ID</label>
-	<div class="flex mb-2">
-		<div class="text-gray-600 p-4 my-auto bg-gray-100 border rounded-l-2xl border-r-0 pr-1">
-			admin.shopify.com/store/
-		</div>
-		<input
-			type="text"
-			name="shopifyStore"
-			bind:value={user.shopifyStore}
-			class="border-l-0 rounded-l-none w-auto min-w-0 pl-1 grow"
-		/>
-	</div>
-	<p class="text-secondary my-2">
-		Add Bitcoin under <a class:active={!!paymentsUrl} href={paymentsUrl || undefined}
-			>Payments > Manual payment methods</a
-		> with a description like "Pay with Bitcoin".
-	</p>
+  <label for="shopifyStore" class="font-bold mb-1 block">Store ID</label>
+  <div class="flex mb-2">
+    <div
+      class="text-gray-600 p-4 my-auto bg-gray-100 border rounded-l-2xl border-r-0 pr-1"
+    >
+      admin.shopify.com/store/
+    </div>
+    <input
+      type="text"
+      name="shopifyStore"
+      bind:value={user.shopifyStore}
+      class="border-l-0 rounded-l-none w-auto min-w-0 pl-1 grow"
+    />
+  </div>
+  <p class="text-secondary my-2">
+    Add Bitcoin under <a
+      class:active={!!paymentsUrl}
+      href={paymentsUrl || undefined}>Payments > Manual payment methods</a
+    > with a description like "Pay with Bitcoin".
+  </p>
 </div>
 
 <div>
-	<label for="display" class="font-bold mb-1 block">Additional scripts</label>
-	<p class="text-secondary my-2">
-		Copy this into <a class:active={!!paymentsUrl} href={checkoutUrl}
-			>Checkout -> Additional scripts</a
-		>
-	</p>
-  <textarea rows={5} type="text" name="shopifyScripts" readonly><script src="{`${$page.url.protocol}//${$page.url.host}/${user.username}/shopify.js`}"> </script></textarea>
+  <label for="display" class="font-bold mb-1 block">Additional scripts</label>
+  <p class="text-secondary my-2">
+    Copy this into <a class:active={!!paymentsUrl} href={checkoutUrl}
+      >Checkout -> Additional scripts</a
+    >
+  </p>
+  <textarea rows={5} type="text" name="shopifyScripts" readonly
+    >{script}</textarea
+  >
 </div>
 
 <div>
-  <label for="shopifyToken" class="font-bold mb-1 block">Admin API token <span class="font-normal">(Optional)</span></label>
-  <p class="text-secondary my-2">Coinos can automatically mark orders as Paid if you provide an API token.
-	<input class="my-4" type="text" name="shopifyToken" bind:value={user.shopifyToken} />
-
-	<p class="text-secondary my-2">
-		Create a new app in <a class:active={!!appsUrl} href={appsUrl || undefined}
-			>Apps > App Development</a
-		>
-	</p>
+  <label for="shopifyToken" class="font-bold mb-1 block"
+    >Admin API token <span class="font-normal">(Optional)</span></label
+  >
+  <p class="text-secondary my-2">
+    Coinos can automatically mark orders as Paid if you provide an API token.
+    <input
+      class="my-4"
+      type="text"
+      name="shopifyToken"
+      bind:value={user.shopifyToken}
+    />
+  </p>
+  <p class="text-secondary my-2">
+    Create a new app in <a class:active={!!appsUrl} href={appsUrl || undefined}
+      >Apps > App Development</a
+    >
+  </p>
 
-	<p class="text-secondary my-2">
-		Edit the Admin API scopes to enable <code class="text-black">write_orders</code> permission then install the
-		app into your store and copy the Admin API access token here.
-	</p>
+  <p class="text-secondary my-2">
+    Edit the Admin API scopes to enable <code class="text-black"
+      >write_orders</code
+    > permission then install the app into your store and copy the Admin API access
+    token here.
+  </p>
 </div>
 
 <style>
-	.active {
-		@apply text-blue-500;
-	}
+  .active {
+    @apply text-blue-500;
+  }
 </style>
diff --git a/src/routes/(app)/[username]/shopify.js/+server.js b/src/routes/(app)/[username]/shopify.js/+server.js
index 7b5c9d41..c93ac729 100644
--- a/src/routes/(app)/[username]/shopify.js/+server.js
+++ b/src/routes/(app)/[username]/shopify.js/+server.js
@@ -1,7 +1,7 @@
 export async function GET({ cookies, params, url }) {
-	let { username } = params;
+  let { username } = params;
 
-	let js = `
+  let js = `
 var qrcode=function(r,_){var t=r,e=QRErrorCorrectLevel[_],n=null,$=0,o=null,a=[],f={},i=function(r,_){n=function(r){for(var _=Array(r),t=0;t<r;t+=1){_[t]=Array(r);for(var e=0;e<r;e+=1)_[t][e]=null}return _}($=4*t+17),u(0,0),u($-7,0),u(0,$-7),l(),g(),v(r,_),t>=7&&h(r),null==o&&(o=x(t,e,a)),s(o,_)},u=function(r,_){for(var t=-1;t<=7;t+=1)if(!(r+t<=-1)&&!($<=r+t))for(var e=-1;e<=7;e+=1)_+e<=-1||$<=_+e||(0<=t&&t<=6&&(0==e||6==e)||0<=e&&e<=6&&(0==t||6==t)||2<=t&&t<=4&&2<=e&&e<=4?n[r+t][_+e]=!0:n[r+t][_+e]=!1)},c=function(){for(var r=0,_=0,t=0;t<8;t+=1){i(!0,t);var e=QRUtil.getLostPoint(f);(0==t||r>e)&&(r=e,_=t)}return _},g=function(){for(var r=8;r<$-8;r+=1)null==n[r][6]&&(n[r][6]=r%2==0);for(var _=8;_<$-8;_+=1)null==n[6][_]&&(n[6][_]=_%2==0)},l=function(){for(var r=QRUtil.getPatternPosition(t),_=0;_<r.length;_+=1)for(var e=0;e<r.length;e+=1){var $=r[_],o=r[e];if(null==n[$][o])for(var a=-2;a<=2;a+=1)for(var f=-2;f<=2;f+=1)-2==a||2==a||-2==f||2==f||0==a&&0==f?n[$+a][o+f]=!0:n[$+a][o+f]=!1}},h=function(r){for(var _=QRUtil.getBCHTypeNumber(t),e=0;e<18;e+=1){var o=!r&&(_>>e&1)==1;n[Math.floor(e/3)][e%3+$-8-3]=o}for(var e=0;e<18;e+=1){var o=!r&&(_>>e&1)==1;n[e%3+$-8-3][Math.floor(e/3)]=o}},v=function(r,_){for(var t=QRUtil.getBCHTypeInfo(e<<3|_),o=0;o<15;o+=1){var a=!r&&(t>>o&1)==1;o<6?n[o][8]=a:o<8?n[o+1][8]=a:n[$-15+o][8]=a}for(var o=0;o<15;o+=1){var a=!r&&(t>>o&1)==1;o<8?n[8][$-o-1]=a:o<9?n[8][15-o-1+1]=a:n[8][15-o-1]=a}n[$-8][8]=!r},s=function(r,_){for(var t=-1,e=$-1,o=7,a=0,f=QRUtil.getMaskFunction(_),i=$-1;i>0;i-=2)for(6==i&&(i-=1);;){for(var u=0;u<2;u+=1)if(null==n[e][i-u]){var c=!1;a<r.length&&(c=(r[a]>>>o&1)==1),f(e,i-u)&&(c=!c),n[e][i-u]=c,-1==(o-=1)&&(a+=1,o=7)}if((e+=t)<0||$<=e){e-=t,t=-t;break}}},d=function(r,_){for(var t=0,e=0,n=0,$=Array(_.length),o=Array(_.length),a=0;a<_.length;a+=1){var f=_[a].dataCount,i=_[a].totalCount-f;e=Math.max(e,f),n=Math.max(n,i),$[a]=Array(f);for(var u=0;u<$[a].length;u+=1)$[a][u]=255&r.getBuffer()[u+t];t+=f;var c=QRUtil.getErrorCorrectPolynomial(i),g=qrPolynomial($[a],c.getLength()-1).mod(c);o[a]=Array(c.getLength()-1);for(var u=0;u<o[a].length;u+=1){var l=u+g.getLength()-o[a].length;o[a][u]=l>=0?g.getAt(l):0}}for(var h=0,u=0;u<_.length;u+=1)h+=_[u].totalCount;for(var v=Array(h),s=0,u=0;u<e;u+=1)for(var a=0;a<_.length;a+=1)u<$[a].length&&(v[s]=$[a][u],s+=1);for(var u=0;u<n;u+=1)for(var a=0;a<_.length;a+=1)u<o[a].length&&(v[s]=o[a][u],s+=1);return v},x=function(r,_,t){for(var e=QRRSBlock.getRSBlocks(r,_),n=qrBitBuffer(),$=0;$<t.length;$+=1){var o=t[$];n.put(o.getMode(),4),n.put(o.getLength(),QRUtil.getLengthInBits(o.getMode(),r)),o.write(n)}for(var a=0,$=0;$<e.length;$+=1)a+=e[$].dataCount;if(n.getLengthInBits()>8*a)throw Error("code length overflow. ("+n.getLengthInBits()+">"+8*a+")");for(n.getLengthInBits()+4<=8*a&&n.put(0,4);n.getLengthInBits()%8!=0;)n.putBit(!1);for(;!(n.getLengthInBits()>=8*a)&&(n.put(236,8),!(n.getLengthInBits()>=8*a));){;n.put(17,8)}return d(n,e)};return f.addData=function(r){var _=qr8BitByte(r);a.push(_),o=null},f.isDark=function(r,_){if(r<0||$<=r||_<0||$<=_)throw Error(r+","+_);return n[r][_]},f.getModuleCount=function(){return $},f.make=function(){i(!1,c())},f.createTableTag=function(r,_){r=r||2;var t="";t+='<table style="',t+=" border-width: 0px; border-style: none;",t+=" border-collapse: collapse;",t+=" padding: 0px; margin: "+(_=void 0===_?4*r:_)+"px;",t+='">',t+="<tbody>";for(var e=0;e<f.getModuleCount();e+=1){t+="<tr>";for(var n=0;n<f.getModuleCount();n+=1)t+='<td style="',t+=" border-width: 0px; border-style: none;",t+=" border-collapse: collapse;",t+=" padding: 0px; margin: 0px;",t+=" width: "+r+"px;",t+=" height: "+r+"px;",t+=" background-color: ",t+=f.isDark(e,n)?"#000000":"#ffffff",t+=";",t+='"/>';t+="</tr>"}return t+="</tbody>",t+="</table>"},f.createImgTag=function(r,_,t){r=r||2;var e=_=void 0===_?4*r:_,n=f.getModuleCount()*r+_;return createImgTag(t,t,function(_,t){if(!(e<=_)||!(_<n)||!(e<=t)||!(t<n))return 1;var $=Math.floor((_-e)/r),o=Math.floor((t-e)/r);return f.isDark(o,$)?0:1})},f};qrcode.stringToBytes=function(r){for(var _=[],t=0;t<r.length;t+=1){var e=r.charCodeAt(t);_.push(255&e)}return _},qrcode.createStringToBytes=function(r,_){var t=function(){for(var t=base64DecodeInputStream(r),e=function(){var r=t.read();if(-1==r)throw Error();return r},n=0,$={};;){var o=t.read();if(-1==o)break;var a=e(),f=e(),i=e(),u=String.fromCharCode(o<<8|a),c=f<<8|i;$[u]=c,n+=1}if(n!=_)throw Error(n+" != "+_);return $}();return function(r){for(var _=[],e=0;e<r.length;e+=1){var n=r.charCodeAt(e);if(n<128)_.push(n);else{var $=t[r.charAt(e)];"number"==typeof $?(255&$)==$?_.push($):(_.push($>>>8),_.push(255&$)):_.push(63)}}return _}};var QRMode={MODE_NUMBER:1,MODE_ALPHA_NUM:2,MODE_8BIT_BYTE:4,MODE_KANJI:8},QRErrorCorrectLevel={L:1,M:0,Q:3,H:2},QRMaskPattern={PATTERN000:0,PATTERN001:1,PATTERN010:2,PATTERN011:3,PATTERN100:4,PATTERN101:5,PATTERN110:6,PATTERN111:7},QRUtil=function(){var r=[[],[6,18],[6,22],[6,26],[6,30],[6,34],[6,22,38],[6,24,42],[6,26,46],[6,28,50],[6,30,54],[6,32,58],[6,34,62],[6,26,46,66],[6,26,48,70],[6,26,50,74],[6,30,54,78],[6,30,56,82],[6,30,58,86],[6,34,62,90],[6,28,50,72,94],[6,26,50,74,98],[6,30,54,78,102],[6,28,54,80,106],[6,32,58,84,110],[6,30,58,86,114],[6,34,62,90,118],[6,26,50,74,98,122],[6,30,54,78,102,126],[6,26,52,78,104,130],[6,30,56,82,108,134],[6,34,60,86,112,138],[6,30,58,86,114,142],[6,34,62,90,118,146],[6,30,54,78,102,126,150],[6,24,50,76,102,128,154],[6,28,54,80,106,132,158],[6,32,58,84,110,136,162],[6,26,54,82,110,138,166],[6,30,58,86,114,142,170]],_={},t=function(r){for(var _=0;0!=r;)_+=1,r>>>=1;return _};return _.getBCHTypeInfo=function(r){for(var _=r<<10;t(_)-t(1335)>=0;)_^=1335<<t(_)-t(1335);return(r<<10|_)^21522},_.getBCHTypeNumber=function(r){for(var _=r<<12;t(_)-t(7973)>=0;)_^=7973<<t(_)-t(7973);return r<<12|_},_.getPatternPosition=function(_){return r[_-1]},_.getMaskFunction=function(r){switch(r){case QRMaskPattern.PATTERN000:return function(r,_){return(r+_)%2==0};case QRMaskPattern.PATTERN001:return function(r,_){return r%2==0};case QRMaskPattern.PATTERN010:return function(r,_){return _%3==0};case QRMaskPattern.PATTERN011:return function(r,_){return(r+_)%3==0};case QRMaskPattern.PATTERN100:return function(r,_){return(Math.floor(r/2)+Math.floor(_/3))%2==0};case QRMaskPattern.PATTERN101:return function(r,_){return r*_%2+r*_%3==0};case QRMaskPattern.PATTERN110:return function(r,_){return(r*_%2+r*_%3)%2==0};case QRMaskPattern.PATTERN111:return function(r,_){return(r*_%3+(r+_)%2)%2==0};default:throw Error("bad maskPattern:"+r)}},_.getErrorCorrectPolynomial=function(r){for(var _=qrPolynomial([1],0),t=0;t<r;t+=1)_=_.multiply(qrPolynomial([1,QRMath.gexp(t)],0));return _},_.getLengthInBits=function(r,_){if(1<=_&&_<10)switch(r){case QRMode.MODE_NUMBER:return 10;case QRMode.MODE_ALPHA_NUM:return 9;case QRMode.MODE_8BIT_BYTE:case QRMode.MODE_KANJI:return 8;default:throw Error("mode:"+r)}else if(_<27)switch(r){case QRMode.MODE_NUMBER:return 12;case QRMode.MODE_ALPHA_NUM:return 11;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 10;default:throw Error("mode:"+r)}else if(_<41)switch(r){case QRMode.MODE_NUMBER:return 14;case QRMode.MODE_ALPHA_NUM:return 13;case QRMode.MODE_8BIT_BYTE:return 16;case QRMode.MODE_KANJI:return 12;default:throw Error("mode:"+r)}else throw Error("type:"+_)},_.getLostPoint=function(r){for(var _=r.getModuleCount(),t=0,e=0;e<_;e+=1)for(var n=0;n<_;n+=1){for(var $=0,o=r.isDark(e,n),a=-1;a<=1;a+=1)if(!(e+a<0)&&!(_<=e+a))for(var f=-1;f<=1;f+=1)!(n+f<0)&&!(_<=n+f)&&(0!=a||0!=f)&&o==r.isDark(e+a,n+f)&&($+=1);$>5&&(t+=3+$-5)}for(var e=0;e<_-1;e+=1)for(var n=0;n<_-1;n+=1){var i=0;r.isDark(e,n)&&(i+=1),r.isDark(e+1,n)&&(i+=1),r.isDark(e,n+1)&&(i+=1),r.isDark(e+1,n+1)&&(i+=1),(0==i||4==i)&&(t+=3)}for(var e=0;e<_;e+=1)for(var n=0;n<_-6;n+=1)r.isDark(e,n)&&!r.isDark(e,n+1)&&r.isDark(e,n+2)&&r.isDark(e,n+3)&&r.isDark(e,n+4)&&!r.isDark(e,n+5)&&r.isDark(e,n+6)&&(t+=40);for(var n=0;n<_;n+=1)for(var e=0;e<_-6;e+=1)r.isDark(e,n)&&!r.isDark(e+1,n)&&r.isDark(e+2,n)&&r.isDark(e+3,n)&&r.isDark(e+4,n)&&!r.isDark(e+5,n)&&r.isDark(e+6,n)&&(t+=40);for(var u=0,n=0;n<_;n+=1)for(var e=0;e<_;e+=1)r.isDark(e,n)&&(u+=1);return t+10*(Math.abs(100*u/_/_-50)/5)},_}(),QRMath=function(){for(var r=Array(256),_=Array(256),t=0;t<8;t+=1)r[t]=1<<t;for(var t=8;t<256;t+=1)r[t]=r[t-4]^r[t-5]^r[t-6]^r[t-8];for(var t=0;t<255;t+=1)_[r[t]]=t;var e={};return e.glog=function(r){if(r<1)throw Error("glog("+r+")");return _[r]},e.gexp=function(_){for(;_<0;)_+=255;for(;_>=256;)_-=255;return r[_]},e}();function qrPolynomial(r,_){if(void 0===r.length)throw Error(r.length+"/"+_);var t=function(){for(var t=0;t<r.length&&0==r[t];)t+=1;for(var e=Array(r.length-t+_),n=0;n<r.length-t;n+=1)e[n]=r[n+t];return e}(),e={};return e.getAt=function(r){return t[r]},e.getLength=function(){return t.length},e.multiply=function(r){for(var _=Array(e.getLength()+r.getLength()-1),t=0;t<e.getLength();t+=1)for(var n=0;n<r.getLength();n+=1)_[t+n]^=QRMath.gexp(QRMath.glog(e.getAt(t))+QRMath.glog(r.getAt(n)));return qrPolynomial(_,0)},e.mod=function(r){if(e.getLength()-r.getLength()<0)return e;for(var _=QRMath.glog(e.getAt(0))-QRMath.glog(r.getAt(0)),t=Array(e.getLength()),n=0;n<e.getLength();n+=1)t[n]=e.getAt(n);for(var n=0;n<r.getLength();n+=1)t[n]^=QRMath.gexp(QRMath.glog(r.getAt(n))+_);return qrPolynomial(t,0).mod(r)},e}var QRRSBlock=function(){var r=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]],_=function(r,_){var t={};return t.totalCount=r,t.dataCount=_,t},t={},e=function(_,t){switch(t){case QRErrorCorrectLevel.L:return r[(_-1)*4+0];case QRErrorCorrectLevel.M:return r[(_-1)*4+1];case QRErrorCorrectLevel.Q:return r[(_-1)*4+2];case QRErrorCorrectLevel.H:return r[(_-1)*4+3];default:return}};return t.getRSBlocks=function(r,t){var n=e(r,t);if(void 0===n)throw Error("bad rs block @ typeNumber:"+r+"/errorCorrectLevel:"+t);for(var $=n.length/3,o=[],a=0;a<$;a+=1)for(var f=n[3*a+0],i=n[3*a+1],u=n[3*a+2],c=0;c<f;c+=1)o.push(_(i,u));return o},t}(),qrBitBuffer=function(){var r=[],_=0,t={};return t.getBuffer=function(){return r},t.getAt=function(_){return(r[Math.floor(_/8)]>>>7-_%8&1)==1},t.put=function(r,_){for(var e=0;e<_;e+=1)t.putBit((r>>>_-e-1&1)==1)},t.getLengthInBits=function(){return _},t.putBit=function(t){var e=Math.floor(_/8);r.length<=e&&r.push(0),t&&(r[e]|=128>>>_%8),_+=1},t},qr8BitByte=function(r){for(var _=QRMode.MODE_8BIT_BYTE,t=r,e=[],n={},$=0,o=t.length;$<o;$++){var a=[],f=t.charCodeAt($);f>65536?(a[0]=240|(1835008&f)>>>18,a[1]=128|(258048&f)>>>12,a[2]=128|(4032&f)>>>6,a[3]=128|63&f):f>2048?(a[0]=224|(61440&f)>>>12,a[1]=128|(4032&f)>>>6,a[2]=128|63&f):f>128?(a[0]=192|(1984&f)>>>6,a[1]=128|63&f):a[0]=f,e.push(a)}(e=Array.prototype.concat.apply([],e)).length!=t.length&&(e.unshift(191),e.unshift(187),e.unshift(239));var i=e;return n.getMode=function(){return _},n.getLength=function(r){return i.length},n.write=function(r){for(var _=0;_<i.length;_+=1)r.put(i[_],8)},n},byteArrayOutputStream=function(){var r=[],_={};return _.writeByte=function(_){r.push(255&_)},_.writeShort=function(r){_.writeByte(r),_.writeByte(r>>>8)},_.writeBytes=function(r,t,e){t=t||0,e=e||r.length;for(var n=0;n<e;n+=1)_.writeByte(r[n+t])},_.writeString=function(r){for(var t=0;t<r.length;t+=1)_.writeByte(r.charCodeAt(t))},_.toByteArray=function(){return r},_.toString=function(){var _="";_+="[";for(var t=0;t<r.length;t+=1)t>0&&(_+=","),_+=r[t];return _+"]"},_},base64EncodeOutputStream=function(){var r=0,_=0,t=0,e="",n={},$=function(r){e+=String.fromCharCode(o(63&r))},o=function(r){if(r<0);else if(r<26)return 65+r;else if(r<52)return 97+(r-26);else if(r<62)return 48+(r-52);else if(62==r)return 43;else if(63==r)return 47;throw Error("n:"+r)};return n.writeByte=function(e){for(r=r<<8|255&e,_+=8,t+=1;_>=6;)$(r>>>_-6),_-=6},n.flush=function(){if(_>0&&($(r<<6-_),r=0,_=0),t%3!=0)for(var n=3-t%3,o=0;o<n;o+=1)e+="="},n.toString=function(){return e},n},base64DecodeInputStream=function(r){var _=r,t=0,e=0,n=0,$={};$.read=function(){for(;n<8;){if(t>=_.length){if(0==n)return -1;throw Error("unexpected end of file./"+n)}var r=_.charAt(t);if(t+=1,"="==r)return n=0,-1;!r.match(/^\s$/)&&(e=e<<6|o(r.charCodeAt(0)),n+=6)}var $=e>>>n-8&255;return n-=8,$};var o=function(r){if(65<=r&&r<=90)return r-65;if(97<=r&&r<=122)return r-97+26;if(48<=r&&r<=57)return r-48+52;if(43==r)return 62;if(47==r)return 63;else throw Error("c:"+r)};return $},gifImage=function(r,_){var t=r,e=_,n=Array(r*_),$={};$.setPixel=function(r,_,e){n[_*t+r]=e},$.write=function(r){r.writeString("GIF87a"),r.writeShort(t),r.writeShort(e),r.writeByte(128),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(0),r.writeByte(255),r.writeByte(255),r.writeByte(255),r.writeString(","),r.writeShort(0),r.writeShort(0),r.writeShort(t),r.writeShort(e),r.writeByte(0);var _=a(2);r.writeByte(2);for(var n=0;_.length-n>255;)r.writeByte(255),r.writeBytes(_,n,255),n+=255;r.writeByte(_.length-n),r.writeBytes(_,n,_.length-n),r.writeByte(0),r.writeString(";")};var o=function(r){var _=r,t=0,e=0,n={};return n.write=function(r,n){if(r>>>n!=0)throw Error("length over");for(;t+n>=8;)_.writeByte(255&(r<<t|e)),n-=8-t,r>>>=8-t,e=0,t=0;e=r<<t|e,t+=n},n.flush=function(){t>0&&_.writeByte(e)},n},a=function(r){for(var _=1<<r,t=(1<<r)+1,e=r+1,$=f(),a=0;a<_;a+=1)$.add(String.fromCharCode(a));$.add(String.fromCharCode(_)),$.add(String.fromCharCode(t));var i=byteArrayOutputStream(),u=o(i);u.write(_,e);var c=0,g=String.fromCharCode(n[c]);for(c+=1;c<n.length;){var l=String.fromCharCode(n[c]);c+=1,$.contains(g+l)?g+=l:(u.write($.indexOf(g),e),4095>$.size()&&($.size()==1<<e&&(e+=1),$.add(g+l)),g=l)}return u.write($.indexOf(g),e),u.write(t,e),u.flush(),i.toByteArray()},f=function(){var r={},_=0,t={};return t.add=function(e){if(t.contains(e))throw Error("dup key:"+e);r[e]=_,_+=1},t.size=function(){return _},t.indexOf=function(_){return r[_]},t.contains=function(_){return void 0!==r[_]},t};return $},createImgTag=function(r,_,t,e){for(var n=gifImage(r,_),$=0;$<_;$+=1)for(var o=0;o<r;o+=1)n.setPixel(o,$,t(o,$));var a=byteArrayOutputStream();n.write(a);for(var f=base64EncodeOutputStream(),i=a.toByteArray(),u=0;u<i.length;u+=1)f.writeByte(i[u]);f.flush();var c="";return c+="data:image/gif;base64,",c+=f},drawImg=function(r,_){var t,e=(_=_||{}).typeNumber||4,n=_.errorCorrectLevel||"M",$=_.size||500;try{(t=qrcode(e,n||"M")).addData(r),t.make()}catch(o){if(!(e>=40))return drawImg(r,{size:$,errorCorrectLevel:n,typeNumber:e+1});throw Error("Text too long to encode")}var a=parseInt($/t.getModuleCount()),f=parseInt(($-t.getModuleCount()*a)/2);return t.createImgTag(a,f,$)};
 
 
@@ -183,9 +183,9 @@ window.addEventListener('load', async () => {
 });
   `;
 
-	return new Response(js, {
-		headers: {
-			'Content-Type': 'application/javascript'
-		}
-	});
+  return new Response(js, {
+    headers: {
+      "Content-Type": "application/javascript",
+    },
+  });
 }
diff --git a/src/routes/(app)/admin/+layout.server.js b/src/routes/(app)/admin/+layout.server.js
index 26449467..e49c6e40 100644
--- a/src/routes/(app)/admin/+layout.server.js
+++ b/src/routes/(app)/admin/+layout.server.js
@@ -1,11 +1,11 @@
-import { auth, get } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
+import { auth, get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export async function load({ cookies, parent }) {
-	let token = cookies.get('token');
-	if (!token) throw redirect(307, '/login');
-	let user = await get('/me', auth(cookies));
-	if (!user) throw redirect(307, '/login');
+  let token = cookies.get("token");
+  if (!token) throw redirect(307, "/login");
+  let user = await get("/me", auth(cookies));
+  if (!user) throw redirect(307, "/login");
 
-	return { user };
+  return { user };
 }
diff --git a/src/routes/(app)/admin/+layout.svelte b/src/routes/(app)/admin/+layout.svelte
index d7561e32..33b64b6a 100644
--- a/src/routes/(app)/admin/+layout.svelte
+++ b/src/routes/(app)/admin/+layout.svelte
@@ -1,10 +1,10 @@
 <script>
-	import { LandingHeader } from '$comp';
-	export let data;
-	let { user } = data;
+  import { LandingHeader } from "$comp";
+  export let data;
+  let { user } = data;
 </script>
 
 <LandingHeader {user} />
 <main class="container px-10 md:px-40 mx-auto min-h-[600px] pb-20">
-	<slot />
+  <slot />
 </main>
diff --git a/src/routes/(app)/admin/+page.server.js b/src/routes/(app)/admin/+page.server.js
index e19f894c..93931aa3 100644
--- a/src/routes/(app)/admin/+page.server.js
+++ b/src/routes/(app)/admin/+page.server.js
@@ -1,10 +1,12 @@
-import { auth, get } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
+import { auth, get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export async function load({ cookies, parent }) {
-	let { user } = await parent();
-	if (!user) throw redirect(307, '/login');
+  let { user } = await parent();
+  if (!user) throw redirect(307, "/login");
 
-	let users = (await get('/users', auth(cookies))).sort((a, b) => b.balance - a.balance);
-	return { users };
+  let users = (await get("/users", auth(cookies))).sort(
+    (a, b) => b.balance - a.balance
+  );
+  return { users };
 }
diff --git a/src/routes/(app)/admin/+page.svelte b/src/routes/(app)/admin/+page.svelte
index 529d2f77..c61a2e45 100644
--- a/src/routes/(app)/admin/+page.svelte
+++ b/src/routes/(app)/admin/+page.svelte
@@ -1,22 +1,22 @@
 <script>
-	import { post } from '$lib/utils';
-	export let data;
-	let reset = (username) => post(`/${username}/reset`, { password });
-	let { users } = data;
-	let password;
+  import { post } from "$lib/utils";
+  export let data;
+  let reset = (username) => post(`/${username}/reset`, { password });
+  let { users } = data;
+  let password;
 </script>
 
 {#each users as { balance, username, expected }}
-	<div class="grid grid-cols-5">
-		<div>{username}</div>
-		<div>{balance}</div>
-		<div>{expected}</div>
-		<div><input bind:value={password} /></div>
-		<div>
-			<button
-				class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
-				on:click={() => reset(username)}>Reset</button
-			>
-		</div>
-	</div>
+  <div class="grid grid-cols-5">
+    <div>{username}</div>
+    <div>{balance}</div>
+    <div>{expected}</div>
+    <div><input bind:value={password} /></div>
+    <div>
+      <button
+        class="text-sm md:text-lg rounded-full border py-2 px-4 hover:opacity-80 min-w-[72px] bg-black text-white"
+        on:click={() => reset(username)}>Reset</button
+      >
+    </div>
+  </div>
 {/each}
diff --git a/src/routes/(app)/buy/+page.server.js b/src/routes/(app)/buy/+page.server.js
index fc7ae473..3d3265cb 100644
--- a/src/routes/(app)/buy/+page.server.js
+++ b/src/routes/(app)/buy/+page.server.js
@@ -1,27 +1,28 @@
-import { env } from '$env/dynamic/private';
-import { error, fail, redirect } from '@sveltejs/kit';
-import { post, auth } from '$lib/utils';
-import { createTicket } from '$lib/ticket';
+import { env } from "$env/dynamic/private";
+import { error, fail, redirect } from "@sveltejs/kit";
+import { post, auth } from "$lib/utils";
+import { createTicket } from "$lib/ticket";
 
 export const actions = {
-	default: async ({ cookies, request }) => {
-		let form = await request.formData();
+  default: async ({ cookies, request }) => {
+    let form = await request.formData();
 
-		let amount = parseFloat(form.get('amount'));
-		if (!amount || amount < 0 || amount > 500) return fail(400, { message: 'Invalid amount' });
+    let amount = parseFloat(form.get("amount"));
+    if (!amount || amount < 0 || amount > 500)
+      return fail(400, { message: "Invalid amount" });
 
-		await post(
-			'/buy',
-			{
-				amount: form.get('amount'),
-				number: form.get('number').replace(/\s+/g, ''),
-				month: form.get('expiry').slice(0, 2),
-				year: form.get('expiry').slice(-2),
-				cvc: form.get('cvc')
-			},
-			auth(cookies)
-		);
+    await post(
+      "/buy",
+      {
+        amount: form.get("amount"),
+        number: form.get("number").replace(/\s+/g, ""),
+        month: form.get("expiry").slice(0, 2),
+        year: form.get("expiry").slice(-2),
+        cvc: form.get("cvc"),
+      },
+      auth(cookies)
+    );
 
-		throw redirect(307, `/${form.get('username')}/payments`);
-	}
+    throw redirect(307, `/${form.get("username")}/payments`);
+  },
 };
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index 22e7e9ec..2f999555 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -1,131 +1,135 @@
 <script>
-	import { enhance } from '$app/forms';
-	import { Icon, Lock, Card, Calendar, Spinner } from '$comp';
-	import { animatedRate } from '$lib/store';
-	import { f } from '$lib/utils';
+  import { enhance } from "$app/forms";
+  import { Icon, Lock, Card, Calendar, Spinner } from "$comp";
+  import { animatedRate } from "$lib/store";
+  import { f } from "$lib/utils";
 
-	export let data, form;
+  export let data, form;
 
-	let { username, currency } = data.user;
-	let loading;
+  let { username, currency } = data.user;
+  let loading;
 
-	let amount, n, d, cvc;
+  let amount, n, d, cvc;
 </script>
 
 <div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
-	<div class="w-full flex">
-		<a href="/" class="mx-auto">
-			<Icon icon="logo" />
-		</a>
-	</div>
+  <div class="w-full flex">
+    <a href="/" class="mx-auto">
+      <Icon icon="logo" />
+    </a>
+  </div>
 
-	<div class="flex justify-center items-center">
-		<div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
-			<div class="relative">
-				<h1 class="text-2xl md:text-3xl font-semibold text-center">Buy Bitcoin</h1>
-			</div>
-			<p class="text-secondary text-center">Purchase up to $500 worth of Bitcoin</p>
+  <div class="flex justify-center items-center">
+    <div class="shadow-xl rounded-3xl px-10 pt-5 pb-10 space-y-5 w-full mx-5">
+      <div class="relative">
+        <h1 class="text-2xl md:text-3xl font-semibold text-center">
+          Buy Bitcoin
+        </h1>
+      </div>
+      <p class="text-secondary text-center">
+        Purchase up to $500 worth of Bitcoin
+      </p>
 
-			{#if form?.message}
-				<div class="text-red-600 text-center">
-					{form.message}
-				</div>
-			{/if}
+      {#if form?.message}
+        <div class="text-red-600 text-center">
+          {form.message}
+        </div>
+      {/if}
 
-			<form
-				method="POST"
-				class="flex flex-wrap gap-5 w-full p-5 mt-20"
-				use:enhance={() => {
-					loading = true;
-					return ({ update }) => update() && (loading = false);
-				}}
-			>
-				<input type="hidden" name="username" value={username} />
+      <form
+        method="POST"
+        class="flex flex-wrap gap-5 w-full p-5 mt-20"
+        use:enhance={() => {
+          loading = true;
+          return ({ update }) => update() && (loading = false);
+        }}
+      >
+        <input type="hidden" name="username" value={username} />
 
-				<label class="relative w-full flex flex-col">
-					<span class="font-bold mb-3">Amount</span>
-					<input
-						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
-						type="text"
-						name="amount"
-						placeholder="&bull;&bull;&bull;"
-						bind:value={amount}
-					/>
-					<span
-						class="absolute bottom-[9px] left-0 translate-x-1/2 w-6 text-black peer-placeholder-shown:text-gray-300 
+        <label class="relative w-full flex flex-col">
+          <span class="font-bold mb-3">Amount</span>
+          <input
+            class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+            type="text"
+            name="amount"
+            placeholder="&bull;&bull;&bull;"
+            bind:value={amount}
+          />
+          <span
+            class="absolute bottom-[9px] left-0 translate-x-1/2 w-6 text-black peer-placeholder-shown:text-gray-300
           ">$</span
-					>
-				</label>
+          >
+        </label>
 
-				<label class="relative w-full flex flex-col">
-					<span class="font-bold mb-3">Card number</span>
-					<input
-						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
-						type="text"
-						name="number"
-						placeholder="0000 0000 0000 0000"
-						bind:value={n}
-					/>
-					<Card />
-				</label>
+        <label class="relative w-full flex flex-col">
+          <span class="font-bold mb-3">Card number</span>
+          <input
+            class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+            type="text"
+            name="number"
+            placeholder="0000 0000 0000 0000"
+            bind:value={n}
+          />
+          <Card />
+        </label>
 
-				<label class="relative flex-1 flex flex-col">
-					<span class="font-bold mb-3">Expire date</span>
-					<input
-						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
-						type="text"
-						name="expiry"
-						placeholder="MM/YY"
-						bind:value={d}
-					/>
-					<Calendar />
-				</label>
+        <label class="relative flex-1 flex flex-col">
+          <span class="font-bold mb-3">Expire date</span>
+          <input
+            class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+            type="text"
+            name="expiry"
+            placeholder="MM/YY"
+            bind:value={d}
+          />
+          <Calendar />
+        </label>
 
-				<label class="relative flex-1 flex flex-col">
-					<span class="font-bold flex items-center gap-3 mb-3">
-						CVC/CVV
-						<span class="relative group">
-							<span
-								class="hidden group-hover:flex justify-center items-center px-2 py-1 text-xs absolute -right-2 transform translate-x-full -translate-y-1/2 w-max top-1/2 bg-black text-white"
-							>
-								3-digit number on the back of your card</span
-							>
-						</span>
-					</span>
-					<input
-						class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
-						type="text"
-						name="cvc"
-						placeholder="&bull;&bull;&bull;"
-						bind:value={cvc}
-					/>
-					<Lock />
-				</label>
+        <label class="relative flex-1 flex flex-col">
+          <span class="font-bold flex items-center gap-3 mb-3">
+            CVC/CVV
+            <span class="relative group">
+              <span
+                class="hidden group-hover:flex justify-center items-center px-2 py-1 text-xs absolute -right-2 transform translate-x-full -translate-y-1/2 w-max top-1/2 bg-black text-white"
+              >
+                3-digit number on the back of your card</span
+              >
+            </span>
+          </span>
+          <input
+            class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+            type="text"
+            name="cvc"
+            placeholder="&bull;&bull;&bull;"
+            bind:value={cvc}
+          />
+          <Lock />
+        </label>
 
-				<div class="w-full flex mt-8">
-					<button
-						class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-xl"
-						type="submit"
-						disabled={loading}
-					>
-						{#if loading}
-							<Spinner />
-						{:else}
-							Submit
-						{/if}
-					</button>
-				</div>
-			</form>
+        <div class="w-full flex mt-8">
+          <button
+            class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-xl"
+            type="submit"
+            disabled={loading}
+          >
+            {#if loading}
+              <Spinner />
+            {:else}
+              Submit
+            {/if}
+          </button>
+        </div>
+      </form>
 
-			<div class="flex">
-				<div class="text-secondary flex mr-auto">
-					<div class="flex mr-1">
-						<div class="my-auto mr-1">1</div>
-						<img src="/images/bitcoin.svg" class="w-5 my-auto" alt="Bitcoin" />
-					</div>
-				</div>
-				<p class="text-secondary">3% credit card fee applies</p>
-			</div>
-		</div>
-	</div>
+      <div class="flex">
+        <div class="text-secondary flex mr-auto">
+          <div class="flex mr-1">
+            <div class="my-auto mr-1">1</div>
+            <img src="/images/bitcoin.svg" class="w-5 my-auto" alt="Bitcoin" />
+          </div>
+        </div>
+        <p class="text-secondary">3% credit card fee applies</p>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/src/routes/(app)/disable2fa/+server.js b/src/routes/(app)/disable2fa/+server.js
index b2bb07ec..1e264398 100644
--- a/src/routes/(app)/disable2fa/+server.js
+++ b/src/routes/(app)/disable2fa/+server.js
@@ -1,13 +1,13 @@
-import { error, json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { error, json } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
 
 export async function POST({ cookies, request }) {
-	try {
-		let body = await request.json();
-		let res = await post('/disable2fa', body, auth(cookies));
+  try {
+    let body = await request.json();
+    let res = await post("/disable2fa", body, auth(cookies));
 
-		return json(res);
-	} catch (e) {
-		throw error(500, 'Problem disabling 2fa');
-	}
+    return json(res);
+  } catch (e) {
+    throw error(500, "Problem disabling 2fa");
+  }
 }
diff --git a/src/routes/(app)/enable2fa/+server.js b/src/routes/(app)/enable2fa/+server.js
index 344850da..6917ae21 100644
--- a/src/routes/(app)/enable2fa/+server.js
+++ b/src/routes/(app)/enable2fa/+server.js
@@ -1,8 +1,8 @@
-import { auth, post } from '$lib/utils';
+import { auth, post } from "$lib/utils";
 
 export async function POST({ cookies, request }) {
-	let body = await request.json();
-	let res = await post('/2fa', body, auth(cookies));
+  let body = await request.json();
+  let res = await post("/2fa", body, auth(cookies));
 
-	return new Response(JSON.stringify(res));
+  return new Response(JSON.stringify(res));
 }
diff --git a/src/routes/(app)/events/+server.js b/src/routes/(app)/events/+server.js
index decd43cb..95df0bc5 100644
--- a/src/routes/(app)/events/+server.js
+++ b/src/routes/(app)/events/+server.js
@@ -1,6 +1,6 @@
-import { auth, post } from '$lib/utils';
-import { json } from '@sveltejs/kit';
+import { auth, post } from "$lib/utils";
+import { json } from "@sveltejs/kit";
 
 export async function POST({ cookies, request }) {
-	return json(post('/event', await request.json(), auth(cookies)));
+  return json(post("/event", await request.json(), auth(cookies)));
 }
diff --git a/src/routes/(app)/fund/[id]/+page.server.js b/src/routes/(app)/fund/[id]/+page.server.js
index 4194deed..6c5c943f 100644
--- a/src/routes/(app)/fund/[id]/+page.server.js
+++ b/src/routes/(app)/fund/[id]/+page.server.js
@@ -1,23 +1,23 @@
-import { error, redirect } from '@sveltejs/kit';
-import { auth, get, post } from '$lib/utils';
-import Qr from 'qrcode-base64';
+import { error, redirect } from "@sveltejs/kit";
+import { auth, get, post } from "$lib/utils";
+import Qr from "qrcode-base64";
 
 export let load = async ({ params: { id }, url }) => {
-	let { amount, payments } = await get(`/fund/${id}`);
+  let { amount, payments } = await get(`/fund/${id}`);
 
-	let src = Qr.drawImg(url.href, { size: 300 });
-	return { amount, payments, src };
+  let src = Qr.drawImg(url.href, { size: 300 });
+  return { amount, payments, src };
 };
 
 export const actions = {
-	default: async ({ cookies, locals, params, request }) => {
-		let { user } = locals;
+  default: async ({ cookies, locals, params, request }) => {
+    let { user } = locals;
 
-		if (user) {
-			await post('/redeem', params, auth(cookies));
-			throw redirect(307, `/${user.username}/payments`);
-		}
+    if (user) {
+      await post("/redeem", params, auth(cookies));
+      throw redirect(307, `/${user.username}/payments`);
+    }
 
-		throw redirect(307, '/register');
-	}
+    throw redirect(307, "/register");
+  },
 };
diff --git a/src/routes/(app)/fund/[id]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte
index d2d3079c..117a4b42 100644
--- a/src/routes/(app)/fund/[id]/+page.svelte
+++ b/src/routes/(app)/fund/[id]/+page.svelte
@@ -1,138 +1,146 @@
 <script>
-	import { format } from 'date-fns';
-	import { enhance } from '$app/forms';
-	import { page } from '$app/stores';
-	import { Avatar, Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { t } from '$lib/translations';
-	import { types, copy, f, s, sat, sats } from '$lib/utils';
-	import { loginRedirect } from '$lib/store';
+  import { format } from "date-fns";
+  import { enhance } from "$app/forms";
+  import { page } from "$app/stores";
+  import { Avatar, Icon } from "$comp";
+  import { toast } from "@zerodevx/svelte-toast";
+  import { t } from "$lib/translations";
+  import { types, copy, f, s, sat, sats } from "$lib/utils";
+  import { loginRedirect } from "$lib/store";
 
-	export let data;
+  export let data;
 
-	let { amount, src, payments, rates, user } = data;
-	let { id } = $page.params;
+  let { amount, src, payments, rates, user } = data;
+  let { id } = $page.params;
 
-	toast.pop(0);
+  toast.pop(0);
 
-	let currency = user ? user.currency : 'CAD';
-	let rate = rates[currency];
+  let currency = user ? user.currency : "CAD";
+  let rate = rates[currency];
 
-	$: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
-	$loginRedirect = $page.url.pathname;
+  $: amountFiat = parseFloat(((amount * rate) / sats).toFixed(2));
+  $loginRedirect = $page.url.pathname;
 
-	let show;
-	let toggle = () => (show = !show);
+  let show;
+  let toggle = () => (show = !show);
 </script>
 
 <div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
-	<div class="flex justify-center items-center">
-		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
-			<div class="relative flex justify-center gap-2">
-				<!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
-				{#if id.split('-').length === 4}
-					<h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {id}</h1>
-				{:else}
-					<img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
-					<div class="my-auto">
-						<h1 class="text-2xl font-semibold my-auto">{$t('payments.fund')}</h1>
-						<h1 class="text-secondary my-auto">{id}</h1>
-					</div>
-				{/if}
-			</div>
-			{#if show}
-				<img {src} class="mx-auto" alt={id} />
-			{/if}
-			<div class="flex justify-center gap-4">
-				<div class="my-auto">
-					<h2 class="text-2xl md:text-3xl font-semibold">
-						{f(amountFiat, currency)}
-					</h2>
-					<h3 class="text-secondary md:text-lg mt-1">
-						{sat(amount)}
-					</h3>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<div class="grow">
-					<a href={`/send/fund/${id}`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="plus" />
-							{$t('payments.addFunds')}
-						</button>
-					</a>
-				</div>
-				<div class="grow">
-					<a href={`/fund/${id}/withdraw`}>
-						<button
-							class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-						>
-							<Icon icon="minus" style="rotate-180" />
-							{$t('payments.takeFunds')}
-						</button>
-					</a>
-				</div>
-			</div>
-			<div class="flex gap-2" data-sveltekit-prefetch="off">
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={toggle}
-				>
-					<Icon icon="qr" style="invert" />
-					{show ? $t('payments.hide') : $t('payments.show')} QR
-				</button>
-				<button
-					class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
-					on:click={() => copy($page.url.host + $page.url.pathname)}
-				>
-					<Icon icon="copy" style="w-6" />
-					{$t('payments.copyLink')}
-				</button>
-			</div>
-			<div class="text-base">
-				{#each payments as p}
-					<a href={`/payment/${p.id}`}>
-						<div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
-							<div class="whitespace-nowrap my-auto">
-								<div class="font-bold" class:text-red-800={p.amount > 0}>
-									{f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
-									{#if p.tip}
-										<span class="text-sm text-secondary">
-											+{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
-										</span>
-									{/if}
-								</div>
+  <div class="flex justify-center items-center">
+    <div
+      class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5"
+    >
+      <div class="relative flex justify-center gap-2">
+        <!-- <p class="absolute right-0 top-1 underline"><Icon icon="settings" /></p> -->
+        {#if id.split("-").length === 4}
+          <h1 class="text-2xl md:text-3xl font-semibold my-auto">Card {id}</h1>
+        {:else}
+          <img src="/images/moneypot.jpg" class="w-24" alt="Fund" />
+          <div class="my-auto">
+            <h1 class="text-2xl font-semibold my-auto">
+              {$t("payments.fund")}
+            </h1>
+            <h1 class="text-secondary my-auto">{id}</h1>
+          </div>
+        {/if}
+      </div>
+      {#if show}
+        <img {src} class="mx-auto" alt={id} />
+      {/if}
+      <div class="flex justify-center gap-4">
+        <div class="my-auto">
+          <h2 class="text-2xl md:text-3xl font-semibold">
+            {f(amountFiat, currency)}
+          </h2>
+          <h3 class="text-secondary md:text-lg mt-1">
+            {sat(amount)}
+          </h3>
+        </div>
+      </div>
+      <div class="flex gap-2" data-sveltekit-prefetch="off">
+        <div class="grow">
+          <a href={`/send/fund/${id}`}>
+            <button
+              class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+            >
+              <Icon icon="plus" />
+              {$t("payments.addFunds")}
+            </button>
+          </a>
+        </div>
+        <div class="grow">
+          <a href={`/fund/${id}/withdraw`}>
+            <button
+              class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+            >
+              <Icon icon="minus" style="rotate-180" />
+              {$t("payments.takeFunds")}
+            </button>
+          </a>
+        </div>
+      </div>
+      <div class="flex gap-2" data-sveltekit-prefetch="off">
+        <button
+          class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+          on:click={toggle}
+        >
+          <Icon icon="qr" style="invert" />
+          {show ? $t("payments.hide") : $t("payments.show")} QR
+        </button>
+        <button
+          class="rounded-full border py-3 px-2 font-bold hover:opacity-80 flex gap-1 w-full justify-center"
+          on:click={() => copy($page.url.host + $page.url.pathname)}
+        >
+          <Icon icon="copy" style="w-6" />
+          {$t("payments.copyLink")}
+        </button>
+      </div>
+      <div class="text-base">
+        {#each payments as p}
+          <a href={`/payment/${p.id}`}>
+            <div class="grid grid-cols-3 border-b h-24 hover:bg-gray-100 px-4">
+              <div class="whitespace-nowrap my-auto">
+                <div class="font-bold" class:text-red-800={p.amount > 0}>
+                  {f(Math.abs(p.amount) * (p.rate / sats), p.currency)}
+                  {#if p.tip}
+                    <span class="text-sm text-secondary">
+                      +{Math.round((p.tip / Math.abs(p.amount)) * 100)}%
+                    </span>
+                  {/if}
+                </div>
 
-								<div class="text-secondary">
-									{sat(Math.abs(p.amount) + (p.tip || 0))}
-								</div>
-							</div>
+                <div class="text-secondary">
+                  {sat(Math.abs(p.amount) + (p.tip || 0))}
+                </div>
+              </div>
 
-							<div class="flex my-auto">
-								<div class="flex">
-									<div class="my-auto">
-										<Avatar user={p.user} size={16} disabled={true} />
-									</div>
-									<div class="my-auto ml-1 text-secondary">{p.user.username}</div>
-								</div>
-							</div>
+              <div class="flex my-auto">
+                <div class="flex">
+                  <div class="my-auto">
+                    <Avatar user={p.user} size={16} disabled={true} />
+                  </div>
+                  <div class="my-auto ml-1 text-secondary">
+                    {p.user.username}
+                  </div>
+                </div>
+              </div>
 
-							<div class="text-secondary text-right text-sm my-auto">
-								<div>
-									{format(new Date(p.created), 'h:mm aaa')}
-								</div>
-								<div>
-									{format(new Date(p.created), 'MMM d')}
-								</div>
-							</div>
-						</div>
-					</a>
-				{:else}
-					<p class="text-secondary text-lg text-center">{$t('payments.empty')}</p>
-				{/each}
-			</div>
-		</div>
-	</div>
+              <div class="text-secondary text-right text-sm my-auto">
+                <div>
+                  {format(new Date(p.created), "h:mm aaa")}
+                </div>
+                <div>
+                  {format(new Date(p.created), "MMM d")}
+                </div>
+              </div>
+            </div>
+          </a>
+        {:else}
+          <p class="text-secondary text-lg text-center">
+            {$t("payments.empty")}
+          </p>
+        {/each}
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.server.js b/src/routes/(app)/fund/[id]/sweep/+page.server.js
index 9fd244a3..05fb18b6 100644
--- a/src/routes/(app)/fund/[id]/sweep/+page.server.js
+++ b/src/routes/(app)/fund/[id]/sweep/+page.server.js
@@ -1,14 +1,13 @@
-import { get, auth, post } from '$lib/utils';
-import { redirect } from '@sveltejs/kit';
+import { get, auth, post } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
 
 export async function load({ cookies, params, parent }) {
-	let { user } = await parent();
-	let { id } = params;
-	let { amount } = await get(`/fund/${id}`);
-
+  let { user } = await parent();
+  let { id } = params;
+  let { amount } = await get(`/fund/${id}`);
 
   if (!amount) throw redirect(307, `/fund/${id}`);
-	if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`);
-	await post('/take', { amount, id }, auth(cookies));
-	return { amount, id };
+  if (!user) throw redirect(307, `/register?redirect=/fund/${id}/sweep`);
+  await post("/take", { amount, id }, auth(cookies));
+  return { amount, id };
 }
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte
index 64bed4dd..bbd7013f 100644
--- a/src/routes/(app)/fund/[id]/sweep/+page.svelte
+++ b/src/routes/(app)/fund/[id]/sweep/+page.svelte
@@ -1,37 +1,41 @@
 <script>
-	import { scale } from 'svelte/transition';
-	import { fiat, f, s } from '$lib/utils';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
+  import { scale } from "svelte/transition";
+  import { fiat, f, s } from "$lib/utils";
+  import { Icon } from "$comp";
+  import { t } from "$lib/translations";
 
-	export let data;
+  export let data;
 
-	let { amount, id, user, rates } = data;
-	let { currency } = user;
-	$: rate = rates[currency];
+  let { amount, id, user, rates } = data;
+  let { currency } = user;
+  $: rate = rates[currency];
 </script>
 
 <div class="container px-4 max-w-xl mx-auto mt-10 space-y-5 text-center">
-	<div class="w-full flex">
-		<a href="/" class="mx-auto">
-			<Icon icon="logo" />
-		</a>
-	</div>
+  <div class="w-full flex">
+    <a href="/" class="mx-auto">
+      <Icon icon="logo" />
+    </a>
+  </div>
 
-	<div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.fundsClaimed')}</h1>
-	<h2 class="text-2xl md:text-3xl font-semibold">
-		{f(fiat(amount, rate), currency)}
-	</h2>
-	<h3 class="text-secondary md:text-lg mb-6 mt-1">
-		⚡️{s(amount)}
-	</h3>
+  <div class="flex w-full py-5 max-w-[200px] mx-auto" in:scale={{ start: 0.5 }}>
+    <Icon icon="check" style="mx-auto" />
+  </div>
+  <h1 class="text-3xl md:text-4xl font-bold mb-6">
+    {$t("payments.fundsClaimed")}
+  </h1>
+  <h2 class="text-2xl md:text-3xl font-semibold">
+    {f(fiat(amount, rate), currency)}
+  </h2>
+  <h3 class="text-secondary md:text-lg mb-6 mt-1">
+    ⚡️{s(amount)}
+  </h3>
 </div>
 
 <a href={`/${user.username}/payments`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
+<div class="fixed bottom-10 w-full text-center">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.server.js b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
index 476149f2..6fb08f61 100644
--- a/src/routes/(app)/fund/[id]/withdraw/+page.server.js
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.server.js
@@ -1,20 +1,20 @@
-import { fail, json, redirect } from '@sveltejs/kit';
-import { fd, auth, post } from '$lib/utils';
+import { fail, json, redirect } from "@sveltejs/kit";
+import { fd, auth, post } from "$lib/utils";
 
 export async function load({ parent }) {
-	let { user } = await parent();
-	if (!user) throw redirect(307, '/register');
+  let { user } = await parent();
+  if (!user) throw redirect(307, "/register");
 }
 
 export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = await fd(request);
-		try {
-			await post('/take', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
+  default: async ({ cookies, request }) => {
+    let body = await fd(request);
+    try {
+      await post("/take", body, auth(cookies));
+    } catch (e) {
+      return fail(400, { message: e.message });
+    }
 
-		throw redirect(307, `/fund/${body.id}`);
-	}
+    throw redirect(307, `/fund/${body.id}`);
+  },
 };
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
index 9cad945a..6b2010b7 100644
--- a/src/routes/(app)/fund/[id]/withdraw/+page.svelte
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
@@ -1,58 +1,58 @@
 <script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { rates } = data;
-	let { amount, id } = $page.params;
-	let { currency } = data.user;
-	let loading;
-
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
-		loading = false;
-	};
-
-	$: rate = rates[currency];
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { Icon, Numpad, Spinner } from "$comp";
+  import { page } from "$app/stores";
+  import { back } from "$lib/utils";
+  import { pin } from "$lib/store";
+
+  export let data;
+  export let form;
+
+  let { rates } = data;
+  let { amount, id } = $page.params;
+  let { currency } = data.user;
+  let loading;
+
+  let submit = () => (loading = true);
+  $: update(form);
+  let update = () => {
+    if (form?.message.includes("pin")) $pin = undefined;
+    loading = false;
+  };
+
+  $: rate = rates[currency];
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
+  <Icon icon="arrow-left" style="w-10" />
 </button>
 
 {#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
+  <div class="text-red-600 text-center">
+    {form.message}
+  </div>
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount bind:currency bind:rate {submit} />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="id" value={id} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} 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}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
+  <Numpad bind:amount bind:currency bind:rate {submit} />
+
+  <form method="POST" use:enhance on:submit={submit}>
+    <input name="id" value={id} type="hidden" />
+    <input name="amount" value={amount} type="hidden" />
+    <input name="pin" value={$pin} 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}
+          {$t("payments.send")}
+        {/if}
+      </button>
+    </div>
+  </form>
 </div>
diff --git a/src/routes/(app)/fund/[id]/withdraw/+server.js b/src/routes/(app)/fund/[id]/withdraw/+server.js
index 0f9a23f3..96d66413 100644
--- a/src/routes/(app)/fund/[id]/withdraw/+server.js
+++ b/src/routes/(app)/fund/[id]/withdraw/+server.js
@@ -1,6 +1,6 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { json } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
 
 export async function POST({ cookies, request }) {
-	return json(await post('/take', await request.json(), auth(cookies)));
+  return json(await post("/take", await request.json(), auth(cookies)));
 }
diff --git a/src/routes/(app)/launch/+page.server.js b/src/routes/(app)/launch/+page.server.js
index 2b44dfae..d11af500 100644
--- a/src/routes/(app)/launch/+page.server.js
+++ b/src/routes/(app)/launch/+page.server.js
@@ -1,6 +1,6 @@
-import { auth, get } from '$lib/utils';
+import { auth, get } from "$lib/utils";
 
 export const load = async ({ parent }) => {
-	let tickets = await get('/tickets');
-	return { ...(await parent()), tickets };
+  let tickets = await get("/tickets");
+  return { ...(await parent()), tickets };
 };
diff --git a/src/routes/(app)/launch/+page.svelte b/src/routes/(app)/launch/+page.svelte
index 3469f0bc..028274fa 100644
--- a/src/routes/(app)/launch/+page.svelte
+++ b/src/routes/(app)/launch/+page.svelte
@@ -1,103 +1,118 @@
 <script>
-	import { LandingHeader } from '$comp';
-	import { loginRedirect } from '$lib/store';
-	import { beforeNavigate } from '$app/navigation';
-	import { info } from '$lib/utils';
-	import { Icon } from '$comp';
-	import { t } from '$lib/translations';
-	import { goto } from '$app/navigation';
-	import { scroll } from '$lib/utils';
+  import { LandingHeader } from "$comp";
+  import { loginRedirect } from "$lib/store";
+  import { beforeNavigate } from "$app/navigation";
+  import { info } from "$lib/utils";
+  import { Icon } from "$comp";
+  import { t } from "$lib/translations";
+  import { goto } from "$app/navigation";
+  import { scroll } from "$lib/utils";
 
-	export let data;
-	let { user, tickets } = data;
-	$loginRedirect = '/launch/purchase';
+  export let data;
+  let { user, tickets } = data;
+  $loginRedirect = "/launch/purchase";
 
-	let hasTicket = !!user?.accounts.find((a) => tickets.includes(a.asset));
-	$: link = hasTicket ? '/launch/ticket' : user ? $loginRedirect : '/register';
-	$: text = (hasTicket ? 'View' : 'Purchase') + ' Ticket';
+  let hasTicket = !!user?.accounts.find((a) => tickets.includes(a.asset));
+  $: link = hasTicket ? "/launch/ticket" : user ? $loginRedirect : "/register";
+  $: text = (hasTicket ? "View" : "Purchase") + " Ticket";
 
-	beforeNavigate(({ to }) => {
-		if (to?.routeId === 'register') info('Please sign in so we can get you a ticket');
-	});
+  beforeNavigate(({ to }) => {
+    if (to?.routeId === "register")
+      info("Please sign in so we can get you a ticket");
+  });
 
-	let showMobileMenu = false;
-	const mobileMenuButtonClick = (section) => {
-		showMobileMenu = false;
-		scroll(section);
-	};
+  let showMobileMenu = false;
+  const mobileMenuButtonClick = (section) => {
+    showMobileMenu = false;
+    scroll(section);
+  };
 </script>
 
-<header class="w-full lg:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90">
-	<nav class="block xl:flex flex-wrap justify-between items-center">
-		<div class="flex justify-start md:justify-center items-center md:space-x-10">
-			<a href="/" class="hidden md:block">
-				<Icon icon="logo" style="mb-5 xl:mb-0" />
-			</a>
-			<Icon icon="logo" style="block md:hidden ml-5 w-48" />
-		</div>
-	</nav>
+<header
+  class="w-full lg:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90"
+>
+  <nav class="block xl:flex flex-wrap justify-between items-center">
+    <div
+      class="flex justify-start md:justify-center items-center md:space-x-10"
+    >
+      <a href="/" class="hidden md:block">
+        <Icon icon="logo" style="mb-5 xl:mb-0" />
+      </a>
+      <Icon icon="logo" style="block md:hidden ml-5 w-48" />
+    </div>
+  </nav>
 </header>
 
 <div class="mx-auto flex items-center justify-center px-8 mt-20">
-	<div class="flex flex-col w-full bg-white rounded shadow-lg sm:w-3/4 lg:w-3/5">
-		<div class="flex flex-col w-full md:flex-row">
-			<div
-				class="flex flex-row justify-around p-4 font-bold leading-none text-gray-800 uppercase bg-gray-400 rounded md:flex-col md:items-center md:justify-center md:w-1/4"
-			>
-				<div class="md:text-3xl">Oct</div>
-				<div class="md:text-6xl">26</div>
-				<div class="md:text-xl">6 pm</div>
-			</div>
-			<div class="p-4 font-normal text-gray-800 md:w-3/4 space-y-5">
-				<h1 class="mb-4 text-4xl font-bold leading-none tracking-tight text-gray-800">
-					Launch Party!
-				</h1>
+  <div
+    class="flex flex-col w-full bg-white rounded shadow-lg sm:w-3/4 lg:w-3/5"
+  >
+    <div class="flex flex-col w-full md:flex-row">
+      <div
+        class="flex flex-row justify-around p-4 font-bold leading-none text-gray-800 uppercase bg-gray-400 rounded md:flex-col md:items-center md:justify-center md:w-1/4"
+      >
+        <div class="md:text-3xl">Oct</div>
+        <div class="md:text-6xl">26</div>
+        <div class="md:text-xl">6 pm</div>
+      </div>
+      <div class="p-4 font-normal text-gray-800 md:w-3/4 space-y-5">
+        <h1
+          class="mb-4 text-4xl font-bold leading-none tracking-tight text-gray-800"
+        >
+          Launch Party!
+        </h1>
 
-				<p class="leading-normal mb-2">
-					Come join us at our launch party celebrating our new design and 10 years serving the
-					Vancouver Bitcoin community!
-				</p>
+        <p class="leading-normal mb-2">
+          Come join us at our launch party celebrating our new design and 10
+          years serving the Vancouver Bitcoin community!
+        </p>
 
-				<div class="flex">
-					<div class="space-y-5">
-						<div class="ml-8">
-							<p><b>When</b></p>
-							<p>6pm October 26</p>
-						</div>
-						<div class="ml-8">
-							<p><b>Where</b></p>
-							<p>The Loft Lounge</p>
-							<p>1184 Denman Street, #203</p>
-							<p>Vancouver, BC</p>
-						</div>
-					</div>
+        <div class="flex">
+          <div class="space-y-5">
+            <div class="ml-8">
+              <p><b>When</b></p>
+              <p>6pm October 26</p>
+            </div>
+            <div class="ml-8">
+              <p><b>Where</b></p>
+              <p>The Loft Lounge</p>
+              <p>1184 Denman Street, #203</p>
+              <p>Vancouver, BC</p>
+            </div>
+          </div>
 
-					<img src="/icons/party.svg" alt="Partygoers" class="w-[120px] mx-auto" />
-				</div>
+          <img
+            src="/icons/party.svg"
+            alt="Partygoers"
+            class="w-[120px] mx-auto"
+          />
+        </div>
 
-				<p>
-					We'll introduce our new interface and then network and enjoy tasty food and drinks from <a
-						href="https://loftondenman.com/"
-						class="underline">The Loft</a
-					>!
-				</p>
+        <p>
+          We'll introduce our new interface and then network and enjoy tasty
+          food and drinks from <a
+            href="https://loftondenman.com/"
+            class="underline">The Loft</a
+          >!
+        </p>
 
-				<p>
-					The Loft will be accepting Lightning payments at the event and going forward into the
-					future as well! We're charging $6 for for an NFT ticket that gets you entry, appies, and
-					the chance to win some swag and sats.
-				</p>
+        <p>
+          The Loft will be accepting Lightning payments at the event and going
+          forward into the future as well! We're charging $6 for for an NFT
+          ticket that gets you entry, appies, and the chance to win some swag
+          and sats.
+        </p>
 
-				<div class="flex w-full my-8">
-					<a href={link} class="mx-auto">
-						<button
-							class="bg-white text-black border rounded-full px-8 py-4 font-bold hover:opacity-80 text-2xl"
-						>
-							{text}
-						</button>
-					</a>
-				</div>
-			</div>
-		</div>
-	</div>
+        <div class="flex w-full my-8">
+          <a href={link} class="mx-auto">
+            <button
+              class="bg-white text-black border rounded-full px-8 py-4 font-bold hover:opacity-80 text-2xl"
+            >
+              {text}
+            </button>
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
 </div>
diff --git a/src/routes/(app)/launch/purchase/+page.server.js b/src/routes/(app)/launch/purchase/+page.server.js
index a3043d9c..58669606 100644
--- a/src/routes/(app)/launch/purchase/+page.server.js
+++ b/src/routes/(app)/launch/purchase/+page.server.js
@@ -1,45 +1,49 @@
-import { auth, get, post } from '$lib/utils';
-import tickets from '$lib/tickets';
-import { redirect } from '@sveltejs/kit';
-import { env } from '$env/dynamic/private';
-import { invalidateAll } from '$app/navigation';
-import { browser } from '$app/environment';
-import { createTicket } from '$lib/ticket';
+import { auth, get, post } from "$lib/utils";
+import tickets from "$lib/tickets";
+import { redirect } from "@sveltejs/kit";
+import { env } from "$env/dynamic/private";
+import { invalidateAll } from "$app/navigation";
+import { browser } from "$app/environment";
+import { createTicket } from "$lib/ticket";
 
 export const load = async ({ parent }) => {
-	let tickets = await get('/tickets');
-	let { user } = await parent();
-	let hasTicket = !!user?.accounts.find((a) => tickets.includes(a.asset));
-	if (hasTicket) throw redirect(307, '/launch/ticket');
-	return { tickets };
+  let tickets = await get("/tickets");
+  let { user } = await parent();
+  let hasTicket = !!user?.accounts.find((a) => tickets.includes(a.asset));
+  if (hasTicket) throw redirect(307, "/launch/ticket");
+  return { tickets };
 };
 
 export const actions = {
-	internal: async ({ cookies, request }) => {
-		let form = await request.formData();
-		let asset = await createTicket(cookies, form.get('username'));
-		await post('/payments', { amount: 22000, username: 'launch' }, auth(cookies));
+  internal: async ({ cookies, request }) => {
+    let form = await request.formData();
+    let asset = await createTicket(cookies, form.get("username"));
+    await post(
+      "/payments",
+      { amount: 22000, username: "launch" },
+      auth(cookies)
+    );
 
-		throw redirect(307, `/launch/thanks/${asset}`);
-	},
+    throw redirect(307, `/launch/thanks/${asset}`);
+  },
 
-	lightning: async ({ cookies, request }) => {
-		let form = await request.formData();
+  lightning: async ({ cookies, request }) => {
+    let form = await request.formData();
 
-		let rates = await get('/rates');
+    let rates = await get("/rates");
 
-		let invoice = {
-			amount: 22000,
-			memo: 'launch',
-			type: 'lightning',
-			prompt: false,
-			rate: rates[form.get('currency')]
-		};
+    let invoice = {
+      amount: 22000,
+      memo: "launch",
+      type: "lightning",
+      prompt: false,
+      rate: rates[form.get("currency")],
+    };
 
-		let user = { username: form.get('username') };
+    let user = { username: form.get("username") };
 
-		let { id } = await post('/invoice', { invoice, user }, auth(cookies));
+    let { id } = await post("/invoice", { invoice, user }, auth(cookies));
 
-		throw redirect(307, `/${user.username}/invoice/${id}`);
-	}
+    throw redirect(307, `/${user.username}/invoice/${id}`);
+  },
 };
diff --git a/src/routes/(app)/launch/purchase/+page.svelte b/src/routes/(app)/launch/purchase/+page.svelte
index fbaa58c0..49a51973 100644
--- a/src/routes/(app)/launch/purchase/+page.svelte
+++ b/src/routes/(app)/launch/purchase/+page.svelte
@@ -1,66 +1,74 @@
 <script>
-	import { onMount } from 'svelte';
-	import { enhance } from '$app/forms';
-	import { post } from '$lib/utils';
-	import { goto } from '$app/navigation';
+  import { onMount } from "svelte";
+  import { enhance } from "$app/forms";
+  import { post } from "$lib/utils";
+  import { goto } from "$app/navigation";
 
-	export let data;
+  export let data;
 
-	let amount = 22000;
-	let {
-		currency,
-		account: { balance },
-		username
-	} = data.user;
+  let amount = 22000;
+  let {
+    currency,
+    account: { balance },
+    username,
+  } = data.user;
 
-	let { tickets } = data;
-	let ticket = tickets.length;
+  let { tickets } = data;
+  let ticket = tickets.length;
 </script>
 
 <div class="mx-auto h-screen flex items-center justify-center px-4">
-	<div class="font-normal text-gray-800 mx-auto mb-8 space-y-8">
-		<h1 class="mb-4 text-4xl font-bold leading-none tracking-tight text-gray-800 text-center">
-			Purchase Ticket
-		</h1>
+  <div class="font-normal text-gray-800 mx-auto mb-8 space-y-8">
+    <h1
+      class="mb-4 text-4xl font-bold leading-none tracking-tight text-gray-800 text-center"
+    >
+      Purchase Ticket
+    </h1>
 
-		<img
-			src={`/tickets/${(ticket + 1).toString().padStart(2, '0')}.png`}
-			class="w-full max-w-[800px]"
-			alt="Ticket"
-		/>
+    <img
+      src={`/tickets/${(ticket + 1).toString().padStart(2, "0")}.png`}
+      class="w-full max-w-[800px]"
+      alt="Ticket"
+    />
 
-		{#if balance >= amount}
-			<form action="?/internal" method="POST" use:enhance>
-				<input type="hidden" name="username" value={username} />
+    {#if balance >= amount}
+      <form action="?/internal" method="POST" use:enhance>
+        <input type="hidden" name="username" value={username} />
 
-				<div class="w-full flex">
-					<button
-						class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-2xl"
-					>
-						Count me in
-					</button>
-				</div>
-			</form>
-		{:else}
-			<h1 class="mb-4 text-xl font-bold leading-none tracking-tight text-gray-800 text-center">
-				Payment Options
-			</h1>
+        <div class="w-full flex">
+          <button
+            class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-2xl"
+          >
+            Count me in
+          </button>
+        </div>
+      </form>
+    {:else}
+      <h1
+        class="mb-4 text-xl font-bold leading-none tracking-tight text-gray-800 text-center"
+      >
+        Payment Options
+      </h1>
 
-			<div class="flex justify-center gap-4">
-				<form action="?/lightning" method="POST">
-					<input type="hidden" name="currency" value={currency} />
-					<input type="hidden" name="username" value={username} />
-					<button class="border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-2xl">
-						Lightning
-					</button>
-				</form>
+      <div class="flex justify-center gap-4">
+        <form action="?/lightning" method="POST">
+          <input type="hidden" name="currency" value={currency} />
+          <input type="hidden" name="username" value={username} />
+          <button
+            class="border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-2xl"
+          >
+            Lightning
+          </button>
+        </form>
 
-				<a href={`purchase/card`}>
-					<button class="border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-2xl">
-						Credit Card
-					</button>
-				</a>
-			</div>
-		{/if}
-	</div>
+        <a href={`purchase/card`}>
+          <button
+            class="border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-2xl"
+          >
+            Credit Card
+          </button>
+        </a>
+      </div>
+    {/if}
+  </div>
 </div>
diff --git a/src/routes/(app)/launch/purchase/card/+page.server.js b/src/routes/(app)/launch/purchase/card/+page.server.js
index 1f564f78..bca601d3 100644
--- a/src/routes/(app)/launch/purchase/card/+page.server.js
+++ b/src/routes/(app)/launch/purchase/card/+page.server.js
@@ -1,44 +1,52 @@
-import { env } from '$env/dynamic/private';
-import { error, redirect } from '@sveltejs/kit';
-import { post, auth } from '$lib/utils';
-import { createTicket } from '$lib/ticket';
+import { env } from "$env/dynamic/private";
+import { error, redirect } from "@sveltejs/kit";
+import { post, auth } from "$lib/utils";
+import { createTicket } from "$lib/ticket";
 
-let stripe = 'https://api.stripe.com/v1';
+let stripe = "https://api.stripe.com/v1";
 
 export const actions = {
-	default: async ({ cookies, request }) => {
-		let form = await request.formData();
-
-		let headers = new Headers();
-		headers.set('Authorization', 'Basic ' + new Buffer(env.STRIPE + ':').toString('base64'));
-
-		let body = new URLSearchParams({
-			'card[number]': form.get('number').replace(/\s+/g, ''),
-			'card[exp_month]': form.get('expiry').slice(0, 2),
-			'card[exp_year]': form.get('expiry').slice(-2),
-			'card[cvc]': form.get('cvc')
-		});
-
-		let method = 'POST';
-
-		let { id: source } = await fetch(`${stripe}/tokens`, { body, headers, method }).then((r) =>
-			r.json()
-		);
-
-		body = new URLSearchParams({
-			amount: 600,
-			currency: 'cad',
-			source,
-			description: 'launch ticket'
-		});
-
-		let { status } = await fetch(`${stripe}/charges`, { body, headers, method }).then((r) =>
-			r.json()
-		);
-
-		if (status !== 'succeeded') throw error(500, { message: 'Card payment failed' });
-		let asset = await createTicket(cookies, form.get('username'));
-
-		throw redirect(307, `/launch/thanks/${asset}`);
-	}
+  default: async ({ cookies, request }) => {
+    let form = await request.formData();
+
+    let headers = new Headers();
+    headers.set(
+      "Authorization",
+      "Basic " + new Buffer(env.STRIPE + ":").toString("base64")
+    );
+
+    let body = new URLSearchParams({
+      "card[number]": form.get("number").replace(/\s+/g, ""),
+      "card[exp_month]": form.get("expiry").slice(0, 2),
+      "card[exp_year]": form.get("expiry").slice(-2),
+      "card[cvc]": form.get("cvc"),
+    });
+
+    let method = "POST";
+
+    let { id: source } = await fetch(`${stripe}/tokens`, {
+      body,
+      headers,
+      method,
+    }).then((r) => r.json());
+
+    body = new URLSearchParams({
+      amount: 600,
+      currency: "cad",
+      source,
+      description: "launch ticket",
+    });
+
+    let { status } = await fetch(`${stripe}/charges`, {
+      body,
+      headers,
+      method,
+    }).then((r) => r.json());
+
+    if (status !== "succeeded")
+      throw error(500, { message: "Card payment failed" });
+    let asset = await createTicket(cookies, form.get("username"));
+
+    throw redirect(307, `/launch/thanks/${asset}`);
+  },
 };
diff --git a/src/routes/(app)/launch/purchase/card/+page.svelte b/src/routes/(app)/launch/purchase/card/+page.svelte
index 05d09025..037a65b2 100644
--- a/src/routes/(app)/launch/purchase/card/+page.svelte
+++ b/src/routes/(app)/launch/purchase/card/+page.svelte
@@ -1,77 +1,77 @@
 <script>
-	import { enhance } from '$app/forms';
-	import { Lock, Card, Calendar, Spinner } from '$comp';
+  import { enhance } from "$app/forms";
+  import { Lock, Card, Calendar, Spinner } from "$comp";
 
-	export let data;
+  export let data;
 
-	let { username } = data.user;
-	let loading;
+  let { username } = data.user;
+  let loading;
 </script>
 
 <div class="container max-w-lg px-4 mx-auto space-y-5">
-	<form
-		method="POST"
-		class="flex flex-wrap gap-5 w-full p-5 mt-20"
-		use:enhance={() => {
-			loading = true;
-			return ({ update }) => update() && (loading = false);
-		}}
-	>
-		<input type="hidden" name="username" value={username} />
-		<label class="relative w-full flex flex-col">
-			<span class="font-bold mb-3">Card number</span>
-			<input
-				class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
-				type="text"
-				name="number"
-				placeholder="0000 0000 0000 0000"
-			/>
-			<Card />
-		</label>
+  <form
+    method="POST"
+    class="flex flex-wrap gap-5 w-full p-5 mt-20"
+    use:enhance={() => {
+      loading = true;
+      return ({ update }) => update() && (loading = false);
+    }}
+  >
+    <input type="hidden" name="username" value={username} />
+    <label class="relative w-full flex flex-col">
+      <span class="font-bold mb-3">Card number</span>
+      <input
+        class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+        type="text"
+        name="number"
+        placeholder="0000 0000 0000 0000"
+      />
+      <Card />
+    </label>
 
-		<label class="relative flex-1 flex flex-col">
-			<span class="font-bold mb-3">Expire date</span>
-			<input
-				class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
-				type="text"
-				name="expiry"
-				placeholder="MM/YY"
-			/>
-			<Calendar />
-		</label>
+    <label class="relative flex-1 flex flex-col">
+      <span class="font-bold mb-3">Expire date</span>
+      <input
+        class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+        type="text"
+        name="expiry"
+        placeholder="MM/YY"
+      />
+      <Calendar />
+    </label>
 
-		<label class="relative flex-1 flex flex-col">
-			<span class="font-bold flex items-center gap-3 mb-3">
-				CVC/CVV
-				<span class="relative group">
-					<span
-						class="hidden group-hover:flex justify-center items-center px-2 py-1 text-xs absolute -right-2 transform translate-x-full -translate-y-1/2 w-max top-1/2 bg-black text-white"
-					>
-						3-digit number on the back of your card</span
-					>
-				</span>
-			</span>
-			<input
-				class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
-				type="text"
-				name="cvc"
-				placeholder="&bull;&bull;&bull;"
-			/>
-			<Lock />
-		</label>
+    <label class="relative flex-1 flex flex-col">
+      <span class="font-bold flex items-center gap-3 mb-3">
+        CVC/CVV
+        <span class="relative group">
+          <span
+            class="hidden group-hover:flex justify-center items-center px-2 py-1 text-xs absolute -right-2 transform translate-x-full -translate-y-1/2 w-max top-1/2 bg-black text-white"
+          >
+            3-digit number on the back of your card</span
+          >
+        </span>
+      </span>
+      <input
+        class="rounded-md peer pl-12 pr-2 py-2 border-2 border-gray-200 placeholder-gray-300"
+        type="text"
+        name="cvc"
+        placeholder="&bull;&bull;&bull;"
+      />
+      <Lock />
+    </label>
 
-		<div class="w-full flex mt-8">
-			<button
-				class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-xl"
-				type="submit"
-				disabled={loading}
-			>
-				{#if loading}
-					<Spinner />
-				{:else}
-					Submit
-				{/if}
-			</button>
-		</div>
-	</form>
+    <div class="w-full flex mt-8">
+      <button
+        class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 mx-auto text-xl"
+        type="submit"
+        disabled={loading}
+      >
+        {#if loading}
+          <Spinner />
+        {:else}
+          Submit
+        {/if}
+      </button>
+    </div>
+  </form>
 </div>
diff --git a/src/routes/(app)/launch/thanks/[asset]/+page.svelte b/src/routes/(app)/launch/thanks/[asset]/+page.svelte
index 43f10057..9b37002b 100644
--- a/src/routes/(app)/launch/thanks/[asset]/+page.svelte
+++ b/src/routes/(app)/launch/thanks/[asset]/+page.svelte
@@ -1,29 +1,31 @@
 <script>
-	import { page } from '$app/stores';
+  import { page } from "$app/stores";
 
-	export let data;
+  export let data;
 
-	let { user } = data;
+  let { user } = data;
 
-	let { asset } = $page.params;
+  let { asset } = $page.params;
 </script>
 
 <div class="container mx-auto max-w-lg px-4 mt-20">
-	<div class="font-normal text-gray-800 mx-auto mb-8 space-y-8">
-		<h1 class="mb-4 text-4xl font-bold leading-none tracking-tight text-gray-800 text-center">
-			Thanks!
-		</h1>
+  <div class="font-normal text-gray-800 mx-auto mb-8 space-y-8">
+    <h1
+      class="mb-4 text-4xl font-bold leading-none tracking-tight text-gray-800 text-center"
+    >
+      Thanks!
+    </h1>
 
-		<p>We look forward to seeing you!</p>
-	</div>
+    <p>We look forward to seeing you!</p>
+  </div>
 
-	<div class="w-full flex">
-		<a href="/launch/ticket" class="mx-auto">
-			<button
-				class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 text-2xl"
-			>
-				Done
-			</button>
-		</a>
-	</div>
+  <div class="w-full flex">
+    <a href="/launch/ticket" class="mx-auto">
+      <button
+        class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 text-2xl"
+      >
+        Done
+      </button>
+    </a>
+  </div>
 </div>
diff --git a/src/routes/(app)/launch/ticket/+page.server.js b/src/routes/(app)/launch/ticket/+page.server.js
index 0362eb7d..7b51e679 100644
--- a/src/routes/(app)/launch/ticket/+page.server.js
+++ b/src/routes/(app)/launch/ticket/+page.server.js
@@ -1,9 +1,11 @@
-import { get } from '$lib/utils';
+import { get } from "$lib/utils";
 
 export const load = async ({ cookies, parent }) => {
-	let { user } = await parent();
-	let tickets = await get('/tickets');
-	let ticket = tickets.findIndex((t) => user.accounts.find((a) => a.asset === t));
-	let asset = tickets[ticket];
-	return { asset, ticket };
+  let { user } = await parent();
+  let tickets = await get("/tickets");
+  let ticket = tickets.findIndex((t) =>
+    user.accounts.find((a) => a.asset === t)
+  );
+  let asset = tickets[ticket];
+  return { asset, ticket };
 };
diff --git a/src/routes/(app)/launch/ticket/+page.svelte b/src/routes/(app)/launch/ticket/+page.svelte
index 3879abcd..6b16e804 100644
--- a/src/routes/(app)/launch/ticket/+page.svelte
+++ b/src/routes/(app)/launch/ticket/+page.svelte
@@ -1,35 +1,37 @@
 <script>
-	export let data;
-	let { asset, ticket } = data;
+  export let data;
+  let { asset, ticket } = data;
 </script>
 
 <div class="mx-auto h-screen flex items-center justify-center px-4">
-	<div class="font-normal text-gray-800 mx-auto mb-8 space-y-8">
-		<h1 class="mb-4 text-4xl font-bold leading-none tracking-tight text-gray-800 text-center">
-			Your Ticket
-		</h1>
+  <div class="font-normal text-gray-800 mx-auto mb-8 space-y-8">
+    <h1
+      class="mb-4 text-4xl font-bold leading-none tracking-tight text-gray-800 text-center"
+    >
+      Your Ticket
+    </h1>
 
-		<p>
-			We've minted your ticket as an <a
-				href={`https://blockstream.info/liquid/asset/${asset}`}
-				class="underline">NFT on the Liquid Blockchain</a
-			> as a proof of purchase and commemorative token.
-		</p>
+    <p>
+      We've minted your ticket as an <a
+        href={`https://blockstream.info/liquid/asset/${asset}`}
+        class="underline">NFT on the Liquid Blockchain</a
+      > as a proof of purchase and commemorative token.
+    </p>
 
-		<img
-			src={`/tickets/${(ticket + 1).toString().padStart(2, '0')}.png`}
-			class="w-full max-w-[800px]"
-			alt="Ticket"
-		/>
+    <img
+      src={`/tickets/${(ticket + 1).toString().padStart(2, "0")}.png`}
+      class="w-full max-w-[800px]"
+      alt="Ticket"
+    />
 
-		<div class="w-full flex">
-			<a href="/" class="mx-auto">
-				<button
-					class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 text-2xl"
-				>
-					Done
-				</button>
-			</a>
-		</div>
-	</div>
+    <div class="w-full flex">
+      <a href="/" class="mx-auto">
+        <button
+          class="bg-black text-white border rounded-full px-8 py-4 font-bold hover:opacity-80 text-2xl"
+        >
+          Done
+        </button>
+      </a>
+    </div>
+  </div>
 </div>
diff --git a/src/routes/(app)/ln/[lnurl]/+page.server.js b/src/routes/(app)/ln/[lnurl]/+page.server.js
index ddd714bf..332bc9e3 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.server.js
+++ b/src/routes/(app)/ln/[lnurl]/+page.server.js
@@ -1,63 +1,75 @@
-import { fd, auth, get, post } from '$lib/utils';
-import { error, fail, redirect } from '@sveltejs/kit';
+import { fd, auth, get, post } from "$lib/utils";
+import { error, fail, redirect } from "@sveltejs/kit";
 
 export async function load({ params, parent }) {
-	let { user } = await parent();
-	if (!user) throw redirect(307, '/register');
+  let { user } = await parent();
+  if (!user) throw redirect(307, "/register");
 
-	let data;
+  let data;
 
-	try {
-		let { lnurl } = params;
-		data = await get(`/decode?text=${lnurl}`);
-	} catch (e) {
-		throw error(500, e.message);
-	}
+  try {
+    let { lnurl } = params;
+    data = await get(`/decode?text=${lnurl}`);
+  } catch (e) {
+    throw error(500, e.message);
+  }
 
-	if (!['payRequest', 'withdrawRequest'].includes(data.tag))
-		throw error(500, 'We only support LNURLp and LNURLw at this time');
+  if (!["payRequest", "withdrawRequest"].includes(data.tag))
+    throw error(500, "We only support LNURLp and LNURLw at this time");
 
-	return data;
+  return data;
 }
 
 export const actions = {
-	pay: async ({ cookies, fetch, request }) => {
-		let error;
-
-		let { callback, amount, minSendable, maxSendable } = await fd(request);
-		minSendable = Math.round(minSendable / 1000);
-		maxSendable = Math.round(maxSendable / 1000);
-
-		if (amount < minSendable) error = `Amount must be at least ${minSendable} sats`;
-		if (amount > maxSendable) error = `Amount must be at most ${maxSendable} sats`;
-		if (error) return fail(400, { error });
-
-		let { pr } = await fetch(`${callback}?amount=${amount * 1000}`).then((r) => r.json());
-		throw redirect(307, `/send/lightning/${pr}`);
-	},
-
-	withdraw: async ({ cookies, fetch, request }) => {
-		let error;
-
-		let { callback, amount, username, currency, minWithdrawable, maxWithdrawable, k1 } = await fd(
-			request
-		);
-
-		minWithdrawable = Math.round(minWithdrawable / 1000);
-		maxWithdrawable = Math.round(maxWithdrawable / 1000);
-
-		if (amount < minWithdrawable) error = `Amount must be at least ${minWithdrawable} sats`;
-		if (amount > maxWithdrawable) error = `Amount must be at most ${maxWithdrawable} sats`;
-		if (error) return fail(400, { error });
-
-		let invoice = { amount, type: 'lightning' };
-		let user = { username, currency };
-
-		let { text: pr } = await post('/invoice', { invoice, user }, auth(cookies));
-
-		let c = callback.includes('?') ? '&' : '?';
-		await fetch(`${callback}${c}k1=${k1}&pr=${pr}`).then((r) => r.json());
-
-		throw redirect(307, `/ln/withdrawal/sent`);
-	}
+  pay: async ({ cookies, fetch, request }) => {
+    let error;
+
+    let { callback, amount, minSendable, maxSendable } = await fd(request);
+    minSendable = Math.round(minSendable / 1000);
+    maxSendable = Math.round(maxSendable / 1000);
+
+    if (amount < minSendable)
+      error = `Amount must be at least ${minSendable} sats`;
+    if (amount > maxSendable)
+      error = `Amount must be at most ${maxSendable} sats`;
+    if (error) return fail(400, { error });
+
+    let { pr } = await fetch(`${callback}?amount=${amount * 1000}`).then((r) =>
+      r.json()
+    );
+    throw redirect(307, `/send/lightning/${pr}`);
+  },
+
+  withdraw: async ({ cookies, fetch, request }) => {
+    let error;
+
+    let {
+      callback,
+      amount,
+      username,
+      currency,
+      minWithdrawable,
+      maxWithdrawable,
+      k1,
+    } = await fd(request);
+
+    minWithdrawable = Math.round(minWithdrawable / 1000);
+    maxWithdrawable = Math.round(maxWithdrawable / 1000);
+
+    if (amount < minWithdrawable)
+      error = `Amount must be at least ${minWithdrawable} sats`;
+    if (amount > maxWithdrawable)
+      error = `Amount must be at most ${maxWithdrawable} sats`;
+    if (error) return fail(400, { error });
+
+    let invoice = { amount, type: "lightning" };
+    let user = { username, currency };
+
+    let { text: pr } = await post("/invoice", { invoice, user }, auth(cookies));
+
+    let c = callback.includes("?") ? "&" : "?";
+    await fetch(`${callback}${c}k1=${k1}&pr=${pr}`).then((r) => r.json());
+
+    throw redirect(307, `/ln/withdrawal/sent`);
+  },
 };
diff --git a/src/routes/(app)/ln/[lnurl]/+page.svelte b/src/routes/(app)/ln/[lnurl]/+page.svelte
index 7656c9fb..9b733f89 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.svelte
+++ b/src/routes/(app)/ln/[lnurl]/+page.svelte
@@ -1,11 +1,11 @@
 <script>
-	import { Lnurlp, Lnurlw } from '$comp';
-	export let data;
-	let { tag } = data;
+  import { Lnurlp, Lnurlw } from "$comp";
+  export let data;
+  let { tag } = data;
 </script>
 
-{#if tag === 'payRequest'}
-	<Lnurlp {data} />
-{:else if tag === 'withdrawRequest'}
-	<Lnurlw {data} />
+{#if tag === "payRequest"}
+  <Lnurlp {data} />
+{:else if tag === "withdrawRequest"}
+  <Lnurlw {data} />
 {/if}
diff --git a/src/routes/(app)/ln/withdrawal/sent/+page.svelte b/src/routes/(app)/ln/withdrawal/sent/+page.svelte
index 84e6a7e0..c527c017 100644
--- a/src/routes/(app)/ln/withdrawal/sent/+page.svelte
+++ b/src/routes/(app)/ln/withdrawal/sent/+page.svelte
@@ -1,23 +1,28 @@
 <script>
-	import { scale } from 'svelte/transition';
-	import { Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { t } from '$lib/translations';
+  import { scale } from "svelte/transition";
+  import { Icon } from "$comp";
+  import { toast } from "@zerodevx/svelte-toast";
+  import { t } from "$lib/translations";
 
-	export let data;
-	let { user } = data;
-	toast.pop(0);
+  export let data;
+  let { user } = data;
+  toast.pop(0);
 </script>
 
 <div class="text-center mt-20 md:mt-0">
-	<div class="flex w-full max-w-[200px] mx-auto py-20" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">Request Sent!</h1>
+  <div
+    class="flex w-full max-w-[200px] mx-auto py-20"
+    in:scale={{ start: 0.5 }}
+  >
+    <Icon icon="check" style="mx-auto" />
+  </div>
+  <h1 class="text-3xl md:text-4xl font-bold mb-6">Request Sent!</h1>
 </div>
 
 <a href={`/${user.username}/payments`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
+<div class="fixed bottom-10 w-full text-center">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/src/routes/(app)/locations/+server.js b/src/routes/(app)/locations/+server.js
index dd9e984b..8a046475 100644
--- a/src/routes/(app)/locations/+server.js
+++ b/src/routes/(app)/locations/+server.js
@@ -1,15 +1,15 @@
-import { get } from '$lib/utils';
-import { json } from '@sveltejs/kit';
+import { get } from "$lib/utils";
+import { json } from "@sveltejs/kit";
 
 export async function GET({ fetch, setHeaders }) {
-	let locations = [];
+  let locations = [];
 
-	try {
-		({ locations } = await get('/locations'));
-		setHeaders({ 'cache-control': 'public, max-age=600' });
-	} catch (e) {
-		console.log('failed to fetch locations');
-	}
+  try {
+    ({ locations } = await get("/locations"));
+    setHeaders({ "cache-control": "public, max-age=600" });
+  } catch (e) {
+    console.log("failed to fetch locations");
+  }
 
-	return json({ locations });
+  return json({ locations });
 }
diff --git a/src/routes/(app)/login/+page.server.js b/src/routes/(app)/login/+page.server.js
index a9cf867b..6876c93d 100644
--- a/src/routes/(app)/login/+page.server.js
+++ b/src/routes/(app)/login/+page.server.js
@@ -1,25 +1,29 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { login, fd } from '$lib/utils';
+import { fail, redirect } from "@sveltejs/kit";
+import { login, fd } from "$lib/utils";
 
 export const load = async ({ parent }) => {
-	let { user } = await parent();
-	if (user?.pubkey) throw redirect(307, `/${user.username}`);
+  let { user } = await parent();
+  if (user?.pubkey) throw redirect(307, `/${user.username}`);
 };
 
 export const actions = {
-	default: async ({ cookies, request }) => {
-		let form = await fd(request);
-		let { username, password, token, loginRedirect } = form;
-		let user = { username, password, token };
+  default: async ({ cookies, request }) => {
+    let form = await fd(request);
+    let { username, password, token, loginRedirect } = form;
+    let user = { username, password, token };
 
-		if (loginRedirect === 'undefined') loginRedirect = undefined;
+    if (loginRedirect === "undefined") loginRedirect = undefined;
 
-		try {
-			let r = await login(user, cookies, request.headers.get('cf-connecting-ip'));
-		} catch (e) {
-			return fail(400, { error: 'Login failed', message: e.message, ...form });
-		}
+    try {
+      let r = await login(
+        user,
+        cookies,
+        request.headers.get("cf-connecting-ip")
+      );
+    } catch (e) {
+      return fail(400, { error: "Login failed", message: e.message, ...form });
+    }
 
-		throw redirect(303, loginRedirect || `/${user.username}`);
-	}
+    throw redirect(303, loginRedirect || `/${user.username}`);
+  },
 };
diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
index 84ecc3ad..6190ae0d 100644
--- a/src/routes/(app)/login/+page.svelte
+++ b/src/routes/(app)/login/+page.svelte
@@ -1,16 +1,16 @@
 <script>
-	import { RegisterOrLogin } from '$comp';
-	import { onMount } from 'svelte';
-	import { animatedRate, pin } from '$lib/store';
+  import { RegisterOrLogin } from "$comp";
+  import { onMount } from "svelte";
+  import { animatedRate, pin } from "$lib/store";
 
-	onMount(() => {
-		$animatedRate = 0;
-		$pin = undefined;
-		localStorage.clear();
-		sessionStorage.clear();
-	});
+  onMount(() => {
+    $animatedRate = 0;
+    $pin = undefined;
+    localStorage.clear();
+    sessionStorage.clear();
+  });
 
-	export let form;
+  export let form;
 </script>
 
 <RegisterOrLogin pageID="signIn" bind:form />
diff --git a/src/routes/(app)/logout/+page.server.js b/src/routes/(app)/logout/+page.server.js
index 2dabc9d4..60750dfa 100644
--- a/src/routes/(app)/logout/+page.server.js
+++ b/src/routes/(app)/logout/+page.server.js
@@ -1,12 +1,12 @@
-import { redirect } from '@sveltejs/kit';
+import { redirect } from "@sveltejs/kit";
 
 const opts = {
-	expires: new Date(0),
-	path: '/'
+  expires: new Date(0),
+  path: "/",
 };
 
 export async function load({ cookies }) {
-	cookies.set('username', '', opts);
-	cookies.set('token', '', opts);
-	throw redirect(307, '/login');
+  cookies.set("username", "", opts);
+  cookies.set("token", "", opts);
+  throw redirect(307, "/login");
 }
diff --git a/src/routes/(app)/otpsecret/+server.js b/src/routes/(app)/otpsecret/+server.js
index 7d5c1ad9..63d06849 100644
--- a/src/routes/(app)/otpsecret/+server.js
+++ b/src/routes/(app)/otpsecret/+server.js
@@ -1,15 +1,17 @@
-import { auth, post } from '$lib/utils';
-import Qr from 'qrcode-base64';
-import { error } from '@sveltejs/kit';
+import { auth, post } from "$lib/utils";
+import Qr from "qrcode-base64";
+import { error } from "@sveltejs/kit";
 
 export async function POST({ cookies, request }) {
-	try {
-		let body = await request.json();
-		let { username, secret } = await post('/otpsecret', body, auth(cookies));
-		let uri = `otpauth://totp/coinos:${username}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`;
-		return new Response(JSON.stringify({ secret, uri, qr: Qr.drawImg(uri, { size: 600 }) }));
-	} catch (e) {
-		if (e.message.includes('pin')) throw e;
-		throw new error(500, 'Problem saving secret');
-	}
+  try {
+    let body = await request.json();
+    let { username, secret } = await post("/otpsecret", body, auth(cookies));
+    let uri = `otpauth://totp/coinos:${username}?secret=${secret}&period=30&digits=6&algorithm=SHA1&issuer=coinos`;
+    return new Response(
+      JSON.stringify({ secret, uri, qr: Qr.drawImg(uri, { size: 600 }) })
+    );
+  } catch (e) {
+    if (e.message.includes("pin")) throw e;
+    throw new error(500, "Problem saving secret");
+  }
 }
diff --git a/src/routes/(app)/password/+server.js b/src/routes/(app)/password/+server.js
index b4a81740..26ed3858 100644
--- a/src/routes/(app)/password/+server.js
+++ b/src/routes/(app)/password/+server.js
@@ -1,7 +1,7 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { json } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
 
 export async function POST({ cookies, request }) {
-	let result = await post('/password', await request.json(), auth(cookies));
-	return json(result);
+  let result = await post("/password", await request.json(), auth(cookies));
+  return json(result);
 }
diff --git a/src/routes/(app)/payment/[id]/+page.server.js b/src/routes/(app)/payment/[id]/+page.server.js
index 1c90ab69..5a364c65 100644
--- a/src/routes/(app)/payment/[id]/+page.server.js
+++ b/src/routes/(app)/payment/[id]/+page.server.js
@@ -1,6 +1,6 @@
-import { auth, get } from '$lib/utils';
+import { auth, get } from "$lib/utils";
 
 export async function load({ cookies, params }) {
-	let payment = await get(`/payments/${params.id}`, auth(cookies));
-	return { payment };
+  let payment = await get(`/payments/${params.id}`, auth(cookies));
+  return { payment };
 }
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 98c5a68b..7e3c6792 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -1,158 +1,173 @@
 <script>
-	import { t } from '$lib/translations';
-	import { back, copy, f, s, fiat, post, sats, success, types } from '$lib/utils';
-	import { Avatar, Icon } from '$comp';
-	import { format } from 'date-fns';
-	import { PUBLIC_EXPLORER as expl } from '$env/static/public';
+  import { t } from "$lib/translations";
+  import {
+    back,
+    copy,
+    f,
+    s,
+    fiat,
+    post,
+    sats,
+    success,
+    types,
+  } from "$lib/utils";
+  import { Avatar, Icon } from "$comp";
+  import { format } from "date-fns";
+  import { PUBLIC_EXPLORER as expl } from "$env/static/public";
 
-	export let data;
-	let { user, payment: p } = data;
+  export let data;
+  let { user, payment: p } = data;
 
-	let { username } = user;
-	let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
-	let a = Math.abs(amount);
+  let { username } = user;
+  let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
+  let a = Math.abs(amount);
 
-	let print = async () => {
-		await post(`/payment/${id}/print`, { id });
-		success('Printing!');
-	};
+  let print = async () => {
+    await post(`/payment/${id}/print`, { id });
+    success("Printing!");
+  };
 
-	fee = fee || 0;
+  fee = fee || 0;
 
-  let direction = amount > 0 ? $t('payments.from') : $t('payments.to')
-  direction = direction[0].toUpperCase() + direction.substr(1, direction.length);
+  let direction = amount > 0 ? $t("payments.from") : $t("payments.to");
+  direction =
+    direction[0].toUpperCase() + direction.substr(1, direction.length);
 </script>
 
 <a href={`/${username}/payments`}>
-	<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80">
-		<Icon icon="arrow-left" style="w-10" />
-	</button>
+  <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80">
+    <Icon icon="arrow-left" style="w-10" />
+  </button>
 </a>
 
 <div class="container mx-auto max-w-lg px-4 space-y-8 break-all text-2xl">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
-		{$t(amount < 0 ? 'payments.sent' : 'payments.received')}
-	</h1>
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold mb-10">
+    {$t(amount < 0 ? "payments.sent" : "payments.received")}
+  </h1>
 
-	{#if p.with}
-		<div>
-			<span class="text-lg text-secondary my-auto mr-2">{direction}</span>
-			<a href={`/${p.with.username}`}>
-				<div class="flex">
-					<div class="my-auto">
-						<Avatar user={p.with} size={20} />
-					</div>
-					<div class="my-auto ml-1">{p.with.username}</div>
-				</div>
-			</a>
-		</div>
-	{/if}
-	{#if p.type === types.fund}
-		<div>
-			<span class="text-lg text-secondary my-auto mr-2">{direction}</span>
-			<a href={`/fund/${p.memo}`}>
-				<div class="flex">
-					<div class="my-auto">
-						<img src="/images/moneypot.png" class="w-12" alt="Pot" />
-					</div>
-					<div class="my-auto ml-1">{p.memo}</div>
-				</div>
-			</a>
-		</div>
-	{/if}
-	<div>
-		<span class="text-lg text-secondary">{$t('payments.amount')}</span>
-		<div>
-			{f(fiat(a, rate), currency)}
-			<span class="text-secondary text-lg">
-				⚡️{s(a)}
-			</span>
-		</div>
-	</div>
+  {#if p.with}
+    <div>
+      <span class="text-lg text-secondary my-auto mr-2">{direction}</span>
+      <a href={`/${p.with.username}`}>
+        <div class="flex">
+          <div class="my-auto">
+            <Avatar user={p.with} size={20} />
+          </div>
+          <div class="my-auto ml-1">{p.with.username}</div>
+        </div>
+      </a>
+    </div>
+  {/if}
+  {#if p.type === types.fund}
+    <div>
+      <span class="text-lg text-secondary my-auto mr-2">{direction}</span>
+      <a href={`/fund/${p.memo}`}>
+        <div class="flex">
+          <div class="my-auto">
+            <img src="/images/moneypot.png" class="w-12" alt="Pot" />
+          </div>
+          <div class="my-auto ml-1">{p.memo}</div>
+        </div>
+      </a>
+    </div>
+  {/if}
+  <div>
+    <span class="text-lg text-secondary">{$t("payments.amount")}</span>
+    <div>
+      {f(fiat(a, rate), currency)}
+      <span class="text-secondary text-lg">
+        ⚡️{s(a)}
+      </span>
+    </div>
+  </div>
 
-	{#if tip}
-		<div>
-			<span class="text-lg text-secondary">{$t('invoice.tip')}</span>
-			<div>
-				{f(fiat(tip, rate), currency)}
-				({Math.round((tip * 100) / Math.abs(a))}%)
-				<span class="text-secondary text-lg">
-					⚡️{s(tip)}
-				</span>
-			</div>
-		</div>
+  {#if tip}
+    <div>
+      <span class="text-lg text-secondary">{$t("invoice.tip")}</span>
+      <div>
+        {f(fiat(tip, rate), currency)}
+        ({Math.round((tip * 100) / Math.abs(a))}%)
+        <span class="text-secondary text-lg">
+          ⚡️{s(tip)}
+        </span>
+      </div>
+    </div>
 
-		<div>
-			<span class="text-lg text-secondary">Total</span>
-			<div>
-				{f(fiat(a + (tip || 0), rate), currency)}
-				<span class="text-secondary text-lg">⚡️{`${s(a + (tip || 0))}`} </span>
-			</div>
-		</div>
-	{/if}
+    <div>
+      <span class="text-lg text-secondary">Total</span>
+      <div>
+        {f(fiat(a + (tip || 0), rate), currency)}
+        <span class="text-secondary text-lg">⚡️{`${s(a + (tip || 0))}`} </span>
+      </div>
+    </div>
+  {/if}
 
-	<div>
-		<span class="text-lg text-secondary">Network fee</span>
-		<div>
-			{f(fiat(fee, rate), currency)}
-			<span class="text-secondary text-lg">⚡️{`${s(fee)}`}</span>
-		</div>
-	</div>
+  <div>
+    <span class="text-lg text-secondary">Network fee</span>
+    <div>
+      {f(fiat(fee, rate), currency)}
+      <span class="text-secondary text-lg">⚡️{`${s(fee)}`}</span>
+    </div>
+  </div>
 
-	{#if ourfee > 0}
-		<div>
-			<span class="text-lg text-secondary">Platform fee</span>
-			<div>
-				{f(fiat(ourfee, rate), currency)}
-				<span class="text-secondary">⚡️{`${s(ourfee)}`}</span>
-			</div>
-		</div>
-	{/if}
+  {#if ourfee > 0}
+    <div>
+      <span class="text-lg text-secondary">Platform fee</span>
+      <div>
+        {f(fiat(ourfee, rate), currency)}
+        <span class="text-secondary">⚡️{`${s(ourfee)}`}</span>
+      </div>
+    </div>
+  {/if}
 
-	<div>
-		<span class="text-lg text-secondary">Date</span>
-		<div>
-			{format(new Date(created), 'MMMM d')},
-			{format(new Date(created), 'h:mm aaa')}
-		</div>
-	</div>
+  <div>
+    <span class="text-lg text-secondary">Date</span>
+    <div>
+      {format(new Date(created), "MMMM d")},
+      {format(new Date(created), "h:mm aaa")}
+    </div>
+  </div>
 
-	{#if type === 'bitcoin'}
-		<div>
-			<span class="text-lg text-secondary">Txid</span>
-			<div class="flex">
-				<div>
-					<a href={`${expl}/tx/${id}`} target="_blank" rel="noreferrer">{id}</a>
-				</div>
-				<button class="flex font-bold hover:opacity-80 mb-auto my-auto" on:click={() => copy(id)}
-					><Icon icon="copy" style="ml-2 w-20 my-auto" />
-				</button>
-			</div>
-		</div>
-	{/if}
+  {#if type === "bitcoin"}
+    <div>
+      <span class="text-lg text-secondary">Txid</span>
+      <div class="flex">
+        <div>
+          <a href={`${expl}/tx/${id}`} target="_blank" rel="noreferrer">{id}</a>
+        </div>
+        <button
+          class="flex font-bold hover:opacity-80 mb-auto my-auto"
+          on:click={() => copy(id)}
+          ><Icon icon="copy" style="ml-2 w-20 my-auto" />
+        </button>
+      </div>
+    </div>
+  {/if}
 
-	{#if user.hasprinter}
-		<div>
-			<button
-				class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
-				on:click={print}
-			>
-				<div class="mx-auto flex">
-					<Icon icon="printer" style="my-auto h-6 mr-2" />
-					<div class="my-auto mt-1 text-base">{$t('payments.print')}</div>
-				</div>
-			</button>
-		</div>
-	{:else}
-		<div>
-			<a href={`/payment/${id}/plain`}>
-				<button class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60">
-					<div class="mx-auto flex">
-						<Icon icon="printer" style="my-auto h-6 mr-2" />
-						<div class="my-auto mt-1 text-base">{$t('payments.print')}</div>
-					</div>
-				</button>
-			</a>
-		</div>
-	{/if}
+  {#if user.hasprinter}
+    <div>
+      <button
+        class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
+        on:click={print}
+      >
+        <div class="mx-auto flex">
+          <Icon icon="printer" style="my-auto h-6 mr-2" />
+          <div class="my-auto mt-1 text-base">{$t("payments.print")}</div>
+        </div>
+      </button>
+    </div>
+  {:else}
+    <div>
+      <a href={`/payment/${id}/plain`}>
+        <button
+          class="rounded-full border py-3 px-6 hover:opacity-80 flex w-full md:w-60"
+        >
+          <div class="mx-auto flex">
+            <Icon icon="printer" style="my-auto h-6 mr-2" />
+            <div class="my-auto mt-1 text-base">{$t("payments.print")}</div>
+          </div>
+        </button>
+      </a>
+    </div>
+  {/if}
 </div>
diff --git a/src/routes/(app)/payment/[id]/plain/+page.server.js b/src/routes/(app)/payment/[id]/plain/+page.server.js
index 1c90ab69..5a364c65 100644
--- a/src/routes/(app)/payment/[id]/plain/+page.server.js
+++ b/src/routes/(app)/payment/[id]/plain/+page.server.js
@@ -1,6 +1,6 @@
-import { auth, get } from '$lib/utils';
+import { auth, get } from "$lib/utils";
 
 export async function load({ cookies, params }) {
-	let payment = await get(`/payments/${params.id}`, auth(cookies));
-	return { payment };
+  let payment = await get(`/payments/${params.id}`, auth(cookies));
+  return { payment };
 }
diff --git a/src/routes/(app)/payment/[id]/plain/+page.svelte b/src/routes/(app)/payment/[id]/plain/+page.svelte
index 5ffd1656..27e8d0ed 100644
--- a/src/routes/(app)/payment/[id]/plain/+page.svelte
+++ b/src/routes/(app)/payment/[id]/plain/+page.svelte
@@ -1,77 +1,87 @@
 <script>
-	import { goto } from '$app/navigation';
-	import { onMount } from 'svelte';
-	import { browser } from '$app/environment';
-	import { t } from '$lib/translations';
-	import { back, copy, f, s, fiat, post, sats, success, types } from '$lib/utils';
-	import { Avatar, Icon } from '$comp';
-	import { format } from 'date-fns';
-	import { PUBLIC_EXPLORER as expl } from '$env/static/public';
+  import { goto } from "$app/navigation";
+  import { onMount } from "svelte";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import {
+    back,
+    copy,
+    f,
+    s,
+    fiat,
+    post,
+    sats,
+    success,
+    types,
+  } from "$lib/utils";
+  import { Avatar, Icon } from "$comp";
+  import { format } from "date-fns";
+  import { PUBLIC_EXPLORER as expl } from "$env/static/public";
 
-	export let data;
-	let { user, payment: p } = data;
+  export let data;
+  let { user, payment: p } = data;
 
-	let { username } = user;
-	let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
-	let a = Math.abs(amount);
+  let { username } = user;
+  let { id, amount, created, rate, type, ref, tip, ourfee, fee, currency } = p;
+  let a = Math.abs(amount);
 
-	onMount(() => {
-		if (browser) {
-			let main = document.querySelector('main');
-			main.style.paddingBottom = '0';
-			window.onfocus = () => goto(`/payment/${id}`);
-			window.print();
-		}
-	});
+  onMount(() => {
+    if (browser) {
+      let main = document.querySelector("main");
+      main.style.paddingBottom = "0";
+      window.onfocus = () => goto(`/payment/${id}`);
+      window.print();
+    }
+  });
 
-	fee = fee || 0;
+  fee = fee || 0;
 </script>
 
 <div class="space-y-5">
-	<div>
-		<span class="text-lg text-secondary">Amount</span>
-		<div>
-			{f(fiat(a, rate), currency)}
-		</div>
-	</div>
+  <div>
+    <span class="text-lg text-secondary">Amount</span>
+    <div>
+      {f(fiat(a, rate), currency)}
+    </div>
+  </div>
 
-	{#if tip}
-		<div>
-			<span class="text-lg text-secondary">Tip</span>
-			<div>
-				{f(fiat(tip, rate), currency)}
-				({Math.round((tip * 100) / Math.abs(a))}%)
-			</div>
-		</div>
+  {#if tip}
+    <div>
+      <span class="text-lg text-secondary">Tip</span>
+      <div>
+        {f(fiat(tip, rate), currency)}
+        ({Math.round((tip * 100) / Math.abs(a))}%)
+      </div>
+    </div>
 
-		<div>
-			<span class="text-lg text-secondary">Total</span>
-			<div>
-				{f(fiat(a + (tip || 0), rate), currency)}
-			</div>
-		</div>
-	{/if}
+    <div>
+      <span class="text-lg text-secondary">Total</span>
+      <div>
+        {f(fiat(a + (tip || 0), rate), currency)}
+      </div>
+    </div>
+  {/if}
 
-	<div>
-		<span class="text-lg text-secondary">Date</span>
-		<div>
-			{format(new Date(created), 'MMMM d')},
-			{format(new Date(created), 'h:mm aaa')}
-		</div>
-	</div>
+  <div>
+    <span class="text-lg text-secondary">Date</span>
+    <div>
+      {format(new Date(created), "MMMM d")},
+      {format(new Date(created), "h:mm aaa")}
+    </div>
+  </div>
 
-	{#if type === 'bitcoin'}
-		<div>
-			<span class="text-lg text-secondary">Txid</span>
-			<div class="flex">
-				<div>
-					{id}
-				</div>
-			</div>
-		</div>
-	{/if}
+  {#if type === "bitcoin"}
+    <div>
+      <span class="text-lg text-secondary">Txid</span>
+      <div class="flex">
+        <div>
+          {id}
+        </div>
+      </div>
+    </div>
+  {/if}
 </div>
 
 <a href={`/payment/${id}`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
diff --git a/src/routes/(app)/payment/[id]/print/+server.js b/src/routes/(app)/payment/[id]/print/+server.js
index fde834d1..2fdfc8c1 100644
--- a/src/routes/(app)/payment/[id]/print/+server.js
+++ b/src/routes/(app)/payment/[id]/print/+server.js
@@ -1,7 +1,7 @@
-import { auth, post } from '$lib/utils';
-import { json } from '@sveltejs/kit';
+import { auth, post } from "$lib/utils";
+import { json } from "@sveltejs/kit";
 
 export async function POST({ cookies, request }) {
-	let body = await request.json();
-	return json(post('/print', body, auth(cookies)));
+  let body = await request.json();
+  return json(post("/print", body, auth(cookies)));
 }
diff --git a/src/routes/(app)/pin/+server.js b/src/routes/(app)/pin/+server.js
index 9f63f545..76d407bf 100644
--- a/src/routes/(app)/pin/+server.js
+++ b/src/routes/(app)/pin/+server.js
@@ -1,7 +1,7 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { json } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
 
 export async function POST({ cookies, request }) {
-	let result = await post('/pin', await request.json(), auth(cookies));
-	return json(result);
+  let result = await post("/pin", await request.json(), auth(cookies));
+  return json(result);
 }
diff --git a/src/routes/(app)/qr/[text]/+page.server.js b/src/routes/(app)/qr/[text]/+page.server.js
index 3ab0725f..5eaafe57 100644
--- a/src/routes/(app)/qr/[text]/+page.server.js
+++ b/src/routes/(app)/qr/[text]/+page.server.js
@@ -1,8 +1,8 @@
-import Qr from 'qrcode-base64';
+import Qr from "qrcode-base64";
 
 export async function load({ params }) {
-	let { text } = params;
-	let src = Qr.drawImg(text, { size: 600 });
+  let { text } = params;
+  let src = Qr.drawImg(text, { size: 600 });
 
-	return { src, text };
+  return { src, text };
 }
diff --git a/src/routes/(app)/qr/[text]/+page.svelte b/src/routes/(app)/qr/[text]/+page.svelte
index f3cd791a..d943b0b5 100644
--- a/src/routes/(app)/qr/[text]/+page.svelte
+++ b/src/routes/(app)/qr/[text]/+page.svelte
@@ -1,24 +1,24 @@
 <script>
-	import { Icon, Qr } from '$comp';
+  import { Icon, Qr } from "$comp";
   import { back } from "$lib/utils";
-	export let data;
-	let { src, text } = data;
+  export let data;
+  let { src, text } = data;
 </script>
 
-
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
   <Icon icon="arrow-left" style="w-10" />
 </button>
 
-
 <div class="container px-4 max-w-4xl mx-auto mt-10 space-y-5">
-	<div class="flex justify-center items-center">
-		<div class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5">
+  <div class="flex justify-center items-center">
+    <div
+      class="md:shadow-xl rounded-3xl md:px-10 pt-5 pb-10 space-y-5 w-full md:mx-5"
+    >
       <Qr {src} />
 
       <div class="text-center w-full text-2xl py-10 break-all">
         {text}
       </div>
-		</div>
-	</div>
+    </div>
+  </div>
 </div>
diff --git a/src/routes/(app)/redeem/[redeemcode]/+page.server.js b/src/routes/(app)/redeem/[redeemcode]/+page.server.js
index 4f685d68..f227f22e 100644
--- a/src/routes/(app)/redeem/[redeemcode]/+page.server.js
+++ b/src/routes/(app)/redeem/[redeemcode]/+page.server.js
@@ -1,17 +1,17 @@
-import { error, redirect } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { error, redirect } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
 
 export async function load({ cookies, locals, params }) {
-	let { user } = locals;
+  let { user } = locals;
 
-	if (user) {
-		try {
-			await post('/redeem', params, auth(cookies));
-		} catch (e) {
-			throw redirect(307, '/');
-		}
-		throw redirect(307, `/${user.username}/payments`);
-	}
+  if (user) {
+    try {
+      await post("/redeem", params, auth(cookies));
+    } catch (e) {
+      throw redirect(307, "/");
+    }
+    throw redirect(307, `/${user.username}/payments`);
+  }
 
-	throw redirect(307, '/login');
+  throw redirect(307, "/login");
 }
diff --git a/src/routes/(app)/redeem/[redeemcode]/+page.svelte b/src/routes/(app)/redeem/[redeemcode]/+page.svelte
index a4609307..b2fcf2f4 100644
--- a/src/routes/(app)/redeem/[redeemcode]/+page.svelte
+++ b/src/routes/(app)/redeem/[redeemcode]/+page.svelte
@@ -1,4 +1,4 @@
 <script>
-	import { loginRedirect } from '$lib/store';
-	$loginRedirect = undefined;
+  import { loginRedirect } from "$lib/store";
+  $loginRedirect = undefined;
 </script>
diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js
index 45344907..e986c73d 100644
--- a/src/routes/(app)/register/+page.server.js
+++ b/src/routes/(app)/register/+page.server.js
@@ -1,41 +1,42 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { fd, post, login } from '$lib/utils';
+import { fail, redirect } from "@sveltejs/kit";
+import { fd, post, login } from "$lib/utils";
 
 export const load = async ({ parent }) => {
-	let { user } = await parent();
-	if (user) throw redirect(307, `/${user.username}`);
+  let { user } = await parent();
+  if (user) throw redirect(307, `/${user.username}`);
 
-	let index = Math.floor(Math.random() * 64) + 1;
+  let index = Math.floor(Math.random() * 64) + 1;
 
-	return { index };
+  return { index };
 };
 
 export const actions = {
-	default: async ({ cookies, request }) => {
-		let ip = request.headers.get('cf-connecting-ip');
-
-		let form = await fd(request);
-		let { profile, username, password, cipher, salt, pubkey, loginRedirect } = form;
-		let user = { profile, username, password, cipher, salt, pubkey };
-		let error;
-
-		if (loginRedirect === 'undefined') loginRedirect = undefined;
-
-		try {
-			await post('/register', { user }, { 'cf-connecting-ip': ip });
-		} catch (e) {
-			console.log(e);
-			if (e.message.includes('taken')) error = e.message;
-		}
-
-		try {
-			await login(user, cookies, ip);
-			error = null;
-		} catch (e) {
-			error ||= e.message;
-		}
-
-		if (error) return fail(400, { error });
-		throw redirect(307, loginRedirect || `/${user.username}`);
-	}
+  default: async ({ cookies, request }) => {
+    let ip = request.headers.get("cf-connecting-ip");
+
+    let form = await fd(request);
+    let { profile, username, password, cipher, salt, pubkey, loginRedirect } =
+      form;
+    let user = { profile, username, password, cipher, salt, pubkey };
+    let error;
+
+    if (loginRedirect === "undefined") loginRedirect = undefined;
+
+    try {
+      await post("/register", { user }, { "cf-connecting-ip": ip });
+    } catch (e) {
+      console.log(e);
+      if (e.message.includes("taken")) error = e.message;
+    }
+
+    try {
+      await login(user, cookies, ip);
+      error = null;
+    } catch (e) {
+      error ||= e.message;
+    }
+
+    if (error) return fail(400, { error });
+    throw redirect(307, loginRedirect || `/${user.username}`);
+  },
 };
diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index a9f9d047..8310aed1 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -1,287 +1,311 @@
 <script>
-	import punks from '$lib/punks';
-	import { upload } from '$lib/upload';
-	import { afterNavigate, invalidateAll } from '$app/navigation';
-	import { applyAction, deserialize } from '$app/forms';
-	import { tick } from 'svelte';
-	import { fly } from 'svelte/transition';
-	import { enhance } from '$app/forms';
-	import { Pin, Icon, Spinner } from '$comp';
-	import { focus, fail } from '$lib/utils';
-	import { avatar, password, loginRedirect } from '$lib/store';
-	import { t } from '$lib/translations';
-	import { page } from '$app/stores';
-	import { generate } from '$lib/nostr';
-	import {
-		NumberDictionary,
-		uniqueNamesGenerator,
-		colors,
-		adjectives,
-		animals
-	} from 'unique-names-generator';
-
-	export let form;
-	export let data;
-
-	$: data && ($avatar = undefined);
-	let username;
-	let { index } = data;
-
-	let cleared;
-	let clear = () => {
-		if (!cleared) {
-			cleared = true;
-			username = '';
-			$password = '';
-			revealPassword = false;
-		}
-	};
-
-	let refresh = async () => {
-		username = uniqueNamesGenerator({
-			dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })],
-			length: 2,
-			separator: ''
-		});
-
-		$password = uniqueNamesGenerator({
-			dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })],
-			length: 2,
-			separator: ''
-		});
-
-		revealPassword = true;
-	};
-
-	afterNavigate(async () => {
-		try {
-			await invalidateAll();
-		} catch (e) {
-			console.log(e);
-		}
-	});
-
-	let token, formElement;
-	let code = [];
-	let redirect;
-
-	$: need2fa = form?.message === '2fa';
-	let cancel = () => (need2fa = false);
-	$: if (form?.message === '2fa' && form.token === token) token = '';
-
-	let email, btn;
-
-	$: update(form);
-	let update = (form) => form && ({ username, password: $password } = form);
-
-	$: token && token?.length === 6 && tick().then(() => btn.click());
-
-	let revealPassword;
-
-	let loading;
-	async function handleSubmit(e) {
-		loading = true;
-
-		let data = new FormData(this);
-		let user = Object.fromEntries(data);
-		await generate(user);
-
-		for (let k in user) {
-			data.set(k, user[k]);
-		}
-
-		data.set('profile', punks[index]);
-		if ($avatar) {
-			try {
-				let { hash } = JSON.parse(
-					await upload($avatar.file, $avatar.type, $avatar.progress, token)
-				);
-
-				data.set('profile', hash);
-				await fetch(`/api/public/${hash}.webp`, { cache: 'reload', mode: 'no-cors' });
-			} catch (e) {
-				console.log('problem uploading avatar', e);
-			}
-		}
-
-		const response = await fetch('/register', {
-			method: 'POST',
-			body: data
-		});
-
-		const result = deserialize(await response.text());
-
-		if (result.type === 'success') {
-			await invalidateAll();
-		}
-
-		applyAction(result);
-		loading = false;
-	}
-
-	let avatarInput;
-	$: src = `/api/public/${punks[index]}.webp`;
-	let decr = () => (index = index <= 0 ? 63 : index - 1);
-	let incr = () => (index = index >= 63 ? 0 : index + 1);
-	let selectAvatar = () => avatarInput.click();
-
-	let progress;
-	let handleFile = async ({ target }) => {
-		let type = 'profile';
-		let file = target.files[0];
-		if (!file) return;
-
-		if (file.size > 10000000) form.error = 'File too large';
-		$avatar = { file, type, progress };
-
-		var reader = new FileReader();
-		reader.onload = async (e) => {
-			src = e.target.result;
-		};
-
-		reader.readAsDataURL(file);
-	};
+  import punks from "$lib/punks";
+  import { upload } from "$lib/upload";
+  import { afterNavigate, invalidateAll } from "$app/navigation";
+  import { applyAction, deserialize } from "$app/forms";
+  import { tick } from "svelte";
+  import { fly } from "svelte/transition";
+  import { enhance } from "$app/forms";
+  import { Pin, Icon, Spinner } from "$comp";
+  import { focus, fail } from "$lib/utils";
+  import { avatar, password, loginRedirect } from "$lib/store";
+  import { t } from "$lib/translations";
+  import { page } from "$app/stores";
+  import { generate } from "$lib/nostr";
+  import {
+    NumberDictionary,
+    uniqueNamesGenerator,
+    colors,
+    adjectives,
+    animals,
+  } from "unique-names-generator";
+
+  export let form;
+  export let data;
+
+  $: data && ($avatar = undefined);
+  let username;
+  let { index } = data;
+
+  let cleared;
+  let clear = () => {
+    if (!cleared) {
+      cleared = true;
+      username = "";
+      $password = "";
+      revealPassword = false;
+    }
+  };
+
+  let refresh = async () => {
+    username = uniqueNamesGenerator({
+      dictionaries: [animals, NumberDictionary.generate({ min: 10, max: 99 })],
+      length: 2,
+      separator: "",
+    });
+
+    $password = uniqueNamesGenerator({
+      dictionaries: [colors, NumberDictionary.generate({ min: 100, max: 999 })],
+      length: 2,
+      separator: "",
+    });
+
+    revealPassword = true;
+  };
+
+  afterNavigate(async () => {
+    try {
+      await invalidateAll();
+    } catch (e) {
+      console.log(e);
+    }
+  });
+
+  let token, formElement;
+  let code = [];
+  let redirect;
+
+  $: need2fa = form?.message === "2fa";
+  let cancel = () => (need2fa = false);
+  $: if (form?.message === "2fa" && form.token === token) token = "";
+
+  let email, btn;
+
+  $: update(form);
+  let update = (form) => form && ({ username, password: $password } = form);
+
+  $: token && token?.length === 6 && tick().then(() => btn.click());
+
+  let revealPassword;
+
+  let loading;
+  async function handleSubmit(e) {
+    loading = true;
+
+    let data = new FormData(this);
+    let user = Object.fromEntries(data);
+    await generate(user);
+
+    for (let k in user) {
+      data.set(k, user[k]);
+    }
+
+    data.set("profile", punks[index]);
+    if ($avatar) {
+      try {
+        let { hash } = JSON.parse(
+          await upload($avatar.file, $avatar.type, $avatar.progress, token)
+        );
+
+        data.set("profile", hash);
+        await fetch(`/api/public/${hash}.webp`, {
+          cache: "reload",
+          mode: "no-cors",
+        });
+      } catch (e) {
+        console.log("problem uploading avatar", e);
+      }
+    }
+
+    const response = await fetch("/register", {
+      method: "POST",
+      body: data,
+    });
+
+    const result = deserialize(await response.text());
+
+    if (result.type === "success") {
+      await invalidateAll();
+    }
+
+    applyAction(result);
+    loading = false;
+  }
+
+  let avatarInput;
+  $: src = `/api/public/${punks[index]}.webp`;
+  let decr = () => (index = index <= 0 ? 63 : index - 1);
+  let incr = () => (index = index >= 63 ? 0 : index + 1);
+  let selectAvatar = () => avatarInput.click();
+
+  let progress;
+  let handleFile = async ({ target }) => {
+    let type = "profile";
+    let file = target.files[0];
+    if (!file) return;
+
+    if (file.size > 10000000) form.error = "File too large";
+    $avatar = { file, type, progress };
+
+    var reader = new FileReader();
+    reader.onload = async (e) => {
+      src = e.target.result;
+    };
+
+    reader.readAsDataURL(file);
+  };
 </script>
 
 {#if need2fa}
-	<Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
+  <Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
 {/if}
 
 <div class="pt-4">
-	<div class="w-[243px] mx-auto">
-		<a href="/">
-			<Icon icon="logo" />
-		</a>
-	</div>
-
-	<div class="flex justify-center items-center">
-		<div class="shadow-xl rounded-3xl p-4 pt-0 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]">
-			<input
-				type="file"
-				class="hidden"
-				bind:this={avatarInput}
-				on:change={(e) => handleFile(e, 'profile')}
-			/>
-
-			<div class="relative">
-				<button class="absolute w-8 h-12 left-12 bg-white rounded top-12" on:click={decr}>
-					<Icon icon="chevron-left" style="w-8 " />
-				</button>
-				<div class="relative w-32 mx-auto" on:click={selectAvatar}>
-					<button
-						class="w-32 h-32 rounded-full border-4 border-white overflow-hidden flex mx-auto relative"
-					>
-						<img
-							{src}
-							class="w-full h-full object-cover object-center overflow-hidden"
-							alt={username}
-						/>
-					</button>
-					<button
-						class="absolute bg-white rounded-full p-2 mx-auto right-0 bottom-0 z-10 bg-opacity-80"
-					>
-						<Icon icon="upload" style="w-8" />
-					</button>
-				</div>
-				<button class="absolute w-8 h-12 right-12 bg-white rounded top-12" on:click={incr}>
-					<Icon icon="chevron-left" style="w-8 rotate-180" />
-				</button>
-			</div>
-
-			{#if form?.error}
-				<div class="text-red-600 text-center" in:fly>
-					{form.error}
-				</div>
-			{/if}
-
-			<form class="space-y-5" on:submit|preventDefault={handleSubmit} method="POST">
-				<input
-					type="hidden"
-					name="loginRedirect"
-					value={$loginRedirect || $page.url.searchParams.get('redirect')}
-				/>
-				<input type="hidden" name="token" value={token} />
-
-				<div class="relative">
-					<label for="username" class="font-semibold">{$t('login.username')}</label>
-					<input
-                           use:focus
-						tabindex="1"
-						name="username"
-						type="text"
-						required
-						class="bg-primary"
-						bind:value={username}
-						on:focus={clear}
-						autocapitalize="none"
-					/>
-					<button type="button" on:click={refresh} class="absolute right-0 top-4" tabindex="5">
-						<Icon icon="random" style="w-10 m-4" />
-					</button>
-				</div>
-
-				<div class="relative">
-					<label for="password" class="block font-semibold">{$t('login.password')}</label>
-					{#if revealPassword}
-						<input
-							tabindex="2"
-							name="password"
-							type="text"
-							required
-							class="bg-primary"
-							bind:value={$password}
-							autocapitalize="none"
-						/>
-					{:else}
-						<input
-							tabindex="2"
-							name="password"
-							type="password"
-							required
-							class="bg-primary"
-							bind:value={$password}
-							autocapitalize="none"
-							on:focus={clear}
-						/>
-					{/if}
-					<button
-						type="button"
-						tabindex="4"
-						on:click={() => (revealPassword = !revealPassword)}
-						class="absolute right-0 top-4"
-					>
-						<Icon icon={revealPassword ? 'eye' : 'eye-off'} style="m-6" />
-					</button>
-				</div>
-
-				<p class="text-secondary text-sm">
-					{$t('login.passwordRecommendation')}
-				</p>
-
-				<button
-					tabindex="3"
-					type="submit"
-					class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
-					disabled={loading}
-					bind:this={btn}
-				>
-					{#if loading}
-						<Spinner />
-					{:else}
-						{$t('login.register')}
-					{/if}
-				</button>
-			</form>
-
-			<p class="text-secondary text-center font-medium">
-				{$t('login.haveAccount')}
-				<a
-					href={'/login'}
-					class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
-				>
-					{$t('login.signIn')}
-				</a>
-			</p>
-		</div>
-	</div>
+  <div class="w-[243px] mx-auto">
+    <a href="/">
+      <Icon icon="logo" />
+    </a>
+  </div>
+
+  <div class="flex justify-center items-center">
+    <div
+      class="shadow-xl rounded-3xl p-4 pt-0 space-y-5 w-full mx-5 md:mx-0 md:w-[400px]"
+    >
+      <input
+        type="file"
+        class="hidden"
+        bind:this={avatarInput}
+        on:change={(e) => handleFile(e, "profile")}
+      />
+
+      <div class="relative">
+        <button
+          class="absolute w-8 h-12 left-12 bg-white rounded top-12"
+          on:click={decr}
+        >
+          <Icon icon="chevron-left" style="w-8 " />
+        </button>
+        <div class="relative w-32 mx-auto" on:click={selectAvatar}>
+          <button
+            class="w-32 h-32 rounded-full border-4 border-white overflow-hidden flex mx-auto relative"
+          >
+            <img
+              {src}
+              class="w-full h-full object-cover object-center overflow-hidden"
+              alt={username}
+            />
+          </button>
+          <button
+            class="absolute bg-white rounded-full p-2 mx-auto right-0 bottom-0 z-10 bg-opacity-80"
+          >
+            <Icon icon="upload" style="w-8" />
+          </button>
+        </div>
+        <button
+          class="absolute w-8 h-12 right-12 bg-white rounded top-12"
+          on:click={incr}
+        >
+          <Icon icon="chevron-left" style="w-8 rotate-180" />
+        </button>
+      </div>
+
+      {#if form?.error}
+        <div class="text-red-600 text-center" in:fly>
+          {form.error}
+        </div>
+      {/if}
+
+      <form
+        class="space-y-5"
+        on:submit|preventDefault={handleSubmit}
+        method="POST"
+      >
+        <input
+          type="hidden"
+          name="loginRedirect"
+          value={$loginRedirect || $page.url.searchParams.get("redirect")}
+        />
+        <input type="hidden" name="token" value={token} />
+
+        <div class="relative">
+          <label for="username" class="font-semibold"
+            >{$t("login.username")}</label
+          >
+          <input
+            use:focus
+            tabindex="1"
+            name="username"
+            type="text"
+            required
+            class="bg-primary"
+            bind:value={username}
+            on:focus={clear}
+            autocapitalize="none"
+          />
+          <button
+            type="button"
+            on:click={refresh}
+            class="absolute right-0 top-4"
+            tabindex="5"
+          >
+            <Icon icon="random" style="w-10 m-4" />
+          </button>
+        </div>
+
+        <div class="relative">
+          <label for="password" class="block font-semibold"
+            >{$t("login.password")}</label
+          >
+          {#if revealPassword}
+            <input
+              tabindex="2"
+              name="password"
+              type="text"
+              required
+              class="bg-primary"
+              bind:value={$password}
+              autocapitalize="none"
+            />
+          {:else}
+            <input
+              tabindex="2"
+              name="password"
+              type="password"
+              required
+              class="bg-primary"
+              bind:value={$password}
+              autocapitalize="none"
+              on:focus={clear}
+            />
+          {/if}
+          <button
+            type="button"
+            tabindex="4"
+            on:click={() => (revealPassword = !revealPassword)}
+            class="absolute right-0 top-4"
+          >
+            <Icon icon={revealPassword ? "eye" : "eye-off"} style="m-6" />
+          </button>
+        </div>
+
+        <p class="text-secondary text-sm">
+          {$t("login.passwordRecommendation")}
+        </p>
+
+        <button
+          tabindex="3"
+          type="submit"
+          class="bg-black text-white w-full rounded-2xl p-4 font-semibold hover:opacity-80"
+          disabled={loading}
+          bind:this={btn}
+        >
+          {#if loading}
+            <Spinner />
+          {:else}
+            {$t("login.register")}
+          {/if}
+        </button>
+      </form>
+
+      <p class="text-secondary text-center font-medium">
+        {$t("login.haveAccount")}
+        <a
+          href={"/login"}
+          class="block md:inline text-black underline underline-offset-4 hover:opacity-80"
+        >
+          {$t("login.signIn")}
+        </a>
+      </p>
+    </div>
+  </div>
 </div>
diff --git a/src/routes/(app)/scan/+page.svelte b/src/routes/(app)/scan/+page.svelte
index 8c5ea0a5..033eb28b 100644
--- a/src/routes/(app)/scan/+page.svelte
+++ b/src/routes/(app)/scan/+page.svelte
@@ -1,44 +1,51 @@
 <script>
-	import { Icon } from '$comp';
-	import QrScanner from 'qr-scanner';
-	import { onMount, onDestroy } from 'svelte';
-	import { back } from '$lib/utils';
-	import { goto } from '$app/navigation';
+  import { Icon } from "$comp";
+  import QrScanner from "qr-scanner";
+  import { onMount, onDestroy } from "svelte";
+  import { back } from "$lib/utils";
+  import { goto } from "$app/navigation";
 
-	let scanner, vid;
-	onMount(() => {
-		scanner = new QrScanner(vid, ({ data }) => scanner.stop() || goto(`/send/${encodeURI(data)}`), {
-			highlightScanRegion: true,
-			highlightCodeOutline: true
-		});
-		scanner.start();
-	});
+  let scanner, vid;
+  onMount(() => {
+    scanner = new QrScanner(
+      vid,
+      ({ data }) => scanner.stop() || goto(`/send/${encodeURI(data)}`),
+      {
+        highlightScanRegion: true,
+        highlightCodeOutline: true,
+      }
+    );
+    scanner.start();
+  });
 
-	onDestroy(() => scanner?.stop());
+  onDestroy(() => scanner?.stop());
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
+  <Icon icon="arrow-left" style="w-10" />
 </button>
 
 <div class="flex w-full mb-4 px-4">
-	<div class="bg-black mx-auto rounded-3xl">
-		<video
-			bind:this={vid}
-			class="border-4 rounded-3xl border-black md:max-w-[600px] !max-h-[80vh] !min-w-[300px]"
-		/>
-	</div>
+  <div class="bg-black mx-auto rounded-3xl">
+    <video
+      bind:this={vid}
+      class="border-4 rounded-3xl border-black md:max-w-[600px] !max-h-[80vh] !min-w-[300px]"
+    />
+  </div>
 </div>
 
 <div class="flex w-full mb-4">
-	<button class="mx-auto border rounded-full px-6 py-2 font-bold hover:opacity-80" on:click={back}>
-		Cancel
-	</button>
+  <button
+    class="mx-auto border rounded-full px-6 py-2 font-bold hover:opacity-80"
+    on:click={back}
+  >
+    Cancel
+  </button>
 </div>
 
 <style>
-	video {
-		transition: transform 0.3s ease-out;
-		transform: scale(1);
-	}
+  video {
+    transition: transform 0.3s ease-out;
+    transform: scale(1);
+  }
 </style>
diff --git a/src/routes/(app)/send/+layout.svelte b/src/routes/(app)/send/+layout.svelte
index 47c11f1c..1a587edf 100644
--- a/src/routes/(app)/send/+layout.svelte
+++ b/src/routes/(app)/send/+layout.svelte
@@ -1,16 +1,16 @@
 <script>
-	import { goto } from '$app/navigation';
-	import { Pin } from '$comp';
-	import { pin } from '$lib/store';
+  import { goto } from "$app/navigation";
+  import { Pin } from "$comp";
+  import { pin } from "$lib/store";
 
-	export let data;
+  export let data;
 
-	let { user } = data;
-	let cancel = () => goto(`/${user.username}`);
+  let { user } = data;
+  let cancel = () => goto(`/${user.username}`);
 </script>
 
 {#if user.haspin && (!$pin || $pin?.length !== 6)}
-	<Pin bind:value={$pin} {cancel} />
+  <Pin bind:value={$pin} {cancel} />
 {/if}
 
 <slot />
diff --git a/src/routes/(app)/send/[...text]/+page.server.js b/src/routes/(app)/send/[...text]/+page.server.js
index 3ca50bca..9a76f21d 100644
--- a/src/routes/(app)/send/[...text]/+page.server.js
+++ b/src/routes/(app)/send/[...text]/+page.server.js
@@ -1,100 +1,100 @@
-import { validate } from 'bitcoin-address-validation';
-import bip21 from 'bip21';
-import { auth, get, post } from '$lib/utils';
-import { fail, redirect } from '@sveltejs/kit';
-import { PUBLIC_DOMAIN } from '$env/static/public';
+import { validate } from "bitcoin-address-validation";
+import bip21 from "bip21";
+import { auth, get, post } from "$lib/utils";
+import { fail, redirect } from "@sveltejs/kit";
+import { PUBLIC_DOMAIN } from "$env/static/public";
 
 let parse = async (t, host) => {
-	if (!t) return;
-
-	if (t.startsWith('http')) throw redirect(307, t);
-	if (t.startsWith(host)) throw redirect(307, `http://${t}`);
-
-	let amount, user, id;
-
-	t = t.trim();
-	t.toLowerCase().startsWith('bitcoin:') &&
-		({
-			address: t,
-			options: { amount }
-		} = bip21.decode(t));
-
-	if (t.endsWith(`@${PUBLIC_DOMAIN}`)) t = t.split('@')[0];
-	if (t.includes('@') && t.includes('.')) {
-		try {
-			t = await get(`/encode?address=${t}`);
-		} catch (e) {}
-	}
-
-	if (t.endsWith('@classic')) {
-		({ uuid: id } = await get(`/invoice/classic/${t.replace('@classic', '')}`));
-		if (id) throw redirect(307, `/send/invoice/${id}`);
-	}
-
-	if (t.includes('/fund')) throw redirect(307, t.substring(t.indexOf('/fund')));
-
-	if (t.toLowerCase().startsWith('lnurl')) throw redirect(307, `/ln/${t}`);
-	if (t.includes(':')) t = t.split(':')[1];
-
-	// lightning
-	if (t.toLowerCase().startsWith('ln')) {
-		try {
-			({ id } = await get(`/invoice/${t}`));
-		} catch (e) {
-			throw redirect(307, `/send/lightning/${t}`);
-      }
-	}
-
-	// bitcoin
-	if (validate(t)) {
-		try {
-			({ id, user } = await get(`/invoice/${t}`));
-		} catch (e) {
-			let r = `/send/bitcoin/${t}`;
-			if (amount) r += '/' + amount;
-			throw redirect(307, r);
-		}
-
-		if (user) throw redirect(307, `/send/${user.username}`);
-		else if (id) throw redirect(307, `/send/${id}`);
-	}
-
-	// user
-	try {
-		user = await get(`/users/${t.split('/')[0]}`);
-		if (user.anon) user = null;
-	} catch (e) {}
-
-	if (user) throw redirect(307, `/send/user/${t}`);
-
-	let fund;
-	try {
-		fund = await get(`/fund/${t}`);
-	} catch (e) {}
-
-	if (fund) throw redirect(307, `/send/fund/${t}`);
-
-	// invoice
-	let invoice;
-	try {
-		invoice = await get(`/invoice/${t}`);
-	} catch (e) {}
-
-	if (invoice) throw redirect(307, `/send/invoice/${invoice.hash}`);
+  if (!t) return;
+
+  if (t.startsWith("http")) throw redirect(307, t);
+  if (t.startsWith(host)) throw redirect(307, `http://${t}`);
+
+  let amount, user, id;
+
+  t = t.trim();
+  t.toLowerCase().startsWith("bitcoin:") &&
+    ({
+      address: t,
+      options: { amount },
+    } = bip21.decode(t));
+
+  if (t.endsWith(`@${PUBLIC_DOMAIN}`)) t = t.split("@")[0];
+  if (t.includes("@") && t.includes(".")) {
+    try {
+      t = await get(`/encode?address=${t}`);
+    } catch (e) {}
+  }
+
+  if (t.endsWith("@classic")) {
+    ({ uuid: id } = await get(`/invoice/classic/${t.replace("@classic", "")}`));
+    if (id) throw redirect(307, `/send/invoice/${id}`);
+  }
+
+  if (t.includes("/fund")) throw redirect(307, t.substring(t.indexOf("/fund")));
+
+  if (t.toLowerCase().startsWith("lnurl")) throw redirect(307, `/ln/${t}`);
+  if (t.includes(":")) t = t.split(":")[1];
+
+  // lightning
+  if (t.toLowerCase().startsWith("ln")) {
+    try {
+      ({ id } = await get(`/invoice/${t}`));
+    } catch (e) {
+      throw redirect(307, `/send/lightning/${t}`);
+    }
+  }
+
+  // bitcoin
+  if (validate(t)) {
+    try {
+      ({ id, user } = await get(`/invoice/${t}`));
+    } catch (e) {
+      let r = `/send/bitcoin/${t}`;
+      if (amount) r += "/" + amount;
+      throw redirect(307, r);
+    }
+
+    if (user) throw redirect(307, `/send/${user.username}`);
+    else if (id) throw redirect(307, `/send/${id}`);
+  }
+
+  // user
+  try {
+    user = await get(`/users/${t.split("/")[0]}`);
+    if (user.anon) user = null;
+  } catch (e) {}
+
+  if (user) throw redirect(307, `/send/user/${t}`);
+
+  let fund;
+  try {
+    fund = await get(`/fund/${t}`);
+  } catch (e) {}
+
+  if (fund) throw redirect(307, `/send/fund/${t}`);
+
+  // invoice
+  let invoice;
+  try {
+    invoice = await get(`/invoice/${t}`);
+  } catch (e) {}
+
+  if (invoice) throw redirect(307, `/send/invoice/${invoice.hash}`);
 };
 
 export async function load({ cookies, params, request, url }) {
-	let { text } = params;
-	await parse(text, url.host);
-	let contacts = await get('/contacts', auth(cookies));
-	return { contacts };
+  let { text } = params;
+  await parse(text, url.host);
+  let contacts = await get("/contacts", auth(cookies));
+  return { contacts };
 }
 
 export const actions = {
-	default: async ({ request, url }) => {
-		const form = await request.formData();
-		let t = form.get('text');
-		await parse(t, url.host);
-		return fail(400, { error: true });
-	}
+  default: async ({ request, url }) => {
+    const form = await request.formData();
+    let t = form.get("text");
+    await parse(t, url.host);
+    return fail(400, { error: true });
+  },
 };
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 74afd846..67d4afaa 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -1,125 +1,129 @@
 <script>
-	import { page } from '$app/stores';
-	import { fly } from 'svelte/transition';
-	import { enhance } from '$app/forms';
-	import { tick } from 'svelte';
-	import { browser } from '$app/environment';
-	import { t } from '$lib/translations';
-	import { AppHeader, Avatar, Icon, Spinner } from '$comp';
-	import { back, fail } from '$lib/utils';
+  import { page } from "$app/stores";
+  import { fly } from "svelte/transition";
+  import { enhance } from "$app/forms";
+  import { tick } from "svelte";
+  import { browser } from "$app/environment";
+  import { t } from "$lib/translations";
+  import { AppHeader, Avatar, Icon, Spinner } from "$comp";
+  import { back, fail } from "$lib/utils";
 
-	export let data;
-	export let form;
-	data.subject = data.user;
+  export let data;
+  export let form;
+  data.subject = data.user;
 
-	let { contacts } = data;
-	let w;
+  let { contacts } = data;
+  let w;
 
-	let el, textarea, text;
-	let placeholder = $t('user.send.placeholder');
+  let el, textarea, text;
+  let placeholder = $t("user.send.placeholder");
 
-	$: $page && setTimeout(() => w > 800 && textarea?.focus(), 0);
-	let keypress = (e) => e.key === 'Enter' && (e.preventDefault() || el.click());
+  $: $page && setTimeout(() => w > 800 && textarea?.focus(), 0);
+  let keypress = (e) => e.key === "Enter" && (e.preventDefault() || el.click());
 
-	let paste = async () => {
-		text = await navigator.clipboard.readText();
-	};
+  let paste = async () => {
+    text = await navigator.clipboard.readText();
+  };
 </script>
 
 <svelte:window bind:innerWidth={w} />
 
 <AppHeader {data} />
 <div class="container px-4 max-w-lg mx-auto space-y-5 mt-20">
-	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
-		{$t('payments.send')}
-	</h1>
+  <h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">
+    {$t("payments.send")}
+  </h1>
 
-	<form method="POST" use:enhance>
-		{#if form?.error}
-			<div class="mb-5">
-				<div class="text-red-600">
-					{$t('error.unrecognizedInput')}
-				</div>
-			</div>
-		{/if}
+  <form method="POST" use:enhance>
+    {#if form?.error}
+      <div class="mb-5">
+        <div class="text-red-600">
+          {$t("error.unrecognizedInput")}
+        </div>
+      </div>
+    {/if}
 
-		<div class="mb-2">
-			<input type="hidden" name="text" bind:value={text} />
+    <div class="mb-2">
+      <input type="hidden" name="text" bind:value={text} />
 
-			<textarea
-				{placeholder}
-				on:keypress={keypress}
-				class="w-full p-4 border rounded-xl h-48"
-				bind:value={text}
-				bind:this={textarea}
-			/>
-		</div>
+      <textarea
+        {placeholder}
+        on:keypress={keypress}
+        class="w-full p-4 border rounded-xl h-48"
+        bind:value={text}
+        bind:this={textarea}
+      />
+    </div>
 
-		<div class="flex justify-end">
-			{#if text?.length}
-				<a href={`/qr/${encodeURIComponent(text)}`}>
-					<button
-						type="button"
-						class="flex border rounded-full px-6 py-2 font-bold hover:opacity-80 mr-1"
-					>
-						<Icon icon="qr" style="mr-2 w-6 my-auto invert" />
-						<div class="my-auto">{$t('user.send.makeQR')}</div>
-					</button>
-				</a>
-			{/if}
+    <div class="flex justify-end">
+      {#if text?.length}
+        <a href={`/qr/${encodeURIComponent(text)}`}>
+          <button
+            type="button"
+            class="flex border rounded-full px-6 py-2 font-bold hover:opacity-80 mr-1"
+          >
+            <Icon icon="qr" style="mr-2 w-6 my-auto invert" />
+            <div class="my-auto">{$t("user.send.makeQR")}</div>
+          </button>
+        </a>
+      {/if}
 
-			<a href="/scan">
-				<button
-					type="button"
-					class="flex border rounded-full px-6 py-2 font-bold hover:opacity-80 mr-1"
-				>
-					<Icon icon="camera" style="mr-2 w-6 my-auto" />
-					<div class="my-auto">{$t('user.send.scan')}</div>
-				</button>
-			</a>
+      <a href="/scan">
+        <button
+          type="button"
+          class="flex border rounded-full px-6 py-2 font-bold hover:opacity-80 mr-1"
+        >
+          <Icon icon="camera" style="mr-2 w-6 my-auto" />
+          <div class="my-auto">{$t("user.send.scan")}</div>
+        </button>
+      </a>
 
-			<button
-				type="button"
-				class="flex border rounded-full px-6 py-2 font-bold hover:opacity-80 mr-1"
-				on:click={paste}
-			>
-				<Icon icon="paste" style="mr-2 w-6 my-auto" />
-				<div class="my-auto">{$t('user.send.paste')}</div>
-			</button>
+      <button
+        type="button"
+        class="flex border rounded-full px-6 py-2 font-bold hover:opacity-80 mr-1"
+        on:click={paste}
+      >
+        <Icon icon="paste" style="mr-2 w-6 my-auto" />
+        <div class="my-auto">{$t("user.send.paste")}</div>
+      </button>
 
-			<button
-				bind:this={el}
-				type="submit"
-				class="{!text
-					? 'opacity-50'
-					: 'opacity-100 hover:opacity-80'} bg-black text-white border rounded-full px-6 py-2 font-bold"
-			>
-				{$t('user.send.next')}
-			</button>
-		</div>
-	</form>
+      <button
+        bind:this={el}
+        type="submit"
+        class="{!text
+          ? 'opacity-50'
+          : 'opacity-100 hover:opacity-80'} bg-black text-white border rounded-full px-6 py-2 font-bold"
+      >
+        {$t("user.send.next")}
+      </button>
+    </div>
+  </form>
 
-	{#if contacts.length}
-		<div class="space-y-5">
-			<h1 class="px-3 md:px-0 text-xl font-semibold mt-10">{$t('user.send.contacts')}</h1>
-			<div>
-				{#each contacts as c}
-					<a href={`/send/${c.username}`}>
-						<div class="border-b p-2 last:border-b-0 hover:bg-gray-100 rounded-2xl">
-							<div class="flex">
-								<div>
-									<div class="flex">
-										<Avatar user={c} size={20} disabled={true} />
-										<div class="my-auto text-left">
-											<p class="ml-1 text-lg break-words">{c.username}</p>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-					</a>
-				{/each}
-			</div>
-		</div>
-	{/if}
+  {#if contacts.length}
+    <div class="space-y-5">
+      <h1 class="px-3 md:px-0 text-xl font-semibold mt-10">
+        {$t("user.send.contacts")}
+      </h1>
+      <div>
+        {#each contacts as c}
+          <a href={`/send/${c.username}`}>
+            <div
+              class="border-b p-2 last:border-b-0 hover:bg-gray-100 rounded-2xl"
+            >
+              <div class="flex">
+                <div>
+                  <div class="flex">
+                    <Avatar user={c} size={20} disabled={true} />
+                    <div class="my-auto text-left">
+                      <p class="ml-1 text-lg break-words">{c.username}</p>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </a>
+        {/each}
+      </div>
+    </div>
+  {/if}
 </div>
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
index 92a754ae..5cb86aec 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.server.js
@@ -1,33 +1,32 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { auth, post, fd } from '$lib/utils';
+import { fail, redirect } from "@sveltejs/kit";
+import { auth, post, fd } from "$lib/utils";
 
 let seen = {};
 export const actions = {
-	default: async ({ cookies, request }) => {
-		try {
-			let { address, amount, confirmed, feeRate, subtract, pin, stale, ts } = await await fd(
-				request
-			);
-			if (seen[ts]) return fail(400, { message: 'Duplicate form submission' });
+  default: async ({ cookies, request }) => {
+    try {
+      let { address, amount, confirmed, feeRate, subtract, pin, stale, ts } =
+        await await fd(request);
+      if (seen[ts]) return fail(400, { message: "Duplicate form submission" });
 
-			let estimate = await post(
-				'/bitcoin/fee',
-				{ address, amount, feeRate, subtract },
-				auth(cookies)
-			);
+      let estimate = await post(
+        "/bitcoin/fee",
+        { address, amount, feeRate, subtract },
+        auth(cookies)
+      );
 
-			let { tx } = estimate;
+      let { tx } = estimate;
 
-			if (stale || !confirmed) return fail(400, estimate);
+      if (stale || !confirmed) return fail(400, estimate);
 
-			seen[ts] = 1;
-			setTimeout(() => delete seen[ts], 30000);
+      seen[ts] = 1;
+      setTimeout(() => delete seen[ts], 30000);
 
-			await post('/bitcoin/send', { pin, subtract, tx }, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
+      await post("/bitcoin/send", { pin, subtract, tx }, auth(cookies));
+    } catch (e) {
+      return fail(400, { message: e.message });
+    }
 
-		throw redirect(307, '/sent');
-	}
+    throw redirect(307, "/sent");
+  },
 };
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index 342eeebe..da11a22c 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -1,142 +1,159 @@
 <script>
-	import { tick } from 'svelte';
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Toggle, Slider, Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { fiat as toFiat, f, back, s, sat } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { rates } = data;
-	let { address, amount } = $page.params;
-	let { balance, currency } = data.user;
-	let loading, submit, fiat, confirmed, feeRate, min, max, fee, ourfee, stale, subtract, adjusting;
-
-	$: rate = rates[currency];
-
-	let toggle = () => (loading = true);
-	let toggleAdjusting = () => (adjusting = !adjusting);
-
-	$: update(form);
-	let update = () => {
-		loading = false;
-		if (form?.message?.includes('pin')) $pin = undefined;
-		if (form) ({ min, max, feeRate, fee, ourfee, subtract } = form);
-		if (!ourfee) ourfee = 0;
-		if (feeRate) confirmed = true;
-		stale = false;
-	};
-
-	let setMax = () => {
-		fiat = false;
-		amount = balance;
-		subtract = true;
-	};
-
-	$: if (amount + fee > balance) subtract = true;
-
-	let timeout;
-	let handle = (e) => {
-		stale = true;
-		feeRate = e.target.value;
-		clearTimeout(timeout);
-		timeout = setTimeout(() => {
-			tick().then(() => submit.click());
-		}, 200);
-	};
+  import { tick } from "svelte";
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { Toggle, Slider, Icon, Numpad, Spinner } from "$comp";
+  import { page } from "$app/stores";
+  import { fiat as toFiat, f, back, s, sat } from "$lib/utils";
+  import { pin } from "$lib/store";
+
+  export let data;
+  export let form;
+
+  let { rates } = data;
+  let { address, amount } = $page.params;
+  let { balance, currency } = data.user;
+  let loading,
+    submit,
+    fiat,
+    confirmed,
+    feeRate,
+    min,
+    max,
+    fee,
+    ourfee,
+    stale,
+    subtract,
+    adjusting;
+
+  $: rate = rates[currency];
+
+  let toggle = () => (loading = true);
+  let toggleAdjusting = () => (adjusting = !adjusting);
+
+  $: update(form);
+  let update = () => {
+    loading = false;
+    if (form?.message?.includes("pin")) $pin = undefined;
+    if (form) ({ min, max, feeRate, fee, ourfee, subtract } = form);
+    if (!ourfee) ourfee = 0;
+    if (feeRate) confirmed = true;
+    stale = false;
+  };
+
+  let setMax = () => {
+    fiat = false;
+    amount = balance;
+    subtract = true;
+  };
+
+  $: if (amount + fee > balance) subtract = true;
+
+  let timeout;
+  let handle = (e) => {
+    stale = true;
+    feeRate = e.target.value;
+    clearTimeout(timeout);
+    timeout = setTimeout(() => {
+      tick().then(() => submit.click());
+    }, 200);
+  };
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
+  <Icon icon="arrow-left" style="w-10" />
 </button>
 
 {#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
+  <div class="text-red-600 text-center">
+    {form.message}
+  </div>
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto space-y-5 text-center">
-	<h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t('payments.send')}</h1>
-
-	<div class="text-lg text-secondary break-all">{address}</div>
-
-	{#if confirmed}
-		<div class="text-center">
-			<h2 class="text-2xl md:text-3xl font-semibold">
-				{f(toFiat(amount, rate), currency)}
-			</h2>
-			<h3 class="text-secondary md:text-lg mb-6 mt-1">⚡️{s(amount)}</h3>
-		</div>
-
-		<div class="text-center">
-			<h2 class="text-secondary mb-5 text-lg">with fee</h2>
-
-			<div class="relative">
-				<h2 class="text-xl font-semibold">
-					{f(toFiat(fee + ourfee, rate), currency)}
-				</h2>
-				<h3 class="text-secondary mb-6 mt-1">⚡️{s(fee + ourfee)}</h3>
-				<button class="absolute right-1/4 top-0 text-secondary p-4" on:click={toggleAdjusting}
-					><Icon icon="settings" style="opacity-30" /></button
-				>
-			</div>
-		</div>
-	{:else}
-		<Numpad bind:amount bind:fiat {currency} {submit} bind:rate />
-	{/if}
-
-	<form method="POST" use:enhance on:submit={toggle}>
-		<input name="ts" value={Date.now()} type="hidden" />
-		<input name="address" value={address} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} type="hidden" />
-		<input name="confirmed" value={confirmed} type="hidden" />
-		<input name="feeRate" value={feeRate} type="hidden" />
-		<input name="stale" value={stale} type="hidden" />
-		<input name="subtract" value={subtract} type="hidden" />
-
-		{#if confirmed && adjusting}
-			<div class="relative mt-10 mb-20">
-				<div class="absolute top-5 left-0 text-secondary">Slower (~40 blocks)</div>
-				<div class="absolute top-5 right-0 text-secondary">Faster (~1 block)</div>
-				<Slider bind:value={feeRate} {handle} {min} {max} />
-			</div>
-			<div class="flex justify-center gap-2 mb-10">
-				<div class="my-auto">
-					<Toggle id="subtract" checked={subtract} bind:value={subtract} />
-				</div>
-				<label for="subtract" class="text-secondary text-lg my-auto mb-2"
-					>Take fee from amount</label
-				>
-			</div>
-		{/if}
-
-		<div class="flex justify-center gap-2">
-			{#if !confirmed}
-				<button
-					type="button"
-					class="hover:opacity-80 bg-black text-white rounded-2xl py-3 px-4 mt-2 border font-bold"
-					on:click|preventDefault={setMax}
-					on:keydown={setMax}>Max ⚡️{s(balance)}</button
-				>
-			{/if}
-
-			<button
-				bind:this={submit}
-				type="submit"
-				class="opacity-100 hover:opacity-80 rounded-2xl border py-3 font-bold mt-2 bg-black text-white px-4 w-24"
-				disabled={loading}
-			>
-				{#if confirmed}
-					{$t('payments.send')}
-				{:else}
-					{$t('payments.next')}
-				{/if}
-			</button>
-		</div>
-	</form>
+  <h1 class="text-3xl md:text-4xl font-semibold mb-2">{$t("payments.send")}</h1>
+
+  <div class="text-lg text-secondary break-all">{address}</div>
+
+  {#if confirmed}
+    <div class="text-center">
+      <h2 class="text-2xl md:text-3xl font-semibold">
+        {f(toFiat(amount, rate), currency)}
+      </h2>
+      <h3 class="text-secondary md:text-lg mb-6 mt-1">⚡️{s(amount)}</h3>
+    </div>
+
+    <div class="text-center">
+      <h2 class="text-secondary mb-5 text-lg">with fee</h2>
+
+      <div class="relative">
+        <h2 class="text-xl font-semibold">
+          {f(toFiat(fee + ourfee, rate), currency)}
+        </h2>
+        <h3 class="text-secondary mb-6 mt-1">⚡️{s(fee + ourfee)}</h3>
+        <button
+          class="absolute right-1/4 top-0 text-secondary p-4"
+          on:click={toggleAdjusting}
+          ><Icon icon="settings" style="opacity-30" /></button
+        >
+      </div>
+    </div>
+  {:else}
+    <Numpad bind:amount bind:fiat {currency} {submit} bind:rate />
+  {/if}
+
+  <form method="POST" use:enhance on:submit={toggle}>
+    <input name="ts" value={Date.now()} type="hidden" />
+    <input name="address" value={address} type="hidden" />
+    <input name="amount" value={amount} type="hidden" />
+    <input name="pin" value={$pin} type="hidden" />
+    <input name="confirmed" value={confirmed} type="hidden" />
+    <input name="feeRate" value={feeRate} type="hidden" />
+    <input name="stale" value={stale} type="hidden" />
+    <input name="subtract" value={subtract} type="hidden" />
+
+    {#if confirmed && adjusting}
+      <div class="relative mt-10 mb-20">
+        <div class="absolute top-5 left-0 text-secondary">
+          Slower (~40 blocks)
+        </div>
+        <div class="absolute top-5 right-0 text-secondary">
+          Faster (~1 block)
+        </div>
+        <Slider bind:value={feeRate} {handle} {min} {max} />
+      </div>
+      <div class="flex justify-center gap-2 mb-10">
+        <div class="my-auto">
+          <Toggle id="subtract" checked={subtract} bind:value={subtract} />
+        </div>
+        <label for="subtract" class="text-secondary text-lg my-auto mb-2"
+          >Take fee from amount</label
+        >
+      </div>
+    {/if}
+
+    <div class="flex justify-center gap-2">
+      {#if !confirmed}
+        <button
+          type="button"
+          class="hover:opacity-80 bg-black text-white rounded-2xl py-3 px-4 mt-2 border font-bold"
+          on:click|preventDefault={setMax}
+          on:keydown={setMax}>Max ⚡️{s(balance)}</button
+        >
+      {/if}
+
+      <button
+        bind:this={submit}
+        type="submit"
+        class="opacity-100 hover:opacity-80 rounded-2xl border py-3 font-bold mt-2 bg-black text-white px-4 w-24"
+        disabled={loading}
+      >
+        {#if confirmed}
+          {$t("payments.send")}
+        {:else}
+          {$t("payments.next")}
+        {/if}
+      </button>
+    </div>
+  </form>
 </div>
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
index 2cb3c4a9..3318a60b 100644
--- a/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.server.js
@@ -1,17 +1,17 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { auth, fd, post } from '$lib/utils';
+import { fail, redirect } from "@sveltejs/kit";
+import { auth, fd, post } from "$lib/utils";
 
 export const actions = {
-	default: async ({ cookies, request }) => {
-		let body = await fd(request);
-		let p;
+  default: async ({ cookies, request }) => {
+    let body = await fd(request);
+    let p;
 
-		try {
-			p = await post('/payments', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
+    try {
+      p = await post("/payments", body, auth(cookies));
+    } catch (e) {
+      return fail(400, { message: e.message });
+    }
 
-		if (p) throw redirect(307, `/fund/${body.name}`);
-	}
+    if (p) throw redirect(307, `/fund/${body.name}`);
+  },
 };
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
index 6aecf8f3..886e93d2 100644
--- a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
@@ -1,58 +1,58 @@
 <script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back } from '$lib/utils';
-	import { pin } from '$lib/store';
-
-	export let data;
-	export let form;
-
-	let { amount, name } = $page.params;
-	let { rates } = data;
-	let { currency } = data.user;
-	let loading;
-
-	$: rate = rates[currency];
-
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message?.includes('pin')) $pin = undefined;
-		loading = false;
-	};
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { Icon, Numpad, Spinner } from "$comp";
+  import { page } from "$app/stores";
+  import { back } from "$lib/utils";
+  import { pin } from "$lib/store";
+
+  export let data;
+  export let form;
+
+  let { amount, name } = $page.params;
+  let { rates } = data;
+  let { currency } = data.user;
+  let loading;
+
+  $: rate = rates[currency];
+
+  let submit = () => (loading = true);
+  $: update(form);
+  let update = () => {
+    if (form?.message?.includes("pin")) $pin = undefined;
+    loading = false;
+  };
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
+  <Icon icon="arrow-left" style="w-10" />
 </button>
 
 {#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
+  <div class="text-red-600 text-center">
+    {form.message}
+  </div>
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount {currency} bind:rate />
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="name" value={name} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="pin" value={$pin} 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}
-					{$t('payments.send')}
-				{/if}
-			</button>
-		</div>
-	</form>
+  <Numpad bind:amount {currency} bind:rate />
+
+  <form method="POST" use:enhance on:submit={submit}>
+    <input name="name" value={name} type="hidden" />
+    <input name="amount" value={amount} type="hidden" />
+    <input name="pin" value={$pin} 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}
+          {$t("payments.send")}
+        {/if}
+      </button>
+    </div>
+  </form>
 </div>
diff --git a/src/routes/(app)/send/invoice/[id]/+page.server.js b/src/routes/(app)/send/invoice/[id]/+page.server.js
index 4cbbb03f..aa284328 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.server.js
+++ b/src/routes/(app)/send/invoice/[id]/+page.server.js
@@ -1,37 +1,48 @@
-import { error, fail, redirect } from '@sveltejs/kit';
-import { fd, auth, get, post } from '$lib/utils';
+import { error, fail, redirect } from "@sveltejs/kit";
+import { fd, auth, get, post } from "$lib/utils";
 
 export async function load({ params: { id }, parent, url }) {
-	let { user } = await parent();
+  let { user } = await parent();
 
-	let {
-		amount,
-		address,
-		currency,
-		hash,
-		rate,
-		prompt,
-		tip,
-		text,
-		user: recipient
-	} = await get(`/invoice/${id}`);
+  let {
+    amount,
+    address,
+    currency,
+    hash,
+    rate,
+    prompt,
+    tip,
+    text,
+    user: recipient,
+  } = await get(`/invoice/${id}`);
 
-	if (prompt && tip === null) throw redirect(307, `/${recipient.username}/invoice/${id}/tip`);
-	if (recipient.username === user.username) throw error(500, { message: 'Cannot send to self' });
-	return { amount, address, currency, hash, tip, rate, payreq: text, recipient };
+  if (prompt && tip === null)
+    throw redirect(307, `/${recipient.username}/invoice/${id}/tip`);
+  if (recipient.username === user.username)
+    throw error(500, { message: "Cannot send to self" });
+  return {
+    amount,
+    address,
+    currency,
+    hash,
+    tip,
+    rate,
+    payreq: text,
+    recipient,
+  };
 }
 
 export const actions = {
-	default: async ({ cookies, params: { id }, request }) => {
-		try {
-			let body = await fd(request);
-			body.hash = id;
+  default: async ({ cookies, params: { id }, request }) => {
+    try {
+      let body = await fd(request);
+      body.hash = id;
 
-			await post('/payments', body, auth(cookies));
-		} catch (e) {
-			return fail(400, { message: e.message });
-		}
+      await post("/payments", body, auth(cookies));
+    } catch (e) {
+      return fail(400, { message: e.message });
+    }
 
-		throw redirect(307, '/sent');
-	}
+    throw redirect(307, "/sent");
+  },
 };
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index 02ab9d41..d29f1c96 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -1,154 +1,168 @@
 <script>
-	import { onDestroy, onMount } from 'svelte';
-	import { t } from '$lib/translations';
-	import { goto, invalidateAll } from '$app/navigation';
-	import { pin } from '$lib/store';
-	import { enhance } from '$app/forms';
-	import { Avatar, Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { post, back, f, fiat as toFiat, s, sats } from '$lib/utils';
-	export let data;
-	export let form;
-
-	let { address, hash, rate, payreq, recipient, tip, rates, user } = data;
-	let { currency } = user;
-
-	let amount = form?.amount || data.amount;
-	let a,
-		af,
-		amountFiat = amount * (rate / sats),
-		fiat = !amount;
-
-	let setAmount = () => {
-		amount = a;
-		amountFiat = af;
-	};
-
-	let loading;
-	let submit = () => (loading = true);
-
-	let external = async () => {
-		let invoice = { type: 'lightning', amount, currency };
-		let { id } = await post(`/${recipient.username}/invoice`, {
-			invoice,
-			user: { username: recipient.username }
-		});
-
-		goto(`/${recipient.username}/invoice/${id}?options=true`, { invalidateAll: true });
-	};
-
-	$: rate = data.rate * (rates[user.currency] / rates[data.currency]);
-
-	$: update(form);
-	let update = () => {
-		if (form?.message.includes('pin')) $pin = undefined;
-		loading = false;
-	};
-
-	// onMount(async () => {
-	// 	if (browser && window.NDEFReader) {
-	// 		try {
-	// 			let ndef = new NDEFReader();
-	// 			await ndef.scan();
-	//
-	// 			ndef.addEventListener('readingerror', (e) => {
-	// 				console.log('nfc error', e);
-	// 			});
-	//
-	// 			ndef.addEventListener('reading', ({ message, serialNumber }) => {
-	// 				console.log(message, serialNumber);
-	// 			});
-	// 		} catch (e) {
-	// 			console.log('NFC error', e);
-	// 		}
-	// 	}
-	// });
+  import { onDestroy, onMount } from "svelte";
+  import { t } from "$lib/translations";
+  import { goto, invalidateAll } from "$app/navigation";
+  import { pin } from "$lib/store";
+  import { enhance } from "$app/forms";
+  import { Avatar, Icon, Numpad, Spinner } from "$comp";
+  import { page } from "$app/stores";
+  import { post, back, f, fiat as toFiat, s, sats } from "$lib/utils";
+  export let data;
+  export let form;
+
+  let { address, hash, rate, payreq, recipient, tip, rates, user } = data;
+  let { currency } = user;
+
+  let amount = form?.amount || data.amount;
+  let a,
+    af,
+    amountFiat = amount * (rate / sats),
+    fiat = !amount;
+
+  let setAmount = () => {
+    amount = a;
+    amountFiat = af;
+  };
+
+  let loading;
+  let submit = () => (loading = true);
+
+  let external = async () => {
+    let invoice = { type: "lightning", amount, currency };
+    let { id } = await post(`/${recipient.username}/invoice`, {
+      invoice,
+      user: { username: recipient.username },
+    });
+
+    goto(`/${recipient.username}/invoice/${id}?options=true`, {
+      invalidateAll: true,
+    });
+  };
+
+  $: rate = data.rate * (rates[user.currency] / rates[data.currency]);
+
+  $: update(form);
+  let update = () => {
+    if (form?.message.includes("pin")) $pin = undefined;
+    loading = false;
+  };
+
+  // onMount(async () => {
+  // 	if (browser && window.NDEFReader) {
+  // 		try {
+  // 			let ndef = new NDEFReader();
+  // 			await ndef.scan();
+  //
+  // 			ndef.addEventListener('readingerror', (e) => {
+  // 				console.log('nfc error', e);
+  // 			});
+  //
+  // 			ndef.addEventListener('reading', ({ message, serialNumber }) => {
+  // 				console.log(message, serialNumber);
+  // 			});
+  // 		} catch (e) {
+  // 			console.log('NFC error', e);
+  // 		}
+  // 	}
+  // });
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
+  <Icon icon="arrow-left" style="w-10" />
 </button>
 
 {#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
+  <div class="text-red-600 text-center">
+    {form.message}
+  </div>
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-	{#if amount}
-		<div class="text-center mb-8">
-			<h1 class="text-xl md:text-2xl text-secondary mb-2">
-				{$t('payments.send')}
-			</h1>
-			<h2 class="text-2xl md:text-3xl font-semibold">
-				{f(toFiat(amount, rate), currency)}
-				{#if tip}
-					<span class="text-lg">
-						+ {f(toFiat(tip, rate), currency)}
-					</span>
-				{/if}
-			</h2>
-			<h3 class="text-secondary md:text-lg mb-6 mt-1">
-				⚡️{s(amount)}
-
-				{#if tip}
-					<span class="text-lg">
-						+ ⚡️{s(tip)}
-					</span>
-				{/if}
-			</h3>
-
-			<h1 class="text-xl md:text-2xl text-secondary mb-2">{$t('payments.to')}</h1>
-
-			<div class="flex p-1 gap-2 justify-center">
-				{#if recipient.username.includes('@classic')}
-					<img
-						src="/images/classic.png"
-						class="w-24 border-4 border-transparent mr-1"
-						alt="Bitcoin"
-					/>
-				{:else}
-					<Avatar user={recipient} size={'20'} />
-				{/if}
-				<p class="text-4xl break-words my-auto">{recipient.username.replace('@classic', '')}</p>
-			</div>
-		</div>
-	{:else}
-		<Numpad bind:amount={a} bind:amountFiat={af} {currency} bind:fiat bind:rate />
-	{/if}
-
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="address" value={address} type="hidden" />
-		<input name="amount" value={amount} type="hidden" />
-		<input name="payreq" value={payreq} type="hidden" />
-		<input name="username" value={recipient.username} type="hidden" />
-		<input name="pin" value={$pin} type="hidden" />
-
-		<div class="flex w-full">
-			{#if amount}
-				<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}
-						{$t('payments.send')}
-					{/if}
-				</button>
-			{:else}
-				<button
-					type="button"
-					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"
-					on:click={setAmount}
-				>
-					{$t('payments.next')}
-				</button>
-			{/if}
-		</div>
-	</form>
-	<div class="flex my-20">
-		<button class="mx-auto" on:click={external}>{$t('payments.moreOptions')}</button>
-	</div>
+  {#if amount}
+    <div class="text-center mb-8">
+      <h1 class="text-xl md:text-2xl text-secondary mb-2">
+        {$t("payments.send")}
+      </h1>
+      <h2 class="text-2xl md:text-3xl font-semibold">
+        {f(toFiat(amount, rate), currency)}
+        {#if tip}
+          <span class="text-lg">
+            + {f(toFiat(tip, rate), currency)}
+          </span>
+        {/if}
+      </h2>
+      <h3 class="text-secondary md:text-lg mb-6 mt-1">
+        ⚡️{s(amount)}
+
+        {#if tip}
+          <span class="text-lg">
+            + ⚡️{s(tip)}
+          </span>
+        {/if}
+      </h3>
+
+      <h1 class="text-xl md:text-2xl text-secondary mb-2">
+        {$t("payments.to")}
+      </h1>
+
+      <div class="flex p-1 gap-2 justify-center">
+        {#if recipient.username.includes("@classic")}
+          <img
+            src="/images/classic.png"
+            class="w-24 border-4 border-transparent mr-1"
+            alt="Bitcoin"
+          />
+        {:else}
+          <Avatar user={recipient} size={"20"} />
+        {/if}
+        <p class="text-4xl break-words my-auto">
+          {recipient.username.replace("@classic", "")}
+        </p>
+      </div>
+    </div>
+  {:else}
+    <Numpad
+      bind:amount={a}
+      bind:amountFiat={af}
+      {currency}
+      bind:fiat
+      bind:rate
+    />
+  {/if}
+
+  <form method="POST" use:enhance on:submit={submit}>
+    <input name="address" value={address} type="hidden" />
+    <input name="amount" value={amount} type="hidden" />
+    <input name="payreq" value={payreq} type="hidden" />
+    <input name="username" value={recipient.username} type="hidden" />
+    <input name="pin" value={$pin} type="hidden" />
+
+    <div class="flex w-full">
+      {#if amount}
+        <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}
+            {$t("payments.send")}
+          {/if}
+        </button>
+      {:else}
+        <button
+          type="button"
+          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"
+          on:click={setAmount}
+        >
+          {$t("payments.next")}
+        </button>
+      {/if}
+    </div>
+  </form>
+  <div class="flex my-20">
+    <button class="mx-auto" on:click={external}
+      >{$t("payments.moreOptions")}</button
+    >
+  </div>
 </div>
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.js b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
index d358bbca..d9e791e1 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.js
@@ -1,24 +1,24 @@
-import { fail, redirect } from '@sveltejs/kit';
-import { fd, auth, post } from '$lib/utils';
+import { fail, redirect } from "@sveltejs/kit";
+import { fd, auth, post } from "$lib/utils";
 
 export async function load({ params }) {
-	return post('/parse', params);
+  return post("/parse", params);
 }
 
 export const actions = {
-	setAmount: async ({ cookies, request }) => fd(request),
+  setAmount: async ({ cookies, request }) => fd(request),
 
-	send: async ({ cookies, request }) => {
-		try {
-			let body = await fd(request);
+  send: async ({ cookies, request }) => {
+    try {
+      let body = await fd(request);
 
-			await post('/payments', body, auth(cookies));
-		} catch (e) {
-			if (e.message.includes('unusable'))
-				e.message = 'Failed to route payment, try sending a lower amount';
-			return fail(400, { message: e.message });
-		}
+      await post("/payments", body, auth(cookies));
+    } catch (e) {
+      if (e.message.includes("unusable"))
+        e.message = "Failed to route payment, try sending a lower amount";
+      return fail(400, { message: e.message });
+    }
 
-		throw redirect(307, '/sent');
-	}
+    throw redirect(307, "/sent");
+  },
 };
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index e232ef05..185597c7 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -1,105 +1,120 @@
 <script>
-	import { t } from '$lib/translations';
-	import { enhance } from '$app/forms';
-	import { Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { back, s } from '$lib/utils';
-	import { pin } from '$lib/store';
+  import { t } from "$lib/translations";
+  import { enhance } from "$app/forms";
+  import { Icon, Numpad, Spinner } from "$comp";
+  import { page } from "$app/stores";
+  import { back, s } from "$lib/utils";
+  import { pin } from "$lib/store";
 
-	export let data;
-	export let form;
+  export let data;
+  export let form;
 
-	let { payreq } = $page.params;
-	let { alias, rates } = data;
+  let { payreq } = $page.params;
+  let { alias, rates } = data;
 
-	let { currency } = data.user;
-	let a;
-	let maxfee = 500;
+  let { currency } = data.user;
+  let a;
+  let maxfee = 500;
 
-	$: amount = form?.amount || data.amount;
-	$: rate = rates[currency];
+  $: amount = form?.amount || data.amount;
+  $: rate = rates[currency];
 
-	let loading;
-	let submit = () => (loading = true);
-	$: update(form);
-	let update = () => {
-		if (form?.message?.includes('pin')) $pin = undefined;
-		loading = false;
-	};
+  let loading;
+  let submit = () => (loading = true);
+  $: update(form);
+  let update = () => {
+    if (form?.message?.includes("pin")) $pin = undefined;
+    loading = false;
+  };
 
-	let show;
-	let toggle = () => (show = !show);
+  let show;
+  let toggle = () => (show = !show);
 </script>
 
 <button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
+  <Icon icon="arrow-left" style="w-10" />
 </button>
 
 {#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
+  <div class="text-red-600 text-center">
+    {form.message}
+  </div>
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-	{#if amount}
-		<div class="text-center mb-8">
-			<h1 class="text-xl md:text-2xl text-secondary mb-2">{$t('payments.send')}</h1>
-			<p class="text-6xl break-words mb-4">
-				⚡️{s(amount)}
-			</p>
-			<h1 class="text-xl md:text-2xl text-secondary mb-2">{$t('payments.to')}</h1>
-			<p class="text-4xl break-words">{alias}</p>
-		</div>
+  {#if amount}
+    <div class="text-center mb-8">
+      <h1 class="text-xl md:text-2xl text-secondary mb-2">
+        {$t("payments.send")}
+      </h1>
+      <p class="text-6xl break-words mb-4">
+        ⚡️{s(amount)}
+      </p>
+      <h1 class="text-xl md:text-2xl text-secondary mb-2">
+        {$t("payments.to")}
+      </h1>
+      <p class="text-4xl break-words">{alias}</p>
+    </div>
 
-		<form method="POST" use:enhance on:submit={submit} action="?/send" class="space-y-5">
-			<input name="payreq" value={payreq} type="hidden" />
-			<input name="amount" value={amount} type="hidden" />
-			<input name="pin" value={$pin} type="hidden" />
-			<input name="maxfee" value={maxfee} type="hidden" />
+    <form
+      method="POST"
+      use:enhance
+      on:submit={submit}
+      action="?/send"
+      class="space-y-5"
+    >
+      <input name="payreq" value={payreq} type="hidden" />
+      <input name="amount" value={amount} type="hidden" />
+      <input name="pin" value={$pin} type="hidden" />
+      <input name="maxfee" value={maxfee} 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"
-					disabled={loading}
-				>
-					{#if loading}
-						<Spinner />
-					{:else}
-						{$t('payments.send')}
-					{/if}
-				</button>
-			</div>
-		</form>
+      <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"
+          disabled={loading}
+        >
+          {#if loading}
+            <Spinner />
+          {:else}
+            {$t("payments.send")}
+          {/if}
+        </button>
+      </div>
+    </form>
 
-		{#if show}
-			<div class="relative w-96 mx-auto">
-				<label for="maxfee">Max fee</label>
-				<input name="maxfee" bind:value={maxfee} />
+    {#if show}
+      <div class="relative w-96 mx-auto">
+        <label for="maxfee">Max fee</label>
+        <input name="maxfee" bind:value={maxfee} />
 
-				<div
-					class="absolute right-[2px] top-[25px] text-gray-600 rounded-r-2xl p-4 h-[54px] my-auto border-l "
-				>
-					⚡️
-				</div>
-			</div>
-		{:else}
-			<div class="flex w-full mt-5">
-				<button class="mx-auto" on:click={toggle}>Settings</button>
-			</div>
-		{/if}
-	{:else}
-		<form method="POST" action="?/setAmount" class="w-[300px] mx-auto" use:enhance>
-			<input type="hidden" value={a} name="amount" />
-			<Numpad bind:amount={a} {currency} {rate} />
-			<button
-				type="submit"
-				class="bg-black text-white rounded-xl h-[48px] flex w-full justify-center items-center font-semibold
+        <div
+          class="absolute right-[2px] top-[25px] text-gray-600 rounded-r-2xl p-4 h-[54px] my-auto border-l"
+        >
+          ⚡️
+        </div>
+      </div>
+    {:else}
+      <div class="flex w-full mt-5">
+        <button class="mx-auto" on:click={toggle}>Settings</button>
+      </div>
+    {/if}
+  {:else}
+    <form
+      method="POST"
+      action="?/setAmount"
+      class="w-[300px] mx-auto"
+      use:enhance
+    >
+      <input type="hidden" value={a} name="amount" />
+      <Numpad bind:amount={a} {currency} {rate} />
+      <button
+        type="submit"
+        class="bg-black text-white rounded-xl h-[48px] flex w-full justify-center items-center font-semibold
 				opacity-100 hover:opacity-80"
-			>
-				Next
-			</button>
-		</form>
-	{/if}
+      >
+        Next
+      </button>
+    </form>
+  {/if}
 </div>
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
index a01cdcfc..1f3a0420 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
@@ -1,46 +1,47 @@
-import { error, fail, redirect } from '@sveltejs/kit';
-import { types, sats, fd, auth, get, post } from '$lib/utils';
+import { error, fail, redirect } from "@sveltejs/kit";
+import { types, sats, fd, auth, get, post } from "$lib/utils";
 
 export async function load({ cookies, params, parent }) {
-	let subject = await get(`/users/${params.username}`);
-
-	let { rates, user } = await parent();
-	let { username } = params;
-	let [amount, currency] = params.amount.split('/');
-
-	if (subject.username === user?.username) throw error(500, { message: 'Cannot send to self' });
-
-	let rate;
-	if (amount) {
-		rate = rates[currency ? currency.toUpperCase() : subject.currency];
-		if (!rate) throw error(500, 'Invalid currency symbol');
-		if (currency) amount = (amount * sats) / rate;
-
-		let { hash } = await post(
-			'/invoice',
-			{
-				invoice: { amount, prompt: false, type: types.lightning },
-				user: { username }
-			},
-			auth(cookies)
-		);
-
-		throw redirect(307, `/${username}/invoice/${hash}`);
-	}
-
-	return { amount, rate, subject };
+  let subject = await get(`/users/${params.username}`);
+
+  let { rates, user } = await parent();
+  let { username } = params;
+  let [amount, currency] = params.amount.split("/");
+
+  if (subject.username === user?.username)
+    throw error(500, { message: "Cannot send to self" });
+
+  let rate;
+  if (amount) {
+    rate = rates[currency ? currency.toUpperCase() : subject.currency];
+    if (!rate) throw error(500, "Invalid currency symbol");
+    if (currency) amount = (amount * sats) / rate;
+
+    let { hash } = await post(
+      "/invoice",
+      {
+        invoice: { amount, prompt: false, type: types.lightning },
+        user: { username },
+      },
+      auth(cookies)
+    );
+
+    throw redirect(307, `/${username}/invoice/${hash}`);
+  }
+
+  return { amount, rate, subject };
 }
 
 export const actions = {
-	default: async ({ cookies, request }) => {
-		try {
-			let body = await fd(request);
-			await post('/payments', body, auth(cookies));
-		} catch (e) {
-			console.log(e);
-			return fail(400, { message: e.message });
-		}
-
-		throw redirect(307, '/sent');
-	}
+  default: async ({ cookies, request }) => {
+    try {
+      let body = await fd(request);
+      await post("/payments", body, auth(cookies));
+    } catch (e) {
+      console.log(e);
+      return fail(400, { message: e.message });
+    }
+
+    throw redirect(307, "/sent");
+  },
 };
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index 32a13939..cb458323 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -1,103 +1,103 @@
 <script>
-	import { t } from '$lib/translations';
-	import { goto } from '$app/navigation';
-	import { pin } from '$lib/store';
-	import { enhance } from '$app/forms';
-	import { AppHeader, Avatar, Icon, Numpad, Spinner } from '$comp';
-	import { page } from '$app/stores';
-	import { f, post, s, sat, sats } from '$lib/utils';
+  import { t } from "$lib/translations";
+  import { goto } from "$app/navigation";
+  import { pin } from "$lib/store";
+  import { enhance } from "$app/forms";
+  import { AppHeader, Avatar, Icon, Numpad, Spinner } from "$comp";
+  import { page } from "$app/stores";
+  import { f, post, s, sat, sats } from "$lib/utils";
 
-	export let data;
-	export let form;
+  export let data;
+  export let form;
 
-	let { subject, rate, rates, user } = data;
-	let currency = user.currency || subject.currency || 'USD';
-	let next;
+  let { subject, rate, rates, user } = data;
+  let currency = user.currency || subject.currency || "USD";
+  let next;
 
-	let amount = form?.amount || data.amount;
-	let a,
-		af,
-		fiat = !amount,
-		hash,
-		amountFiat = 0;
+  let amount = form?.amount || data.amount;
+  let a,
+    af,
+    fiat = !amount,
+    hash,
+    amountFiat = 0;
 
-	$: r = rate || rates[user.currency || subject.currency];
+  $: r = rate || rates[user.currency || subject.currency];
 
-	let setAmount = async () => {
-		amount = a;
-		amountFiat = parseFloat(af).toFixed(2);
-		rate = fiat ? (sats * amountFiat) / amount : r;
-		({ hash } = await post(`/${subject.username}/invoice`, {
-			invoice: {
-				amount,
-				hash: 'internal',
-				rate: rates[subject.currency],
-				prompt: subject.prompt,
-				type: 'internal'
-			},
-			user: subject
-		}));
+  let setAmount = async () => {
+    amount = a;
+    amountFiat = parseFloat(af).toFixed(2);
+    rate = fiat ? (sats * amountFiat) / amount : r;
+    ({ hash } = await post(`/${subject.username}/invoice`, {
+      invoice: {
+        amount,
+        hash: "internal",
+        rate: rates[subject.currency],
+        prompt: subject.prompt,
+        type: "internal",
+      },
+      user: subject,
+    }));
 
-		goto(`/${subject.username}/invoice/${hash}`);
-	};
+    goto(`/${subject.username}/invoice/${hash}`);
+  };
 
-	let loading;
-	let submit = () => (loading = true);
+  let loading;
+  let submit = () => (loading = true);
 
-	$: update(form);
-	let update = () => {
-		if (form?.message?.includes('pin')) $pin = undefined;
-		loading = false;
-	};
+  $: update(form);
+  let update = () => {
+    if (form?.message?.includes("pin")) $pin = undefined;
+    loading = false;
+  };
 </script>
 
 <AppHeader {data} />
 
 {#if form?.message}
-	<div class="text-red-600 text-center">
-		{form.message}
-	</div>
+  <div class="text-red-600 text-center">
+    {form.message}
+  </div>
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto space-y-8">
-	<Numpad
-		bind:amount={a}
-		bind:amountFiat={af}
-		{currency}
-		bind:fiat
-		bind:rate={r}
-		bind:submit={next}
-	/>
+  <Numpad
+    bind:amount={a}
+    bind:amountFiat={af}
+    {currency}
+    bind:fiat
+    bind:rate={r}
+    bind:submit={next}
+  />
 
-	<form method="POST" use:enhance on:submit={submit}>
-		<input name="amount" value={amount} type="hidden" />
-		<input name="username" value={subject.username} type="hidden" />
-		<input name="pin" value={$pin} type="hidden" />
-		<input name="hash" value={hash} type="hidden" />
+  <form method="POST" use:enhance on:submit={submit}>
+    <input name="amount" value={amount} type="hidden" />
+    <input name="username" value={subject.username} type="hidden" />
+    <input name="pin" value={$pin} type="hidden" />
+    <input name="hash" value={hash} type="hidden" />
 
-		<div class="flex w-full">
-			{#if amount}
-				<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}
-						{$t('payments.send')}
-					{/if}
-				</button>
-			{:else}
-				<button
-					type="button"
-					bind:this={next}
-					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"
-					on:click={setAmount}
-					on:keydown={setAmount}
-				>
-					Next
-				</button>
-			{/if}
-		</div>
-	</form>
+    <div class="flex w-full">
+      {#if amount}
+        <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}
+            {$t("payments.send")}
+          {/if}
+        </button>
+      {:else}
+        <button
+          type="button"
+          bind:this={next}
+          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"
+          on:click={setAmount}
+          on:keydown={setAmount}
+        >
+          Next
+        </button>
+      {/if}
+    </div>
+  </form>
 </div>
diff --git a/src/routes/(app)/sent/+page.server.js b/src/routes/(app)/sent/+page.server.js
index 381ff32f..62a4d9b4 100644
--- a/src/routes/(app)/sent/+page.server.js
+++ b/src/routes/(app)/sent/+page.server.js
@@ -1,6 +1,6 @@
-import { get, auth } from '$lib/utils';
+import { get, auth } from "$lib/utils";
 
 export let load = async ({ cookies }) => {
-	let { payments } = await get('/payments', auth(cookies));
-	return { payments };
+  let { payments } = await get("/payments", auth(cookies));
+  return { payments };
 };
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
index dbd18c2e..400e8904 100644
--- a/src/routes/(app)/sent/+page.svelte
+++ b/src/routes/(app)/sent/+page.svelte
@@ -1,47 +1,52 @@
 <script>
-	import { fiat, f, s, sat, sats } from '$lib/utils';
-	import { scale } from 'svelte/transition';
-	import { Icon } from '$comp';
-	import { toast } from '@zerodevx/svelte-toast';
-	import { t } from '$lib/translations';
+  import { fiat, f, s, sat, sats } from "$lib/utils";
+  import { scale } from "svelte/transition";
+  import { Icon } from "$comp";
+  import { toast } from "@zerodevx/svelte-toast";
+  import { t } from "$lib/translations";
 
-	export let data;
-	let { payments, user } = data;
-	let { currency, username } = user;
+  export let data;
+  let { payments, user } = data;
+  let { currency, username } = user;
 
-	let payment = payments[0];
-	let { amount, rate, tip } = payment;
-	amount = Math.abs(amount);
+  let payment = payments[0];
+  let { amount, rate, tip } = payment;
+  amount = Math.abs(amount);
 
-	toast.pop(0);
+  toast.pop(0);
 </script>
 
 <div class="text-center mt-20 md:mt-0">
-	<div class="flex w-full max-w-[200px] mx-auto py-20" in:scale={{ start: 0.5 }}>
-		<Icon icon="check" style="mx-auto" />
-	</div>
-	<h1 class="text-3xl md:text-4xl font-bold mb-6">{$t('payments.sent')}!</h1>
-	<h2 class="text-2xl md:text-3xl font-semibold">
-		{f(fiat(amount, rate), currency)}
-		{#if tip}
-			<span class="text-lg">
-				+ {f(fiat(tip, rate), currency)}
-			</span>
-		{/if}
-	</h2>
-	<h3 class="text-secondary md:text-lg mb-6 mt-1">
-		⚡️{s(amount)}
+  <div
+    class="flex w-full max-w-[200px] mx-auto py-20"
+    in:scale={{ start: 0.5 }}
+  >
+    <Icon icon="check" style="mx-auto" />
+  </div>
+  <h1 class="text-3xl md:text-4xl font-bold mb-6">{$t("payments.sent")}!</h1>
+  <h2 class="text-2xl md:text-3xl font-semibold">
+    {f(fiat(amount, rate), currency)}
+    {#if tip}
+      <span class="text-lg">
+        + {f(fiat(tip, rate), currency)}
+      </span>
+    {/if}
+  </h2>
+  <h3 class="text-secondary md:text-lg mb-6 mt-1">
+    ⚡️{s(amount)}
 
-		{#if tip}
-			<span class="text-lg">
-				+ ⚡️{s(tip)}
-			</span>
-		{/if}
-	</h3>
+    {#if tip}
+      <span class="text-lg">
+        + ⚡️{s(tip)}
+      </span>
+    {/if}
+  </h3>
 </div>
 
 <a href={`/${username}/payments`}>
-	<div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-<div class="fixed bottom-10 w-full text-center">{$t('payments.tapAnywhere')}</div>
+<div class="fixed bottom-10 w-full text-center">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte
index b2f82e89..b31b4389 100644
--- a/src/routes/(app)/support/+page.svelte
+++ b/src/routes/(app)/support/+page.svelte
@@ -1,122 +1,138 @@
 <script>
-	import { onDestroy } from 'svelte';
-	import { fail, success, post } from '$lib/utils';
-	import { scale } from 'svelte/transition';
-	import { AppHeader, Icon } from '$comp';
-	import { t } from '$lib/translations';
+  import { onDestroy } from "svelte";
+  import { fail, success, post } from "$lib/utils";
+  import { scale } from "svelte/transition";
+  import { AppHeader, Icon } from "$comp";
+  import { t } from "$lib/translations";
 
-	export let data;
+  export let data;
 
-	let { user } = data;
-	$: if (user) {
-		data.subject = { ...user };
-	}
+  let { user } = data;
+  $: if (user) {
+    data.subject = { ...user };
+  }
 
-	let email;
-	let message;
-	let sent;
-	let recaptchaSiteKey = '6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM';
+  let email;
+  let message;
+  let sent;
+  let recaptchaSiteKey = "6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM";
 
-	let submit = (e) => {
-		e.preventDefault();
-		grecaptcha.ready(() => {
-			grecaptcha.execute(recaptchaSiteKey, { action: 'submit' }).then((token) =>
-				post('/support', { username: user?.username, email, message, token })
-					.then(() => (sent = true))
-					.catch(() => fail('problem submitting'))
-			);
-		});
-	};
+  let submit = (e) => {
+    e.preventDefault();
+    grecaptcha.ready(() => {
+      grecaptcha.execute(recaptchaSiteKey, { action: "submit" }).then((token) =>
+        post("/support", { username: user?.username, email, message, token })
+          .then(() => (sent = true))
+          .catch(() => fail("problem submitting"))
+      );
+    });
+  };
 
-	onDestroy(() => {
-		const nodeBadge = document.querySelector('.grecaptcha-badge');
-		if (nodeBadge) {
-			document.body.removeChild(nodeBadge.parentNode);
-		}
+  onDestroy(() => {
+    const nodeBadge = document.querySelector(".grecaptcha-badge");
+    if (nodeBadge) {
+      document.body.removeChild(nodeBadge.parentNode);
+    }
 
-		const scriptSelector =
-			"script[src='https://www.google.com/recaptcha/api.js?render=" + recaptchaSiteKey + "']";
-		const script = document.querySelector(scriptSelector);
-		if (script) {
-			script.remove();
-		}
-	});
+    const scriptSelector =
+      "script[src='https://www.google.com/recaptcha/api.js?render=" +
+      recaptchaSiteKey +
+      "']";
+    const script = document.querySelector(scriptSelector);
+    if (script) {
+      script.remove();
+    }
+  });
 </script>
 
 <svelte:head>
-	<script
-		src="https://www.google.com/recaptcha/api.js?render=6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM"
-	></script>
+  <script
+    src="https://www.google.com/recaptcha/api.js?render=6LfCd8YkAAAAANmVJgzN3SQY3n3fv1RhiS5PgMYM"
+  ></script>
 </svelte:head>
 
 {#if user}
-	<AppHeader {data} />
+  <AppHeader {data} />
 {/if}
 
 <div class="container px-4 max-w-lg mx-auto mt-20 space-y-8">
-	{#if sent}
-		<h1 class="text-center text-3xl md:text-4xl font-semibold">Thank you!</h1>
-		<div class="text-center text-lg text-secondary">Someone will be in touch shortly.</div>
+  {#if sent}
+    <h1 class="text-center text-3xl md:text-4xl font-semibold">Thank you!</h1>
+    <div class="text-center text-lg text-secondary">
+      Someone will be in touch shortly.
+    </div>
 
-		<div>
-			<a href={user ? `/${user.username}` : '/'}>
-				<button
-					class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full bg-black text-white"
-					>Ok</button
-				>
-			</a>
-		</div>
-	{:else}
-		<h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">
-			{$t('user.support.header')}
-		</h1>
+    <div>
+      <a href={user ? `/${user.username}` : "/"}>
+        <button
+          class="rounded-full border py-2 px-5 font-bold hover:opacity-80 w-full bg-black text-white"
+          >Ok</button
+        >
+      </a>
+    </div>
+  {:else}
+    <h1 class="text-center text-3xl md:text-4xl font-semibold mb-8">
+      {$t("user.support.header")}
+    </h1>
 
-		<p class="text-secondary text-lg">
-			Fill out this form or email us directly at <a
-				class="underline"
-				href="mailto:support@coinos.io">support@coinos.io</a
-			> and we'll do our best to get back to you in a timely manner.
-		</p>
+    <p class="text-secondary text-lg">
+      Fill out this form or email us directly at <a
+        class="underline"
+        href="mailto:support@coinos.io">support@coinos.io</a
+      > and we'll do our best to get back to you in a timely manner.
+    </p>
 
-		<form on:submit={submit}>
-			<div class="mb-4">
-				<label for="account" class="font-semibold">{$t('user.support.accountName')}</label>
-				<input
-					class="bg-primary"
-					type="text"
-					name="account"
-					required
-					value={user?.username || ''}
-				/>
-			</div>
+    <form on:submit={submit}>
+      <div class="mb-4">
+        <label for="account" class="font-semibold"
+          >{$t("user.support.accountName")}</label
+        >
+        <input
+          class="bg-primary"
+          type="text"
+          name="account"
+          required
+          value={user?.username || ""}
+        />
+      </div>
 
-			<div class="mb-4">
-				<label for="email" class="font-semibold">{$t('user.support.email')}</label>
-				<input class="bg-primary" type="email" name="email" bind:value={email} required />
-			</div>
+      <div class="mb-4">
+        <label for="email" class="font-semibold"
+          >{$t("user.support.email")}</label
+        >
+        <input
+          class="bg-primary"
+          type="email"
+          name="email"
+          bind:value={email}
+          required
+        />
+      </div>
 
-			<div class="mb-4">
-				<label for="message" class="font-semibold">{$t('user.support.message')}</label>
-				<textarea
-					rows={5}
-					class="bg-primary"
-					type="text"
-					name="message"
-					bind:value={message}
-					required
-				/>
-			</div>
+      <div class="mb-4">
+        <label for="message" class="font-semibold"
+          >{$t("user.support.message")}</label
+        >
+        <textarea
+          rows={5}
+          class="bg-primary"
+          type="text"
+          name="message"
+          bind:value={message}
+          required
+        />
+      </div>
 
-			<button
-				type="submit"
-				disabled={!email || !message}
-				class="g-recaptcha {!email || !message
-					? 'opacity-50'
-					: 'opacity-100'} bg-black text-white font-bold rounded-xl py-3 w-full mx-auto {email &&
-				message
-					? 'hover:opacity-80'
-					: ''}">{$t('user.support.send')}</button
-			>
-		</form>
-	{/if}
+      <button
+        type="submit"
+        disabled={!email || !message}
+        class="g-recaptcha {!email || !message
+          ? 'opacity-50'
+          : 'opacity-100'} bg-black text-white font-bold rounded-xl py-3 w-full mx-auto {email &&
+        message
+          ? 'hover:opacity-80'
+          : ''}">{$t("user.support.send")}</button
+      >
+    </form>
+  {/if}
 </div>
diff --git a/src/routes/(app)/support/+server.js b/src/routes/(app)/support/+server.js
index 6b1778a8..e9a16cfc 100644
--- a/src/routes/(app)/support/+server.js
+++ b/src/routes/(app)/support/+server.js
@@ -1,9 +1,9 @@
-import { json } from '@sveltejs/kit';
-import { auth, post } from '$lib/utils';
+import { json } from "@sveltejs/kit";
+import { auth, post } from "$lib/utils";
 
 export const prerender = false;
 
 export async function POST({ cookies, request }) {
-	let result = await post('/email', await request.json(), auth(cookies));
-	return json(result);
+  let result = await post("/email", await request.json(), auth(cookies));
+  return json(result);
 }
diff --git a/src/routes/(app)/withdraw/+server.js b/src/routes/(app)/withdraw/+server.js
index 7b1ff4c6..a75a72f8 100644
--- a/src/routes/(app)/withdraw/+server.js
+++ b/src/routes/(app)/withdraw/+server.js
@@ -1,9 +1,10 @@
-import { auth, post } from '$lib/utils';
+import { auth, post } from "$lib/utils";
 
 export async function POST({ cookies, request }) {
-	let body = await request.json();
-	await post('/payments', body, auth(cookies));
+  let body = await request.json();
+  await post("/payments", body, auth(cookies));
 
-	return new Response(JSON.stringify('ok'), { headers: { 'content-type': 'application/json' } });
+  return new Response(JSON.stringify("ok"), {
+    headers: { "content-type": "application/json" },
+  });
 }
-
diff --git a/src/routes/(static)/+layout.server.js b/src/routes/(static)/+layout.server.js
index 2deeebc5..81d1d3dc 100644
--- a/src/routes/(static)/+layout.server.js
+++ b/src/routes/(static)/+layout.server.js
@@ -1,16 +1,16 @@
-import { get, post, auth, protectedRoutes } from '$lib/utils';
+import { get, post, auth, protectedRoutes } from "$lib/utils";
 
 export async function load({ cookies, request, url, params }) {
-	let token = cookies.get('token');
-	let rate,
-		rates = { USD: 1 };
+  let token = cookies.get("token");
+  let rate,
+    rates = { USD: 1 };
 
-	let user;
-	if (token) {
-		try {
-			user = await get('/me', auth(cookies));
-		} catch (e) {}
-	}
+  let user;
+  if (token) {
+    try {
+      user = await get("/me", auth(cookies));
+    } catch (e) {}
+  }
 
-	return { user };
+  return { user };
 }
diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte
index 3d596dff..29089dff 100644
--- a/src/routes/(static)/+layout.svelte
+++ b/src/routes/(static)/+layout.svelte
@@ -1,13 +1,13 @@
 <script>
-	import { SvelteToast } from '@zerodevx/svelte-toast';
-	import { Footer, LandingHeader } from '$comp';
-	export let data;
-	$: ({ user } = data);
+  import { SvelteToast } from "@zerodevx/svelte-toast";
+  import { Footer, LandingHeader } from "$comp";
+  export let data;
+  $: ({ user } = data);
 </script>
 
 <SvelteToast options={{ reversed: true, intro: { y: 192 } }} />
 <LandingHeader {user} />
 <main class="container flex px-10 md:px-40 mx-auto min-h-[600px] pb-20">
-	<slot />
+  <slot />
 </main>
 <Footer />
diff --git a/src/routes/(static)/bounties/+page.svelte b/src/routes/(static)/bounties/+page.svelte
index 729cf5dd..b53dc85d 100644
--- a/src/routes/(static)/bounties/+page.svelte
+++ b/src/routes/(static)/bounties/+page.svelte
@@ -1,102 +1,108 @@
 <div class="space-y-5">
-	<h1 class="text-3xl mb-6 pt-28 md:pt-12">Bounties</h1>
+  <h1 class="text-3xl mb-6 pt-28 md:pt-12">Bounties</h1>
 
-	<p>
-		We're offering ⚡️1,000,000 to the first 10 people that help us onboard these businesses in
-		Vancouver to take bitcoin payments.
-	</p>
+  <p>
+    We're offering ⚡️1,000,000 to the first 10 people that help us onboard
+    these businesses in Vancouver to take bitcoin payments.
+  </p>
 
-	<ul class="text-center text-lg space-y-3">
-		<li>Grocery / Produce Store</li>
-		<li class="leading-3">
-			<span class="line-through">Cafe</span><br />
-			<span class="text-xs"
-				><a href="/reverendhodl">ReverendHodl</a> for
-				<a href="/laughingbean">Laughing Bean Coffee Co.</a></span
-			>
-		</li>
-		<li>Bakery</li>
-		<li class="leading-3">
-			<span class="line-through">Butcher Shop</span><br />
-			<span class="text-xs"
-				><a href="/danielle">danielle</a> for
-				<a href="/butchersguild">All Natural &amp; Exotic Meats</a></span
-			>
-		</li>
-		<li>Laundromat / Dry Cleaner</li>
-		<li>Dollar Store / Book Store / Gift Shop</li>
-		<li class="leading-3">
-			<span class="line-through">Sushi Restaurant</span><br />
-			<span class="text-xs"
-				><a href="/ica547">ica547</a> for <a href="/metallmash">VanLove Sushi</a></span
-			>
-		</li>
-		<li>Pizza by the Slice</li>
-		<li>Liquor Store / Gas Station</li>
-		<li>Bubble Tea / Ice Cream Parlour</li>
-	</ul>
+  <ul class="text-center text-lg space-y-3">
+    <li>Grocery / Produce Store</li>
+    <li class="leading-3">
+      <span class="line-through">Cafe</span><br />
+      <span class="text-xs"
+        ><a href="/reverendhodl">ReverendHodl</a> for
+        <a href="/laughingbean">Laughing Bean Coffee Co.</a></span
+      >
+    </li>
+    <li>Bakery</li>
+    <li class="leading-3">
+      <span class="line-through">Butcher Shop</span><br />
+      <span class="text-xs"
+        ><a href="/danielle">danielle</a> for
+        <a href="/butchersguild">All Natural &amp; Exotic Meats</a></span
+      >
+    </li>
+    <li>Laundromat / Dry Cleaner</li>
+    <li>Dollar Store / Book Store / Gift Shop</li>
+    <li class="leading-3">
+      <span class="line-through">Sushi Restaurant</span><br />
+      <span class="text-xs"
+        ><a href="/ica547">ica547</a> for
+        <a href="/metallmash">VanLove Sushi</a></span
+      >
+    </li>
+    <li>Pizza by the Slice</li>
+    <li>Liquor Store / Gas Station</li>
+    <li>Bubble Tea / Ice Cream Parlour</li>
+  </ul>
 
-	<p>Eligible businesses:</p>
+  <p>Eligible businesses:</p>
 
-	<ul class="text-sm ml-4 space-y-2">
-		<li>
-			Have a physical location in Vancouver, North Vancouver, West Vancouver, Burnaby, New
-			Westminster, or Richmond
-		</li>
-		<li>Take walk-in customers</li>
-		<li>Have regular hours and a website with contact info</li>
-		<li>Have a 3 star or better rating on Google</li>
-		<li>
-			Accept bitcoin during their posted hours without needing to make any special arrangements
-		</li>
-		<li>Use Coinos</li>
-	</ul>
+  <ul class="text-sm ml-4 space-y-2">
+    <li>
+      Have a physical location in Vancouver, North Vancouver, West Vancouver,
+      Burnaby, New Westminster, or Richmond
+    </li>
+    <li>Take walk-in customers</li>
+    <li>Have regular hours and a website with contact info</li>
+    <li>Have a 3 star or better rating on Google</li>
+    <li>
+      Accept bitcoin during their posted hours without needing to make any
+      special arrangements
+    </li>
+    <li>Use Coinos</li>
+  </ul>
 
-	<p>Each business category can be claimed only once</p>
-	<p>One bounty per person</p>
+  <p>Each business category can be claimed only once</p>
+  <p>One bounty per person</p>
 
-	<p>The businesses can expect free ongoing support and promotion from us and our community.</p>
+  <p>
+    The businesses can expect free ongoing support and promotion from us and our
+    community.
+  </p>
 
-	<p>The prize money will be offered to the person who makes the referral.</p>
+  <p>The prize money will be offered to the person who makes the referral.</p>
 
-	<p>
-		<b>⚡️250,000</b> will be awarded once the business has met with us and is ready to take payments
-	</p>
-	<p>
-		<b>⚡️750,000</b> will be awarded once the merchant has accepted bitcoin for 6 months. We'll be
-		sending
-		<a
-			href="https://btcmap.org/leaderboard"
-			class="text-black hover:underline"
-			target="_blank"
-			rel="noreferrer">shadowy supertaggers</a
-		> to check up on them periodically.
-	</p>
+  <p>
+    <b>⚡️250,000</b> will be awarded once the business has met with us and is ready
+    to take payments
+  </p>
+  <p>
+    <b>⚡️750,000</b> will be awarded once the merchant has accepted bitcoin for
+    6 months. We'll be sending
+    <a
+      href="https://btcmap.org/leaderboard"
+      class="text-black hover:underline"
+      target="_blank"
+      rel="noreferrer">shadowy supertaggers</a
+    > to check up on them periodically.
+  </p>
 
-	<p>
-		Bounties will be awarded solely at our discretion and we reserve the right to refuse any
-		applicants without cause
-	</p>
+  <p>
+    Bounties will be awarded solely at our discretion and we reserve the right
+    to refuse any applicants without cause
+  </p>
 
-	<h2 class="text-xl">Ready to begin!?</h2>
+  <h2 class="text-xl">Ready to begin!?</h2>
 
-	<p>
-		To make a referral, reach out on one of our socials or email us at <a
-			href="mailto:bounties@coinos.io"
-			class="text-black hover:underline">bounties@coinos.io</a
-		> and we'll set up an appointment with you and the business owner to get started.
-	</p>
+  <p>
+    To make a referral, reach out on one of our socials or email us at <a
+      href="mailto:bounties@coinos.io"
+      class="text-black hover:underline">bounties@coinos.io</a
+    > and we'll set up an appointment with you and the business owner to get started.
+  </p>
 
-	<p>
-		We'll update this page as the bounties are claimed so you'll be able to see which ones are still
-		available.
-	</p>
+  <p>
+    We'll update this page as the bounties are claimed so you'll be able to see
+    which ones are still available.
+  </p>
 
-	<p>Thanks for participating and helping to orange pill Vancouver!</p>
+  <p>Thanks for participating and helping to orange pill Vancouver!</p>
 </div>
 
 <style>
-	a {
-		@apply text-blue-400;
-	}
+  a {
+    @apply text-blue-400;
+  }
 </style>
diff --git a/src/routes/(static)/docs/+page.server.js b/src/routes/(static)/docs/+page.server.js
index e80365fa..41176b14 100644
--- a/src/routes/(static)/docs/+page.server.js
+++ b/src/routes/(static)/docs/+page.server.js
@@ -1,4 +1,4 @@
 export let load = async ({ cookies }) => {
-	let token = cookies.get('token');
-	return { token };
+  let token = cookies.get("token");
+  return { token };
 };
diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte
index 63173173..6e08c2e8 100644
--- a/src/routes/(static)/docs/+page.svelte
+++ b/src/routes/(static)/docs/+page.svelte
@@ -1,121 +1,130 @@
 <script>
-	import { copyNoNewlines as copy } from '$lib/utils';
-	import { Code, Icon } from '$comp';
-	import { PUBLIC_COINOS_URL } from '$env/static/public';
-	export let data;
-	let { user, token } = data;
-	let api = 'https://coinos.io/api';
-
-	let tokenSample = token ? `export token="${token}"` : `export token=<your auth token>`;
+  import { copyNoNewlines as copy } from "$lib/utils";
+  import { Code, Icon } from "$comp";
+  import { PUBLIC_COINOS_URL } from "$env/static/public";
+  export let data;
+  let { user, token } = data;
+  let api = "https://coinos.io/api";
+
+  let tokenSample = token
+    ? `export token="${token}"`
+    : `export token=<your auth token>`;
 </script>
 
 <div class="space-y-8 lg:text-xl mt-20 pt-20 md:pt-0 w-full max-w-full">
-	<h1 class="text-4xl">Documentation</h1>
-
-	<p class="text-secondary">
-		Coinos has a simple REST API that can be used to register accounts and make payments and
-		queries. The following examples show how you can call the API with <a
-			href="https://curl.se/"
-			class="font-bold">curl</a
-		> from your command line.
-	</p>
-
-	<h2 class="text-2xl">API Base URL</h2>
-	<div class="bg-black text-white rounded-lg p-4 flex gap-4">
-		<div>{api}</div>
-		<button class="ml-auto my-auto invert opacity-90" on:click={() => copy(api)}
-			><Icon icon="copy" style="w-10 max-w-none" /></button
-		>
-	</div>
-
-	<h2 class="text-2xl">Auth Token</h2>
-	<p class="text-secondary">
-		{#if user && token}
-			This token authorizes you to use the API as <b>{user.username}</b>.
-		{:else}
-			<a href="/login" class="font-bold">Sign in</a> to view your auth token here, or get one from the
-			/login endpoint.
-		{/if}
-
-		Save it in a variable called <b>$token</b> to run the examples.
-	</p>
-
-	<div class="bg-black text-white rounded-lg p-4 flex gap-4">
-		<div class="w-full break-all">{tokenSample}</div>
-		<button class="ml-auto my-auto invert opacity-90" on:click={() => copy(tokenSample)}
-			><Icon icon="copy" style="w-10 max-w-none" /></button
-		>
-	</div>
-
-	<h2 class="text-2xl">POST /register</h2>
-	<p class="text-secondary">Register a new user account with a username and password</p>
-	<Code sample="register" />
-
-	<h2 class="text-2xl">POST /login</h2>
-	<p class="text-secondary">Login to an account to get its auth token</p>
-	<Code sample="login" />
-
-	<h2 class="text-2xl">POST /invoice</h2>
-	<p class="text-secondary">Create an invoice.</p>
-
-	<div class="text-secondary">
-		<div>Request params</div>
-		<div class="grid grid-cols-3 ml-2">
-			<div class="font-bold">type</div>
-			<div class="col-span-2">bitcoin or lightning</div>
-			<div class="font-bold">amount</div>
-			<div class="col-span-2">amount in satoshis</div>
-			<div class="font-bold">webhook</div>
-			<div class="col-span-2">(optional) endpoint to hit when the invoice is paid</div>
-			<div class="font-bold">secret</div>
-			<div class="col-span-2">a secret for the webhook to check</div>
-		</div>
-	</div>
-
-	<p>Get a lightning invoice to receive funds</p>
-	<Code sample="lightningInvoice" />
-
-	<p>Get a bitcoin address to receive funds</p>
-	<Code sample="bitcoinAddress" />
-
-	<p>Sample response</p>
-	<Code sample="invoiceResponse" />
-	<p>You can check the <b>received</b> field to see how much has been paid</p>
-
-	<p>Specify a webhook to be called when an invoice is paid</p>
-	<Code sample="webhook" />
-
-	<h2 class="text-2xl">GET /invoice/:hash</h2>
-	<p class="text-secondary">
-		Fetch an invoice by passing a bitcoin address or lightning payment hash
-	</p>
-	<Code sample="fetchInvoice" />
-
-	<h2 class="text-2xl">POST /payments</h2>
-	<p class="text-secondary">Send a lightning payment</p>
-	<Code sample="lightning" />
-
-	<p class="text-secondary">Send a bitcoin payment</p>
-	<Code sample="bitcoin" />
-
-	<p class="text-secondary">Send an internal payment to another user</p>
-	<Code sample="internal" />
-
-	<h2 class="text-2xl">GET /payments</h2>
-	<p class="text-secondary">Get all payments sent or received by the current user</p>
-
-	<div class="text-secondary">
-		<div>Query params</div>
-		<div class="grid grid-cols-3 ml-2">
-			<div class="font-bold">start</div>
-			<div class="col-span-2">only payments after this unix time</div>
-			<div class="font-bold">end</div>
-			<div class="col-span-2">only payments before this unix time</div>
-			<div class="font-bold">limit</div>
-			<div class="col-span-2">limit to this integer number of results</div>
-			<div class="font-bold">offset</div>
-			<div class="col-span-2">start limiting from this integer offset</div>
-		</div>
-	</div>
-	<Code sample="payments" />
+  <h1 class="text-4xl">Documentation</h1>
+
+  <p class="text-secondary">
+    Coinos has a simple REST API that can be used to register accounts and make
+    payments and queries. The following examples show how you can call the API
+    with <a href="https://curl.se/" class="font-bold">curl</a> from your command
+    line.
+  </p>
+
+  <h2 class="text-2xl">API Base URL</h2>
+  <div class="bg-black text-white rounded-lg p-4 flex gap-4">
+    <div>{api}</div>
+    <button class="ml-auto my-auto invert opacity-90" on:click={() => copy(api)}
+      ><Icon icon="copy" style="w-10 max-w-none" /></button
+    >
+  </div>
+
+  <h2 class="text-2xl">Auth Token</h2>
+  <p class="text-secondary">
+    {#if user && token}
+      This token authorizes you to use the API as <b>{user.username}</b>.
+    {:else}
+      <a href="/login" class="font-bold">Sign in</a> to view your auth token here,
+      or get one from the /login endpoint.
+    {/if}
+
+    Save it in a variable called <b>$token</b> to run the examples.
+  </p>
+
+  <div class="bg-black text-white rounded-lg p-4 flex gap-4">
+    <div class="w-full break-all">{tokenSample}</div>
+    <button
+      class="ml-auto my-auto invert opacity-90"
+      on:click={() => copy(tokenSample)}
+      ><Icon icon="copy" style="w-10 max-w-none" /></button
+    >
+  </div>
+
+  <h2 class="text-2xl">POST /register</h2>
+  <p class="text-secondary">
+    Register a new user account with a username and password
+  </p>
+  <Code sample="register" />
+
+  <h2 class="text-2xl">POST /login</h2>
+  <p class="text-secondary">Login to an account to get its auth token</p>
+  <Code sample="login" />
+
+  <h2 class="text-2xl">POST /invoice</h2>
+  <p class="text-secondary">Create an invoice.</p>
+
+  <div class="text-secondary">
+    <div>Request params</div>
+    <div class="grid grid-cols-3 ml-2">
+      <div class="font-bold">type</div>
+      <div class="col-span-2">bitcoin or lightning</div>
+      <div class="font-bold">amount</div>
+      <div class="col-span-2">amount in satoshis</div>
+      <div class="font-bold">webhook</div>
+      <div class="col-span-2">
+        (optional) endpoint to hit when the invoice is paid
+      </div>
+      <div class="font-bold">secret</div>
+      <div class="col-span-2">a secret for the webhook to check</div>
+    </div>
+  </div>
+
+  <p>Get a lightning invoice to receive funds</p>
+  <Code sample="lightningInvoice" />
+
+  <p>Get a bitcoin address to receive funds</p>
+  <Code sample="bitcoinAddress" />
+
+  <p>Sample response</p>
+  <Code sample="invoiceResponse" />
+  <p>You can check the <b>received</b> field to see how much has been paid</p>
+
+  <p>Specify a webhook to be called when an invoice is paid</p>
+  <Code sample="webhook" />
+
+  <h2 class="text-2xl">GET /invoice/:hash</h2>
+  <p class="text-secondary">
+    Fetch an invoice by passing a bitcoin address or lightning payment hash
+  </p>
+  <Code sample="fetchInvoice" />
+
+  <h2 class="text-2xl">POST /payments</h2>
+  <p class="text-secondary">Send a lightning payment</p>
+  <Code sample="lightning" />
+
+  <p class="text-secondary">Send a bitcoin payment</p>
+  <Code sample="bitcoin" />
+
+  <p class="text-secondary">Send an internal payment to another user</p>
+  <Code sample="internal" />
+
+  <h2 class="text-2xl">GET /payments</h2>
+  <p class="text-secondary">
+    Get all payments sent or received by the current user
+  </p>
+
+  <div class="text-secondary">
+    <div>Query params</div>
+    <div class="grid grid-cols-3 ml-2">
+      <div class="font-bold">start</div>
+      <div class="col-span-2">only payments after this unix time</div>
+      <div class="font-bold">end</div>
+      <div class="col-span-2">only payments before this unix time</div>
+      <div class="font-bold">limit</div>
+      <div class="col-span-2">limit to this integer number of results</div>
+      <div class="font-bold">offset</div>
+      <div class="col-span-2">start limiting from this integer offset</div>
+    </div>
+  </div>
+  <Code sample="payments" />
 </div>
diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js
index 60a2f6c6..5273d372 100644
--- a/src/routes/+layout.server.js
+++ b/src/routes/+layout.server.js
@@ -1,17 +1,17 @@
 import { auth, get } from "$lib/utils";
-import { loadTranslations, locale } from '$lib/translations';
+import { loadTranslations, locale } from "$lib/translations";
 export const load = async ({ cookies, url }) => {
-	let user;
-	let token = cookies.get('token');
-	if (token) {
-		try {
-			user = await get('/me', auth(cookies));
-		} catch (e) {}
-	}
+  let user;
+  let token = cookies.get("token");
+  if (token) {
+    try {
+      user = await get("/me", auth(cookies));
+    } catch (e) {}
+  }
 
-	const { host, pathname } = url;
-	const defaultLocale = user?.language || 'en'; // get from cookie, user session, ...
-	const initLocale = locale.get() || defaultLocale; // set default if no locale already set
-	await loadTranslations(initLocale, pathname); // keep this just before the `return`
-	return { host, pathname };
+  const { host, pathname } = url;
+  const defaultLocale = user?.language || "en"; // get from cookie, user session, ...
+  const initLocale = locale.get() || defaultLocale; // set default if no locale already set
+  await loadTranslations(initLocale, pathname); // keep this just before the `return`
+  return { host, pathname };
 };
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 32d31fa8..182be1cc 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,44 +1,47 @@
 <script>
-	import { PUBLIC_DOMAIN } from '$env/static/public';
-	import '../app.css';
-	import { loading, t } from '$lib/translations';
+  import { PUBLIC_DOMAIN } from "$env/static/public";
+  import "../app.css";
+  import { loading, t } from "$lib/translations";
 
-	export let data;
-	let { pathname } = data;
-  let host = PUBLIC_DOMAIN.includes("localhost") ? `http://${PUBLIC_DOMAIN}` : `https://${PUBLIC_DOMAIN}`
+  export let data;
+  let { pathname } = data;
+
+  let host = PUBLIC_DOMAIN.includes("localhost")
+    ? `http://${PUBLIC_DOMAIN}`
+    : `https://${PUBLIC_DOMAIN}`;
 </script>
 
 <svelte:head>
-	<title>coinos</title>
-	<meta property="og:title" content="coinos" />
-	<meta name="twitter:title" content="coinos" />
+  <title>coinos</title>
+  <meta property="og:title" content="coinos" />
+  <meta name="twitter:title" content="coinos" />
 
-	<meta property="og:image" content={`${host}/images/logo.png`} />
+  <meta property="og:image" content={`${host}/images/logo.png`} />
 
-	<meta property="og:type" content="website" />
-	<meta property="og:description" content="An easy to use bitcoin web wallet" />
-	<meta name="description" content="An easy to use bitcoin web wallet" />
+  <meta property="og:type" content="website" />
+  <meta property="og:description" content="An easy to use bitcoin web wallet" />
+  <meta name="description" content="An easy to use bitcoin web wallet" />
 
-	<meta name="keywords" content="coinos easy bitcoin web wallet" />
+  <meta name="keywords" content="coinos easy bitcoin web wallet" />
 
-	<meta name="twitter:image" content={`${host}/images/logo.png`} />
-	<meta name="twitter:card" content="summary_large_image" />
+  <meta name="twitter:image" content={`${host}/images/logo.png`} />
+  <meta name="twitter:card" content="summary_large_image" />
 
-	<meta property="og:url" content={host + pathname} />
-	<meta name="twitter:site" content="@coinoswallet" />
-	<meta name="twitter:creator" content="@coinoswallet" />
+  <meta property="og:url" content={host + pathname} />
+  <meta name="twitter:site" content="@coinoswallet" />
+  <meta name="twitter:creator" content="@coinoswallet" />
 </svelte:head>
 
 {#if !$loading}
-	<slot />
+  <slot />
 {/if}
 
 <style global>
-	:root {
-		--toastContainerTop: auto;
-		--toastContainerRight: auto;
-		--toastContainerBottom: 8rem;
-		--toastContainerLeft: calc(50vw - 8rem);
-		--toastBackground: #292929;
-	}
+  :root {
+    --toastContainerTop: auto;
+    --toastContainerRight: auto;
+    --toastContainerBottom: 8rem;
+    --toastContainerLeft: calc(50vw - 8rem);
+    --toastBackground: #292929;
+  }
 </style>
diff --git a/src/routes/+page.server.js b/src/routes/+page.server.js
index dbd7fdf7..904e543d 100644
--- a/src/routes/+page.server.js
+++ b/src/routes/+page.server.js
@@ -1,4 +1,4 @@
 // export const prerender = true;
 export let load = async () => {
-	return { faqs: ['cost', 'compatibility', 'safety', 'pos', 'bitcoin'] };
+  return { faqs: ["cost", "compatibility", "safety", "pos", "bitcoin"] };
 };
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 59d56bf1..a90eb4ae 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,114 +1,118 @@
 <script>
-	import {
-		LandingHeader,
-		LandingHero,
-		LandingInfoCard,
-		HowItWorksCard,
-		FaqCard,
-		Image,
-		About,
-		Footer
-	} from '$comp';
-
-	import { t } from '$lib/translations';
-	import { onDestroy, onMount, tick } from 'svelte';
-
-	export let data;
-	let { faqs, locations, user } = data;
-	let update = (data) => ({ faqs, locations, user } = data);
-	$: update(data);
-
-	let howItWorks;
-	let faq;
-	let about;
-
-	let log = console.log;
-
-	const howItWorksSteps = [
-		{ image: 'hand', stepID: 'step1' },
-		{ image: 'bolt', stepID: 'step2' },
-		{ image: 'smile', stepID: 'step3' }
-	];
-
-	let loaded;
-
-	let observer;
-	let isIntersecting = false;
-
-	onMount(async () => {
-		observer = new IntersectionObserver((entries) => {
-			isIntersecting = isIntersecting || entries[0].isIntersecting;
-		});
-
-		loaded = true;
-		await tick();
-		observer.observe(document.getElementById('faq'));
-	});
-
-	onDestroy(() => (loaded = false));
+  import {
+    LandingHeader,
+    LandingHero,
+    LandingInfoCard,
+    HowItWorksCard,
+    FaqCard,
+    Image,
+    About,
+    Footer,
+  } from "$comp";
+
+  import { t } from "$lib/translations";
+  import { onDestroy, onMount, tick } from "svelte";
+
+  export let data;
+  let { faqs, locations, user } = data;
+  let update = (data) => ({ faqs, locations, user } = data);
+  $: update(data);
+
+  let howItWorks;
+  let faq;
+  let about;
+
+  let log = console.log;
+
+  const howItWorksSteps = [
+    { image: "hand", stepID: "step1" },
+    { image: "bolt", stepID: "step2" },
+    { image: "smile", stepID: "step3" },
+  ];
+
+  let loaded;
+
+  let observer;
+  let isIntersecting = false;
+
+  onMount(async () => {
+    observer = new IntersectionObserver((entries) => {
+      isIntersecting = isIntersecting || entries[0].isIntersecting;
+    });
+
+    loaded = true;
+    await tick();
+    observer.observe(document.getElementById("faq"));
+  });
+
+  onDestroy(() => (loaded = false));
 </script>
 
 <svelte:head>
-	<script src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js"></script>
+  <script src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js"></script>
 </svelte:head>
 
 {#if loaded}
-	<LandingHeader {howItWorks} {faq} {about} {user} />
-
-	<main class="space-y-40 py-20 md:py-32 lg:py-36 xl:py-40 px-5 md:px-0">
-		<LandingHero />
-		<LandingInfoCard
-			image="lightning-qr"
-			title={$t('landing.info1.title')}
-			description={$t('landing.info1.description')}
-		/>
-
-		<LandingInfoCard image="phone-checkout" title={$t('landing.info2.title')} order="reverse">
-			{$t('landing.info2.description1')}
-			<br /><br />
-			{$t('landing.info2.description2')}
-			<br /><br />
-			{@html $t('landing.info2.description3')}
-		</LandingInfoCard>
-
-		<div>
-			<LandingInfoCard
-				image="customize"
-				title={$t('landing.info3.title')}
-				description={$t('landing.info3.description')}
-			/>
-			<div bind:this={howItWorks} />
-			<div id="about" />
-		</div>
-
-		<div>
-			<h3 class="text-5xl font-medium mb-10 text-center">
-				{$t('howItWorks.header')}
-			</h3>
-			<div class="grid lg:grid-cols-3 space-y-10 lg:space-y-0 text-center">
-				{#each howItWorksSteps as step}
-					<HowItWorksCard image={step.image} stepID={step.stepID} />
-				{/each}
-			</div>
-			<div bind:this={faq} />
-		</div>
-
-		<div>
-			<div class="space-y-10">
-				<h3 class="text-5xl font-medium text-center pt-40 -mt-40" id="faq">
-					{$t('faq.header')}
-				</h3>
-				{#each faqs as f}
-					<FaqCard questionID={f} />
-				{/each}
-			</div>
-			<div bind:this={about} />
-		</div>
-
-		{#if isIntersecting}
-			<About />
-		{/if}
-	</main>
-
-	<Footer />
+  <LandingHeader {howItWorks} {faq} {about} {user} />
+
+  <main class="space-y-40 py-20 md:py-32 lg:py-36 xl:py-40 px-5 md:px-0">
+    <LandingHero />
+    <LandingInfoCard
+      image="lightning-qr"
+      title={$t("landing.info1.title")}
+      description={$t("landing.info1.description")}
+    />
+
+    <LandingInfoCard
+      image="phone-checkout"
+      title={$t("landing.info2.title")}
+      order="reverse"
+    >
+      {$t("landing.info2.description1")}
+      <br /><br />
+      {$t("landing.info2.description2")}
+      <br /><br />
+      {@html $t("landing.info2.description3")}
+    </LandingInfoCard>
+
+    <div>
+      <LandingInfoCard
+        image="customize"
+        title={$t("landing.info3.title")}
+        description={$t("landing.info3.description")}
+      />
+      <div bind:this={howItWorks} />
+      <div id="about" />
+    </div>
+
+    <div>
+      <h3 class="text-5xl font-medium mb-10 text-center">
+        {$t("howItWorks.header")}
+      </h3>
+      <div class="grid lg:grid-cols-3 space-y-10 lg:space-y-0 text-center">
+        {#each howItWorksSteps as step}
+          <HowItWorksCard image={step.image} stepID={step.stepID} />
+        {/each}
+      </div>
+      <div bind:this={faq} />
+    </div>
+
+    <div>
+      <div class="space-y-10">
+        <h3 class="text-5xl font-medium text-center pt-40 -mt-40" id="faq">
+          {$t("faq.header")}
+        </h3>
+        {#each faqs as f}
+          <FaqCard questionID={f} />
+        {/each}
+      </div>
+      <div bind:this={about} />
+    </div>
+
+    {#if isIntersecting}
+      <About />
+    {/if}
+  </main>
+
+  <Footer />
 {/if}
diff --git a/src/routes/about/+server.js b/src/routes/about/+server.js
index f8a37fb5..b6912cb4 100644
--- a/src/routes/about/+server.js
+++ b/src/routes/about/+server.js
@@ -1,5 +1,5 @@
-import { redirect } from '@sveltejs/kit';
+import { redirect } from "@sveltejs/kit";
 
 export async function GET() {
-	throw new redirect(307, '/#about');
+  throw new redirect(307, "/#about");
 }
diff --git a/src/routes/map/+page.server.js b/src/routes/map/+page.server.js
index 7936e88b..616d28f6 100644
--- a/src/routes/map/+page.server.js
+++ b/src/routes/map/+page.server.js
@@ -1,12 +1,12 @@
-import { get } from '$lib/utils';
+import { get } from "$lib/utils";
 
 // export const prerender = true;
 export let load = async () => {
-	let data = { locations: [] };
+  let data = { locations: [] };
 
-	try {
-		data = await get('/locations');
-	} catch (e) {}
+  try {
+    data = await get("/locations");
+  } catch (e) {}
 
-	return data;
+  return data;
 };
diff --git a/src/routes/map/+page.svelte b/src/routes/map/+page.svelte
index baf067d7..8c5fc3f8 100644
--- a/src/routes/map/+page.svelte
+++ b/src/routes/map/+page.svelte
@@ -1,18 +1,18 @@
 <script>
-	import { Icon, LocationsMap } from '$comp';
-	export let data;
+  import { Icon, LocationsMap } from "$comp";
+  export let data;
 
-	let { locations } = data;
+  let { locations } = data;
 </script>
 
 <div class="pt-4">
-	<div class="w-[243px] mx-auto mb-4">
-		<a href="/">
-			<Icon icon="logo" />
-		</a>
-	</div>
+  <div class="w-[243px] mx-auto mb-4">
+    <a href="/">
+      <Icon icon="logo" />
+    </a>
+  </div>
 
-	<div class="flex justify-center items-center">
-		<LocationsMap {locations} />
-	</div>
+  <div class="flex justify-center items-center">
+    <LocationsMap {locations} />
+  </div>
 </div>
diff --git a/static/lottie/success.json b/static/lottie/success.json
index 6b01e066..adef99b9 100644
--- a/static/lottie/success.json
+++ b/static/lottie/success.json
@@ -1,1313 +1,1351 @@
 {
-	"v": "5.7.1",
-	"fr": 30,
-	"ip": 0,
-	"op": 60,
-	"w": 300,
-	"h": 300,
-	"nm": "Comp 1",
-	"ddd": 0,
-	"assets": [],
-	"layers": [
-		{
-			"ddd": 0,
-			"ind": 1,
-			"ty": 4,
-			"nm": "4",
-			"sr": 1,
-			"ks": {
-				"o": { "a": 0, "k": 100, "ix": 11 },
-				"r": { "a": 0, "k": 0, "ix": 10 },
-				"p": { "a": 0, "k": [151, 151, 0], "ix": 2 },
-				"a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
-				"s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
-			},
-			"ao": 0,
-			"shapes": [
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[0, 0],
-										[-22.5, -7.5],
-										[0, 0]
-									],
-									"o": [
-										[0, 0],
-										[22.5, 7.5],
-										[0, 0]
-									],
-									"v": [
-										[61, 78.5],
-										[78, 100.5],
-										[94, 115.5]
-									],
-									"c": false
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "st",
-							"c": {
-								"a": 0,
-								"k": [0.12941176470588237, 0.19607843137254902, 0.3843137254901961, 1],
-								"ix": 3
-							},
-							"o": { "a": 0, "k": 100, "ix": 4 },
-							"w": { "a": 0, "k": 5, "ix": 5 },
-							"lc": 2,
-							"lj": 1,
-							"ml": 4,
-							"bm": 0,
-							"nm": "Stroke 1",
-							"mn": "ADBE Vector Graphic - Stroke",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [0, 0], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [100, 100], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Shape 1",
-					"np": 3,
-					"cix": 2,
-					"bm": 0,
-					"ix": 1,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "tm",
-					"s": {
-						"a": 1,
-						"k": [
-							{
-								"i": { "x": [0.667], "y": [1] },
-								"o": { "x": [0.333], "y": [0] },
-								"t": 28.254,
-								"s": [0]
-							},
-							{ "t": 51, "s": [100] }
-						],
-						"ix": 1
-					},
-					"e": {
-						"a": 1,
-						"k": [
-							{
-								"i": { "x": [0.667], "y": [1] },
-								"o": { "x": [0.333], "y": [0] },
-								"t": 17,
-								"s": [0]
-							},
-							{ "t": 46.2109375, "s": [100] }
-						],
-						"ix": 2
-					},
-					"o": { "a": 0, "k": 0, "ix": 3 },
-					"m": 1,
-					"ix": 2,
-					"nm": "Trim Paths 1",
-					"mn": "ADBE Vector Filter - Trim",
-					"hd": false
-				}
-			],
-			"ip": 17,
-			"op": 617,
-			"st": 17,
-			"bm": 0
-		},
-		{
-			"ddd": 0,
-			"ind": 2,
-			"ty": 4,
-			"nm": "3",
-			"sr": 1,
-			"ks": {
-				"o": { "a": 0, "k": 100, "ix": 11 },
-				"r": { "a": 0, "k": 203, "ix": 10 },
-				"p": { "a": 0, "k": [251.408, 59.449, 0], "ix": 2 },
-				"a": { "a": 0, "k": [-103.936, 89.696, 0], "ix": 1 },
-				"s": { "a": 0, "k": [91.456, 89.381, 100], "ix": 6 }
-			},
-			"ao": 0,
-			"shapes": [
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[0, 0],
-										[29.459, 25.084],
-										[5, -25.75],
-										[5.75, -0.75]
-									],
-									"o": [
-										[0, 0],
-										[-25.25, -21.5],
-										[-5.515, 28.405],
-										[-5.75, 0.75]
-									],
-									"v": [
-										[-75, 68.75],
-										[-107.25, 86.5],
-										[-94, 84],
-										[-128.75, 113]
-									],
-									"c": false
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "st",
-							"c": { "a": 0, "k": [1, 0.713725490196, 0.211764720842, 1], "ix": 3 },
-							"o": { "a": 0, "k": 100, "ix": 4 },
-							"w": { "a": 0, "k": 5, "ix": 5 },
-							"lc": 2,
-							"lj": 1,
-							"ml": 4,
-							"bm": 0,
-							"nm": "Stroke 1",
-							"mn": "ADBE Vector Graphic - Stroke",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [0, 0], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [100, 100], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Shape 1",
-					"np": 3,
-					"cix": 2,
-					"bm": 0,
-					"ix": 1,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "tm",
-					"s": {
-						"a": 1,
-						"k": [
-							{
-								"i": { "x": [0.667], "y": [1] },
-								"o": { "x": [0.333], "y": [0] },
-								"t": 28.254,
-								"s": [0]
-							},
-							{ "t": 51, "s": [100] }
-						],
-						"ix": 1
-					},
-					"e": {
-						"a": 1,
-						"k": [
-							{
-								"i": { "x": [0.667], "y": [1] },
-								"o": { "x": [0.333], "y": [0] },
-								"t": 17,
-								"s": [0]
-							},
-							{ "t": 46.2109375, "s": [100] }
-						],
-						"ix": 2
-					},
-					"o": { "a": 0, "k": 0, "ix": 3 },
-					"m": 1,
-					"ix": 2,
-					"nm": "Trim Paths 1",
-					"mn": "ADBE Vector Filter - Trim",
-					"hd": false
-				}
-			],
-			"ip": 17,
-			"op": 617,
-			"st": 17,
-			"bm": 0
-		},
-		{
-			"ddd": 0,
-			"ind": 3,
-			"ty": 4,
-			"nm": "2",
-			"sr": 1,
-			"ks": {
-				"o": { "a": 0, "k": 100, "ix": 11 },
-				"r": { "a": 0, "k": 0, "ix": 10 },
-				"p": { "a": 0, "k": [-21, 347, 0], "ix": 2 },
-				"a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
-				"s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
-			},
-			"ao": 0,
-			"shapes": [
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[0, 0],
-										[20.5, 4.5],
-										[0, 0],
-										[18.25, 9.25],
-										[3.5, -3.25]
-									],
-									"o": [
-										[0, 0],
-										[-20.5, -4.5],
-										[0, 0],
-										[-18.25, -9.25],
-										[-3.5, 3.25]
-									],
-									"v": [
-										[90.75, -122.25],
-										[83.5, -110.5],
-										[81.25, -97.25],
-										[69.75, -93.25],
-										[61, -75.75]
-									],
-									"c": false
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "st",
-							"c": { "a": 0, "k": [0.745098039216, 0.643137254902, 1, 1], "ix": 3 },
-							"o": { "a": 0, "k": 100, "ix": 4 },
-							"w": { "a": 0, "k": 5, "ix": 5 },
-							"lc": 2,
-							"lj": 1,
-							"ml": 4,
-							"bm": 0,
-							"nm": "Stroke 1",
-							"mn": "ADBE Vector Graphic - Stroke",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [0, 0], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [100, 100], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Shape 1",
-					"np": 3,
-					"cix": 2,
-					"bm": 0,
-					"ix": 1,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "tm",
-					"s": {
-						"a": 1,
-						"k": [
-							{
-								"i": { "x": [0.667], "y": [1] },
-								"o": { "x": [0.333], "y": [0] },
-								"t": 28.254,
-								"s": [0]
-							},
-							{ "t": 51, "s": [100] }
-						],
-						"ix": 1
-					},
-					"e": {
-						"a": 1,
-						"k": [
-							{
-								"i": { "x": [0.667], "y": [1] },
-								"o": { "x": [0.333], "y": [0] },
-								"t": 17,
-								"s": [0]
-							},
-							{ "t": 46.2109375, "s": [100] }
-						],
-						"ix": 2
-					},
-					"o": { "a": 0, "k": 0, "ix": 3 },
-					"m": 1,
-					"ix": 2,
-					"nm": "Trim Paths 1",
-					"mn": "ADBE Vector Filter - Trim",
-					"hd": false
-				}
-			],
-			"ip": 17,
-			"op": 617,
-			"st": 17,
-			"bm": 0
-		},
-		{
-			"ddd": 0,
-			"ind": 4,
-			"ty": 4,
-			"nm": "1",
-			"sr": 1,
-			"ks": {
-				"o": { "a": 0, "k": 100, "ix": 11 },
-				"r": { "a": 0, "k": 0, "ix": 10 },
-				"p": { "a": 0, "k": [147, 146, 0], "ix": 2 },
-				"a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
-				"s": { "a": 0, "k": [109.756, 101.856, 100], "ix": 6 }
-			},
-			"ao": 0,
-			"shapes": [
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[0, 0],
-										[33.75, 1]
-									],
-									"o": [
-										[0, 0],
-										[-33.75, -1]
-									],
-									"v": [
-										[-57.75, -75.75],
-										[-90.75, -107.5]
-									],
-									"c": false
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "st",
-							"c": { "a": 0, "k": [1, 0.431372578939, 0.513725490196, 1], "ix": 3 },
-							"o": { "a": 0, "k": 100, "ix": 4 },
-							"w": { "a": 0, "k": 5, "ix": 5 },
-							"lc": 2,
-							"lj": 1,
-							"ml": 4,
-							"bm": 0,
-							"nm": "Stroke 1",
-							"mn": "ADBE Vector Graphic - Stroke",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [-1.5, -0.25], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [100, 100], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Shape 1",
-					"np": 3,
-					"cix": 2,
-					"bm": 0,
-					"ix": 1,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "tm",
-					"s": {
-						"a": 1,
-						"k": [
-							{
-								"i": { "x": [0.667], "y": [1] },
-								"o": { "x": [0.333], "y": [0] },
-								"t": 28.254,
-								"s": [0]
-							},
-							{ "t": 51, "s": [100] }
-						],
-						"ix": 1
-					},
-					"e": {
-						"a": 1,
-						"k": [
-							{
-								"i": { "x": [0.667], "y": [1] },
-								"o": { "x": [0.333], "y": [0] },
-								"t": 17,
-								"s": [0]
-							},
-							{ "t": 46.2109375, "s": [100] }
-						],
-						"ix": 2
-					},
-					"o": { "a": 0, "k": 0, "ix": 3 },
-					"m": 1,
-					"ix": 2,
-					"nm": "Trim Paths 1",
-					"mn": "ADBE Vector Filter - Trim",
-					"hd": false
-				}
-			],
-			"ip": 17,
-			"op": 617,
-			"st": 17,
-			"bm": 0
-		},
-		{
-			"ddd": 0,
-			"ind": 5,
-			"ty": 4,
-			"nm": "checkmark/success Outlines",
-			"sr": 1,
-			"ks": {
-				"o": { "a": 0, "k": 100, "ix": 11 },
-				"r": { "a": 0, "k": 0, "ix": 10 },
-				"p": { "a": 0, "k": [150.06, 150.061, 0], "ix": 2 },
-				"a": { "a": 0, "k": [99, 99, 0], "ix": 1 },
-				"s": {
-					"a": 1,
-					"k": [
-						{
-							"i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
-							"o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
-							"t": 0,
-							"s": [100, 100, 100]
-						},
-						{
-							"i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
-							"o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
-							"t": 12,
-							"s": [27, 27, 100]
-						},
-						{ "t": 21, "s": [100, 100, 100] }
-					],
-					"ix": 6
-				}
-			},
-			"ao": 0,
-			"shapes": [
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[0, 0],
-										[0.831, 1.409],
-										[0, 0],
-										[-0.622, 2.004],
-										[-1.844, 1.043],
-										[-2.083, -0.474],
-										[-1.215, -1.74],
-										[0, 0],
-										[-0.949, 0.537],
-										[0, 0],
-										[-2.041, -0.632],
-										[-1.075, -1.826],
-										[0.463, -2.047],
-										[1.756, -1.181]
-									],
-									"o": [
-										[-1.424, 0.805],
-										[0, 0],
-										[-0.93, -1.899],
-										[0.622, -2.006],
-										[1.844, -1.042],
-										[2.084, 0.474],
-										[0, 0],
-										[0.553, 0.939],
-										[0, 0],
-										[1.921, -0.899],
-										[2.042, 0.631],
-										[1.076, 1.823],
-										[-0.463, 2.047],
-										[0, 0]
-									],
-									"v": [
-										[-26.138, 30.587],
-										[-30.199, 29.498],
-										[-58.899, -19.189],
-										[-59.378, -25.261],
-										[-55.542, -30.001],
-										[-49.433, -30.884],
-										[-44.302, -27.441],
-										[-23.618, 7.647],
-										[-20.911, 8.371],
-										[47.571, -30.344],
-										[53.736, -30.76],
-										[58.584, -26.94],
-										[59.537, -20.918],
-										[56.086, -15.898]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": { "a": 0, "k": [1, 1, 1, 1], "ix": 4 },
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [99.943, 103.024], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [83.631, 83.631], "ix": 3 },
-							"r": { "a": 0, "k": -12.6, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 1",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 1,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[-47.479, -12.722],
-										[12.721, -47.478],
-										[47.478, 12.722],
-										[-12.723, 47.478]
-									],
-									"o": [
-										[47.479, 12.722],
-										[-12.723, 47.479],
-										[-47.478, -12.723],
-										[12.721, -47.479]
-									],
-									"v": [
-										[23.036, -85.967],
-										[85.969, 23.035],
-										[-23.035, 85.967],
-										[-85.966, -23.035]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": {
-								"a": 1,
-								"k": [
-									{
-										"i": { "x": [0.833], "y": [0.833] },
-										"o": { "x": [0.167], "y": [0.167] },
-										"t": 0,
-										"s": [0.901960790157, 0.901960790157, 0.901960790157, 1]
-									},
-									{
-										"i": { "x": [0.833], "y": [0.833] },
-										"o": { "x": [0.167], "y": [0.167] },
-										"t": 10,
-										"s": [0.901960790157, 0.901960790157, 0.901960790157, 1]
-									},
-									{ "t": 29, "s": [0.262745112181, 0.823529422283, 0.588235318661, 1] }
-								],
-								"ix": 4
-							},
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [98.939, 98.939], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [100, 100], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 2",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 2,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				}
-			],
-			"ip": 0,
-			"op": 600,
-			"st": 0,
-			"bm": 0
-		},
-		{
-			"ddd": 0,
-			"ind": 6,
-			"ty": 4,
-			"nm": "large-circles/success Outlines",
-			"sr": 1,
-			"ks": {
-				"o": {
-					"a": 1,
-					"k": [
-						{
-							"i": { "x": [0.833], "y": [0.833] },
-							"o": { "x": [0.167], "y": [0.167] },
-							"t": 42,
-							"s": [100]
-						},
-						{ "t": 52, "s": [2] }
-					],
-					"ix": 11
-				},
-				"r": { "a": 0, "k": 0, "ix": 10 },
-				"p": { "a": 0, "k": [148, 146, 0], "ix": 2 },
-				"a": { "a": 0, "k": [95.5, 98, 0], "ix": 1 },
-				"s": {
-					"a": 1,
-					"k": [
-						{
-							"i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
-							"o": { "x": [0.009, 0.009, 0.333], "y": [1.621, 1.621, 0] },
-							"t": 17,
-							"s": [62, 62, 100]
-						},
-						{ "t": 50, "s": [124, 124, 100] }
-					],
-					"ix": 6
-				}
-			},
-			"ao": 0,
-			"shapes": [
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[-6.209, 1.338],
-										[-1.337, -6.209],
-										[6.209, -1.337],
-										[1.338, 6.209]
-									],
-									"o": [
-										[6.208, -1.337],
-										[1.338, 6.209],
-										[-6.209, 1.338],
-										[-1.337, -6.209]
-									],
-									"v": [
-										[-2.421, -11.243],
-										[11.242, -2.422],
-										[2.421, 11.241],
-										[-11.243, 2.421]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": { "a": 0, "k": [0.745000023935, 0.642999985639, 1, 1], "ix": 4 },
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [173.998, 145.423], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [71, 71], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 1",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 1,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[-6.209, 1.337],
-										[-1.338, -6.209],
-										[6.209, -1.338],
-										[1.338, 6.209]
-									],
-									"o": [
-										[6.209, -1.338],
-										[1.337, 6.209],
-										[-6.209, 1.337],
-										[-1.337, -6.208]
-									],
-									"v": [
-										[-2.421, -11.242],
-										[11.242, -2.422],
-										[2.422, 11.242],
-										[-11.243, 2.422]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": {
-								"a": 0,
-								"k": [0.011764705882352941, 0.45098039215686275, 0.8901960784313725, 1],
-								"ix": 4
-							},
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [63.997, 183.011], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [70, 70], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 2",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 2,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[-6.209, 1.337],
-										[-1.337, -6.208],
-										[6.209, -1.337],
-										[1.338, 6.209]
-									],
-									"o": [
-										[6.209, -1.337],
-										[1.338, 6.209],
-										[-6.209, 1.338],
-										[-1.337, -6.209]
-									],
-									"v": [
-										[-2.421, -11.243],
-										[11.242, -2.423],
-										[2.421, 11.242],
-										[-11.243, 2.421]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": { "a": 0, "k": [1, 0.713999968884, 0.211999990426, 1], "ix": 4 },
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [103.291, 12.83], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [70, 70], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 3",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 3,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[-6.208, 1.337],
-										[-1.337, -6.209],
-										[6.209, -1.338],
-										[1.338, 6.209]
-									],
-									"o": [
-										[6.209, -1.337],
-										[1.338, 6.209],
-										[-6.209, 1.337],
-										[-1.337, -6.209]
-									],
-									"v": [
-										[-2.423, -11.242],
-										[11.241, -2.422],
-										[2.421, 11.242],
-										[-11.243, 2.422]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": {
-								"a": 0,
-								"k": [0.011764705882352941, 0.45098039215686275, 0.8901960784313725, 1],
-								"ix": 4
-							},
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [178.004, 59.795], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [67, 67], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 4",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 4,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[-6.209, 1.337],
-										[-1.338, -6.208],
-										[6.209, -1.337],
-										[1.338, 6.209]
-									],
-									"o": [
-										[6.209, -1.337],
-										[1.337, 6.209],
-										[-6.209, 1.338],
-										[-1.337, -6.209]
-									],
-									"v": [
-										[-2.421, -11.243],
-										[11.243, -2.423],
-										[2.422, 11.242],
-										[-11.243, 2.421]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": { "a": 0, "k": [1, 0.430999995213, 0.513999968884, 1], "ix": 4 },
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [12.829, 84.352], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [68, 68], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 5",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 5,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				}
-			],
-			"ip": 17,
-			"op": 617,
-			"st": 17,
-			"bm": 0
-		},
-		{
-			"ddd": 0,
-			"ind": 7,
-			"ty": 4,
-			"nm": "checkmark/success Outlines",
-			"sr": 1,
-			"ks": {
-				"o": { "a": 0, "k": 100, "ix": 11 },
-				"r": { "a": 0, "k": 0, "ix": 10 },
-				"p": { "a": 0, "k": [150.073, 150.073, 0], "ix": 2 },
-				"a": { "a": 0, "k": [99, 99, 0], "ix": 1 },
-				"s": {
-					"a": 1,
-					"k": [
-						{
-							"i": { "x": [0.203, 0.203, 0.667], "y": [0.507, 0.507, 1] },
-							"o": { "x": [0.915, 0.915, 0.333], "y": [0.651, 0.651, 0] },
-							"t": 50,
-							"s": [93.357, 93.357, 100]
-						},
-						{ "t": 59, "s": [121.357, 121.357, 100] }
-					],
-					"ix": 6
-				}
-			},
-			"ao": 0,
-			"shapes": [
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[0, 0],
-										[0.831, 1.409],
-										[0, 0],
-										[-0.622, 2.004],
-										[-1.844, 1.043],
-										[-2.083, -0.474],
-										[-1.215, -1.74],
-										[0, 0],
-										[-0.949, 0.537],
-										[0, 0],
-										[-2.041, -0.632],
-										[-1.075, -1.826],
-										[0.463, -2.047],
-										[1.756, -1.181]
-									],
-									"o": [
-										[-1.424, 0.805],
-										[0, 0],
-										[-0.93, -1.899],
-										[0.622, -2.006],
-										[1.844, -1.042],
-										[2.084, 0.474],
-										[0, 0],
-										[0.553, 0.939],
-										[0, 0],
-										[1.921, -0.899],
-										[2.042, 0.631],
-										[1.076, 1.823],
-										[-0.463, 2.047],
-										[0, 0]
-									],
-									"v": [
-										[-26.138, 30.587],
-										[-30.199, 29.498],
-										[-58.899, -19.189],
-										[-59.378, -25.261],
-										[-55.542, -30.001],
-										[-49.433, -30.884],
-										[-44.302, -27.441],
-										[-23.618, 7.647],
-										[-20.911, 8.371],
-										[47.571, -30.344],
-										[53.736, -30.76],
-										[58.584, -26.94],
-										[59.537, -20.918],
-										[56.086, -15.898]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": { "a": 0, "k": [1, 1, 1, 1], "ix": 4 },
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [98.943, 102.024], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [100, 100], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 1",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 1,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				},
-				{
-					"ty": "gr",
-					"it": [
-						{
-							"ind": 0,
-							"ty": "sh",
-							"ix": 1,
-							"ks": {
-								"a": 0,
-								"k": {
-									"i": [
-										[-47.479, -12.722],
-										[12.721, -47.478],
-										[47.478, 12.722],
-										[-12.723, 47.478]
-									],
-									"o": [
-										[47.479, 12.722],
-										[-12.723, 47.479],
-										[-47.478, -12.723],
-										[12.721, -47.479]
-									],
-									"v": [
-										[23.036, -85.967],
-										[85.969, 23.035],
-										[-23.035, 85.967],
-										[-85.966, -23.035]
-									],
-									"c": true
-								},
-								"ix": 2
-							},
-							"nm": "Path 1",
-							"mn": "ADBE Vector Shape - Group",
-							"hd": false
-						},
-						{
-							"ty": "fl",
-							"c": {
-								"a": 0,
-								"k": [0.2235294117647059, 0.7843137254901961, 0.32941176470588235, 1],
-								"ix": 4
-							},
-							"o": { "a": 0, "k": 100, "ix": 5 },
-							"r": 1,
-							"bm": 0,
-							"nm": "Fill 1",
-							"mn": "ADBE Vector Graphic - Fill",
-							"hd": false
-						},
-						{
-							"ty": "tr",
-							"p": { "a": 0, "k": [98.939, 98.939], "ix": 2 },
-							"a": { "a": 0, "k": [0, 0], "ix": 1 },
-							"s": { "a": 0, "k": [100, 100], "ix": 3 },
-							"r": { "a": 0, "k": 0, "ix": 6 },
-							"o": { "a": 0, "k": 100, "ix": 7 },
-							"sk": { "a": 0, "k": 0, "ix": 4 },
-							"sa": { "a": 0, "k": 0, "ix": 5 },
-							"nm": "Transform"
-						}
-					],
-					"nm": "Group 2",
-					"np": 2,
-					"cix": 2,
-					"bm": 0,
-					"ix": 2,
-					"mn": "ADBE Vector Group",
-					"hd": false
-				}
-			],
-			"ip": 50,
-			"op": 650,
-			"st": 50,
-			"bm": 0
-		}
-	],
-	"markers": []
+  "v": "5.7.1",
+  "fr": 30,
+  "ip": 0,
+  "op": 60,
+  "w": 300,
+  "h": 300,
+  "nm": "Comp 1",
+  "ddd": 0,
+  "assets": [],
+  "layers": [
+    {
+      "ddd": 0,
+      "ind": 1,
+      "ty": 4,
+      "nm": "4",
+      "sr": 1,
+      "ks": {
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [151, 151, 0], "ix": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [0, 0],
+                    [-22.5, -7.5],
+                    [0, 0]
+                  ],
+                  "o": [
+                    [0, 0],
+                    [22.5, 7.5],
+                    [0, 0]
+                  ],
+                  "v": [
+                    [61, 78.5],
+                    [78, 100.5],
+                    [94, 115.5]
+                  ],
+                  "c": false
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "st",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.12941176470588237, 0.19607843137254902, 0.3843137254901961,
+                  1
+                ],
+                "ix": 3
+              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 5, "ix": 5 },
+              "lc": 2,
+              "lj": 1,
+              "ml": 4,
+              "bm": 0,
+              "nm": "Stroke 1",
+              "mn": "ADBE Vector Graphic - Stroke",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Shape 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "tm",
+          "s": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.667], "y": [1] },
+                "o": { "x": [0.333], "y": [0] },
+                "t": 28.254,
+                "s": [0]
+              },
+              { "t": 51, "s": [100] }
+            ],
+            "ix": 1
+          },
+          "e": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.667], "y": [1] },
+                "o": { "x": [0.333], "y": [0] },
+                "t": 17,
+                "s": [0]
+              },
+              { "t": 46.2109375, "s": [100] }
+            ],
+            "ix": 2
+          },
+          "o": { "a": 0, "k": 0, "ix": 3 },
+          "m": 1,
+          "ix": 2,
+          "nm": "Trim Paths 1",
+          "mn": "ADBE Vector Filter - Trim",
+          "hd": false
+        }
+      ],
+      "ip": 17,
+      "op": 617,
+      "st": 17,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 2,
+      "ty": 4,
+      "nm": "3",
+      "sr": 1,
+      "ks": {
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 203, "ix": 10 },
+        "p": { "a": 0, "k": [251.408, 59.449, 0], "ix": 2 },
+        "a": { "a": 0, "k": [-103.936, 89.696, 0], "ix": 1 },
+        "s": { "a": 0, "k": [91.456, 89.381, 100], "ix": 6 }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [0, 0],
+                    [29.459, 25.084],
+                    [5, -25.75],
+                    [5.75, -0.75]
+                  ],
+                  "o": [
+                    [0, 0],
+                    [-25.25, -21.5],
+                    [-5.515, 28.405],
+                    [-5.75, 0.75]
+                  ],
+                  "v": [
+                    [-75, 68.75],
+                    [-107.25, 86.5],
+                    [-94, 84],
+                    [-128.75, 113]
+                  ],
+                  "c": false
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "st",
+              "c": {
+                "a": 0,
+                "k": [1, 0.713725490196, 0.211764720842, 1],
+                "ix": 3
+              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 5, "ix": 5 },
+              "lc": 2,
+              "lj": 1,
+              "ml": 4,
+              "bm": 0,
+              "nm": "Stroke 1",
+              "mn": "ADBE Vector Graphic - Stroke",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Shape 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "tm",
+          "s": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.667], "y": [1] },
+                "o": { "x": [0.333], "y": [0] },
+                "t": 28.254,
+                "s": [0]
+              },
+              { "t": 51, "s": [100] }
+            ],
+            "ix": 1
+          },
+          "e": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.667], "y": [1] },
+                "o": { "x": [0.333], "y": [0] },
+                "t": 17,
+                "s": [0]
+              },
+              { "t": 46.2109375, "s": [100] }
+            ],
+            "ix": 2
+          },
+          "o": { "a": 0, "k": 0, "ix": 3 },
+          "m": 1,
+          "ix": 2,
+          "nm": "Trim Paths 1",
+          "mn": "ADBE Vector Filter - Trim",
+          "hd": false
+        }
+      ],
+      "ip": 17,
+      "op": 617,
+      "st": 17,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 3,
+      "ty": 4,
+      "nm": "2",
+      "sr": 1,
+      "ks": {
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [-21, 347, 0], "ix": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
+        "s": { "a": 0, "k": [100, 100, 100], "ix": 6 }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [0, 0],
+                    [20.5, 4.5],
+                    [0, 0],
+                    [18.25, 9.25],
+                    [3.5, -3.25]
+                  ],
+                  "o": [
+                    [0, 0],
+                    [-20.5, -4.5],
+                    [0, 0],
+                    [-18.25, -9.25],
+                    [-3.5, 3.25]
+                  ],
+                  "v": [
+                    [90.75, -122.25],
+                    [83.5, -110.5],
+                    [81.25, -97.25],
+                    [69.75, -93.25],
+                    [61, -75.75]
+                  ],
+                  "c": false
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "st",
+              "c": {
+                "a": 0,
+                "k": [0.745098039216, 0.643137254902, 1, 1],
+                "ix": 3
+              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 5, "ix": 5 },
+              "lc": 2,
+              "lj": 1,
+              "ml": 4,
+              "bm": 0,
+              "nm": "Stroke 1",
+              "mn": "ADBE Vector Graphic - Stroke",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [0, 0], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Shape 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "tm",
+          "s": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.667], "y": [1] },
+                "o": { "x": [0.333], "y": [0] },
+                "t": 28.254,
+                "s": [0]
+              },
+              { "t": 51, "s": [100] }
+            ],
+            "ix": 1
+          },
+          "e": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.667], "y": [1] },
+                "o": { "x": [0.333], "y": [0] },
+                "t": 17,
+                "s": [0]
+              },
+              { "t": 46.2109375, "s": [100] }
+            ],
+            "ix": 2
+          },
+          "o": { "a": 0, "k": 0, "ix": 3 },
+          "m": 1,
+          "ix": 2,
+          "nm": "Trim Paths 1",
+          "mn": "ADBE Vector Filter - Trim",
+          "hd": false
+        }
+      ],
+      "ip": 17,
+      "op": 617,
+      "st": 17,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 4,
+      "ty": 4,
+      "nm": "1",
+      "sr": 1,
+      "ks": {
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [147, 146, 0], "ix": 2 },
+        "a": { "a": 0, "k": [0, 0, 0], "ix": 1 },
+        "s": { "a": 0, "k": [109.756, 101.856, 100], "ix": 6 }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [0, 0],
+                    [33.75, 1]
+                  ],
+                  "o": [
+                    [0, 0],
+                    [-33.75, -1]
+                  ],
+                  "v": [
+                    [-57.75, -75.75],
+                    [-90.75, -107.5]
+                  ],
+                  "c": false
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "st",
+              "c": {
+                "a": 0,
+                "k": [1, 0.431372578939, 0.513725490196, 1],
+                "ix": 3
+              },
+              "o": { "a": 0, "k": 100, "ix": 4 },
+              "w": { "a": 0, "k": 5, "ix": 5 },
+              "lc": 2,
+              "lj": 1,
+              "ml": 4,
+              "bm": 0,
+              "nm": "Stroke 1",
+              "mn": "ADBE Vector Graphic - Stroke",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [-1.5, -0.25], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Shape 1",
+          "np": 3,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "tm",
+          "s": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.667], "y": [1] },
+                "o": { "x": [0.333], "y": [0] },
+                "t": 28.254,
+                "s": [0]
+              },
+              { "t": 51, "s": [100] }
+            ],
+            "ix": 1
+          },
+          "e": {
+            "a": 1,
+            "k": [
+              {
+                "i": { "x": [0.667], "y": [1] },
+                "o": { "x": [0.333], "y": [0] },
+                "t": 17,
+                "s": [0]
+              },
+              { "t": 46.2109375, "s": [100] }
+            ],
+            "ix": 2
+          },
+          "o": { "a": 0, "k": 0, "ix": 3 },
+          "m": 1,
+          "ix": 2,
+          "nm": "Trim Paths 1",
+          "mn": "ADBE Vector Filter - Trim",
+          "hd": false
+        }
+      ],
+      "ip": 17,
+      "op": 617,
+      "st": 17,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 5,
+      "ty": 4,
+      "nm": "checkmark/success Outlines",
+      "sr": 1,
+      "ks": {
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [150.06, 150.061, 0], "ix": 2 },
+        "a": { "a": 0, "k": [99, 99, 0], "ix": 1 },
+        "s": {
+          "a": 1,
+          "k": [
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 0,
+              "s": [100, 100, 100]
+            },
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.333, 0.333, 0.333], "y": [0, 0, 0] },
+              "t": 12,
+              "s": [27, 27, 100]
+            },
+            { "t": 21, "s": [100, 100, 100] }
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [0, 0],
+                    [0.831, 1.409],
+                    [0, 0],
+                    [-0.622, 2.004],
+                    [-1.844, 1.043],
+                    [-2.083, -0.474],
+                    [-1.215, -1.74],
+                    [0, 0],
+                    [-0.949, 0.537],
+                    [0, 0],
+                    [-2.041, -0.632],
+                    [-1.075, -1.826],
+                    [0.463, -2.047],
+                    [1.756, -1.181]
+                  ],
+                  "o": [
+                    [-1.424, 0.805],
+                    [0, 0],
+                    [-0.93, -1.899],
+                    [0.622, -2.006],
+                    [1.844, -1.042],
+                    [2.084, 0.474],
+                    [0, 0],
+                    [0.553, 0.939],
+                    [0, 0],
+                    [1.921, -0.899],
+                    [2.042, 0.631],
+                    [1.076, 1.823],
+                    [-0.463, 2.047],
+                    [0, 0]
+                  ],
+                  "v": [
+                    [-26.138, 30.587],
+                    [-30.199, 29.498],
+                    [-58.899, -19.189],
+                    [-59.378, -25.261],
+                    [-55.542, -30.001],
+                    [-49.433, -30.884],
+                    [-44.302, -27.441],
+                    [-23.618, 7.647],
+                    [-20.911, 8.371],
+                    [47.571, -30.344],
+                    [53.736, -30.76],
+                    [58.584, -26.94],
+                    [59.537, -20.918],
+                    [56.086, -15.898]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": { "a": 0, "k": [1, 1, 1, 1], "ix": 4 },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [99.943, 103.024], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [83.631, 83.631], "ix": 3 },
+              "r": { "a": 0, "k": -12.6, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 1",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [-47.479, -12.722],
+                    [12.721, -47.478],
+                    [47.478, 12.722],
+                    [-12.723, 47.478]
+                  ],
+                  "o": [
+                    [47.479, 12.722],
+                    [-12.723, 47.479],
+                    [-47.478, -12.723],
+                    [12.721, -47.479]
+                  ],
+                  "v": [
+                    [23.036, -85.967],
+                    [85.969, 23.035],
+                    [-23.035, 85.967],
+                    [-85.966, -23.035]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 1,
+                "k": [
+                  {
+                    "i": { "x": [0.833], "y": [0.833] },
+                    "o": { "x": [0.167], "y": [0.167] },
+                    "t": 0,
+                    "s": [0.901960790157, 0.901960790157, 0.901960790157, 1]
+                  },
+                  {
+                    "i": { "x": [0.833], "y": [0.833] },
+                    "o": { "x": [0.167], "y": [0.167] },
+                    "t": 10,
+                    "s": [0.901960790157, 0.901960790157, 0.901960790157, 1]
+                  },
+                  {
+                    "t": 29,
+                    "s": [0.262745112181, 0.823529422283, 0.588235318661, 1]
+                  }
+                ],
+                "ix": 4
+              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [98.939, 98.939], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 2",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 2,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        }
+      ],
+      "ip": 0,
+      "op": 600,
+      "st": 0,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 6,
+      "ty": 4,
+      "nm": "large-circles/success Outlines",
+      "sr": 1,
+      "ks": {
+        "o": {
+          "a": 1,
+          "k": [
+            {
+              "i": { "x": [0.833], "y": [0.833] },
+              "o": { "x": [0.167], "y": [0.167] },
+              "t": 42,
+              "s": [100]
+            },
+            { "t": 52, "s": [2] }
+          ],
+          "ix": 11
+        },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [148, 146, 0], "ix": 2 },
+        "a": { "a": 0, "k": [95.5, 98, 0], "ix": 1 },
+        "s": {
+          "a": 1,
+          "k": [
+            {
+              "i": { "x": [0.667, 0.667, 0.667], "y": [1, 1, 1] },
+              "o": { "x": [0.009, 0.009, 0.333], "y": [1.621, 1.621, 0] },
+              "t": 17,
+              "s": [62, 62, 100]
+            },
+            { "t": 50, "s": [124, 124, 100] }
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [-6.209, 1.338],
+                    [-1.337, -6.209],
+                    [6.209, -1.337],
+                    [1.338, 6.209]
+                  ],
+                  "o": [
+                    [6.208, -1.337],
+                    [1.338, 6.209],
+                    [-6.209, 1.338],
+                    [-1.337, -6.209]
+                  ],
+                  "v": [
+                    [-2.421, -11.243],
+                    [11.242, -2.422],
+                    [2.421, 11.241],
+                    [-11.243, 2.421]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [0.745000023935, 0.642999985639, 1, 1],
+                "ix": 4
+              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [173.998, 145.423], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [71, 71], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 1",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [-6.209, 1.337],
+                    [-1.338, -6.209],
+                    [6.209, -1.338],
+                    [1.338, 6.209]
+                  ],
+                  "o": [
+                    [6.209, -1.338],
+                    [1.337, 6.209],
+                    [-6.209, 1.337],
+                    [-1.337, -6.208]
+                  ],
+                  "v": [
+                    [-2.421, -11.242],
+                    [11.242, -2.422],
+                    [2.422, 11.242],
+                    [-11.243, 2.422]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764705882352941, 0.45098039215686275, 0.8901960784313725,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [63.997, 183.011], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [70, 70], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 2",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 2,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [-6.209, 1.337],
+                    [-1.337, -6.208],
+                    [6.209, -1.337],
+                    [1.338, 6.209]
+                  ],
+                  "o": [
+                    [6.209, -1.337],
+                    [1.338, 6.209],
+                    [-6.209, 1.338],
+                    [-1.337, -6.209]
+                  ],
+                  "v": [
+                    [-2.421, -11.243],
+                    [11.242, -2.423],
+                    [2.421, 11.242],
+                    [-11.243, 2.421]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [1, 0.713999968884, 0.211999990426, 1],
+                "ix": 4
+              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [103.291, 12.83], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [70, 70], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 3",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 3,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [-6.208, 1.337],
+                    [-1.337, -6.209],
+                    [6.209, -1.338],
+                    [1.338, 6.209]
+                  ],
+                  "o": [
+                    [6.209, -1.337],
+                    [1.338, 6.209],
+                    [-6.209, 1.337],
+                    [-1.337, -6.209]
+                  ],
+                  "v": [
+                    [-2.423, -11.242],
+                    [11.241, -2.422],
+                    [2.421, 11.242],
+                    [-11.243, 2.422]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.011764705882352941, 0.45098039215686275, 0.8901960784313725,
+                  1
+                ],
+                "ix": 4
+              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [178.004, 59.795], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [67, 67], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 4",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 4,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [-6.209, 1.337],
+                    [-1.338, -6.208],
+                    [6.209, -1.337],
+                    [1.338, 6.209]
+                  ],
+                  "o": [
+                    [6.209, -1.337],
+                    [1.337, 6.209],
+                    [-6.209, 1.338],
+                    [-1.337, -6.209]
+                  ],
+                  "v": [
+                    [-2.421, -11.243],
+                    [11.243, -2.423],
+                    [2.422, 11.242],
+                    [-11.243, 2.421]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [1, 0.430999995213, 0.513999968884, 1],
+                "ix": 4
+              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [12.829, 84.352], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [68, 68], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 5",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 5,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        }
+      ],
+      "ip": 17,
+      "op": 617,
+      "st": 17,
+      "bm": 0
+    },
+    {
+      "ddd": 0,
+      "ind": 7,
+      "ty": 4,
+      "nm": "checkmark/success Outlines",
+      "sr": 1,
+      "ks": {
+        "o": { "a": 0, "k": 100, "ix": 11 },
+        "r": { "a": 0, "k": 0, "ix": 10 },
+        "p": { "a": 0, "k": [150.073, 150.073, 0], "ix": 2 },
+        "a": { "a": 0, "k": [99, 99, 0], "ix": 1 },
+        "s": {
+          "a": 1,
+          "k": [
+            {
+              "i": { "x": [0.203, 0.203, 0.667], "y": [0.507, 0.507, 1] },
+              "o": { "x": [0.915, 0.915, 0.333], "y": [0.651, 0.651, 0] },
+              "t": 50,
+              "s": [93.357, 93.357, 100]
+            },
+            { "t": 59, "s": [121.357, 121.357, 100] }
+          ],
+          "ix": 6
+        }
+      },
+      "ao": 0,
+      "shapes": [
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [0, 0],
+                    [0.831, 1.409],
+                    [0, 0],
+                    [-0.622, 2.004],
+                    [-1.844, 1.043],
+                    [-2.083, -0.474],
+                    [-1.215, -1.74],
+                    [0, 0],
+                    [-0.949, 0.537],
+                    [0, 0],
+                    [-2.041, -0.632],
+                    [-1.075, -1.826],
+                    [0.463, -2.047],
+                    [1.756, -1.181]
+                  ],
+                  "o": [
+                    [-1.424, 0.805],
+                    [0, 0],
+                    [-0.93, -1.899],
+                    [0.622, -2.006],
+                    [1.844, -1.042],
+                    [2.084, 0.474],
+                    [0, 0],
+                    [0.553, 0.939],
+                    [0, 0],
+                    [1.921, -0.899],
+                    [2.042, 0.631],
+                    [1.076, 1.823],
+                    [-0.463, 2.047],
+                    [0, 0]
+                  ],
+                  "v": [
+                    [-26.138, 30.587],
+                    [-30.199, 29.498],
+                    [-58.899, -19.189],
+                    [-59.378, -25.261],
+                    [-55.542, -30.001],
+                    [-49.433, -30.884],
+                    [-44.302, -27.441],
+                    [-23.618, 7.647],
+                    [-20.911, 8.371],
+                    [47.571, -30.344],
+                    [53.736, -30.76],
+                    [58.584, -26.94],
+                    [59.537, -20.918],
+                    [56.086, -15.898]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": { "a": 0, "k": [1, 1, 1, 1], "ix": 4 },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [98.943, 102.024], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 1",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 1,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        },
+        {
+          "ty": "gr",
+          "it": [
+            {
+              "ind": 0,
+              "ty": "sh",
+              "ix": 1,
+              "ks": {
+                "a": 0,
+                "k": {
+                  "i": [
+                    [-47.479, -12.722],
+                    [12.721, -47.478],
+                    [47.478, 12.722],
+                    [-12.723, 47.478]
+                  ],
+                  "o": [
+                    [47.479, 12.722],
+                    [-12.723, 47.479],
+                    [-47.478, -12.723],
+                    [12.721, -47.479]
+                  ],
+                  "v": [
+                    [23.036, -85.967],
+                    [85.969, 23.035],
+                    [-23.035, 85.967],
+                    [-85.966, -23.035]
+                  ],
+                  "c": true
+                },
+                "ix": 2
+              },
+              "nm": "Path 1",
+              "mn": "ADBE Vector Shape - Group",
+              "hd": false
+            },
+            {
+              "ty": "fl",
+              "c": {
+                "a": 0,
+                "k": [
+                  0.2235294117647059, 0.7843137254901961, 0.32941176470588235, 1
+                ],
+                "ix": 4
+              },
+              "o": { "a": 0, "k": 100, "ix": 5 },
+              "r": 1,
+              "bm": 0,
+              "nm": "Fill 1",
+              "mn": "ADBE Vector Graphic - Fill",
+              "hd": false
+            },
+            {
+              "ty": "tr",
+              "p": { "a": 0, "k": [98.939, 98.939], "ix": 2 },
+              "a": { "a": 0, "k": [0, 0], "ix": 1 },
+              "s": { "a": 0, "k": [100, 100], "ix": 3 },
+              "r": { "a": 0, "k": 0, "ix": 6 },
+              "o": { "a": 0, "k": 100, "ix": 7 },
+              "sk": { "a": 0, "k": 0, "ix": 4 },
+              "sa": { "a": 0, "k": 0, "ix": 5 },
+              "nm": "Transform"
+            }
+          ],
+          "nm": "Group 2",
+          "np": 2,
+          "cix": 2,
+          "bm": 0,
+          "ix": 2,
+          "mn": "ADBE Vector Group",
+          "hd": false
+        }
+      ],
+      "ip": 50,
+      "op": 650,
+      "st": 50,
+      "bm": 0
+    }
+  ],
+  "markers": []
 }
diff --git a/static/manifest.webmanifest b/static/manifest.webmanifest
index c9243a94..f1cdeec1 100644
--- a/static/manifest.webmanifest
+++ b/static/manifest.webmanifest
@@ -1,38 +1,38 @@
 {
-	"theme_color": "#fff",
-	"background_color": "#000",
-	"display": "fullscreen",
-	"scope": "/",
-	"start_url": "/",
-	"name": "Coinos",
-	"description": "Bitcoin web wallet",
-	"short_name": "Coinos",
-	"icons": [
-		{
-			"src": "/icon-192x192.png",
-			"sizes": "192x192",
-			"type": "image/png"
-		},
-		{
-			"src": "/icon-256x256.png",
-			"sizes": "256x256",
-			"type": "image/png"
-		},
-		{
-			"src": "/icon-384x384.png",
-			"sizes": "384x384",
-			"type": "image/png"
-		},
-		{
-			"src": "/icon-512x512.png",
-			"sizes": "512x512",
-			"type": "image/png"
-		}
-	],
-	"protocol_handlers": [
-		{
-			"protocol": "bitcoin",
-			"url": "/send/%s"
-		}
-	]
+  "theme_color": "#fff",
+  "background_color": "#000",
+  "display": "fullscreen",
+  "scope": "/",
+  "start_url": "/",
+  "name": "Coinos",
+  "description": "Bitcoin web wallet",
+  "short_name": "Coinos",
+  "icons": [
+    {
+      "src": "/icon-192x192.png",
+      "sizes": "192x192",
+      "type": "image/png"
+    },
+    {
+      "src": "/icon-256x256.png",
+      "sizes": "256x256",
+      "type": "image/png"
+    },
+    {
+      "src": "/icon-384x384.png",
+      "sizes": "384x384",
+      "type": "image/png"
+    },
+    {
+      "src": "/icon-512x512.png",
+      "sizes": "512x512",
+      "type": "image/png"
+    }
+  ],
+  "protocol_handlers": [
+    {
+      "protocol": "bitcoin",
+      "url": "/send/%s"
+    }
+  ]
 }
diff --git a/static/qr.js b/static/qr.js
index 92aa4ec1..e8a68e2b 100644
--- a/static/qr.js
+++ b/static/qr.js
@@ -19,7 +19,7 @@
 /*
  * @Modified: Pudon
  * @demoURL: https://github.com/Pudon/weapp-qrcode
- * @Date: 2018-09-11 14:00:05 
+ * @Date: 2018-09-11 14:00:05
  * @Last Modified by: Pudon
  * @Last Modified time: 2018-09-12 16:33:19
  */
@@ -30,457 +30,434 @@
  * @param typeNumber 1 to 40
  * @param errorCorrectLevel 'L','M','Q','H'
  */
-var qrcode = function(typeNumber, errorCorrectLevel) {
-
-    var PAD0 = 0xEC;
-    var PAD1 = 0x11;
-
-    var _typeNumber = typeNumber;
-    var _errorCorrectLevel = QRErrorCorrectLevel[errorCorrectLevel];
-    var _modules = null;
-    var _moduleCount = 0;
-    var _dataCache = null;
-    var _dataList = new Array();
-
-    var _this = {};
-
-    var makeImpl = function(test, maskPattern) {
-
-	_moduleCount = _typeNumber * 4 + 17;
-	_modules = function(moduleCount) {
-	    var modules = new Array(moduleCount);
-	    for (var row = 0; row < moduleCount; row += 1) {
-		modules[row] = new Array(moduleCount);
-		for (var col = 0; col < moduleCount; col += 1) {
-		    modules[row][col] = null;
-		}
-	    }
-	    return modules;
-	}(_moduleCount);
-
-	setupPositionProbePattern(0, 0);
-	setupPositionProbePattern(_moduleCount - 7, 0);
-	setupPositionProbePattern(0, _moduleCount - 7);
-	setupPositionAdjustPattern();
-	setupTimingPattern();
-	setupTypeInfo(test, maskPattern);
-
-	if (_typeNumber >= 7) {
-	    setupTypeNumber(test);
-	}
-
-	if (_dataCache == null) {
-	    _dataCache = createData(_typeNumber, _errorCorrectLevel, _dataList);
-	}
-
-	mapData(_dataCache, maskPattern);
-    };
-
-    var setupPositionProbePattern = function(row, col) {
-
-	for (var r = -1; r <= 7; r += 1) {
-
-	    if (row + r <= -1 || _moduleCount <= row + r) continue;
-
-	    for (var c = -1; c <= 7; c += 1) {
-
-		if (col + c <= -1 || _moduleCount <= col + c) continue;
-
-		if ( (0 <= r && r <= 6 && (c == 0 || c == 6) )
-		     || (0 <= c && c <= 6 && (r == 0 || r == 6) )
-		     || (2 <= r && r <= 4 && 2 <= c && c <= 4) ) {
-		    _modules[row + r][col + c] = true;
-		} else {
-		    _modules[row + r][col + c] = false;
-		}
-	    }
-	}
-    };
-
-    var getBestMaskPattern = function() {
-
-	var minLostPoint = 0;
-	var pattern = 0;
-
-	for (var i = 0; i < 8; i += 1) {
-
-	    makeImpl(true, i);
-
-	    var lostPoint = QRUtil.getLostPoint(_this);
-
-	    if (i == 0 || minLostPoint > lostPoint) {
-		minLostPoint = lostPoint;
-		pattern = i;
-	    }
-	}
-
-	return pattern;
-    };
-
-    var setupTimingPattern = function() {
-
-	for (var r = 8; r < _moduleCount - 8; r += 1) {
-	    if (_modules[r][6] != null) {
-		continue;
-	    }
-	    _modules[r][6] = (r % 2 == 0);
-	}
-
-	for (var c = 8; c < _moduleCount - 8; c += 1) {
-	    if (_modules[6][c] != null) {
-		continue;
-	    }
-	    _modules[6][c] = (c % 2 == 0);
-	}
-    };
-
-    var setupPositionAdjustPattern = function() {
-
-	var pos = QRUtil.getPatternPosition(_typeNumber);
-
-	for (var i = 0; i < pos.length; i += 1) {
-
-	    for (var j = 0; j < pos.length; j += 1) {
-
-		var row = pos[i];
-		var col = pos[j];
-
-		if (_modules[row][col] != null) {
-		    continue;
-		}
-
-		for (var r = -2; r <= 2; r += 1) {
-
-		    for (var c = -2; c <= 2; c += 1) {
-
-			if (r == -2 || r == 2 || c == -2 || c == 2
-			    || (r == 0 && c == 0) ) {
-			    _modules[row + r][col + c] = true;
-			} else {
-			    _modules[row + r][col + c] = false;
-			}
-		    }
-		}
-	    }
-	}
-    };
-
-    var setupTypeNumber = function(test) {
+var qrcode = function (typeNumber, errorCorrectLevel) {
+  var PAD0 = 0xec;
+  var PAD1 = 0x11;
+
+  var _typeNumber = typeNumber;
+  var _errorCorrectLevel = QRErrorCorrectLevel[errorCorrectLevel];
+  var _modules = null;
+  var _moduleCount = 0;
+  var _dataCache = null;
+  var _dataList = new Array();
+
+  var _this = {};
+
+  var makeImpl = function (test, maskPattern) {
+    _moduleCount = _typeNumber * 4 + 17;
+    _modules = (function (moduleCount) {
+      var modules = new Array(moduleCount);
+      for (var row = 0; row < moduleCount; row += 1) {
+        modules[row] = new Array(moduleCount);
+        for (var col = 0; col < moduleCount; col += 1) {
+          modules[row][col] = null;
+        }
+      }
+      return modules;
+    })(_moduleCount);
+
+    setupPositionProbePattern(0, 0);
+    setupPositionProbePattern(_moduleCount - 7, 0);
+    setupPositionProbePattern(0, _moduleCount - 7);
+    setupPositionAdjustPattern();
+    setupTimingPattern();
+    setupTypeInfo(test, maskPattern);
+
+    if (_typeNumber >= 7) {
+      setupTypeNumber(test);
+    }
 
-	var bits = QRUtil.getBCHTypeNumber(_typeNumber);
+    if (_dataCache == null) {
+      _dataCache = createData(_typeNumber, _errorCorrectLevel, _dataList);
+    }
 
-	for (var i = 0; i < 18; i += 1) {
-	    var mod = (!test && ( (bits >> i) & 1) == 1);
-	    _modules[Math.floor(i / 3)][i % 3 + _moduleCount - 8 - 3] = mod;
-	}
+    mapData(_dataCache, maskPattern);
+  };
 
-	for (var i = 0; i < 18; i += 1) {
-	    var mod = (!test && ( (bits >> i) & 1) == 1);
-	    _modules[i % 3 + _moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
-	}
-    };
+  var setupPositionProbePattern = function (row, col) {
+    for (var r = -1; r <= 7; r += 1) {
+      if (row + r <= -1 || _moduleCount <= row + r) continue;
 
-    var setupTypeInfo = function(test, maskPattern) {
+      for (var c = -1; c <= 7; c += 1) {
+        if (col + c <= -1 || _moduleCount <= col + c) continue;
 
-	var data = (_errorCorrectLevel << 3) | maskPattern;
-	var bits = QRUtil.getBCHTypeInfo(data);
+        if (
+          (0 <= r && r <= 6 && (c == 0 || c == 6)) ||
+          (0 <= c && c <= 6 && (r == 0 || r == 6)) ||
+          (2 <= r && r <= 4 && 2 <= c && c <= 4)
+        ) {
+          _modules[row + r][col + c] = true;
+        } else {
+          _modules[row + r][col + c] = false;
+        }
+      }
+    }
+  };
 
-	// vertical
-	for (var i = 0; i < 15; i += 1) {
+  var getBestMaskPattern = function () {
+    var minLostPoint = 0;
+    var pattern = 0;
 
-	    var mod = (!test && ( (bits >> i) & 1) == 1);
+    for (var i = 0; i < 8; i += 1) {
+      makeImpl(true, i);
 
-	    if (i < 6) {
-		_modules[i][8] = mod;
-	    } else if (i < 8) {
-		_modules[i + 1][8] = mod;
-	    } else {
-		_modules[_moduleCount - 15 + i][8] = mod;
-	    }
-	}
+      var lostPoint = QRUtil.getLostPoint(_this);
 
-	// horizontal
-	for (var i = 0; i < 15; i += 1) {
+      if (i == 0 || minLostPoint > lostPoint) {
+        minLostPoint = lostPoint;
+        pattern = i;
+      }
+    }
 
-	    var mod = (!test && ( (bits >> i) & 1) == 1);
+    return pattern;
+  };
 
-	    if (i < 8) {
-		_modules[8][_moduleCount - i - 1] = mod;
-	    } else if (i < 9) {
-		_modules[8][15 - i - 1 + 1] = mod;
-	    } else {
-		_modules[8][15 - i - 1] = mod;
-	    }
-	}
+  var setupTimingPattern = function () {
+    for (var r = 8; r < _moduleCount - 8; r += 1) {
+      if (_modules[r][6] != null) {
+        continue;
+      }
+      _modules[r][6] = r % 2 == 0;
+    }
 
-	// fixed module
-	_modules[_moduleCount - 8][8] = (!test);
-    };
+    for (var c = 8; c < _moduleCount - 8; c += 1) {
+      if (_modules[6][c] != null) {
+        continue;
+      }
+      _modules[6][c] = c % 2 == 0;
+    }
+  };
 
-    var mapData = function(data, maskPattern) {
+  var setupPositionAdjustPattern = function () {
+    var pos = QRUtil.getPatternPosition(_typeNumber);
 
-	var inc = -1;
-	var row = _moduleCount - 1;
-	var bitIndex = 7;
-	var byteIndex = 0;
-	var maskFunc = QRUtil.getMaskFunction(maskPattern);
+    for (var i = 0; i < pos.length; i += 1) {
+      for (var j = 0; j < pos.length; j += 1) {
+        var row = pos[i];
+        var col = pos[j];
 
-	for (var col = _moduleCount - 1; col > 0; col -= 2) {
+        if (_modules[row][col] != null) {
+          continue;
+        }
 
-	    if (col == 6) col -= 1;
+        for (var r = -2; r <= 2; r += 1) {
+          for (var c = -2; c <= 2; c += 1) {
+            if (r == -2 || r == 2 || c == -2 || c == 2 || (r == 0 && c == 0)) {
+              _modules[row + r][col + c] = true;
+            } else {
+              _modules[row + r][col + c] = false;
+            }
+          }
+        }
+      }
+    }
+  };
 
-	    while (true) {
+  var setupTypeNumber = function (test) {
+    var bits = QRUtil.getBCHTypeNumber(_typeNumber);
 
-		for (var c = 0; c < 2; c += 1) {
+    for (var i = 0; i < 18; i += 1) {
+      var mod = !test && ((bits >> i) & 1) == 1;
+      _modules[Math.floor(i / 3)][(i % 3) + _moduleCount - 8 - 3] = mod;
+    }
 
-		    if (_modules[row][col - c] == null) {
+    for (var i = 0; i < 18; i += 1) {
+      var mod = !test && ((bits >> i) & 1) == 1;
+      _modules[(i % 3) + _moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
+    }
+  };
+
+  var setupTypeInfo = function (test, maskPattern) {
+    var data = (_errorCorrectLevel << 3) | maskPattern;
+    var bits = QRUtil.getBCHTypeInfo(data);
+
+    // vertical
+    for (var i = 0; i < 15; i += 1) {
+      var mod = !test && ((bits >> i) & 1) == 1;
+
+      if (i < 6) {
+        _modules[i][8] = mod;
+      } else if (i < 8) {
+        _modules[i + 1][8] = mod;
+      } else {
+        _modules[_moduleCount - 15 + i][8] = mod;
+      }
+    }
 
-			var dark = false;
+    // horizontal
+    for (var i = 0; i < 15; i += 1) {
+      var mod = !test && ((bits >> i) & 1) == 1;
+
+      if (i < 8) {
+        _modules[8][_moduleCount - i - 1] = mod;
+      } else if (i < 9) {
+        _modules[8][15 - i - 1 + 1] = mod;
+      } else {
+        _modules[8][15 - i - 1] = mod;
+      }
+    }
 
-			if (byteIndex < data.length) {
-			    dark = ( ( (data[byteIndex] >>> bitIndex) & 1) == 1);
-			}
+    // fixed module
+    _modules[_moduleCount - 8][8] = !test;
+  };
 
-			var mask = maskFunc(row, col - c);
+  var mapData = function (data, maskPattern) {
+    var inc = -1;
+    var row = _moduleCount - 1;
+    var bitIndex = 7;
+    var byteIndex = 0;
+    var maskFunc = QRUtil.getMaskFunction(maskPattern);
 
-			if (mask) {
-			    dark = !dark;
-			}
+    for (var col = _moduleCount - 1; col > 0; col -= 2) {
+      if (col == 6) col -= 1;
 
-			_modules[row][col - c] = dark;
-			bitIndex -= 1;
+      while (true) {
+        for (var c = 0; c < 2; c += 1) {
+          if (_modules[row][col - c] == null) {
+            var dark = false;
 
-			if (bitIndex == -1) {
-			    byteIndex += 1;
-			    bitIndex = 7;
-			}
-		    }
-		}
+            if (byteIndex < data.length) {
+              dark = ((data[byteIndex] >>> bitIndex) & 1) == 1;
+            }
 
-		row += inc;
+            var mask = maskFunc(row, col - c);
 
-		if (row < 0 || _moduleCount <= row) {
-		    row -= inc;
-		    inc = -inc;
-		    break;
-		}
-	    }
-	}
-    };
+            if (mask) {
+              dark = !dark;
+            }
 
-    var createBytes = function(buffer, rsBlocks) {
+            _modules[row][col - c] = dark;
+            bitIndex -= 1;
 
-	var offset = 0;
+            if (bitIndex == -1) {
+              byteIndex += 1;
+              bitIndex = 7;
+            }
+          }
+        }
 
-	var maxDcCount = 0;
-	var maxEcCount = 0;
+        row += inc;
 
-	var dcdata = new Array(rsBlocks.length);
-	var ecdata = new Array(rsBlocks.length);
+        if (row < 0 || _moduleCount <= row) {
+          row -= inc;
+          inc = -inc;
+          break;
+        }
+      }
+    }
+  };
 
-	for (var r = 0; r < rsBlocks.length; r += 1) {
+  var createBytes = function (buffer, rsBlocks) {
+    var offset = 0;
 
-	    var dcCount = rsBlocks[r].dataCount;
-	    var ecCount = rsBlocks[r].totalCount - dcCount;
+    var maxDcCount = 0;
+    var maxEcCount = 0;
 
-	    maxDcCount = Math.max(maxDcCount, dcCount);
-	    maxEcCount = Math.max(maxEcCount, ecCount);
+    var dcdata = new Array(rsBlocks.length);
+    var ecdata = new Array(rsBlocks.length);
 
-	    dcdata[r] = new Array(dcCount);
+    for (var r = 0; r < rsBlocks.length; r += 1) {
+      var dcCount = rsBlocks[r].dataCount;
+      var ecCount = rsBlocks[r].totalCount - dcCount;
 
-	    for (var i = 0; i < dcdata[r].length; i += 1) {
-		dcdata[r][i] = 0xff & buffer.getBuffer()[i + offset];
-	    }
-	    offset += dcCount;
+      maxDcCount = Math.max(maxDcCount, dcCount);
+      maxEcCount = Math.max(maxEcCount, ecCount);
 
-	    var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount);
-	    var rawPoly = qrPolynomial(dcdata[r], rsPoly.getLength() - 1);
+      dcdata[r] = new Array(dcCount);
 
-	    var modPoly = rawPoly.mod(rsPoly);
-	    ecdata[r] = new Array(rsPoly.getLength() - 1);
-	    for (var i = 0; i < ecdata[r].length; i += 1) {
-		var modIndex = i + modPoly.getLength() - ecdata[r].length;
-		ecdata[r][i] = (modIndex >= 0)? modPoly.getAt(modIndex) : 0;
-	    }
-	}
+      for (var i = 0; i < dcdata[r].length; i += 1) {
+        dcdata[r][i] = 0xff & buffer.getBuffer()[i + offset];
+      }
+      offset += dcCount;
 
-	var totalCodeCount = 0;
-	for (var i = 0; i < rsBlocks.length; i += 1) {
-	    totalCodeCount += rsBlocks[i].totalCount;
-	}
+      var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount);
+      var rawPoly = qrPolynomial(dcdata[r], rsPoly.getLength() - 1);
 
-	var data = new Array(totalCodeCount);
-	var index = 0;
+      var modPoly = rawPoly.mod(rsPoly);
+      ecdata[r] = new Array(rsPoly.getLength() - 1);
+      for (var i = 0; i < ecdata[r].length; i += 1) {
+        var modIndex = i + modPoly.getLength() - ecdata[r].length;
+        ecdata[r][i] = modIndex >= 0 ? modPoly.getAt(modIndex) : 0;
+      }
+    }
 
-	for (var i = 0; i < maxDcCount; i += 1) {
-	    for (var r = 0; r < rsBlocks.length; r += 1) {
-		if (i < dcdata[r].length) {
-		    data[index] = dcdata[r][i];
-		    index += 1;
-		}
-	    }
-	}
+    var totalCodeCount = 0;
+    for (var i = 0; i < rsBlocks.length; i += 1) {
+      totalCodeCount += rsBlocks[i].totalCount;
+    }
 
-	for (var i = 0; i < maxEcCount; i += 1) {
-	    for (var r = 0; r < rsBlocks.length; r += 1) {
-		if (i < ecdata[r].length) {
-		    data[index] = ecdata[r][i];
-		    index += 1;
-		}
-	    }
-	}
+    var data = new Array(totalCodeCount);
+    var index = 0;
 
-	return data;
-    };
+    for (var i = 0; i < maxDcCount; i += 1) {
+      for (var r = 0; r < rsBlocks.length; r += 1) {
+        if (i < dcdata[r].length) {
+          data[index] = dcdata[r][i];
+          index += 1;
+        }
+      }
+    }
 
-    var createData = function(typeNumber, errorCorrectLevel, dataList) {
-
-	var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel);
-
-	var buffer = qrBitBuffer();
-
-	for (var i = 0; i < dataList.length; i += 1) {
-	    var data = dataList[i];
-	    buffer.put(data.getMode(), 4);
-	    buffer.put(data.getLength(), QRUtil.getLengthInBits(data.getMode(), typeNumber) );
-	    data.write(buffer);
-	}
-
-	// calc num max data.
-	var totalDataCount = 0;
-	for (var i = 0; i < rsBlocks.length; i += 1) {
-	    totalDataCount += rsBlocks[i].dataCount;
-	}
-
-	if (buffer.getLengthInBits() > totalDataCount * 8) {
-	    throw new Error('code length overflow. ('
-			    + buffer.getLengthInBits()
-			    + '>'
-			    + totalDataCount * 8
-			    + ')');
-	}
-
-	// end code
-	if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) {
-	    buffer.put(0, 4);
-	}
-
-	// padding
-	while (buffer.getLengthInBits() % 8 != 0) {
-	    buffer.putBit(false);
-	}
-
-	// padding
-	while (true) {
-
-	    if (buffer.getLengthInBits() >= totalDataCount * 8) {
-		break;
-	    }
-	    buffer.put(PAD0, 8);
-
-	    if (buffer.getLengthInBits() >= totalDataCount * 8) {
-		break;
-	    }
-	    buffer.put(PAD1, 8);
-	}
-
-	return createBytes(buffer, rsBlocks);
-    };
+    for (var i = 0; i < maxEcCount; i += 1) {
+      for (var r = 0; r < rsBlocks.length; r += 1) {
+        if (i < ecdata[r].length) {
+          data[index] = ecdata[r][i];
+          index += 1;
+        }
+      }
+    }
 
-    _this.addData = function(data) {
-	var newData = qr8BitByte(data);
-	_dataList.push(newData);
-	_dataCache = null;
-    };
+    return data;
+  };
 
-    _this.isDark = function(row, col) {
-	if (row < 0 || _moduleCount <= row || col < 0 || _moduleCount <= col) {
-	    throw new Error(row + ',' + col);
-	}
-	return _modules[row][col];
-    };
+  var createData = function (typeNumber, errorCorrectLevel, dataList) {
+    var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel);
 
-    _this.getModuleCount = function() {
-	return _moduleCount;
-    };
+    var buffer = qrBitBuffer();
 
-    _this.make = function() {
-	makeImpl(false, getBestMaskPattern() );
-    };
+    for (var i = 0; i < dataList.length; i += 1) {
+      var data = dataList[i];
+      buffer.put(data.getMode(), 4);
+      buffer.put(
+        data.getLength(),
+        QRUtil.getLengthInBits(data.getMode(), typeNumber)
+      );
+      data.write(buffer);
+    }
 
-    _this.createTableTag = function(cellSize, margin) {
+    // calc num max data.
+    var totalDataCount = 0;
+    for (var i = 0; i < rsBlocks.length; i += 1) {
+      totalDataCount += rsBlocks[i].dataCount;
+    }
 
-	cellSize = cellSize || 2;
-	margin = (typeof margin == 'undefined')? cellSize * 4 : margin;
+    if (buffer.getLengthInBits() > totalDataCount * 8) {
+      throw new Error(
+        "code length overflow. (" +
+          buffer.getLengthInBits() +
+          ">" +
+          totalDataCount * 8 +
+          ")"
+      );
+    }
 
-	var qrHtml = '';
+    // end code
+    if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) {
+      buffer.put(0, 4);
+    }
 
-	qrHtml += '<table style="';
-	qrHtml += ' border-width: 0px; border-style: none;';
-	qrHtml += ' border-collapse: collapse;';
-	qrHtml += ' padding: 0px; margin: ' + margin + 'px;';
-	qrHtml += '">';
-	qrHtml += '<tbody>';
+    // padding
+    while (buffer.getLengthInBits() % 8 != 0) {
+      buffer.putBit(false);
+    }
 
-	for (var r = 0; r < _this.getModuleCount(); r += 1) {
+    // padding
+    while (true) {
+      if (buffer.getLengthInBits() >= totalDataCount * 8) {
+        break;
+      }
+      buffer.put(PAD0, 8);
+
+      if (buffer.getLengthInBits() >= totalDataCount * 8) {
+        break;
+      }
+      buffer.put(PAD1, 8);
+    }
 
-	    qrHtml += '<tr>';
+    return createBytes(buffer, rsBlocks);
+  };
 
-	    for (var c = 0; c < _this.getModuleCount(); c += 1) {
-		qrHtml += '<td style="';
-		qrHtml += ' border-width: 0px; border-style: none;';
-		qrHtml += ' border-collapse: collapse;';
-		qrHtml += ' padding: 0px; margin: 0px;';
-		qrHtml += ' width: ' + cellSize + 'px;';
-		qrHtml += ' height: ' + cellSize + 'px;';
-		qrHtml += ' background-color: ';
-		qrHtml += _this.isDark(r, c)? '#000000' : '#ffffff';
-		qrHtml += ';';
-		qrHtml += '"/>';
-	    }
+  _this.addData = function (data) {
+    var newData = qr8BitByte(data);
+    _dataList.push(newData);
+    _dataCache = null;
+  };
 
-	    qrHtml += '</tr>';
-	}
+  _this.isDark = function (row, col) {
+    if (row < 0 || _moduleCount <= row || col < 0 || _moduleCount <= col) {
+      throw new Error(row + "," + col);
+    }
+    return _modules[row][col];
+  };
+
+  _this.getModuleCount = function () {
+    return _moduleCount;
+  };
+
+  _this.make = function () {
+    makeImpl(false, getBestMaskPattern());
+  };
+
+  _this.createTableTag = function (cellSize, margin) {
+    cellSize = cellSize || 2;
+    margin = typeof margin == "undefined" ? cellSize * 4 : margin;
+
+    var qrHtml = "";
+
+    qrHtml += '<table style="';
+    qrHtml += " border-width: 0px; border-style: none;";
+    qrHtml += " border-collapse: collapse;";
+    qrHtml += " padding: 0px; margin: " + margin + "px;";
+    qrHtml += '">';
+    qrHtml += "<tbody>";
+
+    for (var r = 0; r < _this.getModuleCount(); r += 1) {
+      qrHtml += "<tr>";
+
+      for (var c = 0; c < _this.getModuleCount(); c += 1) {
+        qrHtml += '<td style="';
+        qrHtml += " border-width: 0px; border-style: none;";
+        qrHtml += " border-collapse: collapse;";
+        qrHtml += " padding: 0px; margin: 0px;";
+        qrHtml += " width: " + cellSize + "px;";
+        qrHtml += " height: " + cellSize + "px;";
+        qrHtml += " background-color: ";
+        qrHtml += _this.isDark(r, c) ? "#000000" : "#ffffff";
+        qrHtml += ";";
+        qrHtml += '"/>';
+      }
+
+      qrHtml += "</tr>";
+    }
 
-	qrHtml += '</tbody>';
-	qrHtml += '</table>';
+    qrHtml += "</tbody>";
+    qrHtml += "</table>";
 
-	return qrHtml;
-    };
+    return qrHtml;
+  };
 
-    _this.createImgTag = function(cellSize, margin, size) {
+  _this.createImgTag = function (cellSize, margin, size) {
+    cellSize = cellSize || 2;
+    margin = typeof margin == "undefined" ? cellSize * 4 : margin;
 
-	cellSize = cellSize || 2;
-	margin = (typeof margin == 'undefined')? cellSize * 4 : margin;
+    var min = margin;
+    var max = _this.getModuleCount() * cellSize + margin;
 
-	var min = margin;
-	var max = _this.getModuleCount() * cellSize + margin;
+    return createImgTag(size, size, function (x, y) {
+      if (min <= x && x < max && min <= y && y < max) {
+        var c = Math.floor((x - min) / cellSize);
+        var r = Math.floor((y - min) / cellSize);
+        return _this.isDark(r, c) ? 0 : 1;
+      } else {
+        return 1;
+      }
+    });
+  };
 
-	return createImgTag(size, size, function(x, y) {
-	    if (min <= x && x < max && min <= y && y < max) {
-		var c = Math.floor( (x - min) / cellSize);
-		var r = Math.floor( (y - min) / cellSize);
-		return _this.isDark(r, c)? 0 : 1;
-	    } else {
-		return 1;
-	    }
-	} );
-    };
-
-    return _this;
+  return _this;
 };
 
 //---------------------------------------------------------------------
 // qrcode.stringToBytes
 //---------------------------------------------------------------------
 
-qrcode.stringToBytes = function(s) {
-    var bytes = new Array();
-    for (var i = 0; i < s.length; i += 1) {
-	var c = s.charCodeAt(i);
-	bytes.push(c & 0xff);
-    }
-    return bytes;
+qrcode.stringToBytes = function (s) {
+  var bytes = new Array();
+  for (var i = 0; i < s.length; i += 1) {
+    var c = s.charCodeAt(i);
+    bytes.push(c & 0xff);
+  }
+  return bytes;
 };
 
 //---------------------------------------------------------------------
@@ -492,65 +469,63 @@ qrcode.stringToBytes = function(s) {
  * [16bit Unicode],[16bit Bytes], ...
  * @param numChars
  */
-qrcode.createStringToBytes = function(unicodeData, numChars) {
-
-    // create conversion map.
-
-    var unicodeMap = function() {
-
-	var bin = base64DecodeInputStream(unicodeData);
-	var read = function() {
-	    var b = bin.read();
-	    if (b == -1) throw new Error();
-	    return b;
-	};
-
-	var count = 0;
-	var unicodeMap = {};
-	while (true) {
-	    var b0 = bin.read();
-	    if (b0 == -1) break;
-	    var b1 = read();
-	    var b2 = read();
-	    var b3 = read();
-	    var k = String.fromCharCode( (b0 << 8) | b1);
-	    var v = (b2 << 8) | b3;
-	    unicodeMap[k] = v;
-	    count += 1;
-	}
-	if (count != numChars) {
-	    throw new Error(count + ' != ' + numChars);
-	}
-
-	return unicodeMap;
-    }();
-
-    var unknownChar = '?'.charCodeAt(0);
-
-    return function(s) {
-	var bytes = new Array();
-	for (var i = 0; i < s.length; i += 1) {
-	    var c = s.charCodeAt(i);
-	    if (c < 128) {
-		bytes.push(c);
-	    } else {
-		var b = unicodeMap[s.charAt(i)];
-		if (typeof b == 'number') {
-		    if ( (b & 0xff) == b) {
-			// 1byte
-			bytes.push(b);
-		    } else {
-			// 2bytes
-			bytes.push(b >>> 8);
-			bytes.push(b & 0xff);
-		    }
-		} else {
-		    bytes.push(unknownChar);
-		}
-	    }
-	}
-	return bytes;
+qrcode.createStringToBytes = function (unicodeData, numChars) {
+  // create conversion map.
+
+  var unicodeMap = (function () {
+    var bin = base64DecodeInputStream(unicodeData);
+    var read = function () {
+      var b = bin.read();
+      if (b == -1) throw new Error();
+      return b;
     };
+
+    var count = 0;
+    var unicodeMap = {};
+    while (true) {
+      var b0 = bin.read();
+      if (b0 == -1) break;
+      var b1 = read();
+      var b2 = read();
+      var b3 = read();
+      var k = String.fromCharCode((b0 << 8) | b1);
+      var v = (b2 << 8) | b3;
+      unicodeMap[k] = v;
+      count += 1;
+    }
+    if (count != numChars) {
+      throw new Error(count + " != " + numChars);
+    }
+
+    return unicodeMap;
+  })();
+
+  var unknownChar = "?".charCodeAt(0);
+
+  return function (s) {
+    var bytes = new Array();
+    for (var i = 0; i < s.length; i += 1) {
+      var c = s.charCodeAt(i);
+      if (c < 128) {
+        bytes.push(c);
+      } else {
+        var b = unicodeMap[s.charAt(i)];
+        if (typeof b == "number") {
+          if ((b & 0xff) == b) {
+            // 1byte
+            bytes.push(b);
+          } else {
+            // 2bytes
+            bytes.push(b >>> 8);
+            bytes.push(b & 0xff);
+          }
+        } else {
+          bytes.push(unknownChar);
+        }
+      }
+    }
+    return bytes;
+  };
 };
 
 //---------------------------------------------------------------------
@@ -558,10 +533,10 @@ qrcode.createStringToBytes = function(unicodeData, numChars) {
 //---------------------------------------------------------------------
 
 var QRMode = {
-    MODE_NUMBER :		1 << 0,
-    MODE_ALPHA_NUM : 	1 << 1,
-    MODE_8BIT_BYTE : 	1 << 2,
-    MODE_KANJI :		1 << 3
+  MODE_NUMBER: 1 << 0,
+  MODE_ALPHA_NUM: 1 << 1,
+  MODE_8BIT_BYTE: 1 << 2,
+  MODE_KANJI: 1 << 3,
 };
 
 //---------------------------------------------------------------------
@@ -569,10 +544,10 @@ var QRMode = {
 //---------------------------------------------------------------------
 
 var QRErrorCorrectLevel = {
-    L : 1,
-    M : 0,
-    Q : 3,
-    H : 2
+  L: 1,
+  M: 0,
+  Q: 3,
+  H: 2,
 };
 
 //---------------------------------------------------------------------
@@ -580,581 +555,759 @@ var QRErrorCorrectLevel = {
 //---------------------------------------------------------------------
 
 var QRMaskPattern = {
-    PATTERN000 : 0,
-    PATTERN001 : 1,
-    PATTERN010 : 2,
-    PATTERN011 : 3,
-    PATTERN100 : 4,
-    PATTERN101 : 5,
-    PATTERN110 : 6,
-    PATTERN111 : 7
+  PATTERN000: 0,
+  PATTERN001: 1,
+  PATTERN010: 2,
+  PATTERN011: 3,
+  PATTERN100: 4,
+  PATTERN101: 5,
+  PATTERN110: 6,
+  PATTERN111: 7,
 };
 
 //---------------------------------------------------------------------
 // QRUtil
 //---------------------------------------------------------------------
 
-var QRUtil = function() {
-
-    var PATTERN_POSITION_TABLE = [
-	[],
-	[6, 18],
-	[6, 22],
-	[6, 26],
-	[6, 30],
-	[6, 34],
-	[6, 22, 38],
-	[6, 24, 42],
-	[6, 26, 46],
-	[6, 28, 50],
-	[6, 30, 54],
-	[6, 32, 58],
-	[6, 34, 62],
-	[6, 26, 46, 66],
-	[6, 26, 48, 70],
-	[6, 26, 50, 74],
-	[6, 30, 54, 78],
-	[6, 30, 56, 82],
-	[6, 30, 58, 86],
-	[6, 34, 62, 90],
-	[6, 28, 50, 72, 94],
-	[6, 26, 50, 74, 98],
-	[6, 30, 54, 78, 102],
-	[6, 28, 54, 80, 106],
-	[6, 32, 58, 84, 110],
-	[6, 30, 58, 86, 114],
-	[6, 34, 62, 90, 118],
-	[6, 26, 50, 74, 98, 122],
-	[6, 30, 54, 78, 102, 126],
-	[6, 26, 52, 78, 104, 130],
-	[6, 30, 56, 82, 108, 134],
-	[6, 34, 60, 86, 112, 138],
-	[6, 30, 58, 86, 114, 142],
-	[6, 34, 62, 90, 118, 146],
-	[6, 30, 54, 78, 102, 126, 150],
-	[6, 24, 50, 76, 102, 128, 154],
-	[6, 28, 54, 80, 106, 132, 158],
-	[6, 32, 58, 84, 110, 136, 162],
-	[6, 26, 54, 82, 110, 138, 166],
-	[6, 30, 58, 86, 114, 142, 170]
-    ];
-    var G15 = (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0);
-    var G18 = (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0);
-    var G15_MASK = (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1);
+var QRUtil = (function () {
+  var PATTERN_POSITION_TABLE = [
+    [],
+    [6, 18],
+    [6, 22],
+    [6, 26],
+    [6, 30],
+    [6, 34],
+    [6, 22, 38],
+    [6, 24, 42],
+    [6, 26, 46],
+    [6, 28, 50],
+    [6, 30, 54],
+    [6, 32, 58],
+    [6, 34, 62],
+    [6, 26, 46, 66],
+    [6, 26, 48, 70],
+    [6, 26, 50, 74],
+    [6, 30, 54, 78],
+    [6, 30, 56, 82],
+    [6, 30, 58, 86],
+    [6, 34, 62, 90],
+    [6, 28, 50, 72, 94],
+    [6, 26, 50, 74, 98],
+    [6, 30, 54, 78, 102],
+    [6, 28, 54, 80, 106],
+    [6, 32, 58, 84, 110],
+    [6, 30, 58, 86, 114],
+    [6, 34, 62, 90, 118],
+    [6, 26, 50, 74, 98, 122],
+    [6, 30, 54, 78, 102, 126],
+    [6, 26, 52, 78, 104, 130],
+    [6, 30, 56, 82, 108, 134],
+    [6, 34, 60, 86, 112, 138],
+    [6, 30, 58, 86, 114, 142],
+    [6, 34, 62, 90, 118, 146],
+    [6, 30, 54, 78, 102, 126, 150],
+    [6, 24, 50, 76, 102, 128, 154],
+    [6, 28, 54, 80, 106, 132, 158],
+    [6, 32, 58, 84, 110, 136, 162],
+    [6, 26, 54, 82, 110, 138, 166],
+    [6, 30, 58, 86, 114, 142, 170],
+  ];
+  var G15 =
+    (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0);
+  var G18 =
+    (1 << 12) |
+    (1 << 11) |
+    (1 << 10) |
+    (1 << 9) |
+    (1 << 8) |
+    (1 << 5) |
+    (1 << 2) |
+    (1 << 0);
+  var G15_MASK = (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1);
+
+  var _this = {};
+
+  var getBCHDigit = function (data) {
+    var digit = 0;
+    while (data != 0) {
+      digit += 1;
+      data >>>= 1;
+    }
+    return digit;
+  };
 
-    var _this = {};
+  _this.getBCHTypeInfo = function (data) {
+    var d = data << 10;
+    while (getBCHDigit(d) - getBCHDigit(G15) >= 0) {
+      d ^= G15 << (getBCHDigit(d) - getBCHDigit(G15));
+    }
+    return ((data << 10) | d) ^ G15_MASK;
+  };
 
-    var getBCHDigit = function(data) {
-	var digit = 0;
-	while (data != 0) {
-	    digit += 1;
-	    data >>>= 1;
-	}
-	return digit;
-    };
+  _this.getBCHTypeNumber = function (data) {
+    var d = data << 12;
+    while (getBCHDigit(d) - getBCHDigit(G18) >= 0) {
+      d ^= G18 << (getBCHDigit(d) - getBCHDigit(G18));
+    }
+    return (data << 12) | d;
+  };
+
+  _this.getPatternPosition = function (typeNumber) {
+    return PATTERN_POSITION_TABLE[typeNumber - 1];
+  };
+
+  _this.getMaskFunction = function (maskPattern) {
+    switch (maskPattern) {
+      case QRMaskPattern.PATTERN000:
+        return function (i, j) {
+          return (i + j) % 2 == 0;
+        };
+      case QRMaskPattern.PATTERN001:
+        return function (i, j) {
+          return i % 2 == 0;
+        };
+      case QRMaskPattern.PATTERN010:
+        return function (i, j) {
+          return j % 3 == 0;
+        };
+      case QRMaskPattern.PATTERN011:
+        return function (i, j) {
+          return (i + j) % 3 == 0;
+        };
+      case QRMaskPattern.PATTERN100:
+        return function (i, j) {
+          return (Math.floor(i / 2) + Math.floor(j / 3)) % 2 == 0;
+        };
+      case QRMaskPattern.PATTERN101:
+        return function (i, j) {
+          return ((i * j) % 2) + ((i * j) % 3) == 0;
+        };
+      case QRMaskPattern.PATTERN110:
+        return function (i, j) {
+          return (((i * j) % 2) + ((i * j) % 3)) % 2 == 0;
+        };
+      case QRMaskPattern.PATTERN111:
+        return function (i, j) {
+          return (((i * j) % 3) + ((i + j) % 2)) % 2 == 0;
+        };
+
+      default:
+        throw new Error("bad maskPattern:" + maskPattern);
+    }
+  };
 
-    _this.getBCHTypeInfo = function(data) {
-	var d = data << 10;
-	while (getBCHDigit(d) - getBCHDigit(G15) >= 0) {
-	    d ^= (G15 << (getBCHDigit(d) - getBCHDigit(G15) ) );
-	}
-	return ( (data << 10) | d) ^ G15_MASK;
-    };
+  _this.getErrorCorrectPolynomial = function (errorCorrectLength) {
+    var a = qrPolynomial([1], 0);
+    for (var i = 0; i < errorCorrectLength; i += 1) {
+      a = a.multiply(qrPolynomial([1, QRMath.gexp(i)], 0));
+    }
+    return a;
+  };
+
+  _this.getLengthInBits = function (mode, type) {
+    if (1 <= type && type < 10) {
+      // 1 - 9
+
+      switch (mode) {
+        case QRMode.MODE_NUMBER:
+          return 10;
+        case QRMode.MODE_ALPHA_NUM:
+          return 9;
+        case QRMode.MODE_8BIT_BYTE:
+          return 8;
+        case QRMode.MODE_KANJI:
+          return 8;
+        default:
+          throw new Error("mode:" + mode);
+      }
+    } else if (type < 27) {
+      // 10 - 26
+
+      switch (mode) {
+        case QRMode.MODE_NUMBER:
+          return 12;
+        case QRMode.MODE_ALPHA_NUM:
+          return 11;
+        case QRMode.MODE_8BIT_BYTE:
+          return 16;
+        case QRMode.MODE_KANJI:
+          return 10;
+        default:
+          throw new Error("mode:" + mode);
+      }
+    } else if (type < 41) {
+      // 27 - 40
+
+      switch (mode) {
+        case QRMode.MODE_NUMBER:
+          return 14;
+        case QRMode.MODE_ALPHA_NUM:
+          return 13;
+        case QRMode.MODE_8BIT_BYTE:
+          return 16;
+        case QRMode.MODE_KANJI:
+          return 12;
+        default:
+          throw new Error("mode:" + mode);
+      }
+    } else {
+      throw new Error("type:" + type);
+    }
+  };
 
-    _this.getBCHTypeNumber = function(data) {
-	var d = data << 12;
-	while (getBCHDigit(d) - getBCHDigit(G18) >= 0) {
-	    d ^= (G18 << (getBCHDigit(d) - getBCHDigit(G18) ) );
-	}
-	return (data << 12) | d;
-    };
+  _this.getLostPoint = function (qrcode) {
+    var moduleCount = qrcode.getModuleCount();
 
-    _this.getPatternPosition = function(typeNumber) {
-	return PATTERN_POSITION_TABLE[typeNumber - 1];
-    };
+    var lostPoint = 0;
 
-    _this.getMaskFunction = function(maskPattern) {
-
-	switch (maskPattern) {
-
-	    case QRMaskPattern.PATTERN000 :
-		return function(i, j) { return (i + j) % 2 == 0; };
-	    case QRMaskPattern.PATTERN001 :
-		return function(i, j) { return i % 2 == 0; };
-	    case QRMaskPattern.PATTERN010 :
-		return function(i, j) { return j % 3 == 0; };
-	    case QRMaskPattern.PATTERN011 :
-		return function(i, j) { return (i + j) % 3 == 0; };
-	    case QRMaskPattern.PATTERN100 :
-		return function(i, j) { return (Math.floor(i / 2) + Math.floor(j / 3) ) % 2 == 0; };
-	    case QRMaskPattern.PATTERN101 :
-		return function(i, j) { return (i * j) % 2 + (i * j) % 3 == 0; };
-	    case QRMaskPattern.PATTERN110 :
-		return function(i, j) { return ( (i * j) % 2 + (i * j) % 3) % 2 == 0; };
-	    case QRMaskPattern.PATTERN111 :
-		return function(i, j) { return ( (i * j) % 3 + (i + j) % 2) % 2 == 0; };
-
-		default :
-		throw new Error('bad maskPattern:' + maskPattern);
-	}
-    };
+    // LEVEL1
 
-    _this.getErrorCorrectPolynomial = function(errorCorrectLength) {
-	var a = qrPolynomial([1], 0);
-	for (var i = 0; i < errorCorrectLength; i += 1) {
-	    a = a.multiply(qrPolynomial([1, QRMath.gexp(i)], 0) );
-	}
-	return a;
-    };
+    for (var row = 0; row < moduleCount; row += 1) {
+      for (var col = 0; col < moduleCount; col += 1) {
+        var sameCount = 0;
+        var dark = qrcode.isDark(row, col);
 
-    _this.getLengthInBits = function(mode, type) {
+        for (var r = -1; r <= 1; r += 1) {
+          if (row + r < 0 || moduleCount <= row + r) {
+            continue;
+          }
 
-	if (1 <= type && type < 10) {
+          for (var c = -1; c <= 1; c += 1) {
+            if (col + c < 0 || moduleCount <= col + c) {
+              continue;
+            }
 
-	    // 1 - 9
+            if (r == 0 && c == 0) {
+              continue;
+            }
 
-	    switch(mode) {
-		case QRMode.MODE_NUMBER 	: return 10;
-		case QRMode.MODE_ALPHA_NUM 	: return 9;
-		case QRMode.MODE_8BIT_BYTE	: return 8;
-		case QRMode.MODE_KANJI		: return 8;
-		    default :
-		    throw new Error('mode:' + mode);
-	    }
+            if (dark == qrcode.isDark(row + r, col + c)) {
+              sameCount += 1;
+            }
+          }
+        }
 
-	} else if (type < 27) {
+        if (sameCount > 5) {
+          lostPoint += 3 + sameCount - 5;
+        }
+      }
+    }
 
-	    // 10 - 26
+    // LEVEL2
+
+    for (var row = 0; row < moduleCount - 1; row += 1) {
+      for (var col = 0; col < moduleCount - 1; col += 1) {
+        var count = 0;
+        if (qrcode.isDark(row, col)) count += 1;
+        if (qrcode.isDark(row + 1, col)) count += 1;
+        if (qrcode.isDark(row, col + 1)) count += 1;
+        if (qrcode.isDark(row + 1, col + 1)) count += 1;
+        if (count == 0 || count == 4) {
+          lostPoint += 3;
+        }
+      }
+    }
 
-	    switch(mode) {
-		case QRMode.MODE_NUMBER 	: return 12;
-		case QRMode.MODE_ALPHA_NUM 	: return 11;
-		case QRMode.MODE_8BIT_BYTE	: return 16;
-		case QRMode.MODE_KANJI		: return 10;
-		    default :
-		    throw new Error('mode:' + mode);
-	    }
+    // LEVEL3
+
+    for (var row = 0; row < moduleCount; row += 1) {
+      for (var col = 0; col < moduleCount - 6; col += 1) {
+        if (
+          qrcode.isDark(row, col) &&
+          !qrcode.isDark(row, col + 1) &&
+          qrcode.isDark(row, col + 2) &&
+          qrcode.isDark(row, col + 3) &&
+          qrcode.isDark(row, col + 4) &&
+          !qrcode.isDark(row, col + 5) &&
+          qrcode.isDark(row, col + 6)
+        ) {
+          lostPoint += 40;
+        }
+      }
+    }
 
-	} else if (type < 41) {
+    for (var col = 0; col < moduleCount; col += 1) {
+      for (var row = 0; row < moduleCount - 6; row += 1) {
+        if (
+          qrcode.isDark(row, col) &&
+          !qrcode.isDark(row + 1, col) &&
+          qrcode.isDark(row + 2, col) &&
+          qrcode.isDark(row + 3, col) &&
+          qrcode.isDark(row + 4, col) &&
+          !qrcode.isDark(row + 5, col) &&
+          qrcode.isDark(row + 6, col)
+        ) {
+          lostPoint += 40;
+        }
+      }
+    }
 
-	    // 27 - 40
+    // LEVEL4
 
-	    switch(mode) {
-		case QRMode.MODE_NUMBER 	: return 14;
-		case QRMode.MODE_ALPHA_NUM	: return 13;
-		case QRMode.MODE_8BIT_BYTE	: return 16;
-		case QRMode.MODE_KANJI		: return 12;
-		    default :
-		    throw new Error('mode:' + mode);
-	    }
+    var darkCount = 0;
 
-	} else {
-	    throw new Error('type:' + type);
-	}
-    };
+    for (var col = 0; col < moduleCount; col += 1) {
+      for (var row = 0; row < moduleCount; row += 1) {
+        if (qrcode.isDark(row, col)) {
+          darkCount += 1;
+        }
+      }
+    }
 
-    _this.getLostPoint = function(qrcode) {
-
-	var moduleCount = qrcode.getModuleCount();
-
-	var lostPoint = 0;
-
-	// LEVEL1
-
-	for (var row = 0; row < moduleCount; row += 1) {
-	    for (var col = 0; col < moduleCount; col += 1) {
-
-		var sameCount = 0;
-		var dark = qrcode.isDark(row, col);
-
-		for (var r = -1; r <= 1; r += 1) {
-
-		    if (row + r < 0 || moduleCount <= row + r) {
-			continue;
-		    }
-
-		    for (var c = -1; c <= 1; c += 1) {
-
-			if (col + c < 0 || moduleCount <= col + c) {
-			    continue;
-			}
-
-			if (r == 0 && c == 0) {
-			    continue;
-			}
-
-			if (dark == qrcode.isDark(row + r, col + c) ) {
-			    sameCount += 1;
-			}
-		    }
-		}
-
-		if (sameCount > 5) {
-		    lostPoint += (3 + sameCount - 5);
-		}
-	    }
-	};
-
-	// LEVEL2
-
-	for (var row = 0; row < moduleCount - 1; row += 1) {
-	    for (var col = 0; col < moduleCount - 1; col += 1) {
-		var count = 0;
-		if (qrcode.isDark(row, col) ) count += 1;
-		if (qrcode.isDark(row + 1, col) ) count += 1;
-		if (qrcode.isDark(row, col + 1) ) count += 1;
-		if (qrcode.isDark(row + 1, col + 1) ) count += 1;
-		if (count == 0 || count == 4) {
-		    lostPoint += 3;
-		}
-	    }
-	}
-
-	// LEVEL3
-
-	for (var row = 0; row < moduleCount; row += 1) {
-	    for (var col = 0; col < moduleCount - 6; col += 1) {
-		if (qrcode.isDark(row, col)
-		    && !qrcode.isDark(row, col + 1)
-		    &&  qrcode.isDark(row, col + 2)
-		    &&  qrcode.isDark(row, col + 3)
-		    &&  qrcode.isDark(row, col + 4)
-		    && !qrcode.isDark(row, col + 5)
-		    &&  qrcode.isDark(row, col + 6) ) {
-		    lostPoint += 40;
-		}
-	    }
-	}
-
-	for (var col = 0; col < moduleCount; col += 1) {
-	    for (var row = 0; row < moduleCount - 6; row += 1) {
-		if (qrcode.isDark(row, col)
-		    && !qrcode.isDark(row + 1, col)
-		    &&  qrcode.isDark(row + 2, col)
-		    &&  qrcode.isDark(row + 3, col)
-		    &&  qrcode.isDark(row + 4, col)
-		    && !qrcode.isDark(row + 5, col)
-		    &&  qrcode.isDark(row + 6, col) ) {
-		    lostPoint += 40;
-		}
-	    }
-	}
-
-	// LEVEL4
-
-	var darkCount = 0;
-
-	for (var col = 0; col < moduleCount; col += 1) {
-	    for (var row = 0; row < moduleCount; row += 1) {
-		if (qrcode.isDark(row, col) ) {
-		    darkCount += 1;
-		}
-	    }
-	}
-
-	var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5;
-	lostPoint += ratio * 10;
-
-	return lostPoint;
-    };
+    var ratio =
+      Math.abs((100 * darkCount) / moduleCount / moduleCount - 50) / 5;
+    lostPoint += ratio * 10;
 
-    return _this;
-}();
+    return lostPoint;
+  };
+
+  return _this;
+})();
 
 //---------------------------------------------------------------------
 // QRMath
 //---------------------------------------------------------------------
 
-var QRMath = function() {
-
-    var EXP_TABLE = new Array(256);
-    var LOG_TABLE = new Array(256);
-
-    // initialize tables
-    for (var i = 0; i < 8; i += 1) {
-	EXP_TABLE[i] = 1 << i;
-    }
-    for (var i = 8; i < 256; i += 1) {
-	EXP_TABLE[i] = EXP_TABLE[i - 4]
-	    ^ EXP_TABLE[i - 5]
-	    ^ EXP_TABLE[i - 6]
-	    ^ EXP_TABLE[i - 8];
+var QRMath = (function () {
+  var EXP_TABLE = new Array(256);
+  var LOG_TABLE = new Array(256);
+
+  // initialize tables
+  for (var i = 0; i < 8; i += 1) {
+    EXP_TABLE[i] = 1 << i;
+  }
+  for (var i = 8; i < 256; i += 1) {
+    EXP_TABLE[i] =
+      EXP_TABLE[i - 4] ^ EXP_TABLE[i - 5] ^ EXP_TABLE[i - 6] ^ EXP_TABLE[i - 8];
+  }
+  for (var i = 0; i < 255; i += 1) {
+    LOG_TABLE[EXP_TABLE[i]] = i;
+  }
+
+  var _this = {};
+
+  _this.glog = function (n) {
+    if (n < 1) {
+      throw new Error("glog(" + n + ")");
     }
-    for (var i = 0; i < 255; i += 1) {
-	LOG_TABLE[EXP_TABLE[i] ] = i;
-    }
-
-    var _this = {};
-
-    _this.glog = function(n) {
 
-	if (n < 1) {
-	    throw new Error('glog(' + n + ')');
-	}
+    return LOG_TABLE[n];
+  };
 
-	return LOG_TABLE[n];
-    };
-
-    _this.gexp = function(n) {
-
-	while (n < 0) {
-	    n += 255;
-	}
+  _this.gexp = function (n) {
+    while (n < 0) {
+      n += 255;
+    }
 
-	while (n >= 256) {
-	    n -= 255;
-	}
+    while (n >= 256) {
+      n -= 255;
+    }
 
-	return EXP_TABLE[n];
-    };
+    return EXP_TABLE[n];
+  };
 
-    return _this;
-}();
+  return _this;
+})();
 
 //---------------------------------------------------------------------
 // qrPolynomial
 //---------------------------------------------------------------------
 
 function qrPolynomial(num, shift) {
-
-    if (typeof num.length == 'undefined') {
-	throw new Error(num.length + '/' + shift);
+  if (typeof num.length == "undefined") {
+    throw new Error(num.length + "/" + shift);
+  }
+
+  var _num = (function () {
+    var offset = 0;
+    while (offset < num.length && num[offset] == 0) {
+      offset += 1;
     }
+    var _num = new Array(num.length - offset + shift);
+    for (var i = 0; i < num.length - offset; i += 1) {
+      _num[i] = num[i + offset];
+    }
+    return _num;
+  })();
 
-    var _num = function() {
-	var offset = 0;
-	while (offset < num.length && num[offset] == 0) {
-	    offset += 1;
-	}
-	var _num = new Array(num.length - offset + shift);
-	for (var i = 0; i < num.length - offset; i += 1) {
-	    _num[i] = num[i + offset];
-	}
-	return _num;
-    }();
-
-    var _this = {};
-
-    _this.getAt = function(index) {
-	return _num[index];
-    };
-
-    _this.getLength = function() {
-	return _num.length;
-    };
+  var _this = {};
 
-    _this.multiply = function(e) {
+  _this.getAt = function (index) {
+    return _num[index];
+  };
 
-	var num = new Array(_this.getLength() + e.getLength() - 1);
+  _this.getLength = function () {
+    return _num.length;
+  };
 
-	for (var i = 0; i < _this.getLength(); i += 1) {
-	    for (var j = 0; j < e.getLength(); j += 1) {
-		num[i + j] ^= QRMath.gexp(QRMath.glog(_this.getAt(i) ) + QRMath.glog(e.getAt(j) ) );
-	    }
-	}
+  _this.multiply = function (e) {
+    var num = new Array(_this.getLength() + e.getLength() - 1);
 
-	return qrPolynomial(num, 0);
-    };
+    for (var i = 0; i < _this.getLength(); i += 1) {
+      for (var j = 0; j < e.getLength(); j += 1) {
+        num[i + j] ^= QRMath.gexp(
+          QRMath.glog(_this.getAt(i)) + QRMath.glog(e.getAt(j))
+        );
+      }
+    }
 
-    _this.mod = function(e) {
+    return qrPolynomial(num, 0);
+  };
 
-	if (_this.getLength() - e.getLength() < 0) {
-	    return _this;
-	}
+  _this.mod = function (e) {
+    if (_this.getLength() - e.getLength() < 0) {
+      return _this;
+    }
 
-	var ratio = QRMath.glog(_this.getAt(0) ) - QRMath.glog(e.getAt(0) );
+    var ratio = QRMath.glog(_this.getAt(0)) - QRMath.glog(e.getAt(0));
 
-	var num = new Array(_this.getLength() );
-	for (var i = 0; i < _this.getLength(); i += 1) {
-	    num[i] = _this.getAt(i);
-	}
+    var num = new Array(_this.getLength());
+    for (var i = 0; i < _this.getLength(); i += 1) {
+      num[i] = _this.getAt(i);
+    }
 
-	for (var i = 0; i < e.getLength(); i += 1) {
-	    num[i] ^= QRMath.gexp(QRMath.glog(e.getAt(i) ) + ratio);
-	}
+    for (var i = 0; i < e.getLength(); i += 1) {
+      num[i] ^= QRMath.gexp(QRMath.glog(e.getAt(i)) + ratio);
+    }
 
-	// recursive call
-	return qrPolynomial(num, 0).mod(e);
-    };
+    // recursive call
+    return qrPolynomial(num, 0).mod(e);
+  };
 
-    return _this;
+  return _this;
 }
 
 //---------------------------------------------------------------------
 // QRRSBlock
 //---------------------------------------------------------------------
 
-var QRRSBlock = function() {
-
-
-    // [1: [L, M, Q, H], ..]
-    var RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];
-
-    var qrRSBlock = function(totalCount, dataCount) {
-	var _this = {};
-	_this.totalCount = totalCount;
-	_this.dataCount = dataCount;
-	return _this;
-    };
-
+var QRRSBlock = (function () {
+  // [1: [L, M, Q, H], ..]
+  var RS_BLOCK_TABLE = [
+    [1, 26, 19],
+    [1, 26, 16],
+    [1, 26, 13],
+    [1, 26, 9],
+    [1, 44, 34],
+    [1, 44, 28],
+    [1, 44, 22],
+    [1, 44, 16],
+    [1, 70, 55],
+    [1, 70, 44],
+    [2, 35, 17],
+    [2, 35, 13],
+    [1, 100, 80],
+    [2, 50, 32],
+    [2, 50, 24],
+    [4, 25, 9],
+    [1, 134, 108],
+    [2, 67, 43],
+    [2, 33, 15, 2, 34, 16],
+    [2, 33, 11, 2, 34, 12],
+    [2, 86, 68],
+    [4, 43, 27],
+    [4, 43, 19],
+    [4, 43, 15],
+    [2, 98, 78],
+    [4, 49, 31],
+    [2, 32, 14, 4, 33, 15],
+    [4, 39, 13, 1, 40, 14],
+    [2, 121, 97],
+    [2, 60, 38, 2, 61, 39],
+    [4, 40, 18, 2, 41, 19],
+    [4, 40, 14, 2, 41, 15],
+    [2, 146, 116],
+    [3, 58, 36, 2, 59, 37],
+    [4, 36, 16, 4, 37, 17],
+    [4, 36, 12, 4, 37, 13],
+    [2, 86, 68, 2, 87, 69],
+    [4, 69, 43, 1, 70, 44],
+    [6, 43, 19, 2, 44, 20],
+    [6, 43, 15, 2, 44, 16],
+    [4, 101, 81],
+    [1, 80, 50, 4, 81, 51],
+    [4, 50, 22, 4, 51, 23],
+    [3, 36, 12, 8, 37, 13],
+    [2, 116, 92, 2, 117, 93],
+    [6, 58, 36, 2, 59, 37],
+    [4, 46, 20, 6, 47, 21],
+    [7, 42, 14, 4, 43, 15],
+    [4, 133, 107],
+    [8, 59, 37, 1, 60, 38],
+    [8, 44, 20, 4, 45, 21],
+    [12, 33, 11, 4, 34, 12],
+    [3, 145, 115, 1, 146, 116],
+    [4, 64, 40, 5, 65, 41],
+    [11, 36, 16, 5, 37, 17],
+    [11, 36, 12, 5, 37, 13],
+    [5, 109, 87, 1, 110, 88],
+    [5, 65, 41, 5, 66, 42],
+    [5, 54, 24, 7, 55, 25],
+    [11, 36, 12],
+    [5, 122, 98, 1, 123, 99],
+    [7, 73, 45, 3, 74, 46],
+    [15, 43, 19, 2, 44, 20],
+    [3, 45, 15, 13, 46, 16],
+    [1, 135, 107, 5, 136, 108],
+    [10, 74, 46, 1, 75, 47],
+    [1, 50, 22, 15, 51, 23],
+    [2, 42, 14, 17, 43, 15],
+    [5, 150, 120, 1, 151, 121],
+    [9, 69, 43, 4, 70, 44],
+    [17, 50, 22, 1, 51, 23],
+    [2, 42, 14, 19, 43, 15],
+    [3, 141, 113, 4, 142, 114],
+    [3, 70, 44, 11, 71, 45],
+    [17, 47, 21, 4, 48, 22],
+    [9, 39, 13, 16, 40, 14],
+    [3, 135, 107, 5, 136, 108],
+    [3, 67, 41, 13, 68, 42],
+    [15, 54, 24, 5, 55, 25],
+    [15, 43, 15, 10, 44, 16],
+    [4, 144, 116, 4, 145, 117],
+    [17, 68, 42],
+    [17, 50, 22, 6, 51, 23],
+    [19, 46, 16, 6, 47, 17],
+    [2, 139, 111, 7, 140, 112],
+    [17, 74, 46],
+    [7, 54, 24, 16, 55, 25],
+    [34, 37, 13],
+    [4, 151, 121, 5, 152, 122],
+    [4, 75, 47, 14, 76, 48],
+    [11, 54, 24, 14, 55, 25],
+    [16, 45, 15, 14, 46, 16],
+    [6, 147, 117, 4, 148, 118],
+    [6, 73, 45, 14, 74, 46],
+    [11, 54, 24, 16, 55, 25],
+    [30, 46, 16, 2, 47, 17],
+    [8, 132, 106, 4, 133, 107],
+    [8, 75, 47, 13, 76, 48],
+    [7, 54, 24, 22, 55, 25],
+    [22, 45, 15, 13, 46, 16],
+    [10, 142, 114, 2, 143, 115],
+    [19, 74, 46, 4, 75, 47],
+    [28, 50, 22, 6, 51, 23],
+    [33, 46, 16, 4, 47, 17],
+    [8, 152, 122, 4, 153, 123],
+    [22, 73, 45, 3, 74, 46],
+    [8, 53, 23, 26, 54, 24],
+    [12, 45, 15, 28, 46, 16],
+    [3, 147, 117, 10, 148, 118],
+    [3, 73, 45, 23, 74, 46],
+    [4, 54, 24, 31, 55, 25],
+    [11, 45, 15, 31, 46, 16],
+    [7, 146, 116, 7, 147, 117],
+    [21, 73, 45, 7, 74, 46],
+    [1, 53, 23, 37, 54, 24],
+    [19, 45, 15, 26, 46, 16],
+    [5, 145, 115, 10, 146, 116],
+    [19, 75, 47, 10, 76, 48],
+    [15, 54, 24, 25, 55, 25],
+    [23, 45, 15, 25, 46, 16],
+    [13, 145, 115, 3, 146, 116],
+    [2, 74, 46, 29, 75, 47],
+    [42, 54, 24, 1, 55, 25],
+    [23, 45, 15, 28, 46, 16],
+    [17, 145, 115],
+    [10, 74, 46, 23, 75, 47],
+    [10, 54, 24, 35, 55, 25],
+    [19, 45, 15, 35, 46, 16],
+    [17, 145, 115, 1, 146, 116],
+    [14, 74, 46, 21, 75, 47],
+    [29, 54, 24, 19, 55, 25],
+    [11, 45, 15, 46, 46, 16],
+    [13, 145, 115, 6, 146, 116],
+    [14, 74, 46, 23, 75, 47],
+    [44, 54, 24, 7, 55, 25],
+    [59, 46, 16, 1, 47, 17],
+    [12, 151, 121, 7, 152, 122],
+    [12, 75, 47, 26, 76, 48],
+    [39, 54, 24, 14, 55, 25],
+    [22, 45, 15, 41, 46, 16],
+    [6, 151, 121, 14, 152, 122],
+    [6, 75, 47, 34, 76, 48],
+    [46, 54, 24, 10, 55, 25],
+    [2, 45, 15, 64, 46, 16],
+    [17, 152, 122, 4, 153, 123],
+    [29, 74, 46, 14, 75, 47],
+    [49, 54, 24, 10, 55, 25],
+    [24, 45, 15, 46, 46, 16],
+    [4, 152, 122, 18, 153, 123],
+    [13, 74, 46, 32, 75, 47],
+    [48, 54, 24, 14, 55, 25],
+    [42, 45, 15, 32, 46, 16],
+    [20, 147, 117, 4, 148, 118],
+    [40, 75, 47, 7, 76, 48],
+    [43, 54, 24, 22, 55, 25],
+    [10, 45, 15, 67, 46, 16],
+    [19, 148, 118, 6, 149, 119],
+    [18, 75, 47, 31, 76, 48],
+    [34, 54, 24, 34, 55, 25],
+    [20, 45, 15, 61, 46, 16],
+  ];
+
+  var qrRSBlock = function (totalCount, dataCount) {
     var _this = {};
+    _this.totalCount = totalCount;
+    _this.dataCount = dataCount;
+    return _this;
+  };
+
+  var _this = {};
+
+  var getRsBlockTable = function (typeNumber, errorCorrectLevel) {
+    switch (errorCorrectLevel) {
+      case QRErrorCorrectLevel.L:
+        return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
+      case QRErrorCorrectLevel.M:
+        return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
+      case QRErrorCorrectLevel.Q:
+        return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
+      case QRErrorCorrectLevel.H:
+        return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
+      default:
+        return undefined;
+    }
+  };
+
+  _this.getRSBlocks = function (typeNumber, errorCorrectLevel) {
+    var rsBlock = getRsBlockTable(typeNumber, errorCorrectLevel);
+
+    if (typeof rsBlock == "undefined") {
+      throw new Error(
+        "bad rs block @ typeNumber:" +
+          typeNumber +
+          "/errorCorrectLevel:" +
+          errorCorrectLevel
+      );
+    }
 
-    var getRsBlockTable = function(typeNumber, errorCorrectLevel) {
-
-	switch(errorCorrectLevel) {
-	    case QRErrorCorrectLevel.L :
-		return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
-	    case QRErrorCorrectLevel.M :
-		return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
-	    case QRErrorCorrectLevel.Q :
-		return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
-	    case QRErrorCorrectLevel.H :
-		return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
-		default :
-		return undefined;
-	}
-    };
-
-    _this.getRSBlocks = function(typeNumber, errorCorrectLevel) {
-
-	var rsBlock = getRsBlockTable(typeNumber, errorCorrectLevel);
-
-	if (typeof rsBlock == 'undefined') {
-	    throw new Error('bad rs block @ typeNumber:' + typeNumber +
-			    '/errorCorrectLevel:' + errorCorrectLevel);
-	}
-
-	var length = rsBlock.length / 3;
-
-	var list = new Array();
+    var length = rsBlock.length / 3;
 
-	for (var i = 0; i < length; i += 1) {
+    var list = new Array();
 
-	    var count = rsBlock[i * 3 + 0];
-	    var totalCount = rsBlock[i * 3 + 1];
-	    var dataCount = rsBlock[i * 3 + 2];
+    for (var i = 0; i < length; i += 1) {
+      var count = rsBlock[i * 3 + 0];
+      var totalCount = rsBlock[i * 3 + 1];
+      var dataCount = rsBlock[i * 3 + 2];
 
-	    for (var j = 0; j < count; j += 1) {
-		list.push(qrRSBlock(totalCount, dataCount) );
-	    }
-	}
+      for (var j = 0; j < count; j += 1) {
+        list.push(qrRSBlock(totalCount, dataCount));
+      }
+    }
 
-	return list;
-    };
+    return list;
+  };
 
-    return _this;
-}();
+  return _this;
+})();
 
 //---------------------------------------------------------------------
 // qrBitBuffer
 //---------------------------------------------------------------------
 
-var qrBitBuffer = function() {
+var qrBitBuffer = function () {
+  var _buffer = new Array();
+  var _length = 0;
 
-    var _buffer = new Array();
-    var _length = 0;
+  var _this = {};
 
-    var _this = {};
+  _this.getBuffer = function () {
+    return _buffer;
+  };
 
-    _this.getBuffer = function() {
-	return _buffer;
-    };
-
-    _this.getAt = function(index) {
-	var bufIndex = Math.floor(index / 8);
-	return ( (_buffer[bufIndex] >>> (7 - index % 8) ) & 1) == 1;
-    };
+  _this.getAt = function (index) {
+    var bufIndex = Math.floor(index / 8);
+    return ((_buffer[bufIndex] >>> (7 - (index % 8))) & 1) == 1;
+  };
 
-    _this.put = function(num, length) {
-	for (var i = 0; i < length; i += 1) {
-	    _this.putBit( ( (num >>> (length - i - 1) ) & 1) == 1);
-	}
-    };
-
-    _this.getLengthInBits = function() {
-	return _length;
-    };
+  _this.put = function (num, length) {
+    for (var i = 0; i < length; i += 1) {
+      _this.putBit(((num >>> (length - i - 1)) & 1) == 1);
+    }
+  };
 
-    _this.putBit = function(bit) {
+  _this.getLengthInBits = function () {
+    return _length;
+  };
 
-	var bufIndex = Math.floor(_length / 8);
-	if (_buffer.length <= bufIndex) {
-	    _buffer.push(0);
-	}
+  _this.putBit = function (bit) {
+    var bufIndex = Math.floor(_length / 8);
+    if (_buffer.length <= bufIndex) {
+      _buffer.push(0);
+    }
 
-	if (bit) {
-	    _buffer[bufIndex] |= (0x80 >>> (_length % 8) );
-	}
+    if (bit) {
+      _buffer[bufIndex] |= 0x80 >>> _length % 8;
+    }
 
-	_length += 1;
-    };
+    _length += 1;
+  };
 
-    return _this;
+  return _this;
 };
 
 //---------------------------------------------------------------------
 // qr8BitByte
 //---------------------------------------------------------------------
 
-var qr8BitByte = function(data) {
-
-    var _mode = QRMode.MODE_8BIT_BYTE;
-    var _data = data;
-    var _parsedData = [];
+var qr8BitByte = function (data) {
+  var _mode = QRMode.MODE_8BIT_BYTE;
+  var _data = data;
+  var _parsedData = [];
+
+  var _this = {};
+
+  // Added to support UTF-8 Characters
+  for (var i = 0, l = _data.length; i < l; i++) {
+    var byteArray = [];
+    var code = _data.charCodeAt(i);
+
+    if (code > 0x10000) {
+      byteArray[0] = 0xf0 | ((code & 0x1c0000) >>> 18);
+      byteArray[1] = 0x80 | ((code & 0x3f000) >>> 12);
+      byteArray[2] = 0x80 | ((code & 0xfc0) >>> 6);
+      byteArray[3] = 0x80 | (code & 0x3f);
+    } else if (code > 0x800) {
+      byteArray[0] = 0xe0 | ((code & 0xf000) >>> 12);
+      byteArray[1] = 0x80 | ((code & 0xfc0) >>> 6);
+      byteArray[2] = 0x80 | (code & 0x3f);
+    } else if (code > 0x80) {
+      byteArray[0] = 0xc0 | ((code & 0x7c0) >>> 6);
+      byteArray[1] = 0x80 | (code & 0x3f);
+    } else {
+      byteArray[0] = code;
+    }
 
-    var _this = {};
+    // Fix Unicode corruption bug
+    _parsedData.push(byteArray);
+  }
 
+  _parsedData = Array.prototype.concat.apply([], _parsedData);
 
-    // Added to support UTF-8 Characters
-    for (var i = 0, l = _data.length; i < l; i++) {
-	var byteArray = [];
-	var code = _data.charCodeAt(i);
+  if (_parsedData.length != _data.length) {
+    _parsedData.unshift(191);
+    _parsedData.unshift(187);
+    _parsedData.unshift(239);
+  }
 
-	if (code > 0x10000) {
-	    byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
-	    byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
-	    byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
-	    byteArray[3] = 0x80 | (code & 0x3F);
-	} else if (code > 0x800) {
-	    byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
-	    byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
-	    byteArray[2] = 0x80 | (code & 0x3F);
-	} else if (code > 0x80) {
-	    byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
-	    byteArray[1] = 0x80 | (code & 0x3F);
-	} else {
-	    byteArray[0] = code;
-	}
+  var _bytes = _parsedData;
 
-        // Fix Unicode corruption bug
-        _parsedData.push(byteArray);
-    }
+  _this.getMode = function () {
+    return _mode;
+  };
 
-    _parsedData = Array.prototype.concat.apply([], _parsedData);
+  _this.getLength = function (buffer) {
+    return _bytes.length;
+  };
 
-    if (_parsedData.length != _data.length) {
-	_parsedData.unshift(191);
-	_parsedData.unshift(187);
-	_parsedData.unshift(239);
+  _this.write = function (buffer) {
+    for (var i = 0; i < _bytes.length; i += 1) {
+      buffer.put(_bytes[i], 8);
     }
+  };
 
-    var _bytes = _parsedData;
-
-    _this.getMode = function() {
-	return _mode;
-    };
-
-    _this.getLength = function(buffer) {
-	return _bytes.length;
-    };
-
-    _this.write = function(buffer) {
-	for (var i = 0; i < _bytes.length; i += 1) {
-	    buffer.put(_bytes[i], 8);
-	}
-    };
-
-    return _this;
+  return _this;
 };
 
 //=====================================================================
@@ -1165,462 +1318,443 @@ var qr8BitByte = function(data) {
 // byteArrayOutputStream
 //---------------------------------------------------------------------
 
-var byteArrayOutputStream = function() {
+var byteArrayOutputStream = function () {
+  var _bytes = new Array();
 
-    var _bytes = new Array();
+  var _this = {};
 
-    var _this = {};
+  _this.writeByte = function (b) {
+    _bytes.push(b & 0xff);
+  };
 
-    _this.writeByte = function(b) {
-	_bytes.push(b & 0xff);
-    };
-
-    _this.writeShort = function(i) {
-	_this.writeByte(i);
-	_this.writeByte(i >>> 8);
-    };
-
-    _this.writeBytes = function(b, off, len) {
-	off = off || 0;
-	len = len || b.length;
-	for (var i = 0; i < len; i += 1) {
-	    _this.writeByte(b[i + off]);
-	}
-    };
-
-    _this.writeString = function(s) {
-	for (var i = 0; i < s.length; i += 1) {
-	    _this.writeByte(s.charCodeAt(i) );
-	}
-    };
+  _this.writeShort = function (i) {
+    _this.writeByte(i);
+    _this.writeByte(i >>> 8);
+  };
 
-    _this.toByteArray = function() {
-	return _bytes;
-    };
+  _this.writeBytes = function (b, off, len) {
+    off = off || 0;
+    len = len || b.length;
+    for (var i = 0; i < len; i += 1) {
+      _this.writeByte(b[i + off]);
+    }
+  };
 
-    _this.toString = function() {
-	var s = '';
-	s += '[';
-	for (var i = 0; i < _bytes.length; i += 1) {
-	    if (i > 0) {
-		s += ',';
-	    }
-	    s += _bytes[i];
-	}
-	s += ']';
-	return s;
-    };
+  _this.writeString = function (s) {
+    for (var i = 0; i < s.length; i += 1) {
+      _this.writeByte(s.charCodeAt(i));
+    }
+  };
+
+  _this.toByteArray = function () {
+    return _bytes;
+  };
+
+  _this.toString = function () {
+    var s = "";
+    s += "[";
+    for (var i = 0; i < _bytes.length; i += 1) {
+      if (i > 0) {
+        s += ",";
+      }
+      s += _bytes[i];
+    }
+    s += "]";
+    return s;
+  };
 
-    return _this;
+  return _this;
 };
 
 //---------------------------------------------------------------------
 // base64EncodeOutputStream
 //---------------------------------------------------------------------
 
-var base64EncodeOutputStream = function() {
-
-    var _buffer = 0;
-    var _buflen = 0;
-    var _length = 0;
-    var _base64 = '';
-
-    var _this = {};
-
-    var writeEncoded = function(b) {
-	_base64 += String.fromCharCode(encode(b & 0x3f) );
-    };
-
-    var encode = function(n) {
-	if (n < 0) {
-	    // error.
-	} else if (n < 26) {
-	    return 0x41 + n;
-	} else if (n < 52) {
-	    return 0x61 + (n - 26);
-	} else if (n < 62) {
-	    return 0x30 + (n - 52);
-	} else if (n == 62) {
-	    return 0x2b;
-	} else if (n == 63) {
-	    return 0x2f;
-	}
-	throw new Error('n:' + n);
-    };
+var base64EncodeOutputStream = function () {
+  var _buffer = 0;
+  var _buflen = 0;
+  var _length = 0;
+  var _base64 = "";
+
+  var _this = {};
+
+  var writeEncoded = function (b) {
+    _base64 += String.fromCharCode(encode(b & 0x3f));
+  };
+
+  var encode = function (n) {
+    if (n < 0) {
+      // error.
+    } else if (n < 26) {
+      return 0x41 + n;
+    } else if (n < 52) {
+      return 0x61 + (n - 26);
+    } else if (n < 62) {
+      return 0x30 + (n - 52);
+    } else if (n == 62) {
+      return 0x2b;
+    } else if (n == 63) {
+      return 0x2f;
+    }
+    throw new Error("n:" + n);
+  };
 
-    _this.writeByte = function(n) {
+  _this.writeByte = function (n) {
+    _buffer = (_buffer << 8) | (n & 0xff);
+    _buflen += 8;
+    _length += 1;
 
-	_buffer = (_buffer << 8) | (n & 0xff);
-	_buflen += 8;
-	_length += 1;
+    while (_buflen >= 6) {
+      writeEncoded(_buffer >>> (_buflen - 6));
+      _buflen -= 6;
+    }
+  };
 
-	while (_buflen >= 6) {
-	    writeEncoded(_buffer >>> (_buflen - 6) );
-	    _buflen -= 6;
-	}
-    };
+  _this.flush = function () {
+    if (_buflen > 0) {
+      writeEncoded(_buffer << (6 - _buflen));
+      _buffer = 0;
+      _buflen = 0;
+    }
 
-    _this.flush = function() {
-
-	if (_buflen > 0) {
-	    writeEncoded(_buffer << (6 - _buflen) );
-	    _buffer = 0;
-	    _buflen = 0;
-	}
-
-	if (_length % 3 != 0) {
-	    // padding
-	    var padlen = 3 - _length % 3;
-	    for (var i = 0; i < padlen; i += 1) {
-		_base64 += '=';
-	    }
-	}
-    };
+    if (_length % 3 != 0) {
+      // padding
+      var padlen = 3 - (_length % 3);
+      for (var i = 0; i < padlen; i += 1) {
+        _base64 += "=";
+      }
+    }
+  };
 
-    _this.toString = function() {
-	return _base64;
-    };
+  _this.toString = function () {
+    return _base64;
+  };
 
-    return _this;
+  return _this;
 };
 
 //---------------------------------------------------------------------
 // base64DecodeInputStream
 //---------------------------------------------------------------------
 
-var base64DecodeInputStream = function(str) {
-
-    var _str = str;
-    var _pos = 0;
-    var _buffer = 0;
-    var _buflen = 0;
-
-    var _this = {};
-
-    _this.read = function() {
-
-	while (_buflen < 8) {
+var base64DecodeInputStream = function (str) {
+  var _str = str;
+  var _pos = 0;
+  var _buffer = 0;
+  var _buflen = 0;
 
-	    if (_pos >= _str.length) {
-		if (_buflen == 0) {
-		    return -1;
-		}
-		throw new Error('unexpected end of file./' + _buflen);
-	    }
+  var _this = {};
 
-	    var c = _str.charAt(_pos);
-	    _pos += 1;
-
-	    if (c == '=') {
-		_buflen = 0;
-		return -1;
-	    } else if (c.match(/^\s$/) ) {
-		// ignore if whitespace.
-		continue;
-	    }
-
-	    _buffer = (_buffer << 6) | decode(c.charCodeAt(0) );
-	    _buflen += 6;
-	}
-
-	var n = (_buffer >>> (_buflen - 8) ) & 0xff;
-	_buflen -= 8;
-	return n;
-    };
+  _this.read = function () {
+    while (_buflen < 8) {
+      if (_pos >= _str.length) {
+        if (_buflen == 0) {
+          return -1;
+        }
+        throw new Error("unexpected end of file./" + _buflen);
+      }
+
+      var c = _str.charAt(_pos);
+      _pos += 1;
+
+      if (c == "=") {
+        _buflen = 0;
+        return -1;
+      } else if (c.match(/^\s$/)) {
+        // ignore if whitespace.
+        continue;
+      }
+
+      _buffer = (_buffer << 6) | decode(c.charCodeAt(0));
+      _buflen += 6;
+    }
 
-    var decode = function(c) {
-	if (0x41 <= c && c <= 0x5a) {
-	    return c - 0x41;
-	} else if (0x61 <= c && c <= 0x7a) {
-	    return c - 0x61 + 26;
-	} else if (0x30 <= c && c <= 0x39) {
-	    return c - 0x30 + 52;
-	} else if (c == 0x2b) {
-	    return 62;
-	} else if (c == 0x2f) {
-	    return 63;
-	} else {
-	    throw new Error('c:' + c);
-	}
-    };
+    var n = (_buffer >>> (_buflen - 8)) & 0xff;
+    _buflen -= 8;
+    return n;
+  };
+
+  var decode = function (c) {
+    if (0x41 <= c && c <= 0x5a) {
+      return c - 0x41;
+    } else if (0x61 <= c && c <= 0x7a) {
+      return c - 0x61 + 26;
+    } else if (0x30 <= c && c <= 0x39) {
+      return c - 0x30 + 52;
+    } else if (c == 0x2b) {
+      return 62;
+    } else if (c == 0x2f) {
+      return 63;
+    } else {
+      throw new Error("c:" + c);
+    }
+  };
 
-    return _this;
+  return _this;
 };
 
 //---------------------------------------------------------------------
 // gifImage (B/W)
 //---------------------------------------------------------------------
 
-var gifImage = function(width, height) {
-
-    var _width = width;
-    var _height = height;
-    var _data = new Array(width * height);
+var gifImage = function (width, height) {
+  var _width = width;
+  var _height = height;
+  var _data = new Array(width * height);
 
-    var _this = {};
-
-    _this.setPixel = function(x, y, pixel) {
-	_data[y * _width + x] = pixel;
-    };
+  var _this = {};
 
-    _this.write = function(out) {
+  _this.setPixel = function (x, y, pixel) {
+    _data[y * _width + x] = pixel;
+  };
 
-	//---------------------------------
-	// GIF Signature
+  _this.write = function (out) {
+    //---------------------------------
+    // GIF Signature
 
-	out.writeString('GIF87a');
+    out.writeString("GIF87a");
 
-	//---------------------------------
-	// Screen Descriptor
+    //---------------------------------
+    // Screen Descriptor
 
-	out.writeShort(_width);
-	out.writeShort(_height);
+    out.writeShort(_width);
+    out.writeShort(_height);
 
-	out.writeByte(0x80); // 2bit
-	out.writeByte(0);
-	out.writeByte(0);
+    out.writeByte(0x80); // 2bit
+    out.writeByte(0);
+    out.writeByte(0);
 
-	//---------------------------------
-	// Global Color Map
+    //---------------------------------
+    // Global Color Map
 
-	// black
-	out.writeByte(0x00);
-	out.writeByte(0x00);
-	out.writeByte(0x00);
+    // black
+    out.writeByte(0x00);
+    out.writeByte(0x00);
+    out.writeByte(0x00);
 
-	// white
-	out.writeByte(0xff);
-	out.writeByte(0xff);
-	out.writeByte(0xff);
+    // white
+    out.writeByte(0xff);
+    out.writeByte(0xff);
+    out.writeByte(0xff);
 
-	//---------------------------------
-	// Image Descriptor
+    //---------------------------------
+    // Image Descriptor
 
-	out.writeString(',');
-	out.writeShort(0);
-	out.writeShort(0);
-	out.writeShort(_width);
-	out.writeShort(_height);
-	out.writeByte(0);
+    out.writeString(",");
+    out.writeShort(0);
+    out.writeShort(0);
+    out.writeShort(_width);
+    out.writeShort(_height);
+    out.writeByte(0);
 
-	//---------------------------------
-	// Local Color Map
+    //---------------------------------
+    // Local Color Map
 
-	//---------------------------------
-	// Raster Data
+    //---------------------------------
+    // Raster Data
 
-	var lzwMinCodeSize = 2;
-	var raster = getLZWRaster(lzwMinCodeSize);
+    var lzwMinCodeSize = 2;
+    var raster = getLZWRaster(lzwMinCodeSize);
 
-	out.writeByte(lzwMinCodeSize);
+    out.writeByte(lzwMinCodeSize);
 
-	var offset = 0;
-
-	while (raster.length - offset > 255) {
-	    out.writeByte(255);
-	    out.writeBytes(raster, offset, 255);
-	    offset += 255;
-	}
-
-	out.writeByte(raster.length - offset);
-	out.writeBytes(raster, offset, raster.length - offset);
-	out.writeByte(0x00);
-
-	//---------------------------------
-	// GIF Terminator
-	out.writeString(';');
-    };
+    var offset = 0;
 
-    var bitOutputStream = function(out) {
-
-	var _out = out;
-	var _bitLength = 0;
-	var _bitBuffer = 0;
-
-	var _this = {};
-
-	_this.write = function(data, length) {
+    while (raster.length - offset > 255) {
+      out.writeByte(255);
+      out.writeBytes(raster, offset, 255);
+      offset += 255;
+    }
 
-	    if ( (data >>> length) != 0) {
-		throw new Error('length over');
-	    }
+    out.writeByte(raster.length - offset);
+    out.writeBytes(raster, offset, raster.length - offset);
+    out.writeByte(0x00);
 
-	    while (_bitLength + length >= 8) {
-		_out.writeByte(0xff & ( (data << _bitLength) | _bitBuffer) );
-		length -= (8 - _bitLength);
-		data >>>= (8 - _bitLength);
-		_bitBuffer = 0;
-		_bitLength = 0;
-	    }
+    //---------------------------------
+    // GIF Terminator
+    out.writeString(";");
+  };
 
-	    _bitBuffer = (data << _bitLength) | _bitBuffer;
-	    _bitLength = _bitLength + length;
-	};
+  var bitOutputStream = function (out) {
+    var _out = out;
+    var _bitLength = 0;
+    var _bitBuffer = 0;
 
-	_this.flush = function() {
-	    if (_bitLength > 0) {
-		_out.writeByte(_bitBuffer);
-	    }
-	};
+    var _this = {};
 
-	return _this;
+    _this.write = function (data, length) {
+      if (data >>> length != 0) {
+        throw new Error("length over");
+      }
+
+      while (_bitLength + length >= 8) {
+        _out.writeByte(0xff & ((data << _bitLength) | _bitBuffer));
+        length -= 8 - _bitLength;
+        data >>>= 8 - _bitLength;
+        _bitBuffer = 0;
+        _bitLength = 0;
+      }
+
+      _bitBuffer = (data << _bitLength) | _bitBuffer;
+      _bitLength = _bitLength + length;
     };
 
-    var getLZWRaster = function(lzwMinCodeSize) {
-
-	var clearCode = 1 << lzwMinCodeSize;
-	var endCode = (1 << lzwMinCodeSize) + 1;
-	var bitLength = lzwMinCodeSize + 1;
+    _this.flush = function () {
+      if (_bitLength > 0) {
+        _out.writeByte(_bitBuffer);
+      }
+    };
 
-	// Setup LZWTable
-	var table = lzwTable();
+    return _this;
+  };
 
-	for (var i = 0; i < clearCode; i += 1) {
-	    table.add(String.fromCharCode(i) );
-	}
-	table.add(String.fromCharCode(clearCode) );
-	table.add(String.fromCharCode(endCode) );
+  var getLZWRaster = function (lzwMinCodeSize) {
+    var clearCode = 1 << lzwMinCodeSize;
+    var endCode = (1 << lzwMinCodeSize) + 1;
+    var bitLength = lzwMinCodeSize + 1;
 
-	var byteOut = byteArrayOutputStream();
-	var bitOut = bitOutputStream(byteOut);
+    // Setup LZWTable
+    var table = lzwTable();
 
-	// clear code
-	bitOut.write(clearCode, bitLength);
+    for (var i = 0; i < clearCode; i += 1) {
+      table.add(String.fromCharCode(i));
+    }
+    table.add(String.fromCharCode(clearCode));
+    table.add(String.fromCharCode(endCode));
 
-	var dataIndex = 0;
+    var byteOut = byteArrayOutputStream();
+    var bitOut = bitOutputStream(byteOut);
 
-	var s = String.fromCharCode(_data[dataIndex]);
-	dataIndex += 1;
+    // clear code
+    bitOut.write(clearCode, bitLength);
 
-	while (dataIndex < _data.length) {
+    var dataIndex = 0;
 
-	    var c = String.fromCharCode(_data[dataIndex]);
-	    dataIndex += 1;
+    var s = String.fromCharCode(_data[dataIndex]);
+    dataIndex += 1;
 
-	    if (table.contains(s + c) ) {
+    while (dataIndex < _data.length) {
+      var c = String.fromCharCode(_data[dataIndex]);
+      dataIndex += 1;
 
-		s = s + c;
+      if (table.contains(s + c)) {
+        s = s + c;
+      } else {
+        bitOut.write(table.indexOf(s), bitLength);
 
-	    } else {
+        if (table.size() < 0xfff) {
+          if (table.size() == 1 << bitLength) {
+            bitLength += 1;
+          }
 
-		bitOut.write(table.indexOf(s), bitLength);
+          table.add(s + c);
+        }
 
-		if (table.size() < 0xfff) {
+        s = c;
+      }
+    }
 
-		    if (table.size() == (1 << bitLength) ) {
-			bitLength += 1;
-		    }
+    bitOut.write(table.indexOf(s), bitLength);
 
-		    table.add(s + c);
-		}
+    // end code
+    bitOut.write(endCode, bitLength);
 
-		s = c;
-	    }
-	}
+    bitOut.flush();
 
-	bitOut.write(table.indexOf(s), bitLength);
+    return byteOut.toByteArray();
+  };
 
-	// end code
-	bitOut.write(endCode, bitLength);
+  var lzwTable = function () {
+    var _map = {};
+    var _size = 0;
 
-	bitOut.flush();
+    var _this = {};
 
-	return byteOut.toByteArray();
+    _this.add = function (key) {
+      if (_this.contains(key)) {
+        throw new Error("dup key:" + key);
+      }
+      _map[key] = _size;
+      _size += 1;
     };
 
-    var lzwTable = function() {
-
-	var _map = {};
-	var _size = 0;
-
-	var _this = {};
-
-	_this.add = function(key) {
-	    if (_this.contains(key) ) {
-		throw new Error('dup key:' + key);
-	    }
-	    _map[key] = _size;
-	    _size += 1;
-	};
-
-	_this.size = function() {
-	    return _size;
-	};
-
-	_this.indexOf = function(key) {
-	    return _map[key];
-	};
+    _this.size = function () {
+      return _size;
+    };
 
-	_this.contains = function(key) {
-	    return typeof _map[key] != 'undefined';
-	};
+    _this.indexOf = function (key) {
+      return _map[key];
+    };
 
-	return _this;
+    _this.contains = function (key) {
+      return typeof _map[key] != "undefined";
     };
 
     return _this;
-};
+  };
 
-var createImgTag = function(width, height, getPixel, alt) {
+  return _this;
+};
 
-    var gif = gifImage(width, height);
-    for (var y = 0; y < height; y += 1) {
-	for (var x = 0; x < width; x += 1) {
-	    gif.setPixel(x, y, getPixel(x, y) );
-	}
+var createImgTag = function (width, height, getPixel, alt) {
+  var gif = gifImage(width, height);
+  for (var y = 0; y < height; y += 1) {
+    for (var x = 0; x < width; x += 1) {
+      gif.setPixel(x, y, getPixel(x, y));
     }
+  }
 
-    var b = byteArrayOutputStream();
-    gif.write(b);
+  var b = byteArrayOutputStream();
+  gif.write(b);
 
-    var base64 = base64EncodeOutputStream();
-    var bytes = b.toByteArray();
-    for (var i = 0; i < bytes.length; i += 1) {
-	base64.writeByte(bytes[i]);
-    }
-    base64.flush();
+  var base64 = base64EncodeOutputStream();
+  var bytes = b.toByteArray();
+  for (var i = 0; i < bytes.length; i += 1) {
+    base64.writeByte(bytes[i]);
+  }
+  base64.flush();
 
-    var img = '';
-    img += 'data:image/gif;base64,';
-    img += base64;
+  var img = "";
+  img += "data:image/gif;base64,";
+  img += base64;
 
-    return img;
+  return img;
 };
 
 //---------------------------------------------------------------------
 // returns qrcode function.
 
-var drawImg = function(text, options) {
-    options = options || {};
-    var typeNumber = options.typeNumber || 4;
-    var errorCorrectLevel = options.errorCorrectLevel || 'M';
-    var size = options.size || 500;
-
-    var qr;
-
-    try {
-        qr = qrcode(typeNumber, errorCorrectLevel || 'M');
-        qr.addData(text);
-        qr.make();
-    } catch (e) {
-        if(typeNumber >= 40) {
-            throw new Error('Text too long to encode');
-        } else {
-            return drawImg(text, {
-                size: size,
-                errorCorrectLevel: errorCorrectLevel,
-                typeNumber: typeNumber + 1
-            });
-        }
+var drawImg = function (text, options) {
+  options = options || {};
+  var typeNumber = options.typeNumber || 4;
+  var errorCorrectLevel = options.errorCorrectLevel || "M";
+  var size = options.size || 500;
+
+  var qr;
+
+  try {
+    qr = qrcode(typeNumber, errorCorrectLevel || "M");
+    qr.addData(text);
+    qr.make();
+  } catch (e) {
+    if (typeNumber >= 40) {
+      throw new Error("Text too long to encode");
+    } else {
+      return drawImg(text, {
+        size: size,
+        errorCorrectLevel: errorCorrectLevel,
+        typeNumber: typeNumber + 1,
+      });
     }
+  }
 
-    // calc cellsize and margin
-    var cellsize = parseInt(size / qr.getModuleCount());
-    var margin = parseInt((size - qr.getModuleCount() * cellsize) / 2);
+  // calc cellsize and margin
+  var cellsize = parseInt(size / qr.getModuleCount());
+  var margin = parseInt((size - qr.getModuleCount() * cellsize) / 2);
 
-    return qr.createImgTag(cellsize, margin, size);
+  return qr.createImgTag(cellsize, margin, size);
 };
 
 export default {
-	drawImg: drawImg
-};
\ No newline at end of file
+  drawImg: drawImg,
+};
diff --git a/static/shopify.html b/static/shopify.html
index 886c3d34..ef338d35 100644
--- a/static/shopify.html
+++ b/static/shopify.html
@@ -1,87 +1,88 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/qrcodejs/1.0.0/qrcode.min.js"></script>
 <script>
-	window.addEventListener('load', async () => {
-		let sat = (s) => {
-			s = Math.abs(s);
-			let p = Math.floor(Math.log(s) / Math.LN10 + 0.000000001);
-			let d = Math.floor((p + 1) / 3);
-
-			return (
-				'⚡️' +
-				(parseInt(s) > 0
-					? new Intl.NumberFormat('en-US', { maximumFractionDigits: 2 }).format(
-							s / Math.pow(1000, d)
-					  ) + ['', 'K', 'M', 'G', 'T', 'P', 'E', 'Z'][d]
-					: 0
-				).toString()
-			);
-		};
-
-		let copy = (text) => {
-			navigator.clipboard.writeText(text);
-		};
-
-		let f = (s, currency) =>
-			new Intl.NumberFormat('en-US', {
-				style: 'currency',
-				currency
-			})
-				.format(s)
-				.replace('CA', '');
-
-		let s = (s) => new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(s);
-
-		let {
-			default: { drawImg }
-		} = await import('https://coinos.io/qr.js');
-		let base64 = drawImg('test', { size: 300 });
-
-		let link = document.createElement('link');
-		link.setAttribute('rel', 'stylesheet');
-		link.setAttribute('type', 'text/css');
-		link.setAttribute(
-			'href',
-			'https://fonts.googleapis.com/css?family=Public+Sans:400italic,400,300,700'
-		);
-
-		var style = document.createElement('style');
-		style.innerHTML = `#check {
+  window.addEventListener("load", async () => {
+    let sat = (s) => {
+      s = Math.abs(s);
+      let p = Math.floor(Math.log(s) / Math.LN10 + 0.000000001);
+      let d = Math.floor((p + 1) / 3);
+
+      return (
+        "⚡️" +
+        (parseInt(s) > 0
+          ? new Intl.NumberFormat("en-US", { maximumFractionDigits: 2 }).format(
+              s / Math.pow(1000, d)
+            ) + ["", "K", "M", "G", "T", "P", "E", "Z"][d]
+          : 0
+        ).toString()
+      );
+    };
+
+    let copy = (text) => {
+      navigator.clipboard.writeText(text);
+    };
+
+    let f = (s, currency) =>
+      new Intl.NumberFormat("en-US", {
+        style: "currency",
+        currency,
+      })
+        .format(s)
+        .replace("CA", "");
+
+    let s = (s) =>
+      new Intl.NumberFormat("en-US", { maximumFractionDigits: 0 }).format(s);
+
+    let {
+      default: { drawImg },
+    } = await import("https://coinos.io/qr.js");
+    let base64 = drawImg("test", { size: 300 });
+
+    let link = document.createElement("link");
+    link.setAttribute("rel", "stylesheet");
+    link.setAttribute("type", "text/css");
+    link.setAttribute(
+      "href",
+      "https://fonts.googleapis.com/css?family=Public+Sans:400italic,400,300,700"
+    );
+
+    var style = document.createElement("style");
+    style.innerHTML = `#check {
         transform: scale(0.5);
         transition: transform 1s;
       }
     `;
-		document.head.appendChild(style);
-
-		document.head.appendChild(link);
-		document.title = 'Pay With Bitcoin';
-
-		let fiat = Shopify.checkout.payment_due;
-		let main = document.querySelector('main');
-		main.style.fontFamily = 'Public Sans, sans-serif';
-		main.innerHTML = 'Please Pay';
-
-		let data = await fetch('https://dev.coinos.io/api/invoice', {
-			method: 'POST',
-			mode: 'cors',
-			headers: {
-				'Content-Type': 'application/json',
-				accept: 'application/json'
-			},
-			body: JSON.stringify({
-				invoice: {
-					fiat,
-					type: 'lightning',
-					webhook: `https://dev.coinos.io/api/shopify/${Shopify.checkout.order_id}`
-				},
-				user: { username: 'horseradish' }
-			})
-		})
-			.then(function (response) {
-				return response.json();
-			})
-			.catch(console.log);
-
-		main.innerHTML = `<a href="lightning:${data.hash}">
+    document.head.appendChild(style);
+
+    document.head.appendChild(link);
+    document.title = "Pay With Bitcoin";
+
+    let fiat = Shopify.checkout.payment_due;
+    let main = document.querySelector("main");
+    main.style.fontFamily = "Public Sans, sans-serif";
+    main.innerHTML = "Please Pay";
+
+    let data = await fetch("https://dev.coinos.io/api/invoice", {
+      method: "POST",
+      mode: "cors",
+      headers: {
+        "Content-Type": "application/json",
+        accept: "application/json",
+      },
+      body: JSON.stringify({
+        invoice: {
+          fiat,
+          type: "lightning",
+          webhook: `https://dev.coinos.io/api/shopify/${Shopify.checkout.order_id}`,
+        },
+        user: { username: "horseradish" },
+      }),
+    })
+      .then(function (response) {
+        return response.json();
+      })
+      .catch(console.log);
+
+    main.innerHTML = `<a href="lightning:${data.hash}">
       <div style="display: flex; margin-top: 50px; margin-bottom: 80px; position: relative;">
         <img id="qrcode" src="${base64}" />
         <div id="bg"></div>
@@ -89,14 +90,14 @@
     </a>
     <div style="width: 100%; text-align: center; ">
       <div style="font-size: 24px; font-weight: bold; margin-bottom: 12px;">${f(
-				(data.amount * data.rate) / 100000000,
-				data.currency
-			)}</div>
+        (data.amount * data.rate) / 100000000,
+        data.currency
+      )}</div>
       <div style="color: #666; font-size: 18px;">${sat(data.amount)}</div>
     </div>
     <div style="text-align: center; margin: 40px auto; max-width: 460px; word-break: break-all; line-height: 1.5rem">${
-			data.hash
-		}</div>
+      data.hash
+    }</div>
     <div style="margin: 20px 0; display: flex; gap: 1rem; justify-content: center; align-items: center;">
       <a href="lightning:${data.hash}" style="text-decoration: none">
       <div style="color: #999; font-size: 18px; border-radius: 9999px; padding: 0.5rem 1rem; border: 1px solid #ccc; background: white;">Open</div>
@@ -107,43 +108,43 @@
     </div>
     `;
 
-		let copyButton = document.getElementById('copy');
-		copyButton.addEventListener('click', (e) => {
-			e.preventDefault();
-			copy(data.hash);
-			let copied = document.createElement('div');
-			copied.textContent = 'Copied!';
-			main.appendChild(copied);
-			setTimeout(() => copied.remove(), 3000);
-		});
-
-		let qr = document.getElementById('qrcode');
-		qr.style.margin = 'auto';
-		qr.style.marginTop = '40px';
-		qr.style.border = '12px white solid';
-		qr.style.zIndex = 10;
-
-		new QRCode(qr, data.hash);
-
-		let bg = document.getElementById('bg');
-		bg.style.position = 'absolute';
-		bg.style.margin = 'auto';
-		bg.style.left = '0';
-		bg.style.right = '0';
-		bg.style.width = '400px';
-		bg.style.height = '400px';
-		bg.style.borderRadius = '50%';
-		bg.style.background = 'linear-gradient(to right, #F2F6FC, #E1E3FF)';
-		bg.style.zIndex = '0';
-
-		let ws = new WebSocket('wss://dev.coinos.io/ws');
-		ws.onmessage = ({ data }) => {
-			try {
-				let { type, data: d } = JSON.parse(data);
-				if (type === 'payment') {
-					main.innerHTML =
-						'<img id="check" src="https://dev.coinos.io/icons/check.svg" alt="Check" />' +
-						`<h1>Payment received!</h1>
+    let copyButton = document.getElementById("copy");
+    copyButton.addEventListener("click", (e) => {
+      e.preventDefault();
+      copy(data.hash);
+      let copied = document.createElement("div");
+      copied.textContent = "Copied!";
+      main.appendChild(copied);
+      setTimeout(() => copied.remove(), 3000);
+    });
+
+    let qr = document.getElementById("qrcode");
+    qr.style.margin = "auto";
+    qr.style.marginTop = "40px";
+    qr.style.border = "12px white solid";
+    qr.style.zIndex = 10;
+
+    new QRCode(qr, data.hash);
+
+    let bg = document.getElementById("bg");
+    bg.style.position = "absolute";
+    bg.style.margin = "auto";
+    bg.style.left = "0";
+    bg.style.right = "0";
+    bg.style.width = "400px";
+    bg.style.height = "400px";
+    bg.style.borderRadius = "50%";
+    bg.style.background = "linear-gradient(to right, #F2F6FC, #E1E3FF)";
+    bg.style.zIndex = "0";
+
+    let ws = new WebSocket("wss://dev.coinos.io/ws");
+    ws.onmessage = ({ data }) => {
+      try {
+        let { type, data: d } = JSON.parse(data);
+        if (type === "payment") {
+          main.innerHTML =
+            '<img id="check" src="https://dev.coinos.io/icons/check.svg" alt="Check" />' +
+            `<h1>Payment received!</h1>
             <h2>
             ${((d.amount * d.rate) / 100000000).toFixed(2)} CAD
             </h2>
@@ -151,17 +152,17 @@
             ⚡️${d.amount}
             </h3>`;
 
-					var image = document.getElementById('check');
-					image.addEventListener('load', function () {
-						image.style.transform = 'scale(1)';
-					});
-				}
-			} catch (e) {
-				console.log(e);
-			}
-		};
-		ws.onopen = () => {
-			ws.send(JSON.stringify({ type: 'subscribe', data }));
-		};
-	});
+          var image = document.getElementById("check");
+          image.addEventListener("load", function () {
+            image.style.transform = "scale(1)";
+          });
+        }
+      } catch (e) {
+        console.log(e);
+      }
+    };
+    ws.onopen = () => {
+      ws.send(JSON.stringify({ type: "subscribe", data }));
+    };
+  });
 </script>
diff --git a/svelte.config.js b/svelte.config.js
index 70484390..a0f46356 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,23 +1,24 @@
 // import adapter from '@sveltejs/adapter-node';
-import adapter from 'svelte-adapter-bun'
-import preprocess from 'svelte-preprocess';
+import adapter from "svelte-adapter-bun";
+import preprocess from "svelte-preprocess";
 
 const config = {
-	preprocess: [
-		preprocess({
-			postcss: true
-		})
-	],
-	kit: {
-		adapter: adapter(),
-		csrf: {
-			checkOrigin: false
-		}
-	},
-	onwarn: (warning, handler) => {
-		if (warning.code.includes('caption') || warning.filename.includes('Toast')) return;
-		handler(warning);
-	}
+  preprocess: [
+    preprocess({
+      postcss: true,
+    }),
+  ],
+  kit: {
+    adapter: adapter(),
+    csrf: {
+      checkOrigin: false,
+    },
+  },
+  onwarn: (warning, handler) => {
+    if (warning.code.includes("caption") || warning.filename.includes("Toast"))
+      return;
+    handler(warning);
+  },
 };
 
 export default config;
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index c57db020..746f4ca6 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -1,17 +1,17 @@
 /** @type {import('tailwindcss').Config} */
 module.exports = {
-	content: ['./src/**/*.{html,js,svelte}'],
-	theme: {
-		extend: {
-			colors: {
-				primary: '#F5F7FA',
-				secondary: '#70757E',
-				gradient: '#C3CFE2',
-				lightgrey: '#EAECEF',
-				grey: '#70757E'
-			}
-		}
-	},
-	plugins: [require('tailwind-scrollbar')],
-	safelist: ['w-16', 'h-16', 'w-20', 'h-20', 'w-24', 'h-24']
+  content: ["./src/**/*.{html,js,svelte}"],
+  theme: {
+    extend: {
+      colors: {
+        primary: "#F5F7FA",
+        secondary: "#70757E",
+        gradient: "#C3CFE2",
+        lightgrey: "#EAECEF",
+        grey: "#70757E",
+      },
+    },
+  },
+  plugins: [require("tailwind-scrollbar")],
+  safelist: ["w-16", "h-16", "w-20", "h-20", "w-24", "h-24"],
 };
diff --git a/vite.config.js b/vite.config.js
index 9cda1e3f..15974503 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,23 +1,23 @@
-import { sveltekit } from '@sveltejs/kit/vite';
+import { sveltekit } from "@sveltejs/kit/vite";
 
-import path from 'path';
+import path from "path";
 
 /** @type {import('vite').UserConfig} */
 const config = {
-	plugins: [sveltekit()],
-	resolve: {
-		alias: {
-			$comp: path.resolve('src/components/index.js'),
-		}
-	},
-	server: {
-		proxy: {
-			'/api': {
-				target: 'http://localhost:3119',
-				rewrite: (path) => path.replace(/^\/api/, '')
-			}
-		}
-	}
+  plugins: [sveltekit()],
+  resolve: {
+    alias: {
+      $comp: path.resolve("src/components/index.js"),
+    },
+  },
+  server: {
+    proxy: {
+      "/api": {
+        target: "http://localhost:3119",
+        rewrite: (path) => path.replace(/^\/api/, ""),
+      },
+    },
+  },
 };
 
 export default config;
-- 
cgit v1.2.3


From 38ba5cb660fb093bca1a621c364f0f385659a0b4 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Fri, 1 Dec 2023 23:55:25 -0800
Subject: change component imports

---
 src/components/404.svelte                          |  2 +-
 src/components/About.svelte                        | 23 +++++++------
 src/components/AppHeader.svelte                    |  3 +-
 src/components/Avatar.svelte                       |  2 +-
 src/components/Balance.svelte                      |  2 +-
 src/components/Code.svelte                         |  2 +-
 src/components/Event.svelte                        |  3 +-
 src/components/Feed.svelte                         |  2 +-
 src/components/Footer.svelte                       |  3 +-
 src/components/Invoice.svelte                      |  3 +-
 src/components/LandingHeader.svelte                |  2 +-
 src/components/LandingHero.svelte                  |  3 +-
 src/components/Lnurlp.svelte                       |  3 +-
 src/components/Lnurlw.svelte                       |  3 +-
 src/components/LoadingSplash.svelte                |  2 +-
 src/components/LocationsMap.svelte                 |  3 +-
 src/components/Numpad.svelte                       |  3 +-
 src/components/Password.svelte                     |  2 +-
 src/components/Pin.svelte                          |  2 +-
 src/components/Pinpad.svelte                       |  3 +-
 src/components/Popup.svelte                        |  2 +-
 src/components/RegisterOrLogin.svelte              |  4 ++-
 src/components/Request.svelte                      |  5 ++-
 src/components/index.js                            | 40 ----------------------
 src/routes/(app)/+error.svelte                     |  2 +-
 src/routes/(app)/+layout.svelte                    |  5 ++-
 .../(app)/[username]/(profile)/+layout.svelte      |  2 +-
 src/routes/(app)/[username]/(profile)/+page.svelte |  5 ++-
 .../[username]/(profile)/event/[id]/+page.svelte   |  2 +-
 .../[username]/(profile)/followers/+page.svelte    |  2 +-
 .../[username]/(profile)/follows/+page.svelte      |  2 +-
 .../[username]/(profile)/request/+page.svelte      |  2 +-
 .../[username]/(profile)/request/sent/+page.svelte |  2 +-
 src/routes/(app)/[username]/+layout.svelte         |  2 +-
 .../(app)/[username]/card/[serial]/+page.svelte    |  3 +-
 src/routes/(app)/[username]/funds/+page.svelte     |  3 +-
 src/routes/(app)/[username]/generate/+page.svelte  |  2 +-
 .../(app)/[username]/invoice/[id]/+page.svelte     |  5 ++-
 .../[username]/invoice/[id]/paid/+page.svelte      |  2 +-
 .../(app)/[username]/invoice/[id]/tip/+page.svelte |  3 +-
 .../(app)/[username]/invoice/sent/+page.svelte     |  3 +-
 src/routes/(app)/[username]/map/+page.svelte       |  8 -----
 src/routes/(app)/[username]/messages/+page.svelte  |  3 +-
 .../[username]/payments/[...page]/+page.svelte     |  3 +-
 .../[username]/receive/[...param]/+page.svelte     |  4 ++-
 .../(app)/[username]/request/[id]/+page.svelte     |  3 +-
 .../[username]/settings/[...tab]/+page.svelte      |  4 ++-
 .../[username]/settings/[...tab]/_account.svelte   |  2 +-
 .../(app)/[username]/settings/[...tab]/_pos.svelte |  4 ++-
 .../[username]/settings/[...tab]/_security.svelte  |  4 ++-
 .../[username]/settings/[...tab]/_shopify.svelte   |  2 +-
 src/routes/(app)/admin/+layout.svelte              |  2 +-
 src/routes/(app)/buy/+page.svelte                  |  6 +++-
 src/routes/(app)/fund/[id]/+page.svelte            |  3 +-
 src/routes/(app)/fund/[id]/sweep/+page.svelte      |  2 +-
 src/routes/(app)/fund/[id]/withdraw/+page.svelte   |  4 ++-
 src/routes/(app)/launch/+page.svelte               |  4 +--
 src/routes/(app)/launch/purchase/card/+page.svelte |  5 ++-
 src/routes/(app)/ln/[lnurl]/+page.svelte           |  2 +-
 src/routes/(app)/ln/withdrawal/sent/+page.svelte   |  2 +-
 src/routes/(app)/login/+page.svelte                |  2 +-
 src/routes/(app)/payment/[id]/+page.svelte         |  2 +-
 src/routes/(app)/payment/[id]/plain/+page.svelte   |  3 +-
 src/routes/(app)/qr/[text]/+page.svelte            |  3 +-
 src/routes/(app)/register/+page.svelte             |  6 +++-
 src/routes/(app)/scan/+page.svelte                 |  2 +-
 src/routes/(app)/send/+layout.svelte               |  2 +-
 src/routes/(app)/send/[...text]/+page.svelte       |  5 ++-
 .../bitcoin/[address]/[...amount]/+page.svelte     |  6 +++-
 .../send/fund/[name]/[...amount]/+page.svelte      |  4 ++-
 src/routes/(app)/send/invoice/[id]/+page.svelte    |  5 ++-
 .../(app)/send/lightning/[payreq]/+page.svelte     |  4 ++-
 .../send/user/[username]/[...amount]/+page.svelte  |  6 +++-
 src/routes/(app)/sent/+page.svelte                 |  2 +-
 src/routes/(app)/support/+page.svelte              |  3 +-
 src/routes/(static)/+layout.svelte                 |  4 ++-
 src/routes/(static)/docs/+page.svelte              |  5 ++-
 src/routes/+page.svelte                            | 28 +++++++--------
 src/routes/map/+page.svelte                        | 18 ----------
 svelte.config.js                                   |  4 +++
 vite.config.js                                     |  2 +-
 81 files changed, 183 insertions(+), 169 deletions(-)

(limited to 'src')

diff --git a/src/components/404.svelte b/src/components/404.svelte
index d831a40a..7c2e45ee 100644
--- a/src/components/404.svelte
+++ b/src/components/404.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
 </script>
 
diff --git a/src/components/About.svelte b/src/components/About.svelte
index 6e0cdcb5..0087e350 100644
--- a/src/components/About.svelte
+++ b/src/components/About.svelte
@@ -1,16 +1,8 @@
 <script>
   import { onMount } from "svelte";
-
-  let locations;
-  onMount(async () => {
-    try {
-      ({ locations } = await fetch("/locations").then((r) => r.json()));
-    } catch (e) {
-      console.log(e);
-    }
-  });
-
-  import { Image, Icon, LocationsMap } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Image from "$comp/Image.svelte";
+  import LocationsMap from "$comp/LocationsMap.svelte";
   import { t } from "$lib/translations";
 
   let team = [
@@ -31,6 +23,15 @@
     },
     { name: "cole", socials: [] },
   ];
+
+  let locations;
+  onMount(async () => {
+    try {
+      ({ locations } = await fetch("/locations").then((r) => r.json()));
+    } catch (e) {
+      console.log(e);
+    }
+  });
 </script>
 
 <div class="flex justify-center">
diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 2f088eec..9782237b 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -2,7 +2,8 @@
   import OutClick from "svelte-outclick";
   import { banner, newPayment, colorTheme } from "$lib/store";
   import { goto } from "$app/navigation";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon  from "$comp/Icon.svelte";
   import { loading, t } from "$lib/translations";
   import { page } from "$app/stores";
 
diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte
index 3955a42f..f13404bd 100644
--- a/src/components/Avatar.svelte
+++ b/src/components/Avatar.svelte
@@ -1,6 +1,6 @@
 <script>
   import { avatar, banner, colorTheme } from "$lib/store";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { punk } from "$lib/utils";
 
   export let user;
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
index 92714f98..fc986b1f 100644
--- a/src/components/Balance.svelte
+++ b/src/components/Balance.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Pin } from "$comp";
+  import Pin from "$comp/Pin.svelte";
   import { f, s, sat, sats } from "$lib/utils";
   import { animatedRate, pin } from "$lib/store";
   import { t } from "$lib/translations";
diff --git a/src/components/Code.svelte b/src/components/Code.svelte
index 6c1048cf..c8c1058a 100644
--- a/src/components/Code.svelte
+++ b/src/components/Code.svelte
@@ -1,6 +1,6 @@
 <script>
   import { copyNoNewlines as copy } from "$lib/utils";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import samples from "$lib/samples";
   export let sample;
 </script>
diff --git a/src/components/Event.svelte b/src/components/Event.svelte
index 2312f44e..d3a6c0af 100644
--- a/src/components/Event.svelte
+++ b/src/components/Event.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   export let event;
 
   let { id, user, seen, content } = event;
diff --git a/src/components/Feed.svelte b/src/components/Feed.svelte
index 0c9c96d1..5dc2b21a 100644
--- a/src/components/Feed.svelte
+++ b/src/components/Feed.svelte
@@ -1,7 +1,7 @@
 <script>
   import { t } from "$lib/translations";
   import { onMount } from "svelte";
-  import { Event } from "$comp";
+  import Event from "$comp/Event.svelte";
   import { browser } from "$app/environment";
   import VirtualScroll from "svelte-virtual-scroll-list";
   import { fail } from "$lib/utils";
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
index c1ac79cf..d70c013c 100644
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Icon, LocaleSelector } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import LocaleSelector from "$comp/LocaleSelector.svelte";
   import { t } from "$lib/translations";
 
   const followLinks = [
diff --git a/src/components/Invoice.svelte b/src/components/Invoice.svelte
index 363d260a..ba436649 100644
--- a/src/components/Invoice.svelte
+++ b/src/components/Invoice.svelte
@@ -2,7 +2,8 @@
   import { t } from "$lib/translations";
   import { f, sat, sats } from "$lib/utils";
   import { fly } from "svelte/transition";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { invoice } from "$lib/store";
 </script>
 
diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index 556d44a3..d1094a1d 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -1,7 +1,7 @@
 <script>
   import { goto } from "$app/navigation";
   import { scroll } from "$lib/utils";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
   import { page } from "$app/stores";
 
diff --git a/src/components/LandingHero.svelte b/src/components/LandingHero.svelte
index e03bfdc2..43223499 100644
--- a/src/components/LandingHero.svelte
+++ b/src/components/LandingHero.svelte
@@ -1,6 +1,7 @@
 <script>
   import { goto } from "$app/navigation";
-  import { Icon, Image } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Image from "$comp/Image.svelte";
   import { t } from "$lib/translations";
 </script>
 
diff --git a/src/components/Lnurlp.svelte b/src/components/Lnurlp.svelte
index 427e4c07..d4ba7bb5 100644
--- a/src/components/Lnurlp.svelte
+++ b/src/components/Lnurlp.svelte
@@ -1,7 +1,8 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Numpad, Spinner } from "$comp";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner  from "$comp/Spinner.svelte";
   import { pin } from "$lib/store";
 
   export let data, form;
diff --git a/src/components/Lnurlw.svelte b/src/components/Lnurlw.svelte
index 09bbca7f..b83e648f 100644
--- a/src/components/Lnurlw.svelte
+++ b/src/components/Lnurlw.svelte
@@ -1,7 +1,8 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Numpad, Spinner } from "$comp";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { pin } from "$lib/store";
 
   export let data, form;
diff --git a/src/components/LoadingSplash.svelte b/src/components/LoadingSplash.svelte
index 65ee5cd8..41477a4e 100644
--- a/src/components/LoadingSplash.svelte
+++ b/src/components/LoadingSplash.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
 </script>
 
 <div class="flex justify-center items-center">
diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index cd26d4bd..b41b1a73 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -1,7 +1,8 @@
 <script>
   import { tick, onMount, onDestroy } from "svelte";
   import { browser } from "$app/environment";
-  import { Icon, Popup } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Popup from "$comp/Popup.svelte";
   import { shuffleArray } from "$lib/utils";
 
   import "maplibre-gl/dist/maplibre-gl.css";
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 6b779085..c758bf77 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Left, Icon } from "$comp";
+  import Left from "$comp/Left.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { f, s, post, warning, sat, sats } from "$lib/utils";
   import { t } from "$lib/translations";
 
diff --git a/src/components/Password.svelte b/src/components/Password.svelte
index 007ce718..da65d718 100644
--- a/src/components/Password.svelte
+++ b/src/components/Password.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { focus, fail, post } from "$lib/utils";
   import { password as pw, passwordPrompt } from "$lib/store";
 
diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte
index bd51cb0a..9938f9a1 100644
--- a/src/components/Pin.svelte
+++ b/src/components/Pin.svelte
@@ -1,7 +1,7 @@
 <script>
   import { t } from "$lib/translations";
   import { post, success, fail, focus } from "$lib/utils";
-  import { Pinpad } from "$comp";
+  import Pinpad from "$comp/Pinpad.svelte";
   import { pin } from "$lib/store";
   import { onMount } from "svelte";
 
diff --git a/src/components/Pinpad.svelte b/src/components/Pinpad.svelte
index 5db23154..641ddb2b 100644
--- a/src/components/Pinpad.svelte
+++ b/src/components/Pinpad.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Left, Icon } from "$comp";
+  import Left from "$comp/Left.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { focus, post, warning } from "$lib/utils";
   import { t } from "$lib/translations";
 
diff --git a/src/components/Popup.svelte b/src/components/Popup.svelte
index 5d2b9b6a..d59cfcfc 100644
--- a/src/components/Popup.svelte
+++ b/src/components/Popup.svelte
@@ -1,6 +1,6 @@
 <script>
   import { page } from "$app/stores";
-  import { Avatar } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
   export let tags;
 
   let addr = (tags) => {
diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte
index 5617fc7b..be7d4142 100644
--- a/src/components/RegisterOrLogin.svelte
+++ b/src/components/RegisterOrLogin.svelte
@@ -3,7 +3,9 @@
   import { tick } from "svelte";
   import { fly } from "svelte/transition";
   import { enhance } from "$app/forms";
-  import { Pin, Icon, Spinner } from "$comp";
+  import Pin from "$comp/Pin.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { focus, fail } from "$lib/utils";
   import { password, loginRedirect } from "$lib/store";
   import { t } from "$lib/translations";
diff --git a/src/components/Request.svelte b/src/components/Request.svelte
index f3331954..c085f9e2 100644
--- a/src/components/Request.svelte
+++ b/src/components/Request.svelte
@@ -1,7 +1,10 @@
 <script>
   import { t } from "$lib/translations";
   import { fly } from "svelte/transition";
-  import { Avatar, Icon } from "$comp";
+
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+
   import { request, requestRedirect } from "$lib/store";
   import { page } from "$app/stores";
 
diff --git a/src/components/index.js b/src/components/index.js
index 661ad4fa..e69de29b 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -1,40 +0,0 @@
-export { default as Popup } from "./Popup.svelte";
-export { default as Code } from "./Code.svelte";
-export { default as Slider } from "./Slider.svelte";
-export { default as Pinpad } from "./Pinpad.svelte";
-export { default as Balance } from "./Balance.svelte";
-export { default as Lnurlp } from "./Lnurlp.svelte";
-export { default as Lnurlw } from "./Lnurlw.svelte";
-export { default as Event } from "./Event.svelte";
-export { default as Password } from "./Password.svelte";
-export { default as Feed } from "./Feed.svelte";
-export { default as Invoice } from "./Invoice.svelte";
-export { default as Request } from "./Request.svelte";
-export { default as Pin } from "./Pin.svelte";
-export { default as Card } from "./Card.svelte";
-export { default as Lock } from "./Lock.svelte";
-export { default as Calendar } from "./Calendar.svelte";
-export { default as Avatar } from "./Avatar.svelte";
-export { default as Left } from "./Left.svelte";
-export { default as Numpad } from "./Numpad.svelte";
-export { default as Spinner } from "./Spinner.svelte";
-export { default as Check } from "./Check.svelte";
-export { default as Heart } from "./Heart.svelte";
-export { default as Quote } from "./Quote.svelte";
-export { default as LandingHeader } from "./LandingHeader.svelte";
-export { default as LandingHero } from "./LandingHero.svelte";
-export { default as LandingInfoCard } from "./LandingInfoCard.svelte";
-export { default as HowItWorksCard } from "./HowItWorksCard.svelte";
-export { default as FaqCard } from "./FaqCard.svelte";
-export { default as Icon } from "./Icon.svelte";
-export { default as Image } from "./Image.svelte";
-export { default as RegisterOrLogin } from "./RegisterOrLogin.svelte";
-export { default as AppHeader } from "./AppHeader.svelte";
-export { default as LocaleSelector } from "./LocaleSelector.svelte";
-export { default as LoadingSplash } from "./LoadingSplash.svelte";
-export { default as PageNotFound } from "./404.svelte";
-export { default as About } from "./About.svelte";
-export { default as Footer } from "./Footer.svelte";
-export { default as Toggle } from "./Toggle.svelte";
-export { default as LocationsMap } from "./LocationsMap.svelte";
-export { default as Qr } from "./Qr.svelte";
diff --git a/src/routes/(app)/+error.svelte b/src/routes/(app)/+error.svelte
index ed0bec3e..6ce7979c 100644
--- a/src/routes/(app)/+error.svelte
+++ b/src/routes/(app)/+error.svelte
@@ -1,6 +1,6 @@
 <script>
   import { back } from "$lib/utils";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { page } from "$app/stores";
 
   export let data;
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index c5a312e1..51ebd9fe 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -13,7 +13,10 @@
   import { page } from "$app/stores";
   import { browser } from "$app/environment";
   import { goto } from "$app/navigation";
-  import { LoadingSplash, Invoice, Password, Request } from "$comp";
+  import LoadingSplash from "$comp/LoadingSplash.svelte";
+  import Invoice from "$comp/Invoice.svelte";
+  import Password from "$comp/Password.svelte";
+  import Request  from "$comp/Request.svelte";
   import { warning, protectedRoutes } from "$lib/utils";
   import { t, locale } from "$lib/translations";
   import { onNavigate } from "$app/navigation";
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 6b166e2c..604f3fd0 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -2,7 +2,7 @@
   import { hexToUint8Array } from "uint8array-extras";
   import { copy, f, s, sats } from "$lib/utils";
   import { animatedRate } from "$lib/store";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
   import { sign, send } from "$lib/nostr";
   import { bech32m } from "@scure/base";
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index b0e36090..36512d1e 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -1,6 +1,9 @@
 <script>
   import { onMount } from "svelte";
-  import { Icon, Avatar, Balance, Feed } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Avatar from "$comp/Avatar.svelte";
+  import Balance from "$comp/Balance.svelte";
+  import Feed from "$comp/Feed.svelte";
   import { t } from "$lib/translations";
   import { ease, f, sat, sats } from "$lib/utils";
   import { sign, send, encrypt, decrypt } from "$lib/nostr";
diff --git a/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte b/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
index 1347947f..74ce1067 100644
--- a/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/event/[id]/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Event } from "$comp";
+  import Event from "$comp/Event.svelte";
   export let data;
   let { event } = data;
 </script>
diff --git a/src/routes/(app)/[username]/(profile)/followers/+page.svelte b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
index f51af86b..e087ad42 100644
--- a/src/routes/(app)/[username]/(profile)/followers/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/followers/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { t } from "$lib/translations";
-  import { Avatar } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
   import { browser } from "$app/environment";
   import VirtualScroll from "svelte-virtual-scroll-list";
 
diff --git a/src/routes/(app)/[username]/(profile)/follows/+page.svelte b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
index 4f1bf32b..e4363796 100644
--- a/src/routes/(app)/[username]/(profile)/follows/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/follows/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { t } from "$lib/translations";
-  import { Avatar } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
   import { browser } from "$app/environment";
   import VirtualScroll from "svelte-virtual-scroll-list";
 
diff --git a/src/routes/(app)/[username]/(profile)/request/+page.svelte b/src/routes/(app)/[username]/(profile)/request/+page.svelte
index 5727c3d4..a07ee914 100644
--- a/src/routes/(app)/[username]/(profile)/request/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/request/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
 
   export let data;
 
diff --git a/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte b/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
index 6ce0c9f6..ce5eb276 100644
--- a/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/request/sent/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { scale } from "svelte/transition";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
 
   export let data;
   let { subject } = data;
diff --git a/src/routes/(app)/[username]/+layout.svelte b/src/routes/(app)/[username]/+layout.svelte
index 3a351e48..dd29e3aa 100644
--- a/src/routes/(app)/[username]/+layout.svelte
+++ b/src/routes/(app)/[username]/+layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { AppHeader } from "$comp";
+  import AppHeader from "$comp/AppHeader.svelte";
   import { onNavigate } from "$app/navigation";
   export let data;
 
diff --git a/src/routes/(app)/[username]/card/[serial]/+page.svelte b/src/routes/(app)/[username]/card/[serial]/+page.svelte
index a2e17dfc..1d11ebee 100644
--- a/src/routes/(app)/[username]/card/[serial]/+page.svelte
+++ b/src/routes/(app)/[username]/card/[serial]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Card, Icon } from "$comp";
+  import Card from "$comp/Card.svelte";
+  import Icon from "$comp/Icon.svelte";
   export let data;
   let { serial } = data;
   let balance = 0;
diff --git a/src/routes/(app)/[username]/funds/+page.svelte b/src/routes/(app)/[username]/funds/+page.svelte
index 667176e1..25686e86 100644
--- a/src/routes/(app)/[username]/funds/+page.svelte
+++ b/src/routes/(app)/[username]/funds/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
 
   export let data;
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
index 4ebb5eae..68f5741a 100644
--- a/src/routes/(app)/[username]/generate/+page.svelte
+++ b/src/routes/(app)/[username]/generate/+page.svelte
@@ -2,7 +2,7 @@
   import { fail, post, wait } from "$lib/utils";
   import { onMount } from "svelte";
   import { goto, invalidate } from "$app/navigation";
-  import { Pin } from "$comp";
+   import Pin from "$comp/Pin.svelte" 
   import { loginRedirect, pin, password, passwordPrompt } from "$lib/store";
   import { generate } from "$lib/nostr";
   import { browser } from "$app/environment";
diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index b6bf70b7..b18c1a70 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -16,7 +16,10 @@
   import { tick, onMount, onDestroy } from "svelte";
   import { browser } from "$app/environment";
   import { last } from "$lib/store";
-  import { Avatar, Icon, Heart, Image } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Heart from "$comp/Heart.svelte";
+  import Image from "$comp/Image.svelte";
   import { t } from "$lib/translations";
   import { goto, invalidate } from "$app/navigation";
 
diff --git a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
index 655bc3e4..ed1ae931 100644
--- a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { scale } from "svelte/transition";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { toast } from "@zerodevx/svelte-toast";
   import { browser } from "$app/environment";
   import { t } from "$lib/translations";
diff --git a/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
index 87e48f01..02a896b2 100644
--- a/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/tip/+page.svelte
@@ -3,7 +3,8 @@
   import { browser } from "$app/environment";
   import { invoice as inv, request } from "$lib/store";
   import { copy, focus, f, sat, get, reverseFormat, s, sats } from "$lib/utils";
-  import { Icon, Slider } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Slider from "$comp/Slider.svelte";
   import { goto } from "$app/navigation";
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
diff --git a/src/routes/(app)/[username]/invoice/sent/+page.svelte b/src/routes/(app)/[username]/invoice/sent/+page.svelte
index 8583de09..b95bc85e 100644
--- a/src/routes/(app)/[username]/invoice/sent/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/sent/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { request } from "$lib/store";
 </script>
 
diff --git a/src/routes/(app)/[username]/map/+page.svelte b/src/routes/(app)/[username]/map/+page.svelte
index a2ae657c..e69de29b 100644
--- a/src/routes/(app)/[username]/map/+page.svelte
+++ b/src/routes/(app)/[username]/map/+page.svelte
@@ -1,8 +0,0 @@
-<script>
-  import { LocationsMap } from "$comp";
-  export let data;
-
-  let { locations } = data;
-</script>
-
-<LocationsMap {locations} />
diff --git a/src/routes/(app)/[username]/messages/+page.svelte b/src/routes/(app)/[username]/messages/+page.svelte
index 16b82679..263f7294 100644
--- a/src/routes/(app)/[username]/messages/+page.svelte
+++ b/src/routes/(app)/[username]/messages/+page.svelte
@@ -5,7 +5,8 @@
   import { format } from "date-fns";
   import { scale, fade, fly } from "svelte/transition";
   import { enhance } from "$app/forms";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { back, fail, focus } from "$lib/utils";
   import { sign, send, encrypt, decrypt } from "$lib/nostr";
   import { event as e, password } from "$lib/store";
diff --git a/src/routes/(app)/[username]/payments/[...page]/+page.svelte b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
index e61e156c..e80d7e80 100644
--- a/src/routes/(app)/[username]/payments/[...page]/+page.svelte
+++ b/src/routes/(app)/[username]/payments/[...page]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { onMount } from "svelte";
   import { format } from "date-fns";
   import { newPayment } from "$lib/store";
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
index 085a6f6d..49e279b9 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
@@ -1,5 +1,7 @@
 <script>
-  import { Icon, Numpad, Toggle } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Toggle from "$comp/Toggle.svelte";
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
   import { page } from "$app/stores";
diff --git a/src/routes/(app)/[username]/request/[id]/+page.svelte b/src/routes/(app)/[username]/request/[id]/+page.svelte
index f9672c6f..ff33c02c 100644
--- a/src/routes/(app)/[username]/request/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/request/[id]/+page.svelte
@@ -1,7 +1,8 @@
 <script>
   import { scale } from "svelte/transition";
   import { t } from "$lib/translations";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { f, sat, sats } from "$lib/utils";
   import { request as req, requestRedirect } from "$lib/store";
   import { onMount } from "svelte";
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index 92772f43..b7a9ccfb 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -4,7 +4,9 @@
   import { fly } from "svelte/transition";
   import { applyAction, deserialize } from "$app/forms";
 
-  import { Icon, Spinner, Pin } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
+  import Pin from "$comp/Pin.svelte";
   import { t } from "$lib/translations";
   import { fail, post, warning, success } from "$lib/utils";
   import { avatar, banner, password, pin } from "$lib/store";
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
index 64ab669f..20c883e3 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_account.svelte
@@ -1,7 +1,7 @@
 <script>
   import { tick } from "svelte";
   import { colorTheme, avatar, banner } from "$lib/store";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
   import { page } from "$app/stores";
 
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index 94a35493..cbf31a68 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -1,5 +1,7 @@
 <script>
-  import { Icon, LocaleSelector, Toggle } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import LocaleSelector from "$comp/LocaleSelector.svelte";
+  import Toggle from "$comp/Toggle.svelte";
   import { t } from "$lib/translations";
   import { success, fail } from "$lib/utils";
   import { page } from "$app/stores";
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index f8c14e7b..38bf726c 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -2,7 +2,9 @@
   import { getMnemonic, getNsec } from "$lib/nostr";
   import { tick } from "svelte";
   import { t } from "$lib/translations";
-  import { Pin, Icon, Qr } from "$comp";
+  import Pin from "$comp/Pin.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Qr from "$comp/Qr.svelte";
   import { copy, post, success, fail } from "$lib/utils";
   import { pin as current } from "$lib/store";
   import { invalidate } from "$app/navigation";
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
index 3e2a8dae..0266fa9c 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_shopify.svelte
@@ -1,6 +1,6 @@
 <script>
   import { t } from "$lib/translations";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { page } from "$app/stores";
 
   export let user;
diff --git a/src/routes/(app)/admin/+layout.svelte b/src/routes/(app)/admin/+layout.svelte
index 33b64b6a..f85a3b08 100644
--- a/src/routes/(app)/admin/+layout.svelte
+++ b/src/routes/(app)/admin/+layout.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { LandingHeader } from "$comp";
+   import LandingHeader from "$comp/LandingHeader.svelte" 
   export let data;
   let { user } = data;
 </script>
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index 2f999555..903eb7f4 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -1,6 +1,10 @@
 <script>
   import { enhance } from "$app/forms";
-  import { Icon, Lock, Card, Calendar, Spinner } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Lock from "$comp/Lock.svelte";
+  import Card from "$comp/Card.svelte";
+  import Calendar from "$comp/Calendar.svelte";
+  import Spinner  from "$comp/Spinner.svelte";
   import { animatedRate } from "$lib/store";
   import { f } from "$lib/utils";
 
diff --git a/src/routes/(app)/fund/[id]/+page.svelte b/src/routes/(app)/fund/[id]/+page.svelte
index 117a4b42..b81e2917 100644
--- a/src/routes/(app)/fund/[id]/+page.svelte
+++ b/src/routes/(app)/fund/[id]/+page.svelte
@@ -2,7 +2,8 @@
   import { format } from "date-fns";
   import { enhance } from "$app/forms";
   import { page } from "$app/stores";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { toast } from "@zerodevx/svelte-toast";
   import { t } from "$lib/translations";
   import { types, copy, f, s, sat, sats } from "$lib/utils";
diff --git a/src/routes/(app)/fund/[id]/sweep/+page.svelte b/src/routes/(app)/fund/[id]/sweep/+page.svelte
index bbd7013f..4a48edf8 100644
--- a/src/routes/(app)/fund/[id]/sweep/+page.svelte
+++ b/src/routes/(app)/fund/[id]/sweep/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { scale } from "svelte/transition";
   import { fiat, f, s } from "$lib/utils";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
 
   export let data;
diff --git a/src/routes/(app)/fund/[id]/withdraw/+page.svelte b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
index 6b2010b7..7af07e38 100644
--- a/src/routes/(app)/fund/[id]/withdraw/+page.svelte
+++ b/src/routes/(app)/fund/[id]/withdraw/+page.svelte
@@ -1,7 +1,9 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Icon, Numpad, Spinner } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { back } from "$lib/utils";
   import { pin } from "$lib/store";
diff --git a/src/routes/(app)/launch/+page.svelte b/src/routes/(app)/launch/+page.svelte
index 028274fa..b7c472c1 100644
--- a/src/routes/(app)/launch/+page.svelte
+++ b/src/routes/(app)/launch/+page.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { LandingHeader } from "$comp";
+   import LandingHeader from "$comp/LandingHeader.svelte" 
   import { loginRedirect } from "$lib/store";
   import { beforeNavigate } from "$app/navigation";
   import { info } from "$lib/utils";
-  import { Icon } from "$comp";
+   import Icon from "$comp/Icon.svelte" 
   import { t } from "$lib/translations";
   import { goto } from "$app/navigation";
   import { scroll } from "$lib/utils";
diff --git a/src/routes/(app)/launch/purchase/card/+page.svelte b/src/routes/(app)/launch/purchase/card/+page.svelte
index 037a65b2..6d33c87f 100644
--- a/src/routes/(app)/launch/purchase/card/+page.svelte
+++ b/src/routes/(app)/launch/purchase/card/+page.svelte
@@ -1,6 +1,9 @@
 <script>
   import { enhance } from "$app/forms";
-  import { Lock, Card, Calendar, Spinner } from "$comp";
+  import Lock from "$comp/Lock.svelte";
+  import Card from "$comp/Card.svelte";
+  import Calendar from "$comp/Calendar.svelte";
+  import Spinner from "$comp/Spinner.svelte";
 
   export let data;
 
diff --git a/src/routes/(app)/ln/[lnurl]/+page.svelte b/src/routes/(app)/ln/[lnurl]/+page.svelte
index 9b733f89..26616a29 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.svelte
+++ b/src/routes/(app)/ln/[lnurl]/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Lnurlp, Lnurlw } from "$comp";
+   import Lnurlp from "$comp/Lnurlp.svelte"; import Lnurlw from "$comp/Lnurlw.svelte" 
   export let data;
   let { tag } = data;
 </script>
diff --git a/src/routes/(app)/ln/withdrawal/sent/+page.svelte b/src/routes/(app)/ln/withdrawal/sent/+page.svelte
index c527c017..c1a2bdb2 100644
--- a/src/routes/(app)/ln/withdrawal/sent/+page.svelte
+++ b/src/routes/(app)/ln/withdrawal/sent/+page.svelte
@@ -1,6 +1,6 @@
 <script>
   import { scale } from "svelte/transition";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { toast } from "@zerodevx/svelte-toast";
   import { t } from "$lib/translations";
 
diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
index 6190ae0d..08161cee 100644
--- a/src/routes/(app)/login/+page.svelte
+++ b/src/routes/(app)/login/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { RegisterOrLogin } from "$comp";
+  import RegisterOrLogin from "$comp/RegisterOrLogin.svelte";
   import { onMount } from "svelte";
   import { animatedRate, pin } from "$lib/store";
 
diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index 7e3c6792..e2f96372 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -11,7 +11,7 @@
     success,
     types,
   } from "$lib/utils";
-  import { Avatar, Icon } from "$comp";
+   import Avatar from "$comp/Avatar.svelte", import Icon from "$comp/Icon.svelte" 
   import { format } from "date-fns";
   import { PUBLIC_EXPLORER as expl } from "$env/static/public";
 
diff --git a/src/routes/(app)/payment/[id]/plain/+page.svelte b/src/routes/(app)/payment/[id]/plain/+page.svelte
index 27e8d0ed..c63a9d7f 100644
--- a/src/routes/(app)/payment/[id]/plain/+page.svelte
+++ b/src/routes/(app)/payment/[id]/plain/+page.svelte
@@ -14,7 +14,8 @@
     success,
     types,
   } from "$lib/utils";
-  import { Avatar, Icon } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { format } from "date-fns";
   import { PUBLIC_EXPLORER as expl } from "$env/static/public";
 
diff --git a/src/routes/(app)/qr/[text]/+page.svelte b/src/routes/(app)/qr/[text]/+page.svelte
index d943b0b5..2678d91a 100644
--- a/src/routes/(app)/qr/[text]/+page.svelte
+++ b/src/routes/(app)/qr/[text]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-  import { Icon, Qr } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Qr from "$comp/Qr.svelte";
   import { back } from "$lib/utils";
   export let data;
   let { src, text } = data;
diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index 8310aed1..9cd13ebe 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -6,7 +6,11 @@
   import { tick } from "svelte";
   import { fly } from "svelte/transition";
   import { enhance } from "$app/forms";
-  import { Pin, Icon, Spinner } from "$comp";
+
+  import Pin from "$comp/Pin.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner  from "$comp/Spinner.svelte";
+
   import { focus, fail } from "$lib/utils";
   import { avatar, password, loginRedirect } from "$lib/store";
   import { t } from "$lib/translations";
diff --git a/src/routes/(app)/scan/+page.svelte b/src/routes/(app)/scan/+page.svelte
index 033eb28b..6f22121e 100644
--- a/src/routes/(app)/scan/+page.svelte
+++ b/src/routes/(app)/scan/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-  import { Icon } from "$comp";
+   import Icon from "$comp/Icon.svelte" 
   import QrScanner from "qr-scanner";
   import { onMount, onDestroy } from "svelte";
   import { back } from "$lib/utils";
diff --git a/src/routes/(app)/send/+layout.svelte b/src/routes/(app)/send/+layout.svelte
index 1a587edf..55b01f3a 100644
--- a/src/routes/(app)/send/+layout.svelte
+++ b/src/routes/(app)/send/+layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "$app/navigation";
-  import { Pin } from "$comp";
+   import Pin from "$comp/Pin.svelte" 
   import { pin } from "$lib/store";
 
   export let data;
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 67d4afaa..8548964c 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -5,7 +5,10 @@
   import { tick } from "svelte";
   import { browser } from "$app/environment";
   import { t } from "$lib/translations";
-  import { AppHeader, Avatar, Icon, Spinner } from "$comp";
+  import AppHeader from "$comp/AppHeader.svelte";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { back, fail } from "$lib/utils";
 
   export let data;
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index da11a22c..133eab91 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -2,7 +2,11 @@
   import { tick } from "svelte";
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Toggle, Slider, Icon, Numpad, Spinner } from "$comp";
+  import Toggle from "$comp/Toggle.svelte";
+  import Slider from "$comp/Slider.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { fiat as toFiat, f, back, s, sat } from "$lib/utils";
   import { pin } from "$lib/store";
diff --git a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
index 886e93d2..b6a4aa0c 100644
--- a/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/fund/[name]/[...amount]/+page.svelte
@@ -1,7 +1,9 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Icon, Numpad, Spinner } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { back } from "$lib/utils";
   import { pin } from "$lib/store";
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index d29f1c96..79367534 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -4,7 +4,10 @@
   import { goto, invalidateAll } from "$app/navigation";
   import { pin } from "$lib/store";
   import { enhance } from "$app/forms";
-  import { Avatar, Icon, Numpad, Spinner } from "$comp";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { post, back, f, fiat as toFiat, s, sats } from "$lib/utils";
   export let data;
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index 185597c7..ce9649fa 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -1,7 +1,9 @@
 <script>
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
-  import { Icon, Numpad, Spinner } from "$comp";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { back, s } from "$lib/utils";
   import { pin } from "$lib/store";
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index cb458323..1ad2c458 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -3,7 +3,11 @@
   import { goto } from "$app/navigation";
   import { pin } from "$lib/store";
   import { enhance } from "$app/forms";
-  import { AppHeader, Avatar, Icon, Numpad, Spinner } from "$comp";
+  import AppHeader from "$comp/AppHeader.svelte";
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
+  import Numpad from "$comp/Numpad.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { page } from "$app/stores";
   import { f, post, s, sat, sats } from "$lib/utils";
 
diff --git a/src/routes/(app)/sent/+page.svelte b/src/routes/(app)/sent/+page.svelte
index 400e8904..e2d297de 100644
--- a/src/routes/(app)/sent/+page.svelte
+++ b/src/routes/(app)/sent/+page.svelte
@@ -1,7 +1,7 @@
 <script>
   import { fiat, f, s, sat, sats } from "$lib/utils";
   import { scale } from "svelte/transition";
-  import { Icon } from "$comp";
+  import Icon from "$comp/Icon.svelte";
   import { toast } from "@zerodevx/svelte-toast";
   import { t } from "$lib/translations";
 
diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte
index b31b4389..8d8bee1a 100644
--- a/src/routes/(app)/support/+page.svelte
+++ b/src/routes/(app)/support/+page.svelte
@@ -2,7 +2,8 @@
   import { onDestroy } from "svelte";
   import { fail, success, post } from "$lib/utils";
   import { scale } from "svelte/transition";
-  import { AppHeader, Icon } from "$comp";
+  import AppHeader from "$comp/AppHeader.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
 
   export let data;
diff --git a/src/routes/(static)/+layout.svelte b/src/routes/(static)/+layout.svelte
index 29089dff..13073d5a 100644
--- a/src/routes/(static)/+layout.svelte
+++ b/src/routes/(static)/+layout.svelte
@@ -1,6 +1,8 @@
 <script>
   import { SvelteToast } from "@zerodevx/svelte-toast";
-  import { Footer, LandingHeader } from "$comp";
+  import Footer from "$comp/Footer.svelte";
+  import LandingHeader from "$comp/LandingHeader.svelte";
+
   export let data;
   $: ({ user } = data);
 </script>
diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte
index 6e08c2e8..bf7ecb20 100644
--- a/src/routes/(static)/docs/+page.svelte
+++ b/src/routes/(static)/docs/+page.svelte
@@ -1,6 +1,9 @@
 <script>
   import { copyNoNewlines as copy } from "$lib/utils";
-  import { Code, Icon } from "$comp";
+
+  import Code from "$comp/Code.svelte";
+  import Icon from "$comp/Icon.svelte";
+
   import { PUBLIC_COINOS_URL } from "$env/static/public";
   export let data;
   let { user, token } = data;
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index a90eb4ae..6eeb3a2e 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,14 +1,11 @@
 <script>
-  import {
-    LandingHeader,
-    LandingHero,
-    LandingInfoCard,
-    HowItWorksCard,
-    FaqCard,
-    Image,
-    About,
-    Footer,
-  } from "$comp";
+  import LandingHeader from "$comp/LandingHeader.svelte";
+  import LandingHero from "$comp/LandingHero.svelte";
+  import LandingInfoCard from "$comp/LandingInfoCard.svelte";
+  import HowItWorksCard from "$comp/HowItWorksCard.svelte";
+  import FaqCard from "$comp/FaqCard.svelte";
+  import Image from "$comp/Image.svelte";
+  import Footer from "$comp/Footer.svelte";
 
   import { t } from "$lib/translations";
   import { onDestroy, onMount, tick } from "svelte";
@@ -35,12 +32,15 @@
   let observer;
   let isIntersecting = false;
 
+  let About;
   onMount(async () => {
-    observer = new IntersectionObserver((entries) => {
+    observer = new IntersectionObserver(async (entries) => {
+      About = (await import("$comp/About.svelte")).default;
       isIntersecting = isIntersecting || entries[0].isIntersecting;
     });
 
     loaded = true;
+
     await tick();
     observer.observe(document.getElementById("faq"));
   });
@@ -48,12 +48,8 @@
   onDestroy(() => (loaded = false));
 </script>
 
-<svelte:head>
-  <script src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js"></script>
-</svelte:head>
-
 {#if loaded}
-  <LandingHeader {howItWorks} {faq} {about} {user} />
+
 
   <main class="space-y-40 py-20 md:py-32 lg:py-36 xl:py-40 px-5 md:px-0">
     <LandingHero />
diff --git a/src/routes/map/+page.svelte b/src/routes/map/+page.svelte
index 8c5fc3f8..e69de29b 100644
--- a/src/routes/map/+page.svelte
+++ b/src/routes/map/+page.svelte
@@ -1,18 +0,0 @@
-<script>
-  import { Icon, LocationsMap } from "$comp";
-  export let data;
-
-  let { locations } = data;
-</script>
-
-<div class="pt-4">
-  <div class="w-[243px] mx-auto mb-4">
-    <a href="/">
-      <Icon icon="logo" />
-    </a>
-  </div>
-
-  <div class="flex justify-center items-center">
-    <LocationsMap {locations} />
-  </div>
-</div>
diff --git a/svelte.config.js b/svelte.config.js
index a0f46356..efd9dce7 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -13,6 +13,10 @@ const config = {
     csrf: {
       checkOrigin: false,
     },
+    prerender: {
+      crawl: false,
+      entries: []
+      }
   },
   onwarn: (warning, handler) => {
     if (warning.code.includes("caption") || warning.filename.includes("Toast"))
diff --git a/vite.config.js b/vite.config.js
index 15974503..83626bd5 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -7,7 +7,7 @@ const config = {
   plugins: [sveltekit()],
   resolve: {
     alias: {
-      $comp: path.resolve("src/components/index.js"),
+      $comp: path.resolve("src/components"),
     },
   },
   server: {
-- 
cgit v1.2.3


From 20214e1f13bd57b2b76c0393e46a212c3281d45c Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 2 Dec 2023 00:01:14 -0800
Subject: restore maps

---
 src/components/AppHeader.svelte              |  4 ++--
 src/routes/(app)/[username]/map/+page.svelte |  8 ++++++++
 src/routes/map/+page.server.js               |  1 -
 src/routes/map/+page.svelte                  | 19 +++++++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte
index 9782237b..352dcfa7 100644
--- a/src/components/AppHeader.svelte
+++ b/src/components/AppHeader.svelte
@@ -3,7 +3,7 @@
   import { banner, newPayment, colorTheme } from "$lib/store";
   import { goto } from "$app/navigation";
   import Avatar from "$comp/Avatar.svelte";
-  import Icon  from "$comp/Icon.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { loading, t } from "$lib/translations";
   import { page } from "$app/stores";
 
@@ -112,7 +112,7 @@
             <div
               class="{showMenu
                 ? 'block'
-                : 'hidden'} absolute top-14 right-0 bg-white rounded-3xl p-8 shadow-xl z"
+                : 'hidden'} absolute top-14 right-0 bg-white rounded-3xl p-8 shadow-xl z-50"
             >
               <ul class="space-y-5 w-48">
                 {#each menuButtons as { href, icon, key }}
diff --git a/src/routes/(app)/[username]/map/+page.svelte b/src/routes/(app)/[username]/map/+page.svelte
index e69de29b..bfa115e4 100644
--- a/src/routes/(app)/[username]/map/+page.svelte
+++ b/src/routes/(app)/[username]/map/+page.svelte
@@ -0,0 +1,8 @@
+<script>
+  import LocationsMap from "$comp/LocationsMap.svelte";
+  export let data;
+
+  let { locations } = data;
+</script>
+
+<LocationsMap {locations} />
diff --git a/src/routes/map/+page.server.js b/src/routes/map/+page.server.js
index 616d28f6..5012e7e3 100644
--- a/src/routes/map/+page.server.js
+++ b/src/routes/map/+page.server.js
@@ -1,6 +1,5 @@
 import { get } from "$lib/utils";
 
-// export const prerender = true;
 export let load = async () => {
   let data = { locations: [] };
 
diff --git a/src/routes/map/+page.svelte b/src/routes/map/+page.svelte
index e69de29b..53cd8bdc 100644
--- a/src/routes/map/+page.svelte
+++ b/src/routes/map/+page.svelte
@@ -0,0 +1,19 @@
+<script>
+  import Icon from "$comp/Icon.svelte";
+  import LocationsMap from "$comp/LocationsMap.svelte";
+  export let data;
+
+  let { locations } = data;
+</script>
+
+<div class="pt-4">
+  <div class="w-[243px] mx-auto mb-4">
+    <a href="/">
+      <Icon icon="logo" />
+    </a>
+  </div>
+
+  <div class="flex justify-center items-center">
+    <LocationsMap {locations} />
+  </div>
+</div>
-- 
cgit v1.2.3


From f7a4bd1367c814070fc43802d1d45a9ede59ff4c Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 2 Dec 2023 00:18:25 -0800
Subject: typo

---
 src/routes/(app)/payment/[id]/+page.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/payment/[id]/+page.svelte b/src/routes/(app)/payment/[id]/+page.svelte
index e2f96372..fd5bbae0 100644
--- a/src/routes/(app)/payment/[id]/+page.svelte
+++ b/src/routes/(app)/payment/[id]/+page.svelte
@@ -11,7 +11,8 @@
     success,
     types,
   } from "$lib/utils";
-   import Avatar from "$comp/Avatar.svelte", import Icon from "$comp/Icon.svelte" 
+  import Avatar from "$comp/Avatar.svelte";
+  import Icon from "$comp/Icon.svelte";
   import { format } from "date-fns";
   import { PUBLIC_EXPLORER as expl } from "$env/static/public";
 
-- 
cgit v1.2.3


From 68a05c1beac9355ce0a235a6835d3b991b193d9e Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 2 Dec 2023 00:21:02 -0800
Subject: missing header

---
 src/routes/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 6eeb3a2e..3cffea21 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -49,7 +49,7 @@
 </script>
 
 {#if loaded}
-
+  <LandingHeader {howItWorks} {faq} {about} {user} />
 
   <main class="space-y-40 py-20 md:py-32 lg:py-36 xl:py-40 px-5 md:px-0">
     <LandingHero />
-- 
cgit v1.2.3


From 092add79f39fb8348b5ac05abeaa74bed0557408 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sun, 3 Dec 2023 12:40:41 -0800
Subject: remove balance animation

---
 bun.lockb                                          | Bin 110919 -> 110919 bytes
 src/components/Balance.svelte                      |   8 +++---
 src/lib/store.js                                   |   1 -
 .../(app)/[username]/(profile)/+layout.svelte      |  11 ++++-----
 src/routes/(app)/[username]/(profile)/+page.svelte |  27 ++-------------------
 src/routes/(app)/buy/+page.svelte                  |   1 -
 src/routes/(app)/login/+page.svelte                |   2 --
 7 files changed, 11 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/bun.lockb b/bun.lockb
index 50141b28..f6282c22 100755
Binary files a/bun.lockb and b/bun.lockb differ
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
index fc986b1f..cf926b44 100644
--- a/src/components/Balance.svelte
+++ b/src/components/Balance.svelte
@@ -1,11 +1,11 @@
 <script>
   import Pin from "$comp/Pin.svelte";
   import { f, s, sat, sats } from "$lib/utils";
-  import { animatedRate, pin } from "$lib/store";
+  import {  pin } from "$lib/store";
   import { t } from "$lib/translations";
 
   let show;
-  export let user;
+  export let user, rate;
 </script>
 
 {#if show && user.haspin && $pin?.length !== 6}
@@ -20,10 +20,10 @@
     >
   {:else}
     <div class="text-5xl font-bold tabular-nums">
-      {#if isNaN($animatedRate)}
+      {#if isNaN(rate)}
         <div class="text-gray-200">&mdash;</div>
       {:else}
-        {f((user.balance * $animatedRate) / sats, user.currency)}
+        {f((user.balance * rate) / sats, user.currency)}
       {/if}
     </div>
 
diff --git a/src/lib/store.js b/src/lib/store.js
index 2ae8c9b9..ee60058c 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -38,7 +38,6 @@ const persistLocal = (key, defaultValue) => {
   return s;
 };
 
-export const animatedRate = persistLocal("rate", 0);
 export const avatar = writable();
 export const banner = writable();
 export const colorTheme = writable("from-primary to-gradient");
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 604f3fd0..71c282c4 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -1,7 +1,6 @@
 <script>
   import { hexToUint8Array } from "uint8array-extras";
   import { copy, f, s, sats } from "$lib/utils";
-  import { animatedRate } from "$lib/store";
   import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
   import { sign, send } from "$lib/nostr";
@@ -11,9 +10,9 @@
   export let data;
 
   let { encode, toWords } = bech32m;
-  let events, user, subject, rates, src, text;
+  let events, user, subject, src, text;
 
-  $: ({ events, user, rates, subject, src, text } = data);
+  $: ({ events, user, subject, src, rates, text } = data);
   $: ({ currency, username: n, display } = subject);
 
   $: username = n.length > 60 ? n.substr(0, 6) : display || n;
@@ -225,7 +224,7 @@
   </div>
 </div>
 
-{#if currency && !isNaN($animatedRate)}
+{#if currency}
   <div
     class="flex fixed w-full px-4 bg-white py-2 pb-3 bottom-0 bg-opacity-90 tabular-nums"
   >
@@ -234,11 +233,11 @@
         <div class="my-auto mr-1">1</div>
         <img src="/images/bitcoin.svg" class="w-5 my-auto" alt="Bitcoin" />
       </div>
-      <div>= {f($animatedRate, currency)}</div>
+      <div>= {f(rates[currency], currency)}</div>
     </div>
     <div class="text-secondary flex ml-auto">
       <div class="flex">
-        <div class="mr-1">⚡️{s((1 * sats) / $animatedRate)} =</div>
+        <div class="mr-1">⚡️{s((1 * sats) / rates[currency])} =</div>
         <div>{f(1, currency)}</div>
       </div>
     </div>
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 36512d1e..f5f7c6cb 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -7,7 +7,7 @@
   import { t } from "$lib/translations";
   import { ease, f, sat, sats } from "$lib/utils";
   import { sign, send, encrypt, decrypt } from "$lib/nostr";
-  import { event as e, password, rate, animatedRate } from "$lib/store";
+  import { event as e, password } from "$lib/store";
   import { browser } from "$app/environment";
 
   export let data;
@@ -64,36 +64,13 @@
     latest = latest;
     ready = true;
   };
-
-  let i;
-  let o;
-
-  rate.subscribe((n) => {
-    if (!user?.currency) return;
-    clearInterval(i);
-
-    let r = ((rates[user.currency] / rates["USD"]) * n).toFixed(2);
-
-    if (!r || isNaN(r)) return;
-    if (!o) o = r;
-
-    let t = 0;
-    let d = o - r;
-
-    i = setInterval(() => {
-      if (!r) return;
-      $animatedRate = (o - d * ease(t / 100)).toFixed(2);
-      if (t > 80) (o = r) && clearInterval(i);
-      t++;
-    }, 10);
-  });
 </script>
 
 <div class="space-y-5">
   {#if user?.id === subject.id}
     <div class="space-y-5">
       <div class="flex justify-center lg:justify-start">
-        <Balance {user} />
+        <Balance {user} rate={rates[user.currency]} />
       </div>
 
       {#if !user.balance}
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index 903eb7f4..952d9ff5 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -5,7 +5,6 @@
   import Card from "$comp/Card.svelte";
   import Calendar from "$comp/Calendar.svelte";
   import Spinner  from "$comp/Spinner.svelte";
-  import { animatedRate } from "$lib/store";
   import { f } from "$lib/utils";
 
   export let data, form;
diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
index 08161cee..7b3ec6ac 100644
--- a/src/routes/(app)/login/+page.svelte
+++ b/src/routes/(app)/login/+page.svelte
@@ -1,10 +1,8 @@
 <script>
   import RegisterOrLogin from "$comp/RegisterOrLogin.svelte";
   import { onMount } from "svelte";
-  import { animatedRate, pin } from "$lib/store";
 
   onMount(() => {
-    $animatedRate = 0;
     $pin = undefined;
     localStorage.clear();
     sessionStorage.clear();
-- 
cgit v1.2.3


From 036828c786dfe752a8de3fd90529a7f09e94e77b Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sun, 3 Dec 2023 13:53:31 -0800
Subject: rm rate message

---
 src/lib/socket.js | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src')

diff --git a/src/lib/socket.js b/src/lib/socket.js
index d51ab39b..695b512f 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -5,7 +5,6 @@ import {
   request,
   newPayment,
   last,
-  rate,
   user,
 } from "$lib/store";
 import { success, sat } from "$lib/utils";
@@ -32,9 +31,6 @@ export const messages = (data) => ({
   event() {
     event.set(data);
   },
-  rate() {
-    rate.set(data);
-  },
 
   request() {
     request.set(data);
-- 
cgit v1.2.3


From abd70a251fdcfc6240a6bcd0ff9214960cb71bbf Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sun, 3 Dec 2023 13:54:51 -0800
Subject: restore pin var

---
 src/routes/(app)/login/+page.svelte | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/routes/(app)/login/+page.svelte b/src/routes/(app)/login/+page.svelte
index 7b3ec6ac..647ef03c 100644
--- a/src/routes/(app)/login/+page.svelte
+++ b/src/routes/(app)/login/+page.svelte
@@ -1,6 +1,7 @@
 <script>
   import RegisterOrLogin from "$comp/RegisterOrLogin.svelte";
   import { onMount } from "svelte";
+  import { pin } from "$lib/store";
 
   onMount(() => {
     $pin = undefined;
-- 
cgit v1.2.3


From 152900e464169e3fffea076af5c6252f12f7645a Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 4 Dec 2023 22:28:21 -0800
Subject: prettier

---
 src/components/Balance.svelte                     | 2 +-
 src/components/Lnurlp.svelte                      | 2 +-
 src/lib/socket.js                                 | 9 +--------
 src/routes/(app)/+layout.svelte                   | 2 +-
 src/routes/(app)/[username]/generate/+page.svelte | 2 +-
 src/routes/(app)/admin/+layout.svelte             | 2 +-
 src/routes/(app)/buy/+page.svelte                 | 2 +-
 src/routes/(app)/launch/+page.svelte              | 4 ++--
 src/routes/(app)/ln/[lnurl]/+page.svelte          | 3 ++-
 src/routes/(app)/register/+page.svelte            | 2 +-
 src/routes/(app)/scan/+page.svelte                | 2 +-
 src/routes/(app)/send/+layout.svelte              | 2 +-
 svelte.config.js                                  | 4 ++--
 13 files changed, 16 insertions(+), 22 deletions(-)

(limited to 'src')

diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
index cf926b44..98a04ef6 100644
--- a/src/components/Balance.svelte
+++ b/src/components/Balance.svelte
@@ -1,7 +1,7 @@
 <script>
   import Pin from "$comp/Pin.svelte";
   import { f, s, sat, sats } from "$lib/utils";
-  import {  pin } from "$lib/store";
+  import { pin } from "$lib/store";
   import { t } from "$lib/translations";
 
   let show;
diff --git a/src/components/Lnurlp.svelte b/src/components/Lnurlp.svelte
index d4ba7bb5..6db7e7d7 100644
--- a/src/components/Lnurlp.svelte
+++ b/src/components/Lnurlp.svelte
@@ -2,7 +2,7 @@
   import { t } from "$lib/translations";
   import { enhance } from "$app/forms";
   import Numpad from "$comp/Numpad.svelte";
-  import Spinner  from "$comp/Spinner.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { pin } from "$lib/store";
 
   export let data, form;
diff --git a/src/lib/socket.js b/src/lib/socket.js
index 695b512f..8d8adb77 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -1,12 +1,5 @@
 import { get } from "svelte/store";
-import {
-  event,
-  invoice,
-  request,
-  newPayment,
-  last,
-  user,
-} from "$lib/store";
+import { event, invoice, request, newPayment, last, user } from "$lib/store";
 import { success, sat } from "$lib/utils";
 import { PUBLIC_SOCKET } from "$env/static/public";
 import { invalidate } from "$app/navigation";
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 51ebd9fe..2d3aa192 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -16,7 +16,7 @@
   import LoadingSplash from "$comp/LoadingSplash.svelte";
   import Invoice from "$comp/Invoice.svelte";
   import Password from "$comp/Password.svelte";
-  import Request  from "$comp/Request.svelte";
+  import Request from "$comp/Request.svelte";
   import { warning, protectedRoutes } from "$lib/utils";
   import { t, locale } from "$lib/translations";
   import { onNavigate } from "$app/navigation";
diff --git a/src/routes/(app)/[username]/generate/+page.svelte b/src/routes/(app)/[username]/generate/+page.svelte
index 68f5741a..71f828dc 100644
--- a/src/routes/(app)/[username]/generate/+page.svelte
+++ b/src/routes/(app)/[username]/generate/+page.svelte
@@ -2,7 +2,7 @@
   import { fail, post, wait } from "$lib/utils";
   import { onMount } from "svelte";
   import { goto, invalidate } from "$app/navigation";
-   import Pin from "$comp/Pin.svelte" 
+  import Pin from "$comp/Pin.svelte";
   import { loginRedirect, pin, password, passwordPrompt } from "$lib/store";
   import { generate } from "$lib/nostr";
   import { browser } from "$app/environment";
diff --git a/src/routes/(app)/admin/+layout.svelte b/src/routes/(app)/admin/+layout.svelte
index f85a3b08..54905ab0 100644
--- a/src/routes/(app)/admin/+layout.svelte
+++ b/src/routes/(app)/admin/+layout.svelte
@@ -1,5 +1,5 @@
 <script>
-   import LandingHeader from "$comp/LandingHeader.svelte" 
+  import LandingHeader from "$comp/LandingHeader.svelte";
   export let data;
   let { user } = data;
 </script>
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index 952d9ff5..2b81b7a8 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -4,7 +4,7 @@
   import Lock from "$comp/Lock.svelte";
   import Card from "$comp/Card.svelte";
   import Calendar from "$comp/Calendar.svelte";
-  import Spinner  from "$comp/Spinner.svelte";
+  import Spinner from "$comp/Spinner.svelte";
   import { f } from "$lib/utils";
 
   export let data, form;
diff --git a/src/routes/(app)/launch/+page.svelte b/src/routes/(app)/launch/+page.svelte
index b7c472c1..ef02ae0f 100644
--- a/src/routes/(app)/launch/+page.svelte
+++ b/src/routes/(app)/launch/+page.svelte
@@ -1,9 +1,9 @@
 <script>
-   import LandingHeader from "$comp/LandingHeader.svelte" 
+  import LandingHeader from "$comp/LandingHeader.svelte";
   import { loginRedirect } from "$lib/store";
   import { beforeNavigate } from "$app/navigation";
   import { info } from "$lib/utils";
-   import Icon from "$comp/Icon.svelte" 
+  import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
   import { goto } from "$app/navigation";
   import { scroll } from "$lib/utils";
diff --git a/src/routes/(app)/ln/[lnurl]/+page.svelte b/src/routes/(app)/ln/[lnurl]/+page.svelte
index 26616a29..236a2a25 100644
--- a/src/routes/(app)/ln/[lnurl]/+page.svelte
+++ b/src/routes/(app)/ln/[lnurl]/+page.svelte
@@ -1,5 +1,6 @@
 <script>
-   import Lnurlp from "$comp/Lnurlp.svelte"; import Lnurlw from "$comp/Lnurlw.svelte" 
+  import Lnurlp from "$comp/Lnurlp.svelte";
+  import Lnurlw from "$comp/Lnurlw.svelte";
   export let data;
   let { tag } = data;
 </script>
diff --git a/src/routes/(app)/register/+page.svelte b/src/routes/(app)/register/+page.svelte
index 9cd13ebe..5783059a 100644
--- a/src/routes/(app)/register/+page.svelte
+++ b/src/routes/(app)/register/+page.svelte
@@ -9,7 +9,7 @@
 
   import Pin from "$comp/Pin.svelte";
   import Icon from "$comp/Icon.svelte";
-  import Spinner  from "$comp/Spinner.svelte";
+  import Spinner from "$comp/Spinner.svelte";
 
   import { focus, fail } from "$lib/utils";
   import { avatar, password, loginRedirect } from "$lib/store";
diff --git a/src/routes/(app)/scan/+page.svelte b/src/routes/(app)/scan/+page.svelte
index 6f22121e..e23b9bb8 100644
--- a/src/routes/(app)/scan/+page.svelte
+++ b/src/routes/(app)/scan/+page.svelte
@@ -1,5 +1,5 @@
 <script>
-   import Icon from "$comp/Icon.svelte" 
+  import Icon from "$comp/Icon.svelte";
   import QrScanner from "qr-scanner";
   import { onMount, onDestroy } from "svelte";
   import { back } from "$lib/utils";
diff --git a/src/routes/(app)/send/+layout.svelte b/src/routes/(app)/send/+layout.svelte
index 55b01f3a..5e379c32 100644
--- a/src/routes/(app)/send/+layout.svelte
+++ b/src/routes/(app)/send/+layout.svelte
@@ -1,6 +1,6 @@
 <script>
   import { goto } from "$app/navigation";
-   import Pin from "$comp/Pin.svelte" 
+  import Pin from "$comp/Pin.svelte";
   import { pin } from "$lib/store";
 
   export let data;
diff --git a/svelte.config.js b/svelte.config.js
index efd9dce7..bc89e810 100644
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -15,8 +15,8 @@ const config = {
     },
     prerender: {
       crawl: false,
-      entries: []
-      }
+      entries: [],
+    },
   },
   onwarn: (warning, handler) => {
     if (warning.code.includes("caption") || warning.filename.includes("Toast"))
-- 
cgit v1.2.3


From a80fbe90d0fb7f82ea06a212ab304fd5062f10d2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 5 Dec 2023 07:51:08 -0800
Subject: change pwa landing page to /start

---
 src/routes/start/+server.js | 13 +++++++++++++
 static/manifest.webmanifest |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 src/routes/start/+server.js

(limited to 'src')

diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js
new file mode 100644
index 00000000..49474c36
--- /dev/null
+++ b/src/routes/start/+server.js
@@ -0,0 +1,13 @@
+import { auth, get } from "$lib/utils";
+import { redirect } from "@sveltejs/kit";
+
+export async function GET({ cookies }) {
+  let token = cookies.get("token");
+  let user;
+  if (token) {
+    user = await get("/me", auth(cookies));
+    throw redirect(307, `/${user.username}`);
+  }
+
+  throw redirect(307, "/");
+}
diff --git a/static/manifest.webmanifest b/static/manifest.webmanifest
index f1cdeec1..1f716600 100644
--- a/static/manifest.webmanifest
+++ b/static/manifest.webmanifest
@@ -3,7 +3,7 @@
   "background_color": "#000",
   "display": "fullscreen",
   "scope": "/",
-  "start_url": "/",
+  "start_url": "/start",
   "name": "Coinos",
   "description": "Bitcoin web wallet",
   "short_name": "Coinos",
-- 
cgit v1.2.3


From 7807ac9cb6ae7556b021eadf5043a2e0ba35dcf7 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 5 Dec 2023 07:54:57 -0800
Subject: return to numpad after payment

---
 src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
index ed1ae931..9740dc92 100644
--- a/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/paid/+page.svelte
@@ -61,7 +61,7 @@
   {/if}
 </div>
 
-<a href={`/${user.username}/payments`}>
+<a href={`/${user.username}/receive`}>
   <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
 </a>
 
-- 
cgit v1.2.3


From a81b289d4c05fdc95fce1e0764c3e49ab8d1c9c7 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 5 Dec 2023 09:33:41 -0800
Subject: check user cookie

---
 src/routes/start/+server.js | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js
index 49474c36..872d9bcb 100644
--- a/src/routes/start/+server.js
+++ b/src/routes/start/+server.js
@@ -2,11 +2,9 @@ import { auth, get } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export async function GET({ cookies }) {
-  let token = cookies.get("token");
-  let user;
-  if (token) {
-    user = await get("/me", auth(cookies));
-    throw redirect(307, `/${user.username}`);
+  let token = cookies.get("user");
+  if (user) {
+    throw redirect(307, `/${user}/receive`);
   }
 
   throw redirect(307, "/");
-- 
cgit v1.2.3


From 5933fe57b91f4a60ce934417fa967f6b0fa65cc0 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 5 Dec 2023 09:35:16 -0800
Subject: fix

---
 src/routes/start/+server.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js
index 872d9bcb..c351df70 100644
--- a/src/routes/start/+server.js
+++ b/src/routes/start/+server.js
@@ -2,7 +2,7 @@ import { auth, get } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export async function GET({ cookies }) {
-  let token = cookies.get("user");
+  let user = cookies.get("user");
   if (user) {
     throw redirect(307, `/${user}/receive`);
   }
-- 
cgit v1.2.3


From 62a813a07abde15de106446e9eff15009922bd11 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 5 Dec 2023 09:44:31 -0800
Subject: username cookie

---
 src/routes/(app)/[username]/+layout.server.js | 7 ++++++-
 src/routes/start/+server.js                   | 6 +++---
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/+layout.server.js b/src/routes/(app)/[username]/+layout.server.js
index 0e962173..3b25b3b5 100644
--- a/src/routes/(app)/[username]/+layout.server.js
+++ b/src/routes/(app)/[username]/+layout.server.js
@@ -1,11 +1,16 @@
 import { get } from "$lib/utils";
 import { error } from "@sveltejs/kit";
 
-export let load = async ({ depends, params: { username } }) => {
+export let load = async ({ cookies, depends, params: { username } }) => {
   depends("app:user");
 
   try {
     let subject = await get(`/users/${username}`);
+
+    let expires = new Date();
+    expires.setSeconds(expires.getSeconds() + 380 * 24 * 60 * 60);
+    cookies.set("username", username, { path: "/", expires });
+
     return { subject };
   } catch (e) {
     throw error(500, "Unable to retrieve user account data");
diff --git a/src/routes/start/+server.js b/src/routes/start/+server.js
index c351df70..e5d93497 100644
--- a/src/routes/start/+server.js
+++ b/src/routes/start/+server.js
@@ -2,9 +2,9 @@ import { auth, get } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export async function GET({ cookies }) {
-  let user = cookies.get("user");
-  if (user) {
-    throw redirect(307, `/${user}/receive`);
+  let username = cookies.get("username");
+  if (username) {
+    throw redirect(307, `/${username}/receive`);
   }
 
   throw redirect(307, "/");
-- 
cgit v1.2.3


From 2aeb69b785485acdf0f13ba4b2e8ef33dca33c1e Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 5 Dec 2023 09:48:34 -0800
Subject: show qr by default

---
 src/routes/(app)/[username]/invoice/[id]/+page.svelte | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/routes/(app)/[username]/invoice/[id]/+page.svelte b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
index b18c1a70..0ff1c21c 100644
--- a/src/routes/(app)/[username]/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[id]/+page.svelte
@@ -49,8 +49,7 @@
     user: { username, currency },
   } = invoice;
 
-  $: showQr = invoice.uid === user?.id;
-
+  let showQr = true;
   $: src = sm;
 
   let qr;
-- 
cgit v1.2.3


From 54f6d24f819816d6d687dab7291e9db334286e52 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 6 Dec 2023 09:11:26 -0800
Subject: verify email

---
 .../[username]/settings/[...tab]/+page.svelte      | 14 ++++++---
 .../(app)/[username]/settings/[...tab]/_pos.svelte | 12 ++++++--
 .../(app)/[username]/verify/[code]/+page.server.js | 13 +++++++++
 .../(app)/[username]/verify/[code]/+page.svelte    | 34 ++++++++++++++++++++++
 static/icons/clock.svg                             |  5 ++--
 static/icons/orangeclock.svg                       |  4 +++
 6 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 src/routes/(app)/[username]/verify/[code]/+page.server.js
 create mode 100644 src/routes/(app)/[username]/verify/[code]/+page.svelte
 create mode 100644 static/icons/orangeclock.svg

(limited to 'src')

diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index b7a9ccfb..d0ee7eba 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -8,7 +8,7 @@
   import Spinner from "$comp/Spinner.svelte";
   import Pin from "$comp/Pin.svelte";
   import { t } from "$lib/translations";
-  import { fail, post, warning, success } from "$lib/utils";
+  import { fail, post, sleep, warning, success } from "$lib/utils";
   import { avatar, banner, password, pin } from "$lib/store";
   import { upload } from "$lib/upload";
   import { page } from "$app/stores";
@@ -128,13 +128,19 @@
           await sign({ event, user });
           await send(event);
         } catch (e) {
-          warning("nostr profile could not be updated");
+          warning("Nostr profile could not be updated");
         }
       }
 
       if (user.email !== prev.email) {
-        await post("/api/verify", { test: true });
-      }
+        try {
+        await post("/api/request", user);
+        warning("Verification email sent");
+        await sleep(4000);
+        } catch(e) {
+          console.log(e);
+        }
+        }
 
       const response = await fetch(formElement.action, {
         method: "POST",
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index cbf31a68..ed9f1ac4 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -33,12 +33,20 @@
   </select>
 </div>
 
-<div class="space-y-1">
+<div class="space-y-1 relative">
   <label for="email" class="font-bold block">{$t("user.settings.email")}</label>
   <p class="text-secondary">
     {$t("user.settings.emailDescription")}
   </p>
-  <input type="text" name="email" bind:value={user.email} />
+
+  <div class="relative">
+    <input type="text" name="email" bind:value={user.email} />
+    {#if user.verified}
+      <Icon icon="check" style="absolute right-5 top-3 w-8" />
+    {:else}
+      <Icon icon="orangeclock" style="absolute right-5 top-3 w-8" />
+    {/if}
+  </div>
 </div>
 
 <div>
diff --git a/src/routes/(app)/[username]/verify/[code]/+page.server.js b/src/routes/(app)/[username]/verify/[code]/+page.server.js
new file mode 100644
index 00000000..b777b2b8
--- /dev/null
+++ b/src/routes/(app)/[username]/verify/[code]/+page.server.js
@@ -0,0 +1,13 @@
+import { get } from "$lib/utils";
+import { error } from "@sveltejs/kit";
+
+export let load = async ({ params: { code } }) => {
+  try {
+    console.log("CODE", code);
+    let user = await get(`/verify/${code}`);
+    return { user };
+  } catch (e) {
+    console.log(e);
+    return { error: "Verification failed" };
+  }
+};
diff --git a/src/routes/(app)/[username]/verify/[code]/+page.svelte b/src/routes/(app)/[username]/verify/[code]/+page.svelte
new file mode 100644
index 00000000..e9baec8a
--- /dev/null
+++ b/src/routes/(app)/[username]/verify/[code]/+page.svelte
@@ -0,0 +1,34 @@
+<script>
+  import Icon from "$comp/Icon.svelte";
+  import { t } from "$lib/translations";
+
+  export let data;
+  let { user, error } = data;
+</script>
+
+<div class="container px-4 text-center mx-auto">
+  {#if error}
+    <h1 class="text-3xl md:text-4xl font-bold mb-6">
+      Email verification failed
+    </h1>
+  {:else if user.verified}
+    <div
+      class="flex w-full py-5 max-w-[200px] mx-auto"
+      in:scale={{ start: 0.5 }}
+    >
+      <Icon icon="check" style="mx-auto" />
+    </div>
+
+    <h1 class="text-3xl md:text-4xl font-bold mb-6">
+      Email verified successfully!
+    </h1>
+  {/if}
+</div>
+
+<a href={`/${user.username}`}>
+  <div class="opacity-0 w-screen h-screen fixed top-0 left-0 z-50" />
+</a>
+
+<div class="fixed bottom-10 w-full text-center">
+  {$t("payments.tapAnywhere")}
+</div>
diff --git a/static/icons/clock.svg b/static/icons/clock.svg
index 9ea9d1f3..c91ef3dd 100644
--- a/static/icons/clock.svg
+++ b/static/icons/clock.svg
@@ -1,3 +1,4 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12 8V12L15 15M21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 7V12L14.5 10.5M21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12Z" stroke="black" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
 </svg>
diff --git a/static/icons/orangeclock.svg b/static/icons/orangeclock.svg
new file mode 100644
index 00000000..2b07c198
--- /dev/null
+++ b/static/icons/orangeclock.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?><!-- Uploaded to: SVG Repo, www.svgrepo.com, Generator: SVG Repo Mixer Tools -->
+<svg width="800px" height="800px" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12 7V12L14.5 10.5M21 12C21 16.9706 16.9706 21 12 21C7.02944 21 3 16.9706 3 12C3 7.02944 7.02944 3 12 3C16.9706 3 21 7.02944 21 12Z" stroke="#FF9900" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" />
+</svg>
-- 
cgit v1.2.3


From c4e36c6e9b1132d3fc89fbba7fc77848b29a0915 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 6 Dec 2023 13:56:22 -0800
Subject: email verify

---
 .../[username]/settings/[...tab]/+page.server.js   |   3 ++-
 .../[username]/settings/[...tab]/+page.svelte      |  26 +++++++++++++++------
 .../(app)/[username]/settings/[...tab]/_pos.svelte |   1 +
 .../(app)/[username]/verify/[code]/+page.server.js |   1 -
 .../(app)/[username]/verify/[code]/+page.svelte    |   1 +
 src/routes/(static)/docs/+page.svelte              |  10 +++++++-
 static/images/logo.jpg                             | Bin 0 -> 30971 bytes
 7 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 static/images/logo.jpg

(limited to 'src')

diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
index 156b6062..2acad2dd 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.server.js
@@ -1,9 +1,10 @@
 import { fail, redirect } from "@sveltejs/kit";
 import { fd, auth, get, post } from "$lib/utils";
 
-export function load({ params, url }) {
+export function load({ cookies, params, url }) {
   if (url.pathname.endsWith("settings"))
     throw redirect(307, url.pathname + "/account");
+  params.cookies = cookies.getAll();
   return params;
 }
 
diff --git a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
index d0ee7eba..baef4d8e 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/+page.svelte
@@ -8,7 +8,7 @@
   import Spinner from "$comp/Spinner.svelte";
   import Pin from "$comp/Pin.svelte";
   import { t } from "$lib/translations";
-  import { fail, post, sleep, warning, success } from "$lib/utils";
+  import { fail, auth, post, sleep, warning, success } from "$lib/utils";
   import { avatar, banner, password, pin } from "$lib/store";
   import { upload } from "$lib/upload";
   import { page } from "$app/stores";
@@ -28,7 +28,7 @@
   let submit;
   let formElement;
 
-  let { user, token, rates, tab } = data;
+  let { user, token, rates, tab, cookies } = data;
   let prev;
 
   $: update(data);
@@ -134,13 +134,24 @@
 
       if (user.email !== prev.email) {
         try {
-        await post("/api/request", user);
-        warning("Verification email sent");
-        await sleep(4000);
-        } catch(e) {
+          cookies.get = function (n) {
+            return this.find((c) => c.name === n).value;
+          };
+
+          user.verified = false;
+
+          await post(
+            "/api/request",
+            { id: user.id, email: user.email },
+            auth(cookies)
+          );
+
+          warning("Verification email sent");
+          await sleep(4000);
+        } catch (e) {
           console.log(e);
         }
-        }
+      }
 
       const response = await fetch(formElement.action, {
         method: "POST",
@@ -188,6 +199,7 @@
         {#each tabs.filter((t) => t.name !== "shopify") as { name, key }}
           <a href={`/${user.username}/settings/${name}`}>
             <button
+              type="button"
               class="hover:opacity-80"
               class:text-black={tab === name ||
                 (tab === "shopify" && name === "pos")}
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
index ed9f1ac4..8193bc9c 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_pos.svelte
@@ -73,6 +73,7 @@
 
 <a href="./shopify">
   <button
+    type="button"
     class="flex rounded-full border py-2 px-4 font-bold hover:opacity-80 w-full gap-2 my-5 justify-center"
   >
     <img src="/icons/shopify.svg" class="w-8" />
diff --git a/src/routes/(app)/[username]/verify/[code]/+page.server.js b/src/routes/(app)/[username]/verify/[code]/+page.server.js
index b777b2b8..fda11c9e 100644
--- a/src/routes/(app)/[username]/verify/[code]/+page.server.js
+++ b/src/routes/(app)/[username]/verify/[code]/+page.server.js
@@ -3,7 +3,6 @@ import { error } from "@sveltejs/kit";
 
 export let load = async ({ params: { code } }) => {
   try {
-    console.log("CODE", code);
     let user = await get(`/verify/${code}`);
     return { user };
   } catch (e) {
diff --git a/src/routes/(app)/[username]/verify/[code]/+page.svelte b/src/routes/(app)/[username]/verify/[code]/+page.svelte
index e9baec8a..1e099dae 100644
--- a/src/routes/(app)/[username]/verify/[code]/+page.svelte
+++ b/src/routes/(app)/[username]/verify/[code]/+page.svelte
@@ -1,4 +1,5 @@
 <script>
+  import { scale } from "svelte/transition";
   import Icon from "$comp/Icon.svelte";
   import { t } from "$lib/translations";
 
diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte
index bf7ecb20..5c7876aa 100644
--- a/src/routes/(static)/docs/+page.svelte
+++ b/src/routes/(static)/docs/+page.svelte
@@ -17,10 +17,18 @@
 <div class="space-y-8 lg:text-xl mt-20 pt-20 md:pt-0 w-full max-w-full">
   <h1 class="text-4xl">Documentation</h1>
 
+  <p class="text-secondary">
+    Coinos is free and open source software. You can run it on your own server
+    and connect it to your own Bitcoin and Lightning nodes. The code is
+    available for download at <a href="https://github.com/coinos"
+      class="text-black">https://github.com/coinos</a
+    >
+  </p>
+
   <p class="text-secondary">
     Coinos has a simple REST API that can be used to register accounts and make
     payments and queries. The following examples show how you can call the API
-    with <a href="https://curl.se/" class="font-bold">curl</a> from your command
+    with <a href="https://curl.se/" class="text-black">curl</a> from your command
     line.
   </p>
 
diff --git a/static/images/logo.jpg b/static/images/logo.jpg
new file mode 100644
index 00000000..08995cc2
Binary files /dev/null and b/static/images/logo.jpg differ
-- 
cgit v1.2.3