Merge branch 'master' into static-qr

10 files changed, 27 insertions, 20 deletions

diff --git a/src/components/Code.svelte b/src/components/Code.svelte
index 0e09191e..a718c5ed 100644
--- a/src/components/Code.svelte
+++ b/src/components/Code.svelte
@@ -5,9 +5,7 @@
 	export let sample;
 </script>
 
-<div
-	class="bg-black text-white rounded-lg p-4 flex gap-4 whitespace-pre-wrap font-mono"
->
+<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>
diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte
index a33716d4..7520e5d4 100644
--- a/src/components/Footer.svelte
+++ b/src/components/Footer.svelte
@@ -4,8 +4,8 @@
 
 	const followLinks = [
 		{ url: 'https://twitter.com/coinoswallet', titleID: 'twitter' },
-		{ url: 'https://github.com/coinos', titleID: 'github' },
-		{ url: 'https://t.me/coinoswallet', titleID: 'telegram' }
+		{ url: 'https://t.me/coinoswallet', titleID: 'telegram' },
+		{ url: 'https://linktr.ee/coinos.io', titleID: 'linktree' }
 	];
 
 	const companyLinks = [
diff --git a/src/components/Numpad.svelte b/src/components/Numpad.svelte
index 47bd9375..77a4f38b 100644
--- a/src/components/Numpad.svelte
+++ b/src/components/Numpad.svelte
@@ -9,7 +9,7 @@
 		fiat = !amount,
 		submit = undefined;
 
-	let amountFiat = 0;
+	export let amountFiat = 0;
 	let arrow = '<';
 
 	$: update(amount, amountFiat);
diff --git a/src/locales/en.json b/src/locales/en.json
index 402f0214..9a50d6b4 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -60,6 +60,7 @@
 		"company": "Company",
 		"followUs": "Follow Us",
 		"github": "GitHub",
+		"linktree": "Linktree",
 		"jobs": "Jobs",
 		"support": "Support",
 		"telegram": "Telegram",
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index 45469bdb..0dcdc1b2 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -25,7 +25,6 @@
 	};
 
 	$: $selectedRate = r * (rates[u?.currency || 'USD'] / rates.USD);
-	$: $selectedRate = $rate * (rates[u?.currency || 'USD'] / rates.USD);
 
 	onMount(() => {
 		let localStorageLocale = localStorage.getItem(localeLocalStorageKey);
diff --git a/src/routes/(app)/[username]/(profile)/+layout.svelte b/src/routes/(app)/[username]/(profile)/+layout.svelte
index 133930b1..bbb2379e 100644
--- a/src/routes/(app)/[username]/(profile)/+layout.svelte
+++ b/src/routes/(app)/[username]/(profile)/+layout.svelte
@@ -59,6 +59,9 @@
 			t++;
 		}, 10);
 	};
+
+	let hideBio = true;
+	let toggleBio = () => (hideBio = false);
 </script>
 
 <div class="container mx-auto w-full px-4 mb-4 flex flex-wrap lg:flex-nowrap">
@@ -66,7 +69,11 @@
 	<div class="w-[240px] lg:absolute space-y-5 left-20 mx-auto lg:mr-10 mb-10">
 		<h1 class="text-3xl font-bold text-center mx-auto">{display || username}</h1>
 
-		<div class="text-secondary mx-auto text-center lg:text-left lg:mx-0">
+		<div
+			class="text-secondary mx-auto text-center lg:text-left lg:mx-0"
+			class:line-clamp-3={hideBio}
+			on:click={toggleBio}
+		>
 			{subject.address && subject.address !== 'null' ? subject.address : ''}
 		</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 18eda839..c63328e2 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.server.js
@@ -13,9 +13,6 @@ export const actions = {
 	default: async ({ cookies, request }) => {
 		try {
 			let body = await fd(request);
-			let { amount } = body;
-			amount = parseInt(amount);
-
 			await post('/payments', body, auth(cookies));
 		} catch (e) {
 			console.log(e);
diff --git a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
index 74da1fa8..1bb88277 100644
--- a/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
+++ b/src/routes/(app)/send/user/[username]/[...amount]/+page.svelte
@@ -17,14 +17,16 @@
 	let a,
 		af,
 		fiat = !amount,
-		hash;
+		hash,
+		rate,
+		amountFiat = 0;
 
-	$: amountFiat = amount * ($selectedRate / sats);
+	selectedRate.subscribe((r) => rate || (amountFiat = amount * (r / sats)));
 
 	let setAmount = async () => {
 		amount = a;
-		amountFiat = af;
-
+		amountFiat = parseFloat(af).toFixed(2);
+		rate = fiat ? (sats * amountFiat) / amount : $selectedRate;
 		({ hash } = await post(`/${subject.username}/invoice`, {
 			invoice: {
 				amount,
diff --git a/src/routes/(static)/bounties/+page.svelte b/src/routes/(static)/bounties/+page.svelte
index e3670e78..32a962fc 100644
--- a/src/routes/(static)/bounties/+page.svelte
+++ b/src/routes/(static)/bounties/+page.svelte
@@ -54,8 +54,11 @@
 	<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
+		<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>
 
diff --git a/src/routes/(static)/docs/+page.svelte b/src/routes/(static)/docs/+page.svelte
index cb82bd05..8ddb98cd 100644
--- a/src/routes/(static)/docs/+page.svelte
+++ b/src/routes/(static)/docs/+page.svelte
@@ -7,7 +7,7 @@
 	let api = PUBLIC_COINOS_URL + '/api';
 
 	if (!token) token = '<login to see your token here>';
-  let tokenSample = `export token="${token}"`;
+	let tokenSample = `export token="${token}"`;
 </script>
 
 <div class="space-y-8 lg:text-xl mt-20 w-full max-w-full">
@@ -31,8 +31,8 @@
 	<h2 class="text-2xl">Auth Token</h2>
 	<p class="text-secondary">This JWT authorizes you to use the API</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)}
+		<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>