From de0d81dbd7e8f046d53319cc035fae7212d67f54 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 09:20:54 +0100
Subject: [PATCH 1/3] add comments

---
 src/app/services/chat/ws-chat.service.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index 6de1931b8..d5bf890ab 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -17,6 +17,7 @@ export class WsChatService {
   constructor() {}
 
   connect() {
+    // dont connect if is already connected
     if(this.ws.connected == true) { return false }
     
     this.ws.connect();
@@ -43,7 +44,7 @@ export class WsChatService {
   }
 
   login() {
-
+    // dont login if is already login
     if(this.isLogin == true) { return new Promise((resolve, reject)=>{ resolve(this.loginResponse) }) }
     
     const requestId =  uuidv4()

From 56d1886f767f5d0d51cecf4e744fd513b71925d0 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 09:33:01 +0100
Subject: [PATCH 2/3] rewrite cod

---
 src/app/services/chat/ws-chat.service.ts | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts
index d5bf890ab..bfcf3fa86 100644
--- a/src/app/services/chat/ws-chat.service.ts
+++ b/src/app/services/chat/ws-chat.service.ts
@@ -18,7 +18,9 @@ export class WsChatService {
 
   connect() {
     // dont connect if is already connected
-    if(this.ws.connected == true) { return false }
+    if(this.ws.connected == true) { 
+      return false 
+    }
     
     this.ws.connect();
 
@@ -45,7 +47,11 @@ export class WsChatService {
 
   login() {
     // dont login if is already login
-    if(this.isLogin == true) { return new Promise((resolve, reject)=>{ resolve(this.loginResponse) }) }
+    if(this.isLogin == true) { 
+      return new Promise((resolve, reject)=>{ 
+        resolve(this.loginResponse) 
+      }) 
+    }
     
     const requestId =  uuidv4()
 

From 158bfaa4323cbbb248adea827b5035d8492a9e0b Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Fri, 14 Jan 2022 09:58:18 +0100
Subject: [PATCH 3/3] remove chat service from login

---
 src/app/pages/login/login.page.ts | 3 +--
 src/app/services/auth.service.ts  | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts
index a98ef4b43..1e4180e07 100644
--- a/src/app/pages/login/login.page.ts
+++ b/src/app/pages/login/login.page.ts
@@ -40,8 +40,7 @@ export class LoginPage implements OnInit {
     private clearStoreService: ClearStoreService,
     private changeProfileService: ChangeProfileService,
     public ThemeService: ThemeService,
-    private storageservice: StorageService,
-    private chatService: ChatService,
+    private storageservice: StorageService
   ) {}
 
   ngOnInit() {
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 1911bc6de..797d25a9a 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -20,7 +20,7 @@ export class AuthService {
   headers: HttpHeaders;
   public ValidatedUser: UserSession;
   public wsValidatedUserChat:any;
-  public ValidatedUserChat:any;
+  public ValidatedUserChat:any = {}
   public isWsAuthenticated: boolean = false;
   opts:any;