diff --git a/src/app/module/chat/chat.module.ts b/src/app/module/chat/chat.module.ts
index 7918f9ea4..d9ed36f19 100644
--- a/src/app/module/chat/chat.module.ts
+++ b/src/app/module/chat/chat.module.ts
@@ -6,7 +6,6 @@ import { SessionStore } from 'src/app/store/session.service';
 import { Subject, timer } from 'rxjs';
 import { UserTypingLocalRepository } from './data/repository/typing/user-typing-local-data-source.service';
 import { UserTypingRemoteRepositoryService } from './data/repository/typing/user-typing-live-data-source.service';
-import { RoomService } from 'src/app/module/chat/domain/service/room.service'
 import { HttpListenToMessageLoadHistoryAdapter } from './domain/adapter';
 import { ISignalRService } from 'src/app/infra/socket/adapter';
 import { HttpModule } from 'src/app/infra/http/http.module';
@@ -130,12 +129,9 @@ export class ChatModule {
     private signalR: SignalRService,
     private localDataSource: UserTypingLocalRepository,
     private UserTypingRemoteRepositoryService: UserTypingRemoteRepositoryService,
-    private RoomService: RoomService,
     private DistributionService: DistributionService,
     private RoomLastMessageService: RoomLastMessageService
   ) {
-
-    this.RoomService.init()
     this.syncMessage()
     this.listenToTyping()
   }
diff --git a/src/app/module/chat/domain/chat-service.service.ts b/src/app/module/chat/domain/chat-service.service.ts
index 383043a06..a0391d4b6 100644
--- a/src/app/module/chat/domain/chat-service.service.ts
+++ b/src/app/module/chat/domain/chat-service.service.ts
@@ -42,6 +42,7 @@ import { BoldRemoveByRoomIdInput, BoldRemoveByRoomIdService } from 'src/app/modu
 import { MemberListHttpSyncUseCase } from 'src/app/module/chat/domain/use-case/member/member-list-http-sync-use-case.ts.service'
 import { RoomBoldSyncUseCaseService } from 'src/app/module/chat/domain/use-case/room/room-bold-sync-use-case.service'
 import { RoomSetLastMessageService } from 'src/app/module/chat/domain/use-case/room/room-set-last-message.service';
+import { RoomGetListOnCreateUseCaseService } from 'src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service';
 import { IUserPhotoGetByIdInput, UserPhotoGetByIdUseCase } from 'src/app/module/chat/domain/use-case/user-photo/user-photo-get-by-id-use-case.service'
 
 
@@ -101,7 +102,8 @@ export class ChatServiceService {
     private MemberListHttpSyncUseCase: MemberListHttpSyncUseCase, // dont remove
     private RoomBoldSyncUseCaseService: RoomBoldSyncUseCaseService, // dont remove
     private RoomSetLastMessageService: RoomSetLastMessageService, // dont remove
-    private UserPhotoGetByIdUseCase: UserPhotoGetByIdUseCase
+    private UserPhotoGetByIdUseCase: UserPhotoGetByIdUseCase,
+    private RoomGetListOnCreateUseCaseService: RoomGetListOnCreateUseCaseService
   ) {
     this.MessageSocketRepositoryService.listenToDeleteMessages()
     .pipe()
diff --git a/src/app/module/chat/domain/service/room.service.spec.ts b/src/app/module/chat/domain/service/room.service.spec.ts
deleted file mode 100644
index 34729ebbf..000000000
--- a/src/app/module/chat/domain/service/room.service.spec.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-
-import { RoomService } from './room.service';
-
-describe('RoomService', () => {
-  let service: RoomService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({});
-    service = TestBed.inject(RoomService);
-  });
-
-  it('should be created', () => {
-    expect(service).toBeTruthy();
-  });
-});
diff --git a/src/app/module/chat/domain/service/room.service.ts b/src/app/module/chat/domain/service/room.service.ts
deleted file mode 100644
index 27da9fdf1..000000000
--- a/src/app/module/chat/domain/service/room.service.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Injectable } from '@angular/core';
-import { RoomSocketRepositoryService } from 'src/app/module/chat/data/repository/room/room-socket-repository.service'
-@Injectable({
-  providedIn: 'root'
-})
-export class RoomService {
-
-  constructor(
-    private RoomSocketRepositoryService: RoomSocketRepositoryService
-  ) {}
-  
-  init() {
-    this.OnReceiveCreateRoom()
-    this.OnDeleteCreateRoom()
-  }
-
-
-  OnReceiveCreateRoom() {
-    this.RoomSocketRepositoryService.listenToCreateRoom().subscribe((data)=> {
-      console.log('OnReceiveCreateRoom', data)
-    })
-  }
-
-  OnDeleteCreateRoom() {
-    this.RoomSocketRepositoryService.listenToDeleteRoom().subscribe((data)=> {
-      console.log('OnDeleteCreateRoom7', data)
-    })
-  }
-}
diff --git a/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts b/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts
index c9088fd0f..9132c362e 100644
--- a/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts
+++ b/src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts
@@ -30,7 +30,8 @@ export class RoomGetListOnCreateUseCaseService {
 
   private OnDeleteCreateRoom() {
     this.RoomSocketRepositoryService.listenToDeleteRoom().subscribe((data)=> {
-      console.log('OnDeleteCreateRoom7', data)
+      console.log('OnDeleteCreateRoom', data)
+      this.getRoomListUseCaseService.execute()
     })
   }
 }
