From fb0d05134ff8f0410b6c52e07396a8678d3483a0 Mon Sep 17 00:00:00 2001
From: Samuel Ralak <thesamuelralak@gmail.com>
Date: Fri, 16 Aug 2024 09:56:44 +0300
Subject: [PATCH] Problem: Not clear when sats paid to merit holders increases

Solution:

Added NumberIncrement for animated numeric updates in MeritsAndSatflow.svelte and enhanced PayNow.svelte to animate intermediate payment states.

Fixes #84
---
 src/components/MeritsAndSatflow.svelte        | 11 ++++-
 src/components/PayNow.svelte                  | 44 +++++++++++++++++--
 .../components/ui/number-increment/index.ts   |  3 ++
 .../number-increment/number-increment.svelte  | 28 ++++++++++++
 4 files changed, 80 insertions(+), 6 deletions(-)
 create mode 100644 src/lib/components/ui/number-increment/index.ts
 create mode 100644 src/lib/components/ui/number-increment/number-increment.svelte

diff --git a/src/components/MeritsAndSatflow.svelte b/src/components/MeritsAndSatflow.svelte
index 2c38df1..8ec17e2 100644
--- a/src/components/MeritsAndSatflow.svelte
+++ b/src/components/MeritsAndSatflow.svelte
@@ -6,11 +6,13 @@
 	import Pie from './Pie.svelte';
 	import { Avatar, Name } from '@nostr-dev-kit/ndk-svelte-components';
 	import { ndk } from '@/ndk';
+	import NumberIncrement from '@components/ui/number-increment';
 
 	export let rocket: Rocket;
 	export let unratifiedZaps: Map<string, number>;
 
 	let unratifiedZapsAmount = 0;
+	let dataLoaded = false;
 
 	$: {
 		unratifiedZapsAmount = 0;
@@ -53,6 +55,7 @@
 		}
 
 		merits.set(_merits);
+		dataLoaded = true;
 	}
 
 	const COLORS = [
@@ -98,8 +101,12 @@
 									<Name ndk={$ndk} {pubkey} class="hidden max-w-32 truncate p-1 md:inline-block" />
 								</div>
 							</Table.Cell>
-							<Table.Cell class="hidden md:table-cell">{merits}</Table.Cell>
-							<Table.Cell class="text-right">{sats}</Table.Cell>
+							<Table.Cell class="hidden md:table-cell">
+								<NumberIncrement targetValue={merits} />
+							</Table.Cell>
+							<Table.Cell class="text-right">
+								<NumberIncrement targetValue={sats} />
+							</Table.Cell>
 						</Table.Row>
 					{/each}
 				</Table.Body>
diff --git a/src/components/PayNow.svelte b/src/components/PayNow.svelte
index 56123b5..5affd7d 100644
--- a/src/components/PayNow.svelte
+++ b/src/components/PayNow.svelte
@@ -13,12 +13,21 @@
 	import CopyButton from './CopyButton.svelte';
 	import type { Product, Rocket, RocketProduct } from '@/event_helpers/rockets';
 	import { formatSats } from '@/helpers';
+	import { Spinner } from 'flowbite-svelte';
+	import { CheckCircleOutline } from 'flowbite-svelte-icons';
+	import { tweened, type Tweened } from 'svelte/motion';
+	import { cubicOut } from 'svelte/easing';
+	import { fade, fly } from 'svelte/transition';
 
 	export let product: Product;
 	export let rocketProduct: RocketProduct | undefined;
 	export let rocket: Rocket;
 
 	let invoice: string | null;
+	let paymentInitiated: boolean;
+	let paymentFinished: boolean;
+
+	const scale = tweened(0, { duration: 1000, easing: cubicOut });
 
 	async function zap() {
 		if (rocketProduct) {
@@ -36,6 +45,8 @@
 	}
 
 	async function payWithWebLn() {
+		paymentInitiated = true;
+
 		try {
 			if (!invoice) {
 				throw Error('invoice not found');
@@ -44,10 +55,20 @@
 			const response = await webln.sendPayment(invoice);
 			if (response && response.preimage) {
 				console.log(response.preimage);
+				paymentFinished = true;
+
+				await scale.set(1);
+				await new Promise((resolve) => setTimeout(resolve, 1000)); // allow 1 second before resetting payment/dialog states
+
 				open = false;
+				paymentFinished = false;
+
+				await scale.set(0);
 			}
 		} catch (error) {
 			console.error(error);
+		} finally {
+			paymentInitiated = false;
 		}
 	}
 
@@ -62,9 +83,14 @@
 
 {#if rocketProduct}
 	<Dialog.Root bind:open>
-		<Dialog.Trigger class={buttonVariants({ variant: 'default' })}
-			>Buy Now for {formatSats(rocketProduct.Price)}</Dialog.Trigger
-		>
+		<Dialog.Trigger class={buttonVariants({ variant: 'default' })}>
+			{#if open}
+				<Spinner class="me-2" color="white" size={4} /> Confirming...
+			{:else}
+				Buy Now for {formatSats(rocketProduct.Price)}
+			{/if}
+		</Dialog.Trigger>
+
 		<Dialog.Content class="sm:max-w-[425px]">
 			<Dialog.Header>
 				<Dialog.Title>Buy {product.Name()} from {rocket.Name()} now!</Dialog.Title>
@@ -89,7 +115,17 @@
 					<Input bind:value={invoice} readonly />
 					<CopyButton text={invoice} />
 				</div>
-				<Button on:click={payWithWebLn}>Pay with WebLN</Button>
+				<Button on:click={payWithWebLn}>
+					{#if paymentFinished}
+						<div style="transform: scale({$scale});">
+							<CheckCircleOutline class="me-2 text-white" color="white" />
+						</div>
+					{:else if paymentInitiated}
+						<Spinner class="me-2" color="white" size={4} /> Confirming payment...
+					{:else}
+						Pay with WebLN
+					{/if}
+				</Button>
 			{:else}
 				<Button on:click={zap}>Create invoice</Button>
 			{/if}
diff --git a/src/lib/components/ui/number-increment/index.ts b/src/lib/components/ui/number-increment/index.ts
new file mode 100644
index 0000000..79adf45
--- /dev/null
+++ b/src/lib/components/ui/number-increment/index.ts
@@ -0,0 +1,3 @@
+import NumberIncrement from './number-increment.svelte';
+
+export default NumberIncrement;
diff --git a/src/lib/components/ui/number-increment/number-increment.svelte b/src/lib/components/ui/number-increment/number-increment.svelte
new file mode 100644
index 0000000..a61c4c2
--- /dev/null
+++ b/src/lib/components/ui/number-increment/number-increment.svelte
@@ -0,0 +1,28 @@
+<script lang="ts">
+	import { onMount } from 'svelte';
+	import { cubicOut } from 'svelte/easing';
+	import { tweened } from 'svelte/motion';
+
+	export let targetValue: number;
+
+	let currentValue = tweened(0, { duration: 1000, easing: cubicOut });
+
+	// Re-trigger animation whenever targetValue changes
+	$: if (targetValue !== undefined && targetValue !== null) {
+		currentValue.set(targetValue);
+	}
+
+	onMount(() => {
+		currentValue.set(targetValue);
+	});
+</script>
+
+<span class="merits">{$currentValue.toFixed(0)}</span>
+
+<style>
+	.merits {
+		transition:
+			transform 0.5s ease-in-out,
+			opacity 0.5s ease-in-out;
+	}
+</style>