Merge branch 'master' into hashme

4 files changed, 16 insertions, 10 deletions

diff --git a/src/lib/socket.js b/src/lib/socket.js
index aef8a513..e8859fa6 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -7,7 +7,7 @@ import { browser } from '$app/environment';
 
 let socket, token;
 
-export const auth = () => token && send('login', token) && send('heartbeat');
+export const auth = () => token && send('login', token);
 
 export const send = (type, data) => {
 	socket?.readyState === 1 && socket.send(JSON.stringify({ type, data }));
diff --git a/src/lib/store.js b/src/lib/store.js
index ce984b17..4e88c90c 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -46,7 +46,7 @@ export const newPayment = persistLocal('newPayment');
 export const password = persistLocal('password');
 export const passwordPrompt = writable();
 export const payments = persistLocal('transactions', []);
-export const pin = persistSession('pin', undefined);
+export const pin = writable();
 export const rate = writable();
 export const request = writable();
 export const requestRedirect = writable();
diff --git a/src/lib/translations/index.js b/src/lib/translations/index.js
index ea92192b..8d1b9feb 100644
--- a/src/lib/translations/index.js
+++ b/src/lib/translations/index.js
@@ -28,9 +28,9 @@ const config = {
 			loader: async () => (await import('../../locales/en.json')).default
 		},
 		{
-			locale: 'fa',
+			locale: 'es',
 			key: '',
-			loader: async () => (await import('../../locales/fa.json')).default
+			loader: async () => (await import('../../locales/es.json')).default
 		},
 		{
 			locale: 'fr',
@@ -38,11 +38,6 @@ const config = {
 			loader: async () => (await import('../../locales/fr.json')).default
 		},
 		{
-			locale: 'es',
-			key: '',
-			loader: async () => (await import('../../locales/es.json')).default
-		},
-		{
 			locale: 'pt',
 			key: '',
 			loader: async () => (await import('../../locales/pt.json')).default
@@ -56,6 +51,16 @@ const config = {
 			locale: 'zh',
 			key: '',
 			loader: async () => (await import('../../locales/zh.json')).default
+		},
+		{
+			locale: 'fa',
+			key: '',
+			loader: async () => (await import('../../locales/fa.json')).default
+		},
+		{
+			locale: 'el',
+			key: '',
+			loader: async () => (await import('../../locales/el.json')).default
 		}
 	]
 };
diff --git a/src/lib/translations/lang.json b/src/lib/translations/lang.json
index cbf1ce4a..0acc1de6 100644
--- a/src/lib/translations/lang.json
+++ b/src/lib/translations/lang.json
@@ -5,5 +5,6 @@
 	"de": "Deutsch",
 	"pt": "Português",
 	"zh": "中国人",
-	"fa": "فارسی "
+	"fa": "فارسی ",
+	"el": "Ελληνικά"
 }