From 85bd3ca18c5c81aadd8ba8eb4af3c8262a317bee Mon Sep 17 00:00:00 2001
From: gsovereignty <gsovereignty@proton.me>
Date: Sat, 17 Aug 2024 15:29:44 +0800
Subject: [PATCH] problem: build fails (memory leak)

---
 package-lock.json                              | 18 ++++++------------
 package.json                                   |  2 +-
 src/components/MeritsAndSatflow.svelte         |  8 +++-----
 .../NumberIncrement.svelte}                    | 14 +++-----------
 src/components/PayNow.svelte                   | 14 ++++++--------
 .../components/ui/number-increment/index.ts    |  3 ---
 6 files changed, 19 insertions(+), 40 deletions(-)
 rename src/{lib/components/ui/number-increment/number-increment.svelte => components/NumberIncrement.svelte} (59%)
 delete mode 100644 src/lib/components/ui/number-increment/index.ts

diff --git a/package-lock.json b/package-lock.json
index b9cc268..03dd3b1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,6 +29,7 @@
 				"mode-watcher": "^0.3.0",
 				"paneforge": "^0.0.4",
 				"qrious": "^4.0.2",
+				"svelte-loading-spinners": "^0.3.6",
 				"svelte-radix": "^1.1.0",
 				"svelte-sonner": "^0.3.24",
 				"sveltekit-superforms": "^2.14.0",
@@ -48,7 +49,6 @@
 				"autoprefixer": "^10.4.19",
 				"flowbite": "^2.3.0",
 				"flowbite-svelte": "^0.46.14",
-				"flowbite-svelte-icons": "^1.6.1",
 				"husky": "^9.0.11",
 				"lint-staged": "^15.2.7",
 				"postcss": "^8.4.38",
@@ -2792,17 +2792,6 @@
 				"svelte": "^3.55.1 || ^4.0.0"
 			}
 		},
-		"node_modules/flowbite-svelte-icons": {
-			"version": "1.6.1",
-			"resolved": "https://registry.npmjs.org/flowbite-svelte-icons/-/flowbite-svelte-icons-1.6.1.tgz",
-			"integrity": "sha512-Kw/7BzA6fqlFq7tBNudwX0KVU4cbyyXcMcgHTraMwGBtvBQan0RKMbvWwqm4JZNvLGAvRv1BM2EF7rzo/oam1Q==",
-			"dev": true,
-			"peerDependencies": {
-				"svelte": "^3.54.0 || ^4.0.0 || ^5.0.0",
-				"tailwind-merge": "^2.0.0",
-				"tailwindcss": "^3.3.2"
-			}
-		},
 		"node_modules/focus-trap": {
 			"version": "7.5.4",
 			"resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.5.4.tgz",
@@ -5078,6 +5067,11 @@
 				"svelte": "^3.19.0 || ^4.0.0"
 			}
 		},
