payment amount helpers

2 files changed, 13 insertions, 5 deletions

diff --git a/src/lib/invoice.ts b/src/lib/invoice.ts
index a48e02a4..9563d924 100644
--- a/src/lib/invoice.ts
+++ b/src/lib/invoice.ts
@@ -2,6 +2,7 @@ import { auth, get, post } from "$lib/utils";
 import { redirect } from "@sveltejs/kit";
 
 export default async ({ cookies, request }) => {
+	console.log("LOADING");
 	const form = await request.formData();
 	const aid = form.get("aid") || cookies.get("aid");
 
diff --git a/src/lib/socket.ts b/src/lib/socket.ts
index 02d441bf..566e989d 100644
--- a/src/lib/socket.ts
+++ b/src/lib/socket.ts
@@ -1,8 +1,8 @@
-import { invalidate } from "$app/navigation";
-import { navigating } from "$app/stores";
+import { goto, invalidate } from "$app/navigation";
+import { navigating, page } from "$app/stores";
 import { PUBLIC_SOCKET } from "$env/static/public";
 import { event, invoice, last, request } from "$lib/store";
-import { sat, sleep, success, wait } from "$lib/utils";
+import { s, sleep, success, wait } from "$lib/utils";
 import { get } from "svelte/store";
 
 let socket;
@@ -38,13 +38,20 @@ export const messages = (data) => ({
 	},
 
 	async payment() {
-		const { amount, confirmed } = data;
+		const { amount, confirmed, iid } = data;
 		invalidate("app:user");
 		invalidate("app:invoice");
 		invalidate("app:payments");
 
+		const {
+			url: { pathname },
+		} = get(page);
+
 		if (amount > 0) {
-			success(`${confirmed ? "Received" : "Detected"} ${sat(amount)}!`);
+			if (pathname.includes("receive")) {
+				await wait(() => !get(navigating));
+				await goto(`/invoice/${iid}`);
+			} else success(`${confirmed ? "Received" : "Detected"} ⚡️${s(amount)}!`);
 		}
 	},