resolve conflit

src/app/shared/agenda/new-event/new-event.page.ts

@@ -12,7 +12,6 @@ import {  EventAttachment } from 'src/app/models/attachment.model';
 
 import { ToastService } from 'src/app/services/toast.service';
 import { LoginUserRespose } from 'src/app/models/user.model';
-import { AuthService } from 'src/app/services/auth.service';
 
 import {DateAdapter} from '@angular/material/core';
 import * as _moment from 'moment';
@@ -26,6 +25,7 @@ import {  FormGroup, Validators } from '@angular/forms';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { ThemeService } from 'src/app/services/theme.service'
 import { ChatMethodsService } from 'src/app/services/chat/chat-methods.service';
+import { SessionStore } from 'src/app/store/session.service';
 
 const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
   parse: {
@@ -84,6 +84,7 @@ export class NewEventPage implements OnInit {
   @Output() clearContact = new EventEmitter<any>();
   @Output() GoBackEditOrAdd  = new EventEmitter<any>();
   @Output() cloneAllmobileComponent = new EventEmitter<any>();
+  @Output() backToChat = new EventEmitter<any>();
 
   documents:SearchList[] = [];
 
@@ -123,15 +124,14 @@ export class NewEventPage implements OnInit {
     public eventService: EventsService,
     private attachmentsService: AttachmentsService,
     private toastService: ToastService,
-    private userService: AuthService,
     private dateAdapter: DateAdapter<any>,
     public ThemeService: ThemeService,
     private chatMethodService: ChatMethodsService,
     // private translate: TranslateService
   ) {
     this.dateAdapter.setLocale('pt');
-    this.loggeduser = userService.ValidatedUser;
-    this.postEvent = new Event();    
+    this.loggeduser = SessionStore.user;
+    this.postEvent = new Event();
 
   }
 
@@ -373,10 +373,10 @@ export class NewEventPage implements OnInit {
   close() {
 
     this.deleteTemporaryData();
-    this.cloneAllmobileComponent.emit({roomId:this.roomId});
     this.clearContact.emit();
     this.setIntervenient.emit([]);
     this.setIntervenientCC.emit([]);
+    this.backToChat.emit({roomId:this.roomId})
   }
 
   getRecurrenceTypes() {