From dce12a5ccff91bd2b985c9664ca29a4c1a083cf2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 21 Mar 2023 09:58:45 -0700
Subject: pin code refactor

---
 src/components/Balance.svelte | 35 ++++++++++++++++--------
 src/components/Pin.svelte     | 62 +++++++++++++++++++++++++++++++------------
 src/components/Pinpad.svelte  |  3 +--
 3 files changed, 70 insertions(+), 30 deletions(-)

(limited to 'src/components')

diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte
index cc923b7d..fddaae3e 100644
--- a/src/components/Balance.svelte
+++ b/src/components/Balance.svelte
@@ -1,21 +1,34 @@
 <script>
+	import { Pin } from '$comp';
 	import { f, s, sat, sats } from '$lib/utils';
-	import { animatedRate } from '$lib/store';
+	import { animatedRate, pin } from '$lib/store';
 	import { t } from '$lib/translations';
 
+	let show;
 	export let user;
 </script>
 
+{#if show && user.haspin && $pin?.length !== 6}
+	<Pin />
+{/if}
+
 <div class="space-y-2">
-	<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)}>Show Balance</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>
+		<div class="text-secondary text-2xl">
+			⚡️{s(user.balance)}
+		</div>
+	{/if}
 </div>
diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte
index 1d7ed65b..40a53b8b 100644
--- a/src/components/Pin.svelte
+++ b/src/components/Pin.svelte
@@ -1,31 +1,59 @@
 <script>
 	import { t } from '$lib/translations';
-	import { focus } from '$lib/utils';
+	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 = () => (pin = '');
+	export let cancel = () => (p = '');
+	export let persist = true;
+	export let notify = true;
 
-	let pin = '';
+	let p = '';
 
 	$: update(value);
-	let update = (v) => (pin = v);
+	let update = (value) => (p = value);
 
-	$: pin.toString().length > 5 && (value = pin.toString());
+	$: 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 ERR', e);
+		}
+
+		if (result) {
+			if (notify) success('Pin confirmed');
+			if (persist) $pin = p;
+		} else {
+			fail('Invalid pin');
+			value = '';
+		}
+	};
 </script>
 
