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