diff --git a/src/app/ui/chat/chat.page.ts b/src/app/ui/chat/chat.page.ts
index 81a06155a..5801d85c8 100644
--- a/src/app/ui/chat/chat.page.ts
+++ b/src/app/ui/chat/chat.page.ts
@@ -24,6 +24,7 @@ import { BoldLocalRepository } from 'src/app/module/chat/data/repository/bold/bo
 import { BoldTable } from 'src/app/infra/database/dexie/instance/chat/schema/bold';
 import { RoomViewModel } from './store/model/room';
 import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service'
+import { ToastService } from 'src/app/services/toast.service';
 @Component({
   selector: 'app-chat',
   templateUrl: './chat.page.html',
@@ -81,7 +82,8 @@ export class ChatPage implements OnInit {
     private ChatServiceService: ChatServiceService,
     private roomLocalDataSourceService: RoomLocalRepository,
     private boldLocalRepository: BoldLocalRepository,
-    private MessageLocalDataSourceService: MessageLocalDataSourceService
+    private MessageLocalDataSourceService: MessageLocalDataSourceService,
+    private toastService: ToastService,
   ) {
 
     window.onresize = (event) => {
@@ -343,14 +345,19 @@ export class ChatPage implements OnInit {
     this.roomId = roomId;
     this.RoomSelected = this.rooms.filter(e => e.id == roomId)[0]
 
-    if (window.innerWidth < 701) {
-      this.openMessagesModal(roomId);
-    }
-    else {
-      this.idSelected = roomId;
-      this.closeAllDesktopComponents();
-      this.showEmptyComponent = false;
-      this.showMessages = true;
+    if(this.RoomSelected?.id) {
+      if (window.innerWidth < 701) {
+        this.openMessagesModal(roomId);
+      }
+      else {
+        this.idSelected = roomId;
+        this.closeAllDesktopComponents();
+        this.showEmptyComponent = false;
+        this.showMessages = true;
+      }
+    } else {
+      console.log('conversa não existe');
+      // this.toastService._badRequest("Pedimos desculpa mas não foi possível executar a acção. Por favor, contacte o apoio técnico.")
     }
 
   }
diff --git a/src/app/ui/chat/component/messages/messages.page.html b/src/app/ui/chat/component/messages/messages.page.html
index 6eb533d74..5ccda10a6 100644
--- a/src/app/ui/chat/component/messages/messages.page.html
+++ b/src/app/ui/chat/component/messages/messages.page.html
@@ -67,15 +67,6 @@
             </div>
 
             <div *ngFor="let attachment of message.attachments; let i = index">
-              <div *ngIf="attachment.source == MessageAttachmentFileSource.Webtrix">
-
-                <ion-icon  src="assets/icon/webtrix.svg" class="file-icon font-25"></ion-icon>
-                <!-- <ion-label>{{ attachment.fileName}}</ion-label> -->
-                <!-- <ion-icon *ngIf="ThemeService.currentTheme == 'default' && attachment.type != 'webtrix' && !( msg.downloadLoader == true || msg.uploadingFile == true ) " class="icon-download" src="assets/icon/theme/default/icons-download.svg" slot="end"></ion-icon>
-                <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && attachment.type != 'webtrix' && !( msg.downloadLoader == true || msg.uploadingFile == true ) " class="icon-download" src="assets/icon/theme/gov/icons-download.svg" slot="end"></ion-icon>
-                <ion-icon *ngIf="( msg.downloadLoader == true || msg.uploadingFile == true )" class="icon-download" src="assets/gif/theme/{{ThemeService.currentTheme}}/Blocks-loader.svg" slot="end"></ion-icon> -->
-
-              </div>
 
               <div *ngIf="attachment.fileType == MessageAttachmentFileType.Image">
                 <img
@@ -109,7 +100,8 @@
                 <audio [src]="attachment.safeFile|safehtml" preload="metadata" class="flex-grow-1" controls controlsList="nodownload noplaybackrate"></audio>
               </div>
 
-              <div *ngIf="attachment.fileType == MessageAttachmentFileType.Doc" class="d-flex" (click)="openPreview(message)">
+              <div *ngIf="attachment.fileType == MessageAttachmentFileType.Doc"  class="d-flex" (click)="openPreview(message)">
+                <ion-icon *ngIf="attachment.source == MessageAttachmentFileSource.Webtrix"  src="assets/icon/webtrix.svg" class="file-icon font-25"></ion-icon>
                 <fa-icon *ngIf="attachment.mimeType == 'application/pdf'" icon="file-pdf" class="pdf-icon"></fa-icon>
                 <fa-icon *ngIf="attachment.mimeType == 'application/word'" icon="file-word" class="word-icon">
                 </fa-icon>
diff --git a/src/app/ui/chat/modal/messages/messages.page.ts b/src/app/ui/chat/modal/messages/messages.page.ts
index a5ac6922e..4c1bd83e7 100644
--- a/src/app/ui/chat/modal/messages/messages.page.ts
+++ b/src/app/ui/chat/modal/messages/messages.page.ts
@@ -773,13 +773,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   viewDocument(file: any, url?: string) {
 
-    if (file.type == "application/webtrix") {
-      this.openViewDocumentModal(file);
-    }
-    else {
-      let fullUrl = "https://www.tabularium.pt" + url;
-      this.fileService.viewDocumentByUrl(fullUrl);
-    }
+    this.openViewDocumentModal(file);
   }
 
 
diff --git a/version/git-version.ts b/version/git-version.ts
index 39c1a62dc..0e5658815 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,11 +1,11 @@
 export let versionData = {
-  "shortSHA": "5c157d4c6",
-  "SHA": "5c157d4c636ddf926080b5bb672ad931bffc91c3",
-  "branch": "feature/agenda-api-peter",
+  "shortSHA": "4b6364fac",
+  "SHA": "4b6364fac17696810c5caf4f22290bf1f01bdef1",
+  "branch": "feature/chat-new-api-peter",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Fri Sep 13 12:27:39 2024 +0100'",
-  "lastCommitMessage": "merge chat",
-  "lastCommitNumber": "6068",
-  "changeStatus": "On branch feature/agenda-api-peter\nYour branch is ahead of 'origin/feature/agenda-api-peter' by 163 commits.\n  (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/module/chat/data/repository/attachment/attachment-remote-repository.service.ts\n\tmodified:   src/app/module/chat/domain/use-case/message/sync-all-room-messages.service.ts\n\tmodified:   src/app/services/http.service.ts\n\tmodified:   version/git-version.ts",
+  "lastCommitTime": "'Fri Sep 13 12:59:56 2024 +0100'",
+  "lastCommitMessage": "fix download attachment",
+  "lastCommitNumber": "6069",
+  "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/module/chat/chat.module.ts\n\tmodified:   src/app/module/chat/domain/chat-service.service.ts\n\tdeleted:    src/app/module/chat/domain/service/room.service.spec.ts\n\tdeleted:    src/app/module/chat/domain/service/room.service.ts\n\tmodified:   src/app/module/chat/domain/use-case/room/room-get-list-on-create-use-case.service.ts\n\tmodified:   src/app/ui/chat/chat.page.ts\n\tmodified:   src/app/ui/chat/component/messages/messages.page.html\n\tmodified:   src/app/ui/chat/modal/messages/messages.page.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file