From 0f35462ebdde3701e8fe927b3debace9abf79305 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 14 Nov 2024 13:32:52 -0800 Subject: payment amount helpers --- src/lib/socket.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'src/lib/socket.ts') 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)}!`); } }, -- cgit v1.2.3