fix lightning data

2 files changed, 2 insertions, 2 deletions

diff --git a/src/routes/(app)/+layout.server.ts b/src/routes/(app)/+layout.server.ts
index 402c473d..acf19ada 100644
--- a/src/routes/(app)/+layout.server.ts
+++ b/src/routes/(app)/+layout.server.ts
@@ -19,7 +19,7 @@ export async function load({ cookies, request, url, params }) {
 
 	let subject;
 
-	if (url.pathname.startsWith("/invoice") && id) {
+	if (url.pathname.includes("/invoice") && id) {
 		try {
 			({ user: subject } = await get(`/invoice/${id}`));
 		} catch (e) {
diff --git a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
index 90844786..3c3a4756 100644
--- a/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
+++ b/src/routes/(app)/send/lightning/[payreq]/+page.server.ts
@@ -7,7 +7,7 @@ export async function load({ cookies, params, parent }) {
 	let data = { ...params };
 	const rates = await getRates();
 	if (!params.payreq.startsWith("lno")) {
-		data = await post("/parse", params, auth(cookies));
+		data = { ...data, ...(await post("/parse", params, auth(cookies))) };
 	}
 
 	data.rate = rates[user.currency];