generate new invoice on tip

7 files changed, 91 insertions, 62 deletions

diff --git a/src/lib/utils.js b/src/lib/utils.js
index a1bdf8d7..65025c3a 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -47,6 +47,8 @@ export const put = (url, body, headers) => {
 		method: 'PUT',
 		body: JSON.stringify(body),
 		headers
+	}).then(async (r) => {
+		if (!r.ok) throw new Error('put failed');
 	});
 };
 
diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte
index d3b9306d..58a3144d 100644
--- a/src/routes/+error.svelte
+++ b/src/routes/+error.svelte
@@ -15,9 +15,9 @@
 
 			<Icon icon="error" style="mx-auto w-56" />
 
-			<h1 class="font-bold text-5xl">{($t('error.header'), { default: 'Error' })}</h1>
-			<p class="px-1 w-full md:w-96 break-all font-bold">{$page.error.message.toUpperCase()}</p>
-			<p>{($t('error.message'), { default: 'Please try again or contact support.' })}</p>
+			<h1 class="font-bold text-5xl">{$t('error.header')}</h1>
+			<p class="px-1 w-full md:w-96 break-all font-bold">{$page.error.message}</p>
+			<p>{$t('error.message')}</p>
 		</div>
 	</div>
 {/if}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 185eb140..0485e71d 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -24,8 +24,6 @@
 				goto('/login');
 				warning($t('error.signIn'));
 			}
-		} else {
-			ready = true;
 		}
 
 		connect();
