diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts
index e949a8633..316e0f30a 100644
--- a/src/app/guards/auth.guard.ts
+++ b/src/app/guards/auth.guard.ts
@@ -28,8 +28,8 @@ export class AuthGuard implements CanActivate {
     // if user not active or no session
     if(!SessionStore.user.Inactivity || !SessionStore.exist) {
 
-      console.log('no session', !SessionStore.user.Inactivity, !SessionStore.exist)
-      console.log(SessionStore.user)
+      // console.log('no session', !SessionStore.user.Inactivity, !SessionStore.exist)
+      // console.log(SessionStore.user)
       if(SessionStore.user.LoginPreference == 'Pin') {
         this.router.navigate(['/pin']);
       } else {
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 82af13f40..79a942b9a 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -9,22 +9,20 @@
         <ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Assunto*" [(ngModel)]="postData.DispatchFolder.Subject"></ion-input>
       </div>
 
-
-      <div class="container-div width-100">
-        <div class="ion-item-class-2">
-          <div class="ion-icon-class">
-            <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
-          </div>
-          <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Message')?.invalid && validateFrom || validateField ">
-            <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" class="add-border" placeholder="Descrição*" [(ngModel)]="postData.DispatchFolder.Message"></ion-textarea>
-          </div>
-        </div>
-      </div>
-
-
       <!-- Add scrolls -->
       <div class="d-flex flex-column height-100 overflow-y-auto">
 
+        <div class="container-div width-100">
+          <div class="ion-item-class-2">
+            <div class="ion-icon-class">
+              <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
+            </div>
+            <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Message')?.invalid && validateFrom || validateField ">
+              <ion-textarea  autoGrow="true" autocomplete="on" autocorrect="on" spellcheck="true" class="add-border heigh-200" placeholder="Descrição*" [(ngModel)]="postData.DispatchFolder.Message"></ion-textarea>
+            </div>
+          </div>
+        </div>
+
         <div class="container-div width-100">
           <div class="ion-item-class-2 width-100">
             <div class="ion-icon-class">
diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss
index f2b91b59a..9b2d13eb1 100644
--- a/src/app/modals/create-process/create-process.page.scss
+++ b/src/app/modals/create-process/create-process.page.scss
@@ -31,7 +31,6 @@
     .ion-item-class-2{
       //width: 360px;
       margin: 0px auto;
-      overflow: auto;
     }
     .ion-icon-class{
       width: 45px;
diff --git a/src/app/modals/dar-parecer/dar-parecer.page.html b/src/app/modals/dar-parecer/dar-parecer.page.html
index e6a7af109..fc0f56259 100644
--- a/src/app/modals/dar-parecer/dar-parecer.page.html
+++ b/src/app/modals/dar-parecer/dar-parecer.page.html
@@ -9,7 +9,7 @@
       <div class="ion-icon-class">
         <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
       </div>
-      <div class="ion-input-class-no-height width-100">
+      <div class="ion-input-class-no-height width-100 heigh-200">
         <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Meu parecer" rows="6" cols="20"></ion-textarea>
       </div>
     </div>
diff --git a/src/app/modals/delegar/delegar.page.html b/src/app/modals/delegar/delegar.page.html
index b18736918..598195891 100644
--- a/src/app/modals/delegar/delegar.page.html
+++ b/src/app/modals/delegar/delegar.page.html
@@ -37,7 +37,7 @@
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class-no-height width-100">
-              <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+              <ion-textarea class="heigh-200" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
             </div>
           </div>
         </div>
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
index fa2cfd448..6c99b5a51 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
@@ -293,7 +293,7 @@
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class-no-height width-100">
-              <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postData.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+              <ion-textarea autoGrow="true" class="heigh-200" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postData.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
             </div>
           </div>
         </div>
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html
index d74075d2d..f62586fe1 100644
--- a/src/app/modals/forward/forward.page.html
+++ b/src/app/modals/forward/forward.page.html
@@ -38,7 +38,7 @@
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class-no-height width-100">
-              <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+              <ion-textarea class="heigh-200" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
             </div>
           </div>
         </div>
diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html
index 694390ffe..d3cdbcc9e 100644
--- a/src/app/pages/agenda/edit-event/edit-event.page.html
+++ b/src/app/pages/agenda/edit-event/edit-event.page.html
@@ -285,7 +285,7 @@
               </div>
               <div class="ion-input-class-no-height width-100 flex-grow-1">
                 <!-- rows="6" cols="20" -->
-                <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" ></ion-textarea>
+                <ion-textarea class="heigh-200" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" ></ion-textarea>
               </div>
             </div>
           </div>
diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
index 12d6328fd..2b7d4caa7 100644
--- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
+++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts
@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 import { ModalController } from '@ionic/angular';
 import { ThemeService } from 'src/app/services/theme.service'
+import { ToastService } from 'src/app/services/toast.service';
 
 @Component({
   selector: 'app-emend-message-modal',
@@ -12,7 +13,8 @@ export class EmendMessageModalPage implements OnInit {
 
   constructor(
     private modalController: ModalController,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private toastService: ToastService,
   ) {
     this.emendMessage = '';
   }
@@ -24,7 +26,12 @@ export class EmendMessageModalPage implements OnInit {
   }
 
   save() {
-    this.modalController.dismiss({option:'save', note: this.emendMessage});
+    if(this.emendMessage != '') {
+      this.modalController.dismiss({option:'save', note: this.emendMessage});
+    } else {
+      this.toastService._badRequest('É necessário adicionar uma nota');
+    }
+    
   }
 
 }
diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
index 76159ab95..35cf864fa 100644
--- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
+++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts
@@ -114,37 +114,42 @@ export class EventActionsPopoverPage implements OnInit {
     .then( async (res) => {
       
       
-      if(res.data.note !== ''){
-        let body = { "serialNumber": this.serialNumber, 
-        "action": "Emendar",
-            "dataFields": {
-            "ReviewUserComment": res.data,
+      if(res.data.option == 'save') { 
+        if(res.data.note !== '') {
+          let body = { "serialNumber": this.serialNumber, 
+          "action": "Emendar",
+              "dataFields": {
+              "ReviewUserComment": res.data,
+            }
+          }
+          
+  
+          const loader = this.toastService.loading()
+          
+          try { 
+            await this.processes.PostTaskAction(body).toPromise();
+            this.toastService._successMessage('Evento enviado para revisão');
+            this.goBack();
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+             
+              this.toastService._badRequest('Evento não enviado para revisão');
+            }
+            this.toastService.badRequest();
+          }
+          finally {
+            loader.remove()
           }
         }
+        else {
+          this.toastService._badRequest('É necessário adicionar uma nota');
+        }
+      } else {
         
+      }
 
-        const loader = this.toastService.loading()
-        
-        try { 
-          await this.processes.PostTaskAction(body).toPromise();
-          this.toastService._successMessage('Evento enviado para revisão');
-          this.goBack();
-        } catch (error) {
-          if(error.status == 0) {
-            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
-          } else {
-           
-            this.toastService._badRequest('Evento não enviado para revisão');
-          }
-          this.toastService.badRequest();
-        }
-        finally {
-          loader.remove()
-        }
-      }
-      else{
-        
-      }
     });
   }
 
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html
index 279d22d2b..49c7991e4 100644
--- a/src/app/pages/agenda/new-event/new-event.page.html
+++ b/src/app/pages/agenda/new-event/new-event.page.html
@@ -264,7 +264,7 @@
         </div>
         <div class="ion-input-class-no-height flex-grow-1">
 
-          <ion-textarea class="textarea" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" autoGrow="true" ></ion-textarea>
+          <ion-textarea class="textarea heigh-200" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" autoGrow="true" ></ion-textarea>
 
         </div>
       </div>
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
index e9a5c1d1e..064445d08 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts
@@ -191,39 +191,41 @@ export class ApproveEventModalPage implements OnInit {
     await modal.present();
 
     modal.onDidDismiss().then( async (res) => {
-      if(res.data.note !== '') {
-        let body = { 
-          "serialNumber": serialNumber, 
-          "action": "Emendar",
-          "dataFields": {
-            "ReviewUserComment": res.data,
+      if(res.data.option == 'save') { 
+        if(res.data.note !== '') {
+          let body = { 
+            "serialNumber": serialNumber, 
+            "action": "Emendar",
+            "dataFields": {
+              "ReviewUserComment": res.data,
+            }
           }
-        }
 
-        //
-        const loader = this.toastService.loading()
-        
-        try {
-          await this.processes.PostTaskAction(body).toPromise()
-          this.router.navigate(['/home/gabinete-digital/event-list']);
-          this.toastService._successMessage('Evento enviado para revisão');
-        } catch (error) {
-          if(error.status == 0) {
-            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
-          } else {
-           
-            this.toastService._badRequest('Evento não enviado para revisão');
+          //
+          const loader = this.toastService.loading()
+          
+          try {
+            await this.processes.PostTaskAction(body).toPromise()
+            this.router.navigate(['/home/gabinete-digital/event-list']);
+            this.toastService._successMessage('Evento enviado para revisão');
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+            
+              this.toastService._badRequest('Evento não enviado para revisão');
+            }
+            this.router.navigate(['/home/gabinete-digital/event-list']);
+          }     
+          finally {
+            loader.remove()
           }
-          this.router.navigate(['/home/gabinete-digital/event-list']);
-        }     
-        finally {
-          loader.remove()
-        }
 
-      }
-      else {
-        //this.alertService.presentAlert('Operação cancelada!');
-      }
+        }
+        else {
+          this.toastService._badRequest('É necessário adicionar uma nota');
+        }
+     }
     });
   }
 
diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
index 8d9c5fda8..b34cf6c01 100644
--- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts
@@ -16,6 +16,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { OfflineManagerService } from 'src/app/services/offline-manager.service';
 import { RouteService } from 'src/app/services/route.service';
 import { Storage } from '@ionic/storage';
+import config from 'capacitor.config';
 
 @Component({
   selector: 'app-approve-event',
@@ -117,10 +118,14 @@ export class ApproveEventPage implements OnInit {
         this.loadedEvent = event
           
   
-          this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
-  
-          this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
-  
+          try {
+            this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
+            this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
+          } catch(error) {
+            console.log(this.loadedEvent)
+            throw(error)
+          }
+          
           this.loadedAttachments = this.loadedEvent.Documents;
           
       })
@@ -178,11 +183,15 @@ export class ApproveEventPage implements OnInit {
           this.loadedEvent = task
           
   
-          this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
-  
-          this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
-
           this.loadedAttachments = this.loadedEvent.Documents;
+
+          try {
+            this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
+            this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
+          } catch(error) {
+            console.log(this.loadedEvent)
+            throw(error)
+          }
             
         })
       })
@@ -194,12 +203,17 @@ export class ApproveEventPage implements OnInit {
   async getTask() {
     this.processes.GetTask(this.serialNumber).subscribe(async res => {
 
-      this.loadedEvent = await this.processes.GetTask(this.serialNumber).toPromise();
+      this.loadedEvent = res
       this.addProcessToDB(this.loadedEvent)
       
-      this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
-
-      this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
+      try {
+        this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
+        this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
+  
+      } catch(error) {
+        console.log(this.loadedEvent)
+        throw(error)
+      }
 
     }, (error) => {
       this.getProcessFromDB();
@@ -247,40 +261,42 @@ export class ApproveEventPage implements OnInit {
     modal.onDidDismiss()
       .then(async (res) => {
         
-
-        if (res.data !== '') {
-          let body = {
-            "serialNumber": serialNumber,
-            "action": "Emendar",
-            "dataFields": {
-              "ReviewUserComment": res.data,
+        if(res.data.option == 'save') { 
+          if (res.data !== '') {
+            let body = {
+              "serialNumber": serialNumber,
+              "action": "Emendar",
+              "dataFields": {
+                "ReviewUserComment": res.data,
+              }
             }
-          }
-          
+            
 
-          const loader = this.toastService.loading()
+            const loader = this.toastService.loading()
 
-          try {
-            await this.processes.PostTaskAction(body).toPromise()
-            .catch(() => {
+            try {
+              await this.processes.PostTaskAction(body).toPromise()
+              .catch(() => {
+                
+                this.offlineManager.storeRequestData('event-listRever', body);
+              });
+              this.toastService._successMessage('Evento enviado para revisão');
+              this.goBack();
+            } catch (error) {
+              if(error.status == 0) {
+                this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+              } else {
               
-              this.offlineManager.storeRequestData('event-listRever', body);
-            });
-            this.toastService._successMessage('Evento enviado para revisão');
-            this.goBack();
-          } catch (error) {
-            if(error.status == 0) {
-              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
-            } else {
-             
-              this.toastService._badRequest('Evento não enviado para revisão');
+                this.toastService._badRequest('Evento não enviado para revisão');
+              }
+            } finally {
+              loader.remove()
             }
-          } finally {
-            loader.remove()
-          }
 
-        }
-        else {
+          }
+          else {
+            this.toastService._badRequest('É necessário adicionar uma nota');
+          }
         }
       });
 
@@ -362,39 +378,44 @@ export class ApproveEventPage implements OnInit {
 
     modal.onDidDismiss().then(async (res) => {
       
-
-      if (res.data.note !== '') {
-        let body = {
-          "serialNumber": serialNumber,
-          "action": "Emendar",
-          "dataFields": {
-            "ReviewUserComment": res.data,
+      if(res.data.option == 'save') {
+        if (res.data.note !== '') {
+          let body = {
+            "serialNumber": serialNumber,
+            "action": "Emendar",
+            "dataFields": {
+              "ReviewUserComment": res.data,
+            }
           }
-        }
-        
-
-        const loader = this.toastService.loading()
-
-        try {
-          await this.processes.PostTaskAction(body).toPromise();
-          this.toastService._successMessage();
-          this.goBack();
-          this.toastService._successMessage('Evento enviado para revisão');
-        } catch (error) {
-          if(error.status == 0) {
-            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
-          } else {
-           
-            this.toastService._badRequest('Evento não enviado para revisão');
+          
+  
+          const loader = this.toastService.loading()
+  
+          try {
+            await this.processes.PostTaskAction(body).toPromise();
+            this.toastService._successMessage();
+            this.goBack();
+            this.toastService._successMessage('Evento enviado para revisão');
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+             
+              this.toastService._badRequest('Evento não enviado para revisão');
+            }
+          } finally {
+            loader.remove()
           }
-        } finally {
-          loader.remove()
+  
         }
+        else {
+          this.toastService._badRequest('É necessário adicionar uma nota');
+        }
+      } else {
 
       }
-      else {
-        //this.alertService.presentAlert('Operação cancelada!');
-      }
+
+
     });
   }
 
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
index 173ca0e50..3a31233c5 100644
--- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
@@ -256,7 +256,7 @@
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class-no-height width-100">
-              <ion-textarea [(ngModel)]="postData.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+              <ion-textarea class="heigh-200" autoGrow="true" [(ngModel)]="postData.Body.Text" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
             </div>
           </div>
         </div>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 891d862d0..680cb56f7 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -32,7 +32,7 @@
               <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
             </div>
             <div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid  && validateFrom || validateField ">
-              <ion-textarea autocomplete="on" autocorrect="on" spellcheck="true" class="add-border" placeholder="Descrição*" [(ngModel)]="postData.DispatchFolder.Message"></ion-textarea>
+              <ion-textarea autoGrow="true" autocomplete="on" autocorrect="on" spellcheck="true" class="add-border heigh-200" placeholder="Descrição*" [(ngModel)]="postData.DispatchFolder.Message"></ion-textarea>
             </div>
           </div>
         </div>
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
index 779ab1a8b..c555c4613 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
@@ -31,7 +31,6 @@
   .ion-item-class-2{
     //width: 360px;
     margin: 0px auto;
-    overflow: auto;
   }
   .ion-icon-class{
     width: 45px;
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 da1467b5a..851f58faa 100644
--- a/src/app/shared/agenda/approve-event/approve-event.page.ts
+++ b/src/app/shared/agenda/approve-event/approve-event.page.ts
@@ -187,37 +187,44 @@ export class ApproveEventPage implements OnInit {
 
     modal.onDidDismiss()
     .then( async (res) => {
-      
-      if(res.data.note !== '') {
-        let body = { "serialNumber": serialNumber,
-        "action": "Emendar",
-            "dataFields": {
-            "ReviewUserComment": res.data,
-          }
-        }
-        
-        const loader = this.toastService.loading();
 
-        try {
-          await this.processes.PostTaskAction(body).toPromise();
-          this.toastService._successMessage('Evento enviado para revisão');
-          this.close();
-        } catch (error) {
-          if(error.status == 0) {
-            this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
-          } else {
-           
-            this.toastService._badRequest('Evento não enviado para revisão');
+      if(res.data.option == 'save') { 
+
+      
+        if(res.data.note !== '') {
+          let body = { "serialNumber": serialNumber,
+          "action": "Emendar",
+              "dataFields": {
+              "ReviewUserComment": res.data,
+            }
+          }
+          
+          const loader = this.toastService.loading();
+
+          try {
+            await this.processes.PostTaskAction(body).toPromise();
+            this.toastService._successMessage('Evento enviado para revisão');
+            this.close();
+          } catch (error) {
+            if(error.status == 0) {
+              this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
+            } else {
+            
+              this.toastService._badRequest('Evento não enviado para revisão');
+            }
+          }  finally {
+            loader.remove()
           }
-        }  finally {
-          loader.remove()
         }
-      }
-      else {
-        if(res.data.option == 'save') {
-          this.toastService._badRequest('É necessário adicionar uma nota');
+        else {
+          if(res.data.option == 'save') {
+            this.toastService._badRequest('É necessário adicionar uma nota');
+          }
         }
+      } else {
+        
       } 
+      
     });
 
   }
diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html
index 4a2d4f487..df8c201b1 100644
--- a/src/app/shared/agenda/new-event/new-event.page.html
+++ b/src/app/shared/agenda/new-event/new-event.page.html
@@ -293,7 +293,7 @@
         </div>
         <div class="ion-input-class-no-height flex-grow-1">
 
-          <ion-textarea style="height: 150px;" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" autoGrow="true" ></ion-textarea>
+          <ion-textarea class="heigh-200" autocomplete="on" autocorrect="on" spellcheck="true" [(ngModel)]="postEvent.Body.Text"  placeholder="Detalhes" autoGrow="true" ></ion-textarea>
 
         </div>
       </div>
diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss
index e22c8af89..ec0ef471e 100644
--- a/src/app/shared/agenda/new-event/new-event.page.scss
+++ b/src/app/shared/agenda/new-event/new-event.page.scss
@@ -175,7 +175,7 @@
   
   .container-div {
     ion-textarea {
-      height: 81px;
+      // height: 81px;
     }
   }
   
diff --git a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
index f16b3c42c..03634895b 100644
--- a/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
+++ b/src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html
@@ -267,7 +267,7 @@
                 <ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
               </div>
               <div class="ion-input-class-no-height width-100 flex-grow-1">
-                <ion-textarea [(ngModel)]="eventProcess.workflowInstanceDataFields.Body"  placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
+                <ion-textarea class="heigh-200" [(ngModel)]="eventProcess.workflowInstanceDataFields.Body"  placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
               </div>
             </div>
           </div>
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 38a854fa6..53f31b337 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 = doneITProd;
\ No newline at end of file
+export const environment: Environment = oaprProd;
\ No newline at end of file
diff --git a/src/global.scss b/src/global.scss
index 88975c962..8ef3dc6dd 100644
--- a/src/global.scss
+++ b/src/global.scss
@@ -1434,7 +1434,7 @@ pre {
 }
 
 
-ion-textarea  textarea {
+ion-textarea.heigh-200  textarea {
     min-height: 137px;
     line-height: 21px;
 }
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index f8b898ec7..45edf1e15 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
 export let versionData = {
-  "shortSHA": "39e2f775d",
-  "SHA": "39e2f775dbd168470f90f68d18c88ffb96ecb910",
+  "shortSHA": "7d79128ff",
+  "SHA": "7d79128ffd9539571a95017c4caf44b1f24ebdd1",
   "branch": "no_bug_movemente",
-  "lastCommitAuthor": "'Eudes Inácio'",
-  "lastCommitTime": "'Fri Feb 17 12:24:25 2023 +0100'",
-  "lastCommitMessage": "git pull made",
-  "lastCommitNumber": "4805",
+  "lastCommitAuthor": "'Peter Maquiran'",
+  "lastCommitTime": "'Fri Feb 17 12:37:10 2023 +0100'",
+  "lastCommitMessage": "Fix null variable",
+  "lastCommitNumber": "4806",
   "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/event-list/approve-event/approve-event.page.html\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.html",
+  "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n  (use \"git restore --staged <file>...\" to unstage)\n\tmodified:   src/app/guards/auth.guard.ts\n\tmodified:   src/app/modals/create-process/create-process.page.html\n\tmodified:   src/app/modals/create-process/create-process.page.scss\n\tmodified:   src/app/modals/dar-parecer/dar-parecer.page.html\n\tmodified:   src/app/modals/delegar/delegar.page.html\n\tmodified:   src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified:   src/app/modals/forward/forward.page.html\n\tmodified:   src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified:   src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts\n\tmodified:   src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts\n\tmodified:   src/app/pages/agenda/new-event/new-event.page.html\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified:   src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified:   src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified:   src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss\n\tmodified:   src/app/shared/agenda/approve-event/approve-event.page.ts\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.html\n\tmodified:   src/app/shared/agenda/new-event/new-event.page.scss\n\tmodified:   src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified:   src/environments/environment.prod.ts\n\tmodified:   src/global.scss",
   "changeAuthor": "peter.maquiran"
 }
\ No newline at end of file