-<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={pin} {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>
+{#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>
+{/if}
diff --git a/src/components/Pinpad.svelte b/src/components/Pinpad.svelte
index bf3778f7..f55dc40d 100644
--- a/src/components/Pinpad.svelte
+++ b/src/components/Pinpad.svelte
@@ -1,7 +1,6 @@
 <script>
 	import { Left, Icon } from '$comp';
-	import { pin, selectedRate } from '$lib/store';
-	import { f, s, focus, post, warning, sat, sats } from '$lib/utils';
+	import { focus, post, warning } from '$lib/utils';
 	import { t } from '$lib/translations';
 
 	export let v;
-- 
cgit v1.2.3


From aa258684dd8cf953afe540abb233ab0daad09253 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 22 Mar 2023 16:57:03 -0700
Subject: password reset

---
 src/components/Pin.svelte                       |  2 +-
 src/routes/(app)/[username]/generate/+server.js |  3 ++-
 src/routes/(app)/[username]/reset/+server.js    | 10 ++++++++++
 src/routes/(app)/admin/+page.svelte             | 12 +++++++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 src/routes/(app)/[username]/reset/+server.js

(limited to 'src/components')

diff --git a/src/components/Pin.svelte b/src/components/Pin.svelte
index 40a53b8b..0cff904f 100644
--- a/src/components/Pin.svelte
+++ b/src/components/Pin.svelte
@@ -28,7 +28,7 @@
 		try {
 			result = await post('/pin', { pin: p });
 		} catch (e) {
-			console.log('PIN ERR', e);
+			console.log('Pin check failed', e);
 		}
 
 		if (result) {
diff --git a/src/routes/(app)/[username]/generate/+server.js b/src/routes/(app)/[username]/generate/+server.js
index 1335c3e2..e1df08e3 100644
--- a/src/routes/(app)/[username]/generate/+server.js
+++ b/src/routes/(app)/[username]/generate/+server.js
@@ -3,7 +3,8 @@ import { error, json } from '@sveltejs/kit';
 
 export async function POST({ cookies, request }) {
 	try {
-		return json(await post(`/user`, await request.json(), auth(cookies)));
+		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]/reset/+server.js b/src/routes/(app)/[username]/reset/+server.js
new file mode 100644
index 00000000..73d3d849
--- /dev/null
+++ b/src/routes/(app)/[username]/reset/+server.js
@@ -0,0 +1,10 @@
+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);
+}
diff --git a/src/routes/(app)/admin/+page.svelte b/src/routes/(app)/admin/+page.svelte
index 011ed6a2..831b0284 100644
--- a/src/routes/(app)/admin/+page.svelte
+++ b/src/routes/(app)/admin/+page.svelte
@@ -1,12 +1,22 @@
 <script>
+  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-3">
+	<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}
-- 
cgit v1.2.3


From f4507d0758c5e3e5e879d70cb1c5dbdbfd2186e8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Wed, 29 Mar 2023 08:08:41 -0700
Subject: currency display

---
 src/components/Lnurlp.svelte                               |  6 ++++--
 src/components/Lnurlw.svelte                               |  5 +++--
 src/components/Numpad.svelte                               | 14 +++++++-------
 .../(app)/[username]/receive/[...param]/+page.svelte       |  5 +++--
 .../(app)/send/bitcoin/[address]/[...amount]/+page.svelte  | 11 +++++++----
 src/routes/(app)/send/lightning/[payreq]/+page.svelte      |  5 +++--
 src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte  |  5 ++++-
 .../(app)/send/user/[username]/[...amount]/+page.server.js |  5 +++--
 .../(app)/send/user/[username]/[...amount]/+page.svelte    |  8 ++++----
 9 files changed, 38 insertions(+), 26 deletions(-)

(limited to 'src/components')

diff --git a/src/components/Lnurlp.svelte b/src/components/Lnurlp.svelte
index ab0c50ce..9918a3f4 100644
--- a/src/components/Lnurlp.svelte
+++ b/src/components/Lnurlp.svelte
@@ -6,7 +6,9 @@
 
 	export let data, form;
 	let { currency } = data.user;
-	let { minSendable, maxSendable, callback, metadata } = data;
+	let { minSendable, maxSendable, callback, metadata, rates } = data;
+
+	$: rate = rates[currency];
 
 	let amount = Math.round(minSendable / 1000),
 		loading;
@@ -33,7 +35,7 @@
 		</div>
 	{/if}
 
-	<Numpad bind:amount {currency} />
+	<Numpad bind:amount bind:rate {currency} />
 
 	<form action="?/pay" method="POST" use:enhance on:submit={submit}>
 		<input name="amount" value={amount} type="hidden" />
diff --git a/src/components/Lnurlw.svelte b/src/components/Lnurlw.svelte
index f2855b53..f780d755 100644
--- a/src/components/Lnurlw.svelte
+++ b/src/components/Lnurlw.svelte
@@ -7,7 +7,8 @@
 	export let data, form;
 
 	let { currency, username } = data.user;
-	let { defaultDescription, minWithdrawable, maxWithdrawable, k1, callback } = data;
+	let { defaultDescription, minWithdrawable, maxWithdrawable, k1, callback, rates } = data;
+	$: rate = rates[currency];
 
 	let amount = Math.round(maxWithdrawable / 1000),
 		loading;
@@ -28,7 +29,7 @@
 		</div>
 	{/if}
 
-	<Numpad bind:amount {currency} />
+	<Numpad bind:amount {currency} bind:rate />
 
 	<form action="?/withdraw" method="POST" use:enhance on:submit={submit}>
 		<input name="amount" value={amount} type="hidden" />
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 77a4f38b..20bfe561 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -7,17 +7,19 @@
 	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 / ($selectedRate / sats));
+			amount = Math.round(f / (rate / sats));
 		} else {
-			amountFiat = ((a * $selectedRate) / sats).toFixed(2);
+			amountFiat = ((a * rate) / sats).toFixed(2);
 		}
 	};
 
@@ -60,7 +62,7 @@
 						amount = 0;
 					}
 				}
-			} else if (value !== '.' && value !== '<' && parseInt(amountFiat + value) > $selectedRate) {
+			} else if (value !== '.' && value !== '<' && parseInt(amountFiat + value) > rate) {
 				warning($t('user.receive.lessThan1BTCWarning'));
 			} else if (amountFiat !== 0 && amountFiat.match(/\.../)) {
 				return;
@@ -184,12 +186,10 @@
 					type="button"
 					on:click={() => {
 						if (fiat) {
-							amount = parseInt((amountFiat / ($selectedRate / sats)).toFixed(0));
+							amount = parseInt((amountFiat / (rate / sats)).toFixed(0));
 						} else {
 							amountFiat =
-								(amount * ($selectedRate / sats)).toFixed(2) > 0.0
-									? (amount * ($selectedRate / sats)).toFixed(2)
-									: 0;
+								(amount * (rate / sats)).toFixed(2) > 0.0 ? (amount * (rate / sats)).toFixed(2) : 0;
 						}
 						fiat = !fiat;
 					}}><Icon icon="swap" style="inline hover:opacity-80" /></button
diff --git a/src/routes/(app)/[username]/receive/[...param]/+page.svelte b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
index 95495368..27b339aa 100644
--- a/src/routes/(app)/[username]/receive/[...param]/+page.svelte
+++ b/src/routes/(app)/[username]/receive/[...param]/+page.svelte
@@ -18,9 +18,10 @@
 
 	let lightning = true;
 	let { currency, username, prompt } = data.subject;
-	let { user } = data;
+	let { rates, user } = data;
 	let submit;
 
+	$: rate = rates[currency];
 	$: type = lightning ? 'lightning' : 'bitcoin';
 </script>
 
@@ -37,7 +38,7 @@
 	<input type="hidden" name="prompt" value={prompt} />
 
 	<div class="space-y-3 w-[300px] mx-auto">
-		<Numpad bind:amount bind:currency {submit} />
+		<Numpad bind:amount bind:currency bind:rate {submit} />
 		<button
 			bind:this={submit}
 			type="submit"
diff --git a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
index 77d5fde6..342eeebe 100644
--- a/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/bitcoin/[address]/[...amount]/+page.svelte
@@ -5,15 +5,18 @@
 	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, selectedRate } from '$lib/store';
