fix merge

src/app/shared/popover/chat-popover/chat-popover.page.ts

@@ -5,6 +5,9 @@ import { ToastService } from 'src/app/services/toast.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SetRoomOwnerPage } from 'src/app/modals/set-room-owner/set-room-owner.page';
 import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
+import { HttpErrorResponse } from '@angular/common/http';
+import { SessionStore } from 'src/app/store/session.service';
+import { GroupContactsPage } from '../../chat/group-messages/group-contacts/group-contacts.page';
 
 
 @Component({
@@ -17,6 +20,7 @@ export class ChatPopoverPage implements OnInit {
   room: any;
   members:any;
   isAdmin = false;
+  isGroupCreated: boolean;
 
   constructor(
     private popoverController: PopoverController,

src/app/shared/popover/deploma-options/deploma-options.page.html

@@ -12,9 +12,11 @@
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Revisar Diploma'">
         <button (click)="openAddNoteModal('Solicitar assinatura')" class="btn-cancel" shape="round" >Solicitar assinatura do Presidente</button>
         <button (click)="openAddNoteModal('Solicitar alteração')" class="btn-cancel" shape="round" >Solicitar alteração</button>
-        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
-        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
         <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar despacho</button>
+        <button (click)="openAddNoteModal('Arquivo')" class="btn-cancel" shape="round" >Arquivar</button>
+        <button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
+        
+        
         <div class="solid"></div>
       </div>
       <div class="buttons width-100" *ngIf="task.activityInstanceName == 'Diploma Assinado'">

src/app/shared/popover/opts-expediente/opts-expediente.page.ts

@@ -294,14 +294,9 @@ export class OptsExpedientePage implements OnInit {
     try {
       await this.processes.CompleteTask(body).toPromise();
       this.close();
-      this.toastService._successMessage('Processo aprovado')
+      this.httpErrorHanlde.httpsSucessMessagge('Avaliação Superiror')
     } catch(error) {
-      if(error.status == 0) {
-        this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
-      } else {
-       
-        this.toastService._badRequest('Processo não aprovado')
-      }
+      this.httpErrorHanlde.httpStatusHandle(error)
     }  finally {
       loader.remove()
     }