From fd83c9b03143affc35209f3f791f95f5a9d6adb8 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 27 Jul 2022 14:16:26 +0100
Subject: [PATCH 1/4] block buttons

---
 src/app/pages/chat/chat.page.html               | 2 +-
 src/app/pages/chat/chat.page.scss               | 5 +++++
 src/app/pages/chat/chat.page.ts                 | 2 --
 src/app/shared/chat/new-group/new-group.page.ts | 1 -
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index c08544c4c..83a24c002 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -27,7 +27,7 @@
               </button>
             </div>
           </div>
-        <ion-toolbar>
+        <ion-toolbar [class.block-button]="showNewEvent || showNewGroup">
           <ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
             <ion-segment-button value="Contactos">
               Conversas
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss
index fc0a86d91..d09c59662 100644
--- a/src/app/pages/chat/chat.page.scss
+++ b/src/app/pages/chat/chat.page.scss
@@ -182,4 +182,9 @@ ion-content{
 
 .bold-message {
   font-weight: bold;
+}
+
+.block-button {
+  pointer-events: none;
+  opacity: 0.2;
 }
\ No newline at end of file
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 7af4f7fa5..e40254599 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -696,8 +696,6 @@ export class ChatPage implements OnInit {
 
   async openGroupMessagesModal(roomId: any) {
 
-    
-
     const modal = await this.modalController.create({
       component: GroupMessagesPage,
       cssClass: 'modal modal-desktop isGroupChatOpened',
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 8898b563e..524e873a4 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -61,7 +61,6 @@ export class NewGroupPage implements OnInit{
 
   }
 
-
   _ionChange(event){
     
     

From 155b3cd72ca6f63b823faefa52f3ca5e97936d83 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 27 Jul 2022 14:18:45 +0100
Subject: [PATCH 2/4] fix

---
 src/app/pages/chat/chat.page.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 83a24c002..42855ce85 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -27,7 +27,8 @@
               </button>
             </div>
           </div>
-        <ion-toolbar [class.block-button]="showNewEvent || showNewGroup">
+
+        <ion-toolbar [class.block-button]="showNewEvent || showNewGroup || showContacts">
           <ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
             <ion-segment-button value="Contactos">
               Conversas

From 48dcea0a0928719ad451eadcfcc68428aeb40024 Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 27 Jul 2022 15:11:34 +0100
Subject: [PATCH 3/4] fix

---
 src/app/shared/chat/new-group/new-group.page.ts | 4 ++++
 1 file changed, 4 insertions(+)

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 524e873a4..d4a4b9376 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -171,6 +171,10 @@ export class NewGroupPage implements OnInit{
         }],
       })
     });
+
+    setTimeout(() => {
+      this.groupName = ""
+    }, 150);
   }
 
   async addContacts(){

From 266b09f3a86c4c65bb127974e494258af0146b2e Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Wed, 27 Jul 2022 16:12:46 +0100
Subject: [PATCH 4/4] fix

---
 src/app/pages/chat/chat.page.html                     |  2 ++
 src/app/pages/chat/chat.page.ts                       |  6 ++++++
 src/app/pages/chat/new-group/new-group.page.html      |  1 +
 .../shared/chat/messages/contacts/contacts.page.html  |  6 +++---
 .../shared/chat/messages/contacts/contacts.page.ts    | 11 ++++++-----
 src/app/shared/chat/new-group/new-group.page.ts       |  2 ++
 6 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 42855ce85..1a5fc5817 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -198,6 +198,7 @@
 
         <app-contacts
           (openMessage)="openMessagesPage($event)"
+          (emptyTextDescriptionOpen)="emptyTextDescriptionOpen()"
           *ngIf="showContacts"
           [style.display]="showContacts ? 'flex' : 'none'"
            class=" height-100 flex-column">
@@ -205,6 +206,7 @@
 
         <app-new-group
           (addGroupMessage)="openGroupContactsPage($event)"
+          (closeAllDesktopComponents)="closeAllDesktopComponents()"
           [style.display]="showNewGroup ? 'flex' : 'none'"
            class=" height-100 flex-column">
         </app-new-group>
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index e40254599..5b46924ac 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -599,6 +599,12 @@ export class ChatPage implements OnInit {
 
   }
 
+
+  async emptyTextDescriptionOpen() {
+    this.closeAllDesktopComponents()
+    this.showEmptyComponent = true
+  }
+
   async getGroups(event?) {
     this.result = this.chatService.getAllPrivateGroups().subscribe(async (res: any) => {
       //
diff --git a/src/app/pages/chat/new-group/new-group.page.html b/src/app/pages/chat/new-group/new-group.page.html
index b6b7a0690..080631e24 100644
--- a/src/app/pages/chat/new-group/new-group.page.html
+++ b/src/app/pages/chat/new-group/new-group.page.html
@@ -4,6 +4,7 @@
       <div class="title-content width-100">
         <div class="left">
           <button class="btn-no-color" (click)="close()">
+            /././../
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
             <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
           </button>
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.html b/src/app/shared/chat/messages/contacts/contacts.page.html
index ba60cce1e..66c0d0250 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.html
+++ b/src/app/shared/chat/messages/contacts/contacts.page.html
@@ -2,9 +2,9 @@
   <ion-toolbar class="header-toolbar">
     <div class="main-header">
       <div class="title-content">
-        <div class="back-icon cursor-pointer">
-          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " (click)="close()" slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
-          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " (click)="close()" slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
+        <div class="back-icon cursor-pointer" (click)="close()">
+          <ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
+          <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
         </div>
         <div class="div-title">
           <ion-label class="title">Nova Conversa</ion-label>
diff --git a/src/app/shared/chat/messages/contacts/contacts.page.ts b/src/app/shared/chat/messages/contacts/contacts.page.ts
index cf0821c9b..99f0b518d 100644
--- a/src/app/shared/chat/messages/contacts/contacts.page.ts
+++ b/src/app/shared/chat/messages/contacts/contacts.page.ts
@@ -27,6 +27,7 @@ export class ContactsPage implements OnInit {
   sessionStore = SessionStore
 
   @Output() openMessage:EventEmitter<any> = new EventEmitter<any>();
+  @Output() emptyTextDescriptionOpen:EventEmitter<any> = new EventEmitter<any>();  
 
   constructor(
     private modalController: ModalController,
@@ -96,20 +97,20 @@ export class ContactsPage implements OnInit {
     let first_prev = records[recordIndex - 1].name[0];
     let first_current = record.name[0];
 
-    if(first_prev != first_current){
+    if(first_prev != first_current) {
       return first_current;
     }
     return null;
   }
 
-  doRefresh(event){
+  doRefresh(event) {
   }
 
-  close(){
-    this.modalController.dismiss();
+  close() {
+    this.emptyTextDescriptionOpen.emit();
   }
 
-  clicked(){
+  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 d4a4b9376..309b88ef1 100644
--- a/src/app/shared/chat/new-group/new-group.page.ts
+++ b/src/app/shared/chat/new-group/new-group.page.ts
@@ -29,6 +29,8 @@ export class NewGroupPage implements OnInit{
 
   @Input() groupName:string;
   @Output() addGroupMessage:EventEmitter<any> = new EventEmitter<any>();
+  @Output() closeAllDesktopComponents:EventEmitter<any> = new EventEmitter<any>();
+  
 
   constructor(
     private pickerController: PickerController,