save merge

This commit is contained in:
Peter Maquiran
2022-02-09 14:39:59 +01:00
8 changed files with 116 additions and 42 deletions
@@ -48,11 +48,11 @@
</mat-menu>
</div>
<div class="title">
<ion-label>{{msg.u.name}} {{msg.offline}} {{ msg.sendAttempt }} {{ msg.uploadingFile }} errorUploadingAttachment:{{ msg.errorUploadingAttachment}}</ion-label>
<ion-label>{{msg.u.name}}</ion-label>
<span class="time">{{showDateDuration(msg._updatedAt)}}</span>
</div>
<div>
<ion-label>{{msg.msg}} {{msg.offline}}</ion-label>
<ion-label>{{msg.msg}}</ion-label>
{{last ? scrollToBottom() : ''}}
</div>
</div>
@@ -67,7 +67,7 @@
</mat-menu>
</div>
<div class="title">
<ion-label>{{msg.u.name}} {{msg.offline}} {{ msg.sendAttempt }} {{ msg.uploadingFile }} errorUploadingAttachment:{{ msg.errorUploadingAttachment}}</ion-label>
<ion-label>{{msg.u.name}} </ion-label>
<span class="time">{{showDateDuration(msg.duration)}}</span>
</div>
<div>