diff --git a/package-lock.json b/package-lock.json
index 761c43cce..afca13576 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -42,6 +42,7 @@
         "@capacitor/keyboard": "^4.1.0",
         "@capacitor/local-notifications": "^4.1.4",
         "@capacitor/network": "^4.1.0",
+        "@capacitor/push-notifications": "^4.1.2",
         "@capacitor/share": "^4.1.0",
         "@capacitor/storage": "^1.2.5",
         "@fortawesome/angular-fontawesome": "^0.9.0",
@@ -3533,6 +3534,14 @@
         "@capacitor/core": "^4.0.0"
       }
     },
+    "node_modules/@capacitor/push-notifications": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@capacitor/push-notifications/-/push-notifications-4.1.2.tgz",
+      "integrity": "sha512-ok6CGvedwK1azmf8VWhrNlg6jhi4PFz3HoyS0GNE2ew7+JGnxN77sgK5q1TVzdkge+vkqipO6uu5bD1xfj/pWQ==",
+      "peerDependencies": {
+        "@capacitor/core": "^4.0.0"
+      }
+    },
     "node_modules/@capacitor/share": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@capacitor/share/-/share-4.1.0.tgz",
@@ -40727,6 +40736,12 @@
       "integrity": "sha512-GMJ6LmxmrFA55rAaYxgm4tKSZyUmuLRreQz5Gdu0P09Ja8abSjmXa/DX16gOu1I1+wqHWm2rRI6nPkeUH55Ibw==",
       "requires": {}
     },
+    "@capacitor/push-notifications": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@capacitor/push-notifications/-/push-notifications-4.1.2.tgz",
+      "integrity": "sha512-ok6CGvedwK1azmf8VWhrNlg6jhi4PFz3HoyS0GNE2ew7+JGnxN77sgK5q1TVzdkge+vkqipO6uu5bD1xfj/pWQ==",
+      "requires": {}
+    },
     "@capacitor/share": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/@capacitor/share/-/share-4.1.0.tgz",
diff --git a/package.json b/package.json
index 30e7a5920..c9fdb520b 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "@capacitor/keyboard": "^4.1.0",
     "@capacitor/local-notifications": "^4.1.4",
     "@capacitor/network": "^4.1.0",
+    "@capacitor/push-notifications": "^4.1.2",
     "@capacitor/share": "^4.1.0",
     "@capacitor/storage": "^1.2.5",
     "@fortawesome/angular-fontawesome": "^0.9.0",
diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts
index a9618ce7f..06b324206 100644
--- a/src/app/modals/profile/profile.page.ts
+++ b/src/app/modals/profile/profile.page.ts
@@ -186,6 +186,8 @@ export class ProfilePage implements OnInit {
     }
     else if (Service === "gabinete-digital" && Object === "expedientes-pr") {
       this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital']));
+    } else if (Service === "chat") {
+      this.zone.run(() => this.router.navigate(['/home/chat', IdObject, 'chat']));
     }
 
     // this.notificationservice.tempClearArray();
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index f626c951b..4a4999453 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -258,7 +258,7 @@
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-send"
           src="assets/icon/theme/gov/icons-chat-record-audio.svg"></ion-icon>
       </button>
-      <button *ngIf="ChatSystemService.getDmRoom(roomId).message" class="btn-no-color" (click)="sendMessage()"
+      <button *ngIf="ChatSystemService.getDmRoom(roomId).message" class="btn-no-color" (click)="sendMessage(ChatSystemService.getDmRoom(roomId).messages)"
         class="btn-no-color">
         <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-send"
           src="assets/icon/theme/gov/icons-chat-send.svg"></ion-icon>
diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts
index c5ec7322e..e3ea00806 100644
--- a/src/app/pages/chat/messages/messages.page.ts
+++ b/src/app/pages/chat/messages/messages.page.ts
@@ -1,5 +1,5 @@
 import { AfterViewInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router'
+import { ActivatedRoute, Route, Router } from '@angular/router'
 import { GestureController, ModalController, NavParams, PopoverController, Platform, AlertController } from '@ionic/angular';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { EventPerson } from 'src/app/models/eventperson.model';
@@ -41,6 +41,7 @@ import { File } from '@awesome-cordova-plugins/file/ngx';
 import { FileOpener } from '@awesome-cordova-plugins/file-opener/ngx';
 import { Filesystem, Directory } from '@capacitor/filesystem';
 import { NewEventPage } from '../../agenda/new-event/new-event.page';
+import { NotificationsService } from 'src/app/services/notifications.service';
 
 
 const IMAGE_DIR = 'stored-images';
@@ -126,6 +127,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     // private document: DocumentViewer
     private file: File,
     private fileOpener: FileOpener,
+    private notificationService: NotificationsService,
+    private router: Router
   ) {
     this.loggedUser = SessionStore.user.ChatData['data'];
     this.roomId = this.navParams.get('roomId');
@@ -150,6 +153,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnInit() {
+    console.log(this.router.url); 
     this.createDirectoryImage()
     // this.chatService.refreshtoken();
     this.ChatSystemService.getUserOfRoom(this.roomId).then((value) => {
@@ -377,8 +381,14 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
   }
 
-  sendMessage() {
-    this.ChatSystemService.getDmRoom(this.roomId).send({})
+  sendMessage(msg) {
+    let lastMsg = msg.pop();
+    console.log(msg)
+    console.log(lastMsg._id,lastMsg.msg,lastMsg.msg)
+    this.ChatSystemService.getDmRoom(this.roomId).send({}).then(() => {
+      console.log(this.members)
+      this.notificationService.ChatSendMessageNotification(this.members[1].username,this.members[1].name,lastMsg.msg,this.roomId)
+    })
   }
 
   base64toBlob(base64Data, contentType) {
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index 4dae78b20..b8bbd202a 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -84,7 +84,7 @@
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Responder ao PR</div> </div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel mb-0" style="margin-bottom: 0px !important;" shape="round" >Executado</button>
         <!-- <div class="solid"></div> -->
-        <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Reencaminhar para Área jurídica</div>
+        <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Reencaminhar para Área Jurídica</div>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
         <!-- <div class="solid"></div> -->
         <div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc">Outras opções</div>
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
index a50f25025..b4a49a6b2 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html
@@ -128,7 +128,7 @@
       <div class="buttons" *ngIf="task.activityInstanceName == 'Tarefa de Despacho'">
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' "> <div>Responder ao PR</div> </div>
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
-        <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' ">Reencaminhar para Área jurídica</div>
+        <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' ">Reencaminhar para Área Jurídica</div>
         <button (click)="openAddNoteModal('Gerar Diploma')" *ngIf="task.WorkflowName == 'Despacho do Presidente da República'" class="btn-cancel" style="margin-bottom: 0px !important;" shape="round" >Gerar Diploma </button>
         <div class="option-desc" *ngIf="task.WorkflowName == 'Despacho do Presidente da República' " >Outras opções</div>
         <button (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
index 9ce2097e3..bc0d99233 100644
--- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
@@ -162,7 +162,7 @@
           <button (click)="openAddNoteModal('Arquivar')" class="btn-cancel" shape="round" >Arquivar</button>
           <button (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
           <button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
-          <button *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
+          <button *ngIf="loggeduser.Profile != 'PR'" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button>
           <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
           <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
         </div>
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index 6e8231bce..a641a1042 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -72,7 +72,7 @@ export class MessageService {
     private AESEncrypt: AESEncrypt,
     private AttachmentsService: AttachmentsService,
     private NetworkServiceService: NetworkServiceService,
-    private ChatSystemService: ChatSystemService) {
+    private ChatSystemService: ChatSystemService,) {
   }
 
   setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference = 'out-'+uuidv4() , viewed = [], received = [], delate = false, delateRequest =false, from, sendAttempt = 0, origin }:Message) {
@@ -180,8 +180,9 @@ export class MessageService {
 
   async send(): Promise<any> {
     if(this.messageSend) {
+      console.log('sended')
       return new Promise((resolve, reject) => {
-        resolve('solve') 
+        resolve('solve')
       })
     }
 
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index 0cadbc568..b04c93800 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 /* tslint:disable */
 import { Injectable, NgZone } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
 import { StorageService } from 'src/app/services/storage.service';
 import { AuthConnstants } from 'src/app/config/auth-constants';
@@ -171,6 +171,29 @@ export class NotificationsService {
      );
   }
 
+  ChatSendMessageNotification(userID,title,bodymsg,roomId) {
+    const geturl = environment.apiURL + `notifications/send`;
+
+    const headers = { 'Authorization': SessionStore.user.BasicAuthKey };
+               const body = {
+                 UserId: userID,
+                 title: title,
+                 body: bodymsg,
+                 data: {
+                  Service: "chat",
+                  IdObject: roomId
+                 }
+               };
+               let id = 437
+               console.log(userID,title,bodymsg,roomId)
+               this.http.post<Tokenn>(geturl+`?userId=${userID}&title=${title}&body=${bodymsg}`, body, { headers }).subscribe(data => {
+                this.active = true
+                 console.log(data)
+               }, (error) => {
+                 console.log(error)
+               })
+  }
+
   tempClearArray(data) {
     this.DataArray = new Array;
   }
@@ -222,7 +245,9 @@ export class NotificationsService {
      }
      else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expedientes-pr") {
        this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.notification.data.IdObject, 'gabinete-digital']));
-     }
+     } else if (notification.notification.data.Service === "chat") {
+      this.zone.run(() => this.router.navigate(['/home/chat', notification.notification.data.IdObject, 'chat']));
+    }
 
   }
 
diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts
index e808c866b..bc3154af7 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -189,7 +189,7 @@ export class ApproveEventPage implements OnInit {
 
         try {
           await this.processes.PostTaskAction(body).toPromise();
-          this.toastService._successMessage('Pedido enviado');
+          this.toastService._successMessage('Evento enviado para revisão');
           this.close();
         } catch (error) {
           this.toastService._badRequest();
diff --git a/src/app/shared/popover/despachos-options/despachos-options.page.html b/src/app/shared/popover/despachos-options/despachos-options.page.html
index 7e0840c6a..5a068d440 100644
--- a/src/app/shared/popover/despachos-options/despachos-options.page.html
+++ b/src/app/shared/popover/despachos-options/despachos-options.page.html
@@ -12,7 +12,7 @@
       <div class="flex-grow-1 width-50 pr-10">
         <button class="btn-cancel desk" shape="round" > Responder ao PR </button>
         <button (click)="openAddNoteModal('Executado')" class="btn-cancel width-100" shape="round" >Executado</button>
-        <button class="btn-cancel desk" shape="round"> Reencaminhar para Área jurídica </button>
+        <button class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
         <button (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel width-100" shape="round" >Gerar Diploma</button>
         <button class="btn-cancel desk" shape="round"> Outras opções </button>
         <button (click)="openTaskProcessModal('0',fulltask)" class="btn-cancel width-100" shape="round" >Efetuar Despacho</button>
@@ -21,7 +21,7 @@
         <button (click)="openTaskProcessModal('1',fulltask)" class="btn-cancel width-100" shape="round" >Solicitar Parecer</button>
         <button *ngIf="!p.userRole(['PR'])" (click)="openTaskProcessModal('2',fulltask)" class="btn-cancel width-100" shape="round" >Pedido de Deferimento</button>
         <button (click)="openDelegarModal(task)" class="btn-cancel width-100" shape="round" >Delegar</button>
-        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel width-100" shape="round"  >Enviar para pendentes</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" full class="btn-cancel width-100" shape="round"  >Enviar para Pendentes</button>
       </div>
     </div>
     <div *ngIf="task && p.userRole(['PR'])" class="d-flex width-100">
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
index 1bf5ad3aa..8a0d608de 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
@@ -11,7 +11,7 @@
       <div class="flex-grow-1 width-50 pr-10">
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Responder ao PR </button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Executado')" class="btn-cancel" shape="round" >Executado</button>
-        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Reencaminhar para Área jurídica </button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Reencaminhar para Área Jurídica </button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Gerar Diploma')" class="btn-cancel" shape="round" >Gerar Diploma</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="btn-cancel desk" shape="round"> Outras opções </button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('0',fulltask)" class="btn-cancel" shape="round" >Efetuar Despacho</button>
@@ -20,7 +20,7 @@
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
         <!-- <button *ngIf="!p.userRole(['PR'])" (click)="openExpedientActionsModal('2',fulltask)" class="btn-cancel" shape="round" >Pedido de Deferimento</button> -->
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openDelegarModal(task)" class="btn-cancel" shape="round" >Delegar</button>
-        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" full class="btn-cancel" shape="round"  >Enviar para pendentes</button>
+        <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks]) && task.Status != 'Pending'" (click)="sendExpedienteToPending()" full class="btn-cancel" shape="round"  >Enviar para Pendentes</button>
         <button (click)="cancle()" full class="btn-cancel" shape="round" >Cancelar</button>
       </div>
     </div>
diff --git a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html
index ea2a75bb8..5f0257527 100644
--- a/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html
+++ b/src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html
@@ -5,7 +5,7 @@
       <button (click)="openDelegarModal()" class="btn-cancel" shape="round" >Delegar</button>
       <div class="solid"></div>
       <button (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
-      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para pendentes</button>
+      <button (click)="sendExpedienteToPending()" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
     </div>
 
   </div>
diff --git a/src/app/shared/popover/opts-expediente/opts-expediente.page.html b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
index 1cadf082d..5ec3d42da 100644
--- a/src/app/shared/popover/opts-expediente/opts-expediente.page.html
+++ b/src/app/shared/popover/opts-expediente/opts-expediente.page.html
@@ -20,7 +20,7 @@
         <button *ngIf="p.userPermission([p.permissionList.Agenda.access])" (click)="openBookMeetingModal()" class="btn-cancel" shape="round" >Marcar Reunião</button>
         <button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="attachDocument()" class="btn-cancel" shape="round" >Anexar Documentos</button>
         <button (click)="distartExpedientModal('descartar')" class="btn-cancel" shape="round" >Descartar</button>
-        <button (click)="sendExpedienteToPending()" *ngIf="(task.Status || '') != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para pendentes</button>
+        <button (click)="sendExpedienteToPending()" *ngIf="(task.Status || '') != 'Pending'" full class="btn-cancel" shape="round"  >Enviar para Pendentes</button>
         <button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
       </div>
     </div>
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 53f31b337..38a854fa6 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,4 +3,4 @@ import { oaprProd } from './suport/oapr'
 import { doneITProd } from './suport/doneIt'
 
 
-export const environment: Environment = oaprProd;
\ No newline at end of file
+export const environment: Environment = doneITProd;
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index 633fa50ca..694607b51 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "4dd42a4e1",
-  "SHA": "4dd42a4e1fa3b3c44cd4f771e067018ae7cf8fdf",
+  "shortSHA": "a712f6271",
+  "SHA": "a712f6271de72b42cd03c1a4aeec71a0fd05b048",
   "branch": "no_bug_movemente",
   "lastCommitAuthor": "'Peter Maquiran'",
-  "lastCommitTime": "'Mon Jan 30 17:41:27 2023 +0100'",
-  "lastCommitMessage": "fixe",
-  "lastCommitNumber": "4695",
+  "lastCommitTime": "'Mon Jan 30 17:45:06 2023 +0100'",
+  "lastCommitMessage": "save",
+  "lastCommitNumber": "4696",
   "change": "",
-  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts\n\tmodified:   src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts",
+  "changeStatus": "On branch no_bug_movemente\nAll conflicts fixed but you are still merging.\n  (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified:   package-lock.json\n\tmodified:   package.json\n\tmodified:   src/app/modals/profile/profile.page.ts\n\tmodified:   src/app/pages/chat/messages/messages.page.html\n\tmodified:   src/app/pages/chat/messages/messages.page.ts\n\tmodified:   src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified:   src/app/pages/gabinete-digital/despachos/despacho/despacho.page.html\n\tmodified:   src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified:   src/app/services/chat/message.service.ts\n\tmodified:   src/app/services/notifications.service.ts\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/popover/despachos-options/despachos-options.page.html\n\tmodified:   src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html\n\tmodified:   src/app/shared/popover/diplomas-gerar-options/diplomas-gerar-options.page.html\n\tmodified:   src/app/shared/popover/opts-expediente/opts-expediente.page.html\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   version/git-version.ts",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file