From d8fc76bedc0d39f3833a8f15c5784625cf41ae55 Mon Sep 17 00:00:00 2001 From: ithiame Date: Tue, 10 Dec 2024 10:29:04 +0000 Subject: [PATCH 1/2] =?UTF-8?q?=20=F0=9F=90=9B=20Issue=20on=20subscription?= =?UTF-8?q?=20listing=20when=20no=20npub=20is=20filled=20#410?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/[id]/subscribers/+page.server.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/routes/(app)/admin[[hash=admin_hash]]/product/[id]/subscribers/+page.server.ts b/src/routes/(app)/admin[[hash=admin_hash]]/product/[id]/subscribers/+page.server.ts index 5c1ff3948..7abf85491 100644 --- a/src/routes/(app)/admin[[hash=admin_hash]]/product/[id]/subscribers/+page.server.ts +++ b/src/routes/(app)/admin[[hash=admin_hash]]/product/[id]/subscribers/+page.server.ts @@ -16,6 +16,10 @@ export const load = async ({ params }) => { product: pojo(product), subscriptions: subscriptions.map((subscription) => ({ ...subscription, + user: { + ...subscription.user, + userId: subscription.user.userId?.toString() + }, notifications: subscription.notifications.map(pojo) })) }; From 2a40237a9f8fa0abf1f914f45cd5125cb3ffb167 Mon Sep 17 00:00:00 2001 From: ithiame Date: Tue, 10 Dec 2024 14:46:49 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=20=F0=9F=90=9B=20Issue=20on=20subscription?= =?UTF-8?q?=20listing=20when=20no=20npub=20is=20filled=20#410?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/[id]/subscribers/+page.server.ts | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/routes/(app)/admin[[hash=admin_hash]]/product/[id]/subscribers/+page.server.ts b/src/routes/(app)/admin[[hash=admin_hash]]/product/[id]/subscribers/+page.server.ts index 7abf85491..d38ed9a7a 100644 --- a/src/routes/(app)/admin[[hash=admin_hash]]/product/[id]/subscribers/+page.server.ts +++ b/src/routes/(app)/admin[[hash=admin_hash]]/product/[id]/subscribers/+page.server.ts @@ -15,11 +15,8 @@ export const load = async ({ params }) => { return { product: pojo(product), subscriptions: subscriptions.map((subscription) => ({ - ...subscription, - user: { - ...subscription.user, - userId: subscription.user.userId?.toString() - }, + ...pojo(subscription), + user: pojo(subscription.user), notifications: subscription.notifications.map(pojo) })) };