This commit is contained in:
tiago.kayaya
2022-03-21 21:16:03 +01:00
parent 6ad75007ea
commit a76ebbbf0d
@@ -62,24 +62,8 @@
<span class="time">{{msg.duration}}</span>
</div>
<div>
<<<<<<< HEAD
<ion-label>{{msg.msg}}</ion-label>
{{last ? scrollToBottom() : ''}}
</div>
</div>
<div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'
(click)="openPreview(msg)" *ngIf="msg.msg !=''">
<div class="title">
<ion-label>{{msg.u.name}}</ion-label>
<span class="time">{{msg.duration}}</span>
</div>
<div>
<ion-label>{{msg.msg}}</ion-label>
=======
<ion-label *ngIf="msg.delate == false">{{msg.msg}}</ion-label>
<ion-label *ngIf="msg.delate == true">{{msg.msg}}</ion-label>
>>>>>>> c9af986ae8181cf24741ac7407264daea648d27e
{{last ? scrollToBottom() : ''}}
</div>
</div>