From 5eb7351c8baa4384f9fd176167d3092f70149893 Mon Sep 17 00:00:00 2001
From: Adam Soltys <adam@coinos.io>
Date: Thu, 5 Dec 2024 21:15:48 -0800
Subject: fix ecash rate

---
 src/components/Success.svelte                            |  2 +-
 .../(app)/ecash/[id]/[...version]/+layout.server.ts      | 16 ++++++++++++++--
 src/routes/(app)/ecash/[id]/[...version]/+layout.svelte  |  3 +--
 src/routes/(app)/invoice/[id]/paid/+page.svelte          |  2 +-
 src/routes/(app)/send/ecash/+page.svelte                 |  2 +-
 src/routes/(app)/send/ecash/[request]/+page.svelte       |  2 +-
 6 files changed, 19 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/components/Success.svelte b/src/components/Success.svelte
index f82a4dcb..973e2d35 100644
--- a/src/components/Success.svelte
+++ b/src/components/Success.svelte
@@ -52,7 +52,7 @@
       class="text-green-400"
       width="160"
       in:scale={{ start: 0.2, duration: 500 }}
-    />
+    ></iconify-icon>
   {/if}
   <h1 class="text-3xl md:text-4xl font-bold mb-6">{title}</h1>
   <Amount {amount} {tip} {rate} {currency} />
diff --git a/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts b/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts
index e7ac3787..50be6986 100644
--- a/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts
+++ b/src/routes/(app)/ecash/[id]/[...version]/+layout.server.ts
@@ -1,11 +1,23 @@
+import getRates from "$lib/rates";
 import { get } from "$lib/utils";
 
-export async function load({ params }) {
+export async function load({ params, parent }) {
+	const { user } = await parent();
+	const rates = await getRates();
 	let { id, version } = params;
 	version ||= 4;
 	version = parseInt(version);
 
 	const { token, status } = await get(`/cash/${id}/${version}`);
 	const { spent, total, mint, external } = status;
-	return { id, token, spent, total, mint, external, version };
+	return {
+		id,
+		token,
+		spent,
+		total,
+		mint,
+		external,
+		version,
+		rate: rates[user?.currency || "USD"],
+	};
 }
diff --git a/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte b/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte
index d0d06046..6a9845f4 100644
--- a/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte
+++ b/src/routes/(app)/ecash/[id]/[...version]/+layout.svelte
@@ -5,9 +5,8 @@
 
   let { data, children } = $props();
 
-  let { id, rates, user, token, total, spent, external, mint } = data;
+  let { id, user, token, total, spent, external, mint, rate } = data;
   let currency = user?.currency || "USD";
-  let rate = rates[currency];
 
   let amount = total - spent;
 
diff --git a/src/routes/(app)/invoice/[id]/paid/+page.svelte b/src/routes/(app)/invoice/[id]/paid/+page.svelte
index 2cd718be..7e588024 100644
--- a/src/routes/(app)/invoice/[id]/paid/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/paid/+page.svelte
@@ -30,7 +30,7 @@
   {/if}
 </div>
 
-<a href={`/${user.username}`}>
+<a href={`/${user.username}`} aria-label="Continue">
   <div class="opacity-0 w-screen h-screen fixed top-24 left-0 z-50"></div>
 </a>
 
diff --git a/src/routes/(app)/send/ecash/+page.svelte b/src/routes/(app)/send/ecash/+page.svelte
index 96ab5b02..b9c93661 100644
--- a/src/routes/(app)/send/ecash/+page.svelte
+++ b/src/routes/(app)/send/ecash/+page.svelte
@@ -26,7 +26,7 @@
 
   let submitting = $state();
   let toggle = () => (submitting = !submitting);
-  $effect(() => ({ rate: $rate } = user));
+  $effect(() => ({ rate: $rate } = data));
 </script>
 
 <div class="container px-4 max-w-xl mx-auto space-y-5 text-center">
diff --git a/src/routes/(app)/send/ecash/[request]/+page.svelte b/src/routes/(app)/send/ecash/[request]/+page.svelte
index 3f75eee4..f014d1b6 100644
--- a/src/routes/(app)/send/ecash/[request]/+page.svelte
+++ b/src/routes/(app)/send/ecash/[request]/+page.svelte
@@ -73,7 +73,7 @@
   let toggle = () => (show = !show);
   let amount = $derived(form?.amount || data.req.amount);
 
-  $effect(() => ($rate ||= data.rate);
+  $effect(() => ($rate ||= data.rate));
   $effect(() => form && (submitting = false));
 </script>
 
-- 
cgit v1.2.3