From c2e97701530cf9e38d0502fa95c51df334a8aedd Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 11 Oct 2022 14:18:55 +0100
Subject: [PATCH] improve chat user flow

---
 src/app/pages/chat/chat.page.html                      | 4 ++++
 src/app/shared/chat/messages/contacts/contacts.page.ts | 8 +++++---
 src/app/shared/chat/new-group/new-group.page.ts        | 4 +++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index e7904bfb5..86c24687b 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -203,14 +203,18 @@
 
         <app-contacts
           (openMessage)="openMessagesPage($event)"
+          (backToChat)="backToChat($event)"
           (emptyTextDescriptionOpen)="emptyTextDescriptionOpen()"
           *ngIf="showContacts"
+          [roomId]="roomId"
           [style.display]="showContacts ? 'flex' : 'none'"
            class=" height-100 flex-column">
         </app-contacts>
 
         <app-new-group
           (addGroupMessage)="openGroupContactsPage($event)"
+          [roomId]="roomId"
+          (backToChat)="backToChat($event)"
           (closeAllDesktopComponents)="closeAllDesktopComponents()"
           [style.display]="showNewGroup ? 'flex' : 'none'"
           *ngIf="showNewGroup"
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index 15853dad6..5ef7a97a5 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -1,5 +1,5 @@
 import { HttpErrorResponse, HttpHeaders } from '@angular/common/http';
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
@@ -22,9 +22,11 @@ export class ContactsPage implements OnInit {
   room:any;
   dm:any;
   sessionStore = SessionStore
+  @Input() roomId: string;
 
   @Output() openMessage:EventEmitter<any> = new EventEmitter<any>();
-  @Output() emptyTextDescriptionOpen:EventEmitter<any> = new EventEmitter<any>();  
+  @Output() emptyTextDescriptionOpen:EventEmitter<any> = new EventEmitter<any>();
+  @Output() backToChat:EventEmitter<any> = new EventEmitter<any>();  
 
   constructor(
     private modalController: ModalController,
@@ -86,7 +88,7 @@ export class ContactsPage implements OnInit {
   }
 
   close() {
-    this.emptyTextDescriptionOpen.emit();
+    this.backToChat.emit({roomId: this.roomId});
   }
 
   clicked() {
diff --git a/src/app/shared/chat/new-group/new-group.page.ts b/src/app/shared/chat/new-group/new-group.page.ts
index 66586a7bc..4df61c4b2 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -28,10 +28,12 @@ export class NewGroupPage implements OnInit{
   link = ''
   documents: any;
   loggedUserChat: any;
+  @Input() roomId: string;
 
   @Input() groupName:string;
   @Output() addGroupMessage:EventEmitter<any> = new EventEmitter<any>();
   @Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
+  @Output() backToChat:EventEmitter<any> = new EventEmitter<any>();  
   
 
   constructor(
@@ -81,7 +83,7 @@ export class NewGroupPage implements OnInit{
       this.RouteService.goBack();
       this.dataService.set("link", false);
     } else {
-      this.closeAllDesktopComponents.emit();
+      this.backToChat.emit({roomId: this.roomId});
     }
   }