payments fixes

3 files changed, 9 insertions, 20 deletions

diff --git a/src/lib/invoice.js b/src/lib/invoice.js
index 23ce1757..218972c6 100644
--- a/src/lib/invoice.js
+++ b/src/lib/invoice.js
@@ -21,16 +21,16 @@ export default async ({ cookies, request, url }) => {
 	let user = { username: form.get('username'), currency: form.get('currency') };
 
 	invoice = await post('/invoice', { invoice, user }, auth(cookies));
-	let { hash } = invoice;
+	let { id } = invoice;
 
 	if (request_id) {
 		if (url.pathname.endsWith('tip')) {
-			throw redirect(307, `/send/invoice/${hash}`);
+			throw redirect(307, `/send/invoice/${id}`);
 		}
 
 		throw redirect(307, `/${user.username}/request/${request_id}`);
 	}
 
-	if (invoice.prompt) throw redirect(307, `/${user.username}/invoice/${hash}/tip`);
-	else throw redirect(307, `/${user.username}/invoice/${hash}`);
+	if (invoice.prompt) throw redirect(307, `/${user.username}/invoice/${id}/tip`);
+	else throw redirect(307, `/${user.username}/invoice/${id}`);
 };
diff --git a/src/lib/socket.js b/src/lib/socket.js
index e8859fa6..96fde317 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -1,5 +1,5 @@
 import { get } from 'svelte/store';
-import { event, invoice, request, newPayment, last, rate, payments, user } from '$lib/store';
+import { event, invoice, request, newPayment, last, rate, user } from '$lib/store';
 import { success, sat } from '$lib/utils';
 import { PUBLIC_SOCKET } from '$env/static/public';
 import { invalidate } from '$app/navigation';
@@ -34,23 +34,13 @@ export const messages = (data) => ({
 	},
 
 	async payment() {
-		let { amount, invoice } = data;
+		let { amount, confirmed } = data;
+		invalidate('app:user');
 		invalidate('app:invoice');
-
-		let p = get(payments);
-		let i = p.findIndex((p) => p.id === data.id);
-
-		if (~i) {
-			p[i] = data;
-			payments.set(p);
-		} else newPayment.set(true);
-
-		invalidate((url) => url.pathname === '/payments');
+		invalidate('app:payments');
 
 		if (amount > 0) {
-			success(`${data.confirmed ? 'Received' : 'Detected'} ${sat(amount)}!`);
-		} else {
-			// success(`Sent ${sat(amount)}!`);
+			success(`${confirmed ? 'Received' : 'Detected'} ${sat(amount)}!`);
 		}
 	},
 
diff --git a/src/lib/store.js b/src/lib/store.js
index 923bda52..64cf015e 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -45,7 +45,6 @@ export const decrypted = persistLocal('decrypted', {});
 export const newPayment = persistLocal('newPayment');
 export const password = persistLocal('password');
 export const passwordPrompt = writable();
-export const payments = persistLocal('transactions', []);
 export const pin = writable();
 export const rate = writable();
 export const request = writable();