fix merge

src/app/pages/chat/messages/messages.page.ts

@@ -423,7 +423,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
         }],
         temporaryData: formData,
         attachmentsModelData: {
-          fileBase64: await this.fileService.blobToBase64(blob),
+          fileBase64: encodedData,
         }
       })
 

src/app/pages/events/events.page.html

@@ -25,7 +25,7 @@
   <div class="conteiner-box pt-20 height-100">
     
     <div class="main-content justify-center d-flex height-100"> 
-      <div class="box-container width-100 d-flex mx-20" style="padding: 0px;overflow: hidden;">
+      <div class="box-container width-100 d-flex mx-20 overflow-hidden" style="padding: 0px;overflow: hidden;">
         <ion-progress-bar type="indeterminate" *ngIf="loadingAllTask || TaskService.showLoader"></ion-progress-bar>
         <div class="px-20 pb-20 container-filters">
           <p class="time ion-text-left font-18-em">{{customDate}}</p>

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss

@@ -215,7 +215,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;

src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss

@@ -174,7 +174,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;

src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss

@@ -240,7 +240,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;

src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss

@@ -227,7 +227,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;

src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.scss

@@ -63,7 +63,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss

@@ -287,7 +287,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .menu-ptions{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss

@@ -205,7 +205,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .menu-ptions{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss

@@ -171,7 +171,7 @@ ion-button{
 }
 @media only screen and (min-width: 801px) {
   .div-icon{
-    display: none;
+    display: none !important;
   }
   .content{
     width: 65%;

src/app/pages/inactivity/inactivity.page.scss

@@ -319,12 +319,6 @@ ion-item{
     position: relative;
     top: 35px;
   }
-
-  .div-top-header {
-    position: absolute !important;
-    top: 0px !important;
-  }
-
   
 }