check for user in invoice route

2 files changed, 13 insertions, 11 deletions

diff --git a/src/routes/(app)/invoice/[id]/+layout.server.ts b/src/routes/(app)/invoice/[id]/+layout.server.ts
index d6ab979e..df8693be 100644
--- a/src/routes/(app)/invoice/[id]/+layout.server.ts
+++ b/src/routes/(app)/invoice/[id]/+layout.server.ts
@@ -19,7 +19,7 @@ export async function load({ cookies, depends, params, url, parent }) {
 			(!amount && (pending || received)) ||
 			(amount > 0 && (pending >= amount || received >= amount));
 		if (paid && !url.pathname.endsWith("paid")) {
-			if (invoice.uid === user.id)
+			if (invoice.uid === user?.id)
 				redirect(307, `/invoice/${id}/paid` + (options ? "?options=true" : ""));
 			else redirect(307, `/pay/${subject.username}/${invoice.amount}`);
 		}
@@ -28,7 +28,7 @@ export async function load({ cookies, depends, params, url, parent }) {
 
 		if (
 			user &&
-			invoice.uid !== user.id &&
+			invoice.uid !== user?.id &&
 			!(url.pathname.includes("tip") || url.pathname.includes("memo")) &&
 			!options
 		) {
diff --git a/src/routes/(app)/invoice/[id]/+page.svelte b/src/routes/(app)/invoice/[id]/+page.svelte
index 0cb5aeac..29dd815d 100644
--- a/src/routes/(app)/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/invoice/[id]/+page.svelte
@@ -56,16 +56,18 @@
 
   let subbed = false;
 
-  onMount(async () => {
-    if (browser) {
-      last.subscribe((v) => {
-        if (!v || subbed) return;
-        subbed = true;
-        send("subscribe", invoice);
-      });
+  $effect(() => {
+    if (!browser) return;
+    last.subscribe((v) => {
+      if (!v || subbed) return;
+      subbed = true;
+      send("subscribe", invoice);
+    });
+  });
 
-      if ($amountPrompt && !amount) toggleAmount();
-    }
+  onMount(async () => {
+    if (!browser) return;
+    if ($amountPrompt && !amount) toggleAmount();
   });
 
   let update = async () => {