+	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);
 
@@ -64,7 +67,7 @@
 	{#if confirmed}
 		<div class="text-center">
 			<h2 class="text-2xl md:text-3xl font-semibold">
-				{f(toFiat(amount, $selectedRate), currency)}
+				{f(toFiat(amount, rate), currency)}
 			</h2>
 			<h3 class="text-secondary md:text-lg mb-6 mt-1">⚡️{s(amount)}</h3>
 		</div>
@@ -74,7 +77,7 @@
 
 			<div class="relative">
 				<h2 class="text-xl font-semibold">
-					{f(toFiat(fee + ourfee, $selectedRate), currency)}
+					{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}
@@ -83,7 +86,7 @@
 			</div>
 		</div>
 	{:else}
-		<Numpad bind:amount bind:fiat {currency} {submit} />
+		<Numpad bind:amount bind:fiat {currency} {submit} bind:rate />
 	{/if}
 
 	<form method="POST" use:enhance on:submit={toggle}>
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.svelte b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
index af07a565..cb1b539e 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.svelte
@@ -10,13 +10,14 @@
 	export let form;
 
 	let { payreq } = $page.params;
-	let { alias } = data;
+	let { alias, rates } = data;
 
 	let { currency } = data.user;
 	let a;
 	let maxfee = 100;
 
 	$: amount = form?.amount || data.amount;
+	$: rate = rates[currency];
 
 	let loading;
 	let submit = () => (loading = true);
@@ -91,7 +92,7 @@
 	{: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} />
+			<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
diff --git a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte b/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
index da761cc2..6aecf8f3 100644
--- a/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/pot/[name]/[...amount]/+page.svelte
@@ -10,9 +10,12 @@
 	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 = () => {
@@ -32,7 +35,7 @@
 {/if}
 
 <div class="container px-4 mt-20 max-w-xl mx-auto">
-	<Numpad bind:amount {currency} />
+	<Numpad bind:amount {currency} bind:rate />
 
 	<form method="POST" use:enhance on:submit={submit}>
 		<input name="name" value={name} type="hidden" />
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 ba758036..a01cdcfc 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
@@ -10,8 +10,9 @@ export async function load({ cookies, params, parent }) {
 
 	if (subject.username === user?.username) throw error(500, { message: 'Cannot send to self' });
 
+	let rate;
 	if (amount) {
-		let rate = rates[currency ? currency.toUpperCase() : subject.currency];
+		rate = rates[currency ? currency.toUpperCase() : subject.currency];
 		if (!rate) throw error(500, 'Invalid currency symbol');
 		if (currency) amount = (amount * sats) / rate;
 
@@ -27,7 +28,7 @@ export async function load({ cookies, params, parent }) {
 		throw redirect(307, `/${username}/invoice/${hash}`);
 	}
 
-	return { amount, subject };
+	return { amount, rate, subject };
 }
 
 export const actions = {
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index 6562de8a..2f59f492 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -10,18 +10,18 @@
 	export let data;
 	export let form;
 
-	let { subject, rates, user } = data;
-	let currency = subject.currency || 'USD';
+	let { subject, rate, rates, user } = data;
+	let currency = user.currency || subject.currency || 'USD';
 
 	let amount = form?.amount || data.amount;
 	let a,
 		af,
 		fiat = !amount,
 		hash,
-		rate,
 		amountFiat = 0;
 
 	selectedRate.subscribe((r) => rate || (amountFiat = amount * (r / sats)));
+	$: r = rate || rates[user.currency || subject.currency];
 
 	let setAmount = async () => {
 		amount = a;
@@ -60,7 +60,7 @@
 {/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 />
+	<Numpad bind:amount={a} bind:amountFiat={af} {currency} bind:fiat bind:rate={r} />
 
 	<form method="POST" use:enhance on:submit={submit}>
 		<input name="amount" value={amount} type="hidden" />
-- 
cgit v1.2.3


From bf83d563fdac23da32b547130f0e24b48bf4b743 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 4 Apr 2023 15:11:42 -0700
Subject: rate refactoring

---
 src/components/Numpad.svelte                       |   1 -
 src/lib/store.js                                   |   1 -
 src/lib/utils.js                                   |  50 ++++---
 src/routes/(app)/+layout.svelte                    |  17 +--
 .../(app)/[username]/(profile)/+layout.svelte      |  24 +--
 src/routes/(app)/[username]/(profile)/+page.svelte |  41 ++++--
 .../(app)/[username]/dashboard/+page.server.js     |   4 -
 src/routes/(app)/[username]/dashboard/+page.svelte | 163 ---------------------
 .../[username]/invoice/[hash]/+layout.server.js    |   6 +-
 .../[username]/invoice/[hash]/paid/+page.svelte    |   8 +-
 src/routes/(app)/buy/+page.svelte                  |  21 +--
 src/routes/(app)/launch/purchase/+page.svelte      |   1 -
 src/routes/(app)/pot/[name]/+page.svelte           |   2 +-
 .../send/user/[username]/[...amount]/+page.svelte  |   5 +-
 14 files changed, 77 insertions(+), 267 deletions(-)
 delete mode 100644 src/routes/(app)/[username]/dashboard/+page.server.js
 delete mode 100644 src/routes/(app)/[username]/dashboard/+page.svelte

(limited to 'src/components')

diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 20bfe561..82512678 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -1,6 +1,5 @@
 <script>
 	import { Left, Icon } from '$comp';
-	import { selectedRate } from '$lib/store';
 	import { f, s, post, warning, sat, sats } from '$lib/utils';
 	import { t } from '$lib/translations';
 
diff --git a/src/lib/store.js b/src/lib/store.js
index 6853386c..86405e39 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -50,6 +50,5 @@ export const pin = persistSession('pin', undefined);
 export const rate = writable();
 export const request = writable();
 export const requestRedirect = writable();
-export const selectedRate = writable();
 export const token = persistSession('token');
 export const user = writable();
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 18554bd9..5eef79fc 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -10,11 +10,11 @@ export function scroll(section) {
 	setTimeout(() => section.scrollIntoView({ behavior: 'smooth' }), 500);
 }
 
-const base = browser ? '' : PUBLIC_COINOS_URL;
+let base = browser ? '' : PUBLIC_COINOS_URL;
 
-export const 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 const g = (url, fetch, headers) =>
+export let g = (url, fetch, headers) =>
 	fetch(base + url, { headers })
 		.then((r) => r.text())
 		.then((body) => {
@@ -25,7 +25,7 @@ export const g = (url, fetch, headers) =>
 			}
 		});
 
-export const get = (url, headers = {}) =>
+export let get = (url, headers = {}) =>
 	fetch(base + url, { headers })
 		.then(async (r) => {
 			if (r.ok) return r.text();
@@ -39,7 +39,7 @@ export const get = (url, headers = {}) =>
 			}
 		});
 
-export const post = (url, body, headers) => {
+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) => {
@@ -69,7 +69,7 @@ export const post = (url, body, headers) => {
 		});
 };
 
-export const copy = (text) => {
+export let copy = (text) => {
 	navigator.clipboard.writeText(text);
 	success('Copied!');
 };
@@ -85,7 +85,7 @@ export function reverseFormat(val, locale) {
 
 export let protectedRoutes = [/customers/, /settings/, /payments/];
 
-export const success = (m) => {
+export let success = (m) => {
 	toast.pop();
 	toast.push(m, {
 		theme: {
@@ -94,7 +94,7 @@ export const success = (m) => {
 	});
 };
 
-export const warning = (m) => {
+export let warning = (m) => {
 	toast.pop();
 	toast.push(m, {
 		theme: {
@@ -102,7 +102,7 @@ export const warning = (m) => {
 		}
 	});
 };
-export const fail = (m) => {
+export let fail = (m) => {
 	toast.pop();
 	toast.push(m, {
 		theme: {
@@ -110,7 +110,7 @@ export const fail = (m) => {
 		}
 	});
 };
-export const info = (m) => {
+export let info = (m) => {
 	toast.pop();
 	toast.push(m, {
 		theme: {
@@ -119,7 +119,7 @@ export const info = (m) => {
 	});
 };
 
-export const login = async (user, cookies) => {
+export let login = async (user, cookies) => {
 	let maxAge = 30 * 24 * 60 * 60;
 
 	let res = await fetch(base + '/login', {
@@ -143,17 +143,17 @@ export const login = async (user, cookies) => {
 	cookies.set('token', token, opts);
 };
 
-export const auth = (cookies) => ({ authorization: `Bearer ${cookies.get('token')}` });
+export let auth = (cookies) => ({ authorization: `Bearer ${cookies.get('token')}` });
 
-export const fiat = (amount, rate) => (amount * rate) / sats;
-export const fd = async (req) => {
+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;
 };
 
-export const f = (s, currency) =>
+export let f = (s, currency) =>
 	new Intl.NumberFormat('en-US', {
 		style: 'currency',
 		currency
@@ -161,8 +161,8 @@ export const f = (s, currency) =>
 		.format(s)
 		.replace('CA', '');
 
-export const s = (s) => new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(s);
-export const sat = (s) => {
+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);
@@ -177,20 +177,20 @@ export const sat = (s) => {
 	);
 };
 
-export const sats = 100000000;
+export let sats = 100000000;
 
-export const back = () => browser && (history.length ? history.go(-1) : goto('/'));
-export const 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 const sleep = (n) => new Promise((r) => setTimeout(r, n));
-export const wait = async (f, n = 100, s = 300) => {
+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();
 };
 
-export const stretch = async (password, salt) =>
+export let stretch = async (password, salt) =>
 	crypto.subtle.deriveKey(
 		{
 			name: 'PBKDF2',
@@ -236,10 +236,12 @@ export function ss(str1, str2) {
 	return 0.0;
 }
 
-export const types = {
+export let types = {
 	bitcoin: 'bitcoin',
 	lightning: 'lightning',
 	internal: 'internal',
 	pot: 'pot',
 	classic: 'classic'
 };
+
+export let ease = (t) => (t < 0.5 ? 8 * t * t * t * t : 1 - 8 * --t * t * t * t);
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 0dcdc1b2..ae9bcc50 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -2,7 +2,7 @@
 	import { SvelteToast } from '@zerodevx/svelte-toast';
 	import { onDestroy, onMount } from 'svelte';
 	import { close, connect, send } from '$lib/socket';
-	import { last, selectedRate, invoice, rate, user, request, passwordPrompt } from '$lib/store';
+	import { last, invoice, request, passwordPrompt } from '$lib/store';
 	import { page } from '$app/stores';
 	import { browser } from '$app/environment';
 	import { goto } from '$app/navigation';
@@ -15,16 +15,7 @@
 	export let data;
 
 	let { subject } = $page.data;
-	let r, u, token, rates;
-
-	$: update(data);
-	let update = () => {
-		({ user: u, rate: r, token, rates } = data);
-		$rate = r;
-		$user = u;
-	};
-
-	$: $selectedRate = r * (rates[u?.currency || 'USD'] / rates.USD);
+  let { rate, user, token, rates } = data;
 
 	onMount(() => {
 		let localStorageLocale = localStorage.getItem(localeLocalStorageKey);
@@ -89,9 +80,9 @@
 </main>
 
 {#if $invoice}
-	<Invoice user={u} />
+	<Invoice {user} />
 {/if}
 
 {#if $request}
-	<Request user={u} />
+	<Request {user} />
 {/if}
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 006bbf72..3d814668 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -1,13 +1,13 @@
 <script>
 	import { f, s, sats } from '$lib/utils';
-	import { animatedRate, selectedRate } from '$lib/store';
+	import { animatedRate } from '$lib/store';
 	import { Icon } from '$comp';
 	import { t } from '$lib/translations';
 	import { sign, send } from '$lib/nostr';
 
 	export let data;
-	let events, user, subject, src, text;
-	$: ({ events, user, subject, src, text } = data);
+	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;
@@ -42,24 +42,6 @@
 
 	$: following = !!user?.follows.find((t) => t.includes(subject.pubkey));
 
-	let ease = (t) => (t < 0.5 ? 8 * t * t * t * t : 1 - 8 * --t * t * t * t);
-	let i;
-
-	let o = $selectedRate;
-	$: animate($selectedRate);
-	let animate = (n) => {
-		clearInterval(i);
-
-		let t = 0;
-		let d = o - n;
-
-		i = setInterval(() => {
-			$animatedRate = (o - d * ease(t / 100)).toFixed(2);
-			if (t > 80) (o = n) && clearInterval(i);
-			t++;
-		}, 10);
-	};
-
 	let hideBio = true;
 	let toggleBio = () => (hideBio = false);
 </script>
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 09335e9c..1ce09f38 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -2,24 +2,23 @@
 	import { onMount } from 'svelte';
 	import { Icon, Avatar, Balance, Feed } from '$comp';
 	import { t } from '$lib/translations';
-	import { f, sat, sats } from '$lib/utils';
+	import { ease, f, sat, sats } from '$lib/utils';
 	import { sign, send, encrypt, decrypt } from '$lib/nostr';
-	import { event as e, password } from '$lib/store';
+	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 } = data;
+	let { messages, notes, invoices, sent, received, subject, user, rates } = data;
 	$: refresh(data);
-	let refresh = (d) => ({ messages, notes, invoices, sent, received, subject, user } = d);
+	let refresh = (d) => ({ messages, notes, invoices, sent, received, subject, user, rates } = d);
 
 	let keys = new Set();
 	let latest = [];
-	let i = 0;
 	let ready;
 
 	e.subscribe(async (event) => {
 		if (!(event && ready)) return;
-		if (event.recipient.id === user?.id && !~latest.findIndex((m) => m.id === event.id)) {
+		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);
@@ -34,22 +33,46 @@
 
 	$: initialize($password);
 	let initialize = async (p) => {
+		let i = 0;
 		ready = false;
-		if (!p) return;
+		if (!p || !user) return;
 		while (i < messages.length) {
 			let event = messages[i];
-			let k = event.author.id === user.id ? event.recipient.pubkey : event.author.pubkey;
+			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);
 			}
-			i++;
 		}
 
 		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 (!o) o = r;
+
+		let t = 0;
+		let d = o - r;
+
+		i = setInterval(() => {
+			$animatedRate = (o - d * ease(t / 100)).toFixed(2);
+			if (t > 80) (o = r) && clearInterval(i);
+			t++;
+		}, 10);
+	});
 </script>
 
 <div class="space-y-8">
diff --git a/src/routes/(app)/[username]/dashboard/+page.server.js b/src/routes/(app)/[username]/dashboard/+page.server.js
deleted file mode 100644
index ae66a20d..00000000
--- a/src/routes/(app)/[username]/dashboard/+page.server.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { redirect } from '@sveltejs/kit';
-export async function load({ params: { username } }) {
-	throw redirect(301, `/${username}`);
-}
diff --git a/src/routes/(app)/[username]/dashboard/+page.svelte b/src/routes/(app)/[username]/dashboard/+page.svelte
deleted file mode 100644
index d8761ea9..00000000
--- a/src/routes/(app)/[username]/dashboard/+page.svelte
+++ /dev/null
@@ -1,163 +0,0 @@
-<script>
-	import { enhance } from '$app/forms';
-	import { f, s, post, fail, sat, sats } from '$lib/utils';
-	import { tick } from 'svelte';
-	import { Avatar, Icon } from '$comp';
-	import { rate, password, selectedRate } from '$lib/store';
-	import { goto } from '$app/navigation';
-	import { t } from '$lib/translations';
-	import { events } from '$lib/store';
-
-	export let data;
-	$: ({ invoices, requests } = data);
-
-	let ease = (t) => (t < 0.5 ? 8 * t * t * t * t : 1 - 8 * --t * t * t * t);
-	let interval, rateInterval;
-
-	let oldRate = $selectedRate;
-	let animatedRate = oldRate;
-	$: animateRate($selectedRate);
-	let animateRate = (newRate) => {
-		if (!accountBalanceFiat) return;
-		let t = 0;
-		let newBalance = (user.balance * newRate) / sats;
-		let oldBalance = parseFloat(accountBalanceFiat);
-		let diff = oldBalance - newBalance;
-		let rateDiff = oldRate - newRate;
-
-		clearInterval(rateInterval);
-		rateInterval = setInterval(() => {
-			let delta = rateDiff * ease(t / 100);
-			animatedRate = (oldRate - delta).toFixed(2);
-			if (t > 80) clearInterval(interval);
-			t++;
-		}, 10);
-
-		oldRate = newRate;
-
-		clearInterval(interval);
-		interval = setInterval(() => {
-			let delta = diff * ease(t / 100);
-			accountBalanceFiat = (oldBalance - delta).toFixed(2);
-			if (t > 80) clearInterval(interval);
-			t++;
-		}, 10);
-	};
-
-	$: user = data.user;
-	$: accountBalanceFiat =
-		accountBalanceFiat ||
-		(user && $selectedRate && ((user.balance * $selectedRate) / sats).toFixed(2));
-
-	let payreq = '',
-		payreqField,
-		loading;
-
-	$: btcPrice = f($selectedRate, user.currency);
-
-	$: accountBalanceBtc = user.balance / sats;
-</script>
-
-<div class="container px-4 max-w-md mx-auto mt-20 space-y-12 mb-8">
-	<div class="mt-24 space-y-2">
-		<div class="text-5xl font-bold">
-			{$selectedRate ? f(accountBalanceFiat, user.currency) : $t('user.dashboard.fetchingRate')}
-		</div>
-
-		<div class="text-secondary text-2xl">
-			⚡️{s(user.balance)}
-		</div>
-	</div>
-
-	<div class="grid sm:grid-cols-2 gap-2 text-lg">
-		<a href="/send">
-			<button class="rounded-full border py-4 px-5 font-bold hover:opacity-80 w-full"
-				>{$t('user.dashboard.send')}</button
-			>
-		</a>
-		<a href={`/${user.username}/receive`}>
-			<button class="rounded-full border py-4 px-5 font-bold hover:opacity-80 w-full"
-				>{$t('user.dashboard.receive')}</button
-			>
-		</a>
-	</div>
-
-	<!-- <div> -->
-	<!-- 	{#each invoices as { request_id, amount, currency, rate, user: recipient, requester, id }} -->
-	<!-- 		{@const requested = user.username === requester?.username} -->
-	<!-- 		<a href={`/invoice/${id}` + (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> -->
-
-	<!-- <div> -->
-	<!-- 	{#each requests 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> -->
-</div>
-
-<div class="flex fixed w-full px-4 bg-white py-2 bottom-0 bg-opacity-90">
-	<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, user.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, user.currency)}</div>
-		</div>
-	</div>
-</div>
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+layout.server.js b/src/routes/(app)/[username]/invoice/[hash]/+layout.server.js
index 7cf87e14..04d413bb 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+layout.server.js
+++ b/src/routes/(app)/[username]/invoice/[hash]/+layout.server.js
@@ -12,10 +12,12 @@ export async function load({ depends, params, url, parent }) {
 	if (user && invoice.uid !== user.id && !url.pathname.includes('tip'))
 		throw redirect(307, `/send/invoice/${hash}`);
 
-	let { amount, received } = invoice;
+	let { amount, pending, received } = invoice;
 	amount = parseInt(amount);
 
-	let paid = (!amount && received) || (amount > 0 && received >= amount);
+  console.log("PENDING", pending)
+
+	let paid = (!amount && received) || (amount > 0 && (pending >= amount || received >= amount));
 	if (paid && !url.pathname.endsWith('paid'))
 		throw redirect(307, `/${params.username}/invoice/${hash}/paid`);
 
diff --git a/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte
index 4d7aae51..c9619cee 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[hash]/paid/+page.svelte
@@ -21,7 +21,7 @@
 	{#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, rate), currency)}
+			{f(fiat(received - tip, rate), currency)}
 			{#if tip}
 				<span class="text-lg">
 					+ {f(fiat(tip, rate), currency)}
@@ -29,7 +29,7 @@
 			{/if}
 		</h2>
 		<h3 class="text-secondary md:text-lg mb-6 mt-1">
-			⚡️{s(received)}
+			⚡️{s(received - tip)}
 
 			{#if tip}
 				<span class="text-lg">
@@ -42,13 +42,13 @@
 	{#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, rate), currency)}
+			{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)}
+			⚡️{s(pending - tip)}
 			{#if tip}
 				<span class="text-lg">
 					+ ⚡️{s(tip)}
diff --git a/src/routes/(app)/buy/+page.svelte b/src/routes/(app)/buy/+page.svelte
index 2f556ada..22e7e9ec 100644
--- a/src/routes/(app)/buy/+page.svelte
+++ b/src/routes/(app)/buy/+page.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { enhance } from '$app/forms';
 	import { Icon, Lock, Card, Calendar, Spinner } from '$comp';
-	import { animatedRate, selectedRate } from '$lib/store';
+	import { animatedRate } from '$lib/store';
 	import { f } from '$lib/utils';
 
 	export let data, form;
@@ -10,24 +10,6 @@
 	let loading;
 
 	let amount, n, d, cvc;
-
-	let ease = (t) => (t < 0.5 ? 8 * t * t * t * t : 1 - 8 * --t * t * t * t);
-	let i;
-
-	let o = $selectedRate;
-	$: animate($selectedRate);
-	let animate = (n) => {
-		clearInterval(i);
-
-		let t = 0;
-		let d = o - n;
-
-		i = setInterval(() => {
-			$animatedRate = (o - d * ease(t / 100)).toFixed(2);
-			if (t > 80) (o = n) && clearInterval(i);
-			t++;
-		}, 10);
-	};
 </script>
 
 <div class="container px-4 max-w-xl mx-auto mt-10 space-y-5">
@@ -141,7 +123,6 @@
 						<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>
 				<p class="text-secondary">3% credit card fee applies</p>
 			</div>
diff --git a/src/routes/(app)/launch/purchase/+page.svelte b/src/routes/(app)/launch/purchase/+page.svelte
index 3273752a..fbaa58c0 100644
--- a/src/routes/(app)/launch/purchase/+page.svelte
+++ b/src/routes/(app)/launch/purchase/+page.svelte
@@ -1,7 +1,6 @@
 <script>
 	import { onMount } from 'svelte';
 	import { enhance } from '$app/forms';
-	import { selectedRate } from '$lib/store';
 	import { post } from '$lib/utils';
 	import { goto } from '$app/navigation';
 
diff --git a/src/routes/(app)/pot/[name]/+page.svelte b/src/routes/(app)/pot/[name]/+page.svelte
index 2d93abfc..7b3d890b 100644
--- a/src/routes/(app)/pot/[name]/+page.svelte
+++ b/src/routes/(app)/pot/[name]/+page.svelte
@@ -6,7 +6,7 @@
 	import { toast } from '@zerodevx/svelte-toast';
 	import { t } from '$lib/translations';
 	import { copy, f, s, sat, sats } from '$lib/utils';
-	import { loginRedirect, selectedRate } from '$lib/store';
+	import { loginRedirect } from '$lib/store';
 
 	export let data;
 
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index 2f59f492..f3a67c30 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -1,7 +1,7 @@
 <script>
 	import { t } from '$lib/translations';
 	import { goto } from '$app/navigation';
-	import { pin, selectedRate } from '$lib/store';
+	import { pin } from '$lib/store';
 	import { enhance } from '$app/forms';
 	import { AppHeader, Avatar, Icon, Numpad, Spinner } from '$comp';
 	import { page } from '$app/stores';
@@ -20,13 +20,12 @@
 		hash,
 		amountFiat = 0;
 
-	selectedRate.subscribe((r) => rate || (amountFiat = amount * (r / sats)));
 	$: r = rate || rates[user.currency || subject.currency];
 
 	let setAmount = async () => {
 		amount = a;
 		amountFiat = parseFloat(af).toFixed(2);
-		rate = fiat ? (sats * amountFiat) / amount : $selectedRate;
+    rate = fiat ? (sats * amountFiat) / amount : r;
 		({ hash } = await post(`/${subject.username}/invoice`, {
 			invoice: {
 				amount,
-- 
cgit v1.2.3


From 23ca37cdda46d947187bd7f9fadae4be853dfa4a Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 6 Apr 2023 15:37:15 -0700
Subject: remove invalid token message

---
 src/components/RegisterOrLogin.svelte                          | 6 +-----
 src/routes/(app)/[username]/(profile)/+page.svelte             | 4 ++--
 src/routes/(app)/[username]/settings/[...tab]/_security.svelte | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'src/components')

diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte
index 6c099178..294247a6 100644
--- a/src/components/RegisterOrLogin.svelte
+++ b/src/components/RegisterOrLogin.svelte
@@ -22,11 +22,7 @@
 
 	$: need2fa = form?.message === '2fa';
 	let cancel = () => (need2fa = false);
-	$: if (form?.message === '2fa' && form.token === token) {
-		token = '';
-		console.log('TOKEN', token);
-		fail('Invalid token, try again');
-	}
+	$: if (form?.message === '2fa' && form.token === token) token = '';
 
 	let username, email, btn;
 
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 11a1bebf..308289b0 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -63,14 +63,14 @@
 
 		let r = ((rates[user.currency] / rates['USD']) * n).toFixed(2);
 
-    if (!r || isNaN(r)) return;
+		if (!r || isNaN(r)) return;
 		if (!o) o = r;
 
 		let t = 0;
 		let d = o - r;
 
 		i = setInterval(() => {
-      if (!r) return;
+			if (!r) return;
 			$animatedRate = (o - d * ease(t / 100)).toFixed(2);
 			if (t > 80) (o = r) && clearInterval(i);
 			t++;
diff --git a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
index 01047344..40947bda 100644
--- a/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
+++ b/src/routes/(app)/[username]/settings/[...tab]/_security.svelte
@@ -192,7 +192,7 @@
 	{/if}
 
 	{#if confirming2fa || disabling2fa}
-		<Pin bind:value={token} title="Enter 2FA Code" {cancel} persist={false} />
+		<Pin bind:value={token} title="Enter 2FA Code" {cancel} persist={false} notify={false} />
 	{/if}
 </div>
 
-- 
cgit v1.2.3


From c9f41721a320c2303d4bf41b61284a790661fbf8 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Thu, 6 Apr 2023 18:30:39 -0700
Subject: don't notify on 2fa

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

(limited to 'src/components')

diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte
index 294247a6..7aedeb9b 100644
--- a/src/components/RegisterOrLogin.svelte
+++ b/src/components/RegisterOrLogin.svelte
@@ -67,7 +67,7 @@
 </script>
 
 {#if need2fa}
-	<Pin bind:value={token} title="Enter 2FA Code" {cancel} />
+	<Pin bind:value={token} title="Enter 2FA Code" {cancel} notify={false} />
 {/if}
 
 <div class="pt-10">
-- 
cgit v1.2.3