profile page fixes

2 files changed, 12 insertions, 6 deletions

diff --git a/src/routes/(app)/[username]/(profile)/+page.server.js b/src/routes/(app)/[username]/(profile)/+page.server.js
index 2777afdc..085271fd 100644
--- a/src/routes/(app)/[username]/(profile)/+page.server.js
+++ b/src/routes/(app)/[username]/(profile)/+page.server.js
@@ -5,7 +5,8 @@ export async function load({ cookies, params, parent, url }) {
 	let { pubkey } = subject;
 	let { since = 0 } = params;
 
-	let messages = [];
+  let messages, invoices, sent, received;
+	messages = invoices = sent = received = [];
 
 	if (user) {
 		try {
@@ -14,6 +15,8 @@ export async function load({ cookies, params, parent, url }) {
 		} catch (e) {
 			console.log(`failed to fetch nostr messages`, e);
 		}
+
+		({ invoices, sent, received } = await get('/requests', auth(cookies)));
 	}
 
 	let notes = [];
@@ -28,7 +31,5 @@ export async function load({ cookies, params, parent, url }) {
 		e.seen = e.created_at;
 	});
 
-	let { invoices, sent, received } = await get('/requests', auth(cookies));
-
 	return { invoices, messages, notes, sent, received };
 }
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 4d4f3b13..e5a42f07 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -15,7 +15,8 @@
 	let i = 0;
 
 	e.subscribe(async (event) => {
-		if (event?.recipient.id === user.id && !~latest.findIndex((m) => m.id === event.id)) {
+    if (!event) return;
+		if (event.recipient.id === user?.id && !~latest.findIndex((m) => m.id === event.id)) {
 			event.content = await decrypt({ event, user });
 
 			let i = latest.findIndex((m) => m.pubkey === event.pubkey);
@@ -23,9 +24,13 @@
 			if (~i) latest.splice(i, 1);
 			else latest.pop();
 
-			console.log(latest);
 			latest.unshift(event);
 
+			console.log(
+				'latest',
+				latest.map((m) => m.id)
+			);
+
 			latest = latest;
 		}
 	});
@@ -164,7 +169,7 @@
 		</div>
 	{/if}
 
-	{#if latest.length && user.id === subject.id}
+	{#if latest.length && user?.id === subject.id}
 		<div class="relative">
 			{#each latest as { content, pubkey, author, recipient }}
 				{@const user = author.id === user.id ? recipient : author}