+		"node_modules/svelte-loading-spinners": {
+			"version": "0.3.6",
+			"resolved": "https://registry.npmjs.org/svelte-loading-spinners/-/svelte-loading-spinners-0.3.6.tgz",
+			"integrity": "sha512-mthHQ2TwiwzTWzbFry3CBnVEfzqPOD9WkVw84OfSYzHRq6N9wgQ+yv37u81uPeuLU/ZOIPqhujpXquB1aol5ZQ=="
+		},
 		"node_modules/svelte-preprocess": {
 			"version": "5.1.4",
 			"resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-5.1.4.tgz",
diff --git a/package.json b/package.json
index 48287e2..aef73ac 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
 		"autoprefixer": "^10.4.19",
 		"flowbite": "^2.3.0",
 		"flowbite-svelte": "^0.46.14",
-		"flowbite-svelte-icons": "^1.6.1",
 		"husky": "^9.0.11",
 		"lint-staged": "^15.2.7",
 		"postcss": "^8.4.38",
@@ -60,6 +59,7 @@
 		"mode-watcher": "^0.3.0",
 		"paneforge": "^0.0.4",
 		"qrious": "^4.0.2",
+		"svelte-loading-spinners": "^0.3.6",
 		"svelte-radix": "^1.1.0",
 		"svelte-sonner": "^0.3.24",
 		"sveltekit-superforms": "^2.14.0",
diff --git a/src/components/MeritsAndSatflow.svelte b/src/components/MeritsAndSatflow.svelte
index b9aa6d3..001c789 100644
--- a/src/components/MeritsAndSatflow.svelte
+++ b/src/components/MeritsAndSatflow.svelte
@@ -2,17 +2,16 @@
 	import * as Card from '@/components/ui/card';
 	import * as Table from '@/components/ui/table';
 	import { Rocket, ZapPurchase } from '@/event_helpers/rockets';
+	import { ndk } from '@/ndk';
+	import { Avatar, Name } from '@nostr-dev-kit/ndk-svelte-components';
 	import { writable } from 'svelte/store';
 	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';
+	import NumberIncrement from './NumberIncrement.svelte';
 
 	export let rocket: Rocket;
 	export let unratifiedZaps: Map<string, ZapPurchase>;
 
 	let unratifiedZapsAmount = 0;
-	let dataLoaded = false;
 
 	$: {
 		unratifiedZapsAmount = 0;
@@ -55,7 +54,6 @@
 		}
 
 		merits.set(_merits);
-		dataLoaded = true;
 	}
 
 	const COLORS = [
diff --git a/src/lib/components/ui/number-increment/number-increment.svelte b/src/components/NumberIncrement.svelte
similarity index 59%
rename from src/lib/components/ui/number-increment/number-increment.svelte
rename to src/components/NumberIncrement.svelte
index a61c4c2..4ae1645 100644
--- a/src/lib/components/ui/number-increment/number-increment.svelte
+++ b/src/components/NumberIncrement.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { cubicOut } from 'svelte/easing';
+	import { expoInOut } from 'svelte/easing';
 	import { tweened } from 'svelte/motion';
 
-	export let targetValue: number;
+	export let targetValue: number = 0;
 
-	let currentValue = tweened(0, { duration: 1000, easing: cubicOut });
+	let currentValue = tweened(0, { duration: 1000, easing: expoInOut });
 
 	// Re-trigger animation whenever targetValue changes
 	$: if (targetValue !== undefined && targetValue !== null) {
@@ -18,11 +18,3 @@
 </script>
 
 <span class="merits">{$currentValue.toFixed(0)}</span>
-
-<style>
-	.merits {
-		transition:
-			transform 0.5s ease-in-out,
-			opacity 0.5s ease-in-out;
-	}
-</style>
diff --git a/src/components/PayNow.svelte b/src/components/PayNow.svelte
index 1cd0c41..c203086 100644
--- a/src/components/PayNow.svelte
+++ b/src/components/PayNow.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { Button, buttonVariants } from '$lib/components/ui/button/index.js';
+	import { Button } from '$lib/components/ui/button/index.js';
 	import * as Dialog from '$lib/components/ui/dialog/index.js';
 	import { Input } from '$lib/components/ui/input';
 	import * as Alert from '@/components/ui/alert';
@@ -8,9 +8,7 @@
 	import { ndk } from '@/ndk';
 	import { currentUser } from '@/stores/session';
 	import { NDKZap } from '@nostr-dev-kit/ndk';
-	import { Spinner } from 'flowbite-svelte';
-	import { CheckCircleOutline } from 'flowbite-svelte-icons';
-	import { Terminal } from 'lucide-svelte';
+	import { Check, Terminal } from 'lucide-svelte';
 	import { cubicOut } from 'svelte/easing';
 	import { tweened } from 'svelte/motion';
 	import { requestProvider } from 'webln';
@@ -37,7 +35,7 @@
 			});
 			invoice = await z.createZapRequest(
 				rocketProduct.Price() * 1000,
-				`Purchase of ${product.Name()} from ${rocket.Event.dTag}`,
+				`Purchase of ${product.Name()} from ${rocket.Name()}`,
 				[['product', product.ID()]]
 			);
 		}
@@ -85,7 +83,7 @@
 		<Dialog.Trigger>
 			<Button {disabled}>
 				{#if open}
-					<Spinner class="me-2" color="white" size={4} /> Confirming...
+					Confirming...
 				{:else if !disabled}
 					Buy Now for {formatSats(rocketProduct.Price())}
 				{:else if disabled}
@@ -121,10 +119,10 @@
 				<Button on:click={payWithWebLn}>
 					{#if paymentFinished}
 						<div style="transform: scale({$scale});">
-							<CheckCircleOutline class="me-2 text-white" color="white" />
+							<Check class="me-2 text-white" color="white" />
 						</div>
 					{:else if paymentInitiated}
-						<Spinner class="me-2" color="white" size={4} /> Confirming payment...
+						Confirming payment...
 					{:else}
 						Pay with WebLN
 					{/if}
diff --git a/src/lib/components/ui/number-increment/index.ts b/src/lib/components/ui/number-increment/index.ts
deleted file mode 100644
index 79adf45..0000000
--- a/src/lib/components/ui/number-increment/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import NumberIncrement from './number-increment.svelte';
-
-export default NumberIncrement;