save merge

src/app/pages/chat/chat.page.html

@@ -69,10 +69,10 @@
                     <div *ngIf="room.lastMessage" class="item-description" [class.item-description-active]="room.id == idSelected">
 
                       <ion-label *ngIf="room.lastMessage && room.otherUserType == false">{{room.lastMessage.msg}}</ion-label>
-                      <ion-label *ngIf="room.otherUserType == true">A escrever ...</ion-label>
-                      <ion-label *ngIf="room.lastMessage.file">
+                      <ion-label *ngIf="room.otherUserType == true">A escrever...</ion-label>
+                      <!-- <ion-label *ngIf="room.lastMessage.file">
                         <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>
-                      </ion-label>
+                      </ion-label> -->
 
                       <div *ngIf="room.lastMessage.file">
                         <fa-icon *ngIf="room.lastMessage.file.type != 'application/meeting' && room.lastMessage.file.type != 'application/img'" icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="room.id == idSelected"></fa-icon>

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

@@ -628,8 +628,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.wsChatMethodsService.getDmRoom(roomId).send({
       file: {
         "type": "application/img",
-        "guid": '',
-        "image_url": 'data:image/jpeg;base64,' +file.base64String
+        "guid": ''
       },
       temporaryData: formData,
       attachments: [{

src/app/pages/inactivity/inactivity.page.ts

@@ -201,10 +201,8 @@ export class InactivityPage implements OnInit {
 
   storePin() {
 
-    const code = this.code.join('')
-
-    SessionStore.setPin(code)
-
+    const code = this.code.join('');
+    SessionStore.setPin(code);
     this.router.navigate(['/home/events']);
 
   }