Merge branch 'master' into i18n

1 files changed, 10 insertions, 3 deletions

diff --git a/src/lib/socket.js b/src/lib/socket.js
index 66091d76..a30d4376 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -1,5 +1,6 @@
 import { get } from 'svelte/store';
-import { rate, user, token, invoices, preferredCurrency } from '$lib/store';
+import { rate, user, token, invoices, preferredCurrency, newPayment } from '$lib/store';
+import { success } from '$lib/utils';
 
 let interval, socket;
 
@@ -18,14 +19,20 @@ export const messages = (data) => ({
 	},
 
 	payment() {
-		invoices.set({ ...get(invoices), [data.invoice.uuid]: data.invoice });
+		if (data.invoice) invoices.set({ ...get(invoices), [data.invoice.uuid]: data.invoice });
+		newPayment.set(true);
+		if (data.amount > 0) {
+			success(`Received ${data.amount} sats!`);
+		} else {
+			success(`Sent ${-data.amount} sats!`);
+		}
 	},
 
 	connected: auth,
 
 	login() {
 		user.set(data);
-		preferredCurrency.set(data.currency);
+		preferredCurrency.set('USD');
 	}
 });