move to app layout

2 files changed, 15 insertions, 3 deletions

diff --git a/src/lib/socket.js b/src/lib/socket.js
index df20fdd8..94c1802e 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -6,7 +6,7 @@ import { env } from '$env/dynamic/public';
 const socketUrl = env.PUBLIC_SOCKET;
 const btc = env.PUBLIC_BTC;
 
-let interval, socket, token;
+let socket, token;
 
 export const auth = () => token && send('login', token);
 
@@ -15,19 +15,23 @@ export const send = (type, data) => {
 };
 
 export const messages = (data) => ({
-	rate() {
+  id() {
 		last.set(Date.now());
+  },
+
+	rate() {
 		rate.set(data);
 	},
 
 	async payment() {
 		let { amount, invoice } = data;
-		if (get(user).account_id !== data.account_id) return;
 
 		if (invoice) {
 			invoices.set({ ...get(invoices), [invoice.uuid]: invoice });
 		}
 
+		if (get(user).account_id !== data.account_id) return;
+
 		newPayment.set(true);
 		if (amount > 0) {
 			success(`Received ${amount} sats!`);
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 41435bf6..e2c8f955 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -144,3 +144,11 @@ export const sats = 100000000;
 
 export const back = () => browser && history.go(-1);
 export const focus = (el) => setTimeout(() => el.focus());
+
+
+export const wait = async (f, s = 300) => {
+  let i = 0;
+  while (!(await f()) && i < s) (await sleep(1000)) && i++;
+  if (i >= s) throw new Error("timeout");
+  return f();
+};