diff --git a/src/routes/[username]/receive/+page.svelte b/src/routes/[username]/receive/+page.svelte
index 181f8ea6..c588bbe0 100644
--- a/src/routes/[username]/receive/+page.svelte
+++ b/src/routes/[username]/receive/+page.svelte
@@ -81,7 +81,7 @@
 	};
 
 	let submit = async () => {
-		let { id } = await post('/invoice', {
+		let id = await post('/invoice', {
 			amount,
 			rate: $selectedRate,
 			username: $page.params.username
diff --git a/src/routes/invoice/+server.js b/src/routes/invoice/+server.js
index c77784d7..4b961be9 100644
--- a/src/routes/invoice/+server.js
+++ b/src/routes/invoice/+server.js
@@ -1,16 +1,16 @@
-import { json as json$1 } from '@sveltejs/kit';
-import { post } from '$lib/utils';
-import { user } from '$lib/store';
-
-let network = 'lightning';
+import cookie from 'cookie';
+import { get, post } from '$lib/utils';
 
 export async function POST({ request }) {
-	let { amount, rate, username, text } = await request.json();
-	if (!text) ({ text } = await post('/lightning/invoice', { amount }));
-	let { uuid: id } = await post('/invoice', {
-		invoice: { amount, currency: user.currency, network, rate, text },
-		user: { username }
-	});
+	let { token } = cookie.parse(request.headers.get('cookie') || '');
+
+	let network = 'lightning';
+	let { amount, currency, rate, tip, text, username } = await request.json();
+	let headers = { authorization: `Bearer ${token}` };
+
+	({ text } = await post('/lightning/invoice', { amount }, headers));
+	let invoice = { amount, currency, network, rate, tip, text };
+	let { uuid }  = await post('/invoice', { invoice, user: { username } }, headers);
 
-	return json$1({ id });
+	return new Response(JSON.stringify(uuid), { headers: { 'content-type': 'application/json' } });
 }
diff --git a/src/routes/invoice/[id]/+page.server.js b/src/routes/invoice/[id]/+page.server.js
index 78607545..d46d039b 100644
--- a/src/routes/invoice/[id]/+page.server.js
+++ b/src/routes/invoice/[id]/+page.server.js
@@ -1,14 +1,8 @@
-import { get } from '$lib/utils';
+import cookie from 'cookie';
+import { get, post } from '$lib/utils';
 
 export async function load({ params }) {
 	let { id } = params;
-	let {
-		amount,
-		rate,
-		status,
-		text,
-		user: { username }
-	} = await get(`/invoice?uuid=${id}`);
-
-	return { amount, id, rate, username, status, text };
+	return { id, invoice: await get(`/invoice?uuid=${id}`) };
 }
+
diff --git a/src/routes/invoice/[id]/+page.svelte b/src/routes/invoice/[id]/+page.svelte
index 19809f9f..e8bd9edf 100644
--- a/src/routes/invoice/[id]/+page.svelte
+++ b/src/routes/invoice/[id]/+page.svelte
@@ -3,54 +3,85 @@
 	import { browser } from '$app/env';
 	import { invoices, user } from '$lib/store';
 	import { Icon, Image } from '$comp';
-	import { goto } from '$app/navigation';
-	import { onMount } from 'svelte';
+	import { goto, invalidate } from '$app/navigation';
+	import { onMount, tick } from 'svelte';
 	import { copy } from '$lib/utils';
 	import { t } from '$lib/translations';
 
 	export let data;
-	$: ({ amount, id, rate, status, text, username } = data);
 
-	$invoices[id] = { amount, id, rate, status, text, username };
+	$: refresh(data);
+	let { invoice, id } = data;
+	let {
+		amount,
+		rate,
+		status,
+		text,
+		tip,
+		user: { username, currency }
+	} = invoice;
+
+	amount -= tip;
+
+	let refresh = (data) => {
+		({ invoice, id } = data);
+		({
+			amount,
+			rate,
+			status,
+			text,
+			tip,
+			user: { username, currency }
+		} = invoice);
+
+		amount -= tip;
+
+		tipPercent = Math.round((tip / amount) * 100);
+	};
+
+	$invoices[id] = { amount, id, rate, status, text, tip, username };
 
 	$: amountFiat = parseFloat(((amount * rate) / 100000000).toFixed(2));
 
 	let tipPercent = 0;
 	let qr;
 
-	$: tipAmount = customTipAmount
-		? customTipAmount < 0
-			? (customTipAmount = 0)
-			: customTipAmount
-		: (amountFiat / 100) * tipPercent;
+	$: tipAmount = (amountFiat / 100) * tipPercent;
 
 	$: tipAmountFormatted = new Intl.NumberFormat('en-US', {
 		style: 'currency',
-		currency: $user.currency
+		currency
 	}).format(tipAmount);
 
-	$: tipAmountSats = new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(
-		tipAmount / (rate / 100000000)
-	);
+	$: tipAmountSats = new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(tip);
 
 	$: totalAmountSats = new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(
 		amount + parseFloat(tipAmountSats.replace(/,/g, ''))
 	);
 
-	$: update(tipAmountSats);
-	let update = async (n) => {
-		let { id } = await post('/invoice', {
-			amount: amount + reverseFormat(n),
+	let apply = async () => {
+		tipAmount = customTipAmount;
+		tipPercent = Math.round((tipAmount / amountFiat) * 100);
+		update();
+	};
+
+	let update = async () => {
+		await tick();
+		tip = (tipAmount * 100000000) / rate;
+		let r = await post(`/invoice`, {
+			amount: amount + tip,
 			rate,
+			tip,
 			text,
 			username
 		});
-		({ text } = await get(`/invoice/${id}`));
+
+		goto(`/invoice/${r}`);
 	};
 
 	$: totalAmountFormatted = new Intl.NumberFormat('en-US', {
 		style: 'currency',
-		currency: $user.currency
+		currency
 	}).format(amountFiat + parseFloat(tipAmount));
 
 	const amountFormatted = new Intl.NumberFormat('en-US', {
@@ -59,13 +90,22 @@
 
 	$: invoiceAmountFiatFormatted = new Intl.NumberFormat('en-US', {
 		style: 'currency',
-		currency: $user.currency
+		currency
 	}).format(amountFiat);
 
 	let customTipAmount;
 
 	const tipAmounts = ['None', '10%', '15%', '20%'];
 
+	let timeout;
+	const handleSlide = (e) => {
+		customTipAmount = '';
+		customInput.value = '';
+		tipPercent = e.target.value;
+		clearTimeout(timeout);
+		timeout = setTimeout(update, 100);
+	};
+
 	const handleTipButtonClick = (amount) => {
 		customTipAmount = '';
 		customInput.value = '';
@@ -75,6 +115,8 @@
 		} else {
 			tipPercent = amount.slice(0, 2);
 		}
+
+		update();
 	};
 
 	const handleCustomTipAmount = (e) => {
@@ -83,8 +125,8 @@
 	};
 
 	$: generate(text);
-	let generate = async (ready) => {
-		if (!ready) return;
+	let generate = async (text) => {
+		if (!(browser && text)) return;
 		let { default: QRCodeStyling } = await import('qr-code-styling');
 
 		const qrCode = new QRCodeStyling({
@@ -103,6 +145,7 @@
 			}
 		});
 
+		while (qr.firstChild) qr.removeChild(qr.lastChild);
 		qrCode.append(qr);
 	};
 
@@ -116,18 +159,14 @@
 			tipAmount = 0;
 			showMobileTip = false;
 		} else {
-			goto(`/${$user.username}/receive`);
+			goto(`/${username}/receive`);
 		}
 	};
 
 	let customInput;
 
 	const handleDoneClick = () => {
-		if ($user) {
-			goto(`/${$user.username}/receive`);
-		} else {
-			goto('/');
-		}
+		goto(`/${username}/receive`);
 	};
 </script>
 
@@ -167,11 +206,7 @@
 						max="100"
 						value={tipPercent}
 						class="px-2"
-						on:input={(e) => {
-							customTipAmount = '';
-							customInput.value = '';
-							tipPercent = e.target.value;
-						}}
+						on:input={handleSlide}
 					/>
 
 					<div>
@@ -210,7 +245,7 @@
 									? 'opacity-50'
 									: 'opacity-100'}"
 								disabled={showMobileTip ? !customTipAmount && !tipAmount : !customTipAmount}
-								on:click={() => (showMobileTip = false)}>Done</button
+								on:click={apply}>Apply</button
 							>
 						</div>
 					</div>