From 6acbdff97bae0fe29b049a540e98f65327419579 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 21 Nov 2018 08:34:37 +0100
Subject: [PATCH] MOBILE-2632 message: Apply fix in search message MDL-64034

---
 .../group-conversations/group-conversations.html | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/addon/messages/pages/group-conversations/group-conversations.html b/src/addon/messages/pages/group-conversations/group-conversations.html
index 92c80a6b4..fa9281a0b 100644
--- a/src/addon/messages/pages/group-conversations/group-conversations.html
+++ b/src/addon/messages/pages/group-conversations/group-conversations.html
@@ -29,13 +29,21 @@
                     <h2>{{ 'core.searchresults' | translate }}</h2>
                     <ion-note item-end>{{ search.results.length }}</ion-note>
                 </ion-item-divider>
-                <!-- @todo: Search conversations does not return the conversationid. Check how it is solved in web. -->
-                <a ion-item text-wrap *ngFor="let result of search.results" [title]="result.fullname" (click)="gotoConversation(result.id, result.userid, result.messageid)" [class.core-split-item-selected]="result.id == selectedConversation" detail-none>
+
+                <a ion-item text-wrap *ngFor="let result of search.results" [title]="result.fullname" (click)="gotoConversation(result.conversationid, result.userid, result.messageid)" [class.core-split-item-selected]="(result.conversationid && result.conversationid == selectedConversationId) || (result.userid && result.userid == selectedUserId)" detail-none>
                     <ion-avatar item-start>
                         <img src="{{result.profileimageurl}}" [alt]="'core.pictureof' | translate:{$a: result.fullname}" core-external-content onError="this.src='assets/img/user-avatar.png'">
                     </ion-avatar>
-                    <h2><core-format-text [text]="result.fullname"></core-format-text></h2>
-                    <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage"></core-format-text></p>
+                    <h2>
+                        <p>
+                            <core-format-text [text]="result.fullname"></core-format-text>
+                            <core-icon name="fa-ban" *ngIf="result.isblocked" [attr.aria-label]="'addon.messages.contactblocked' | translate"></core-icon>
+                        </p>
+                        <ion-note *ngIf="result.lastmessagedate > 0">
+                            {{result.lastmessagedate | coreDateDayOrTime}}
+                        </ion-note>
+                    </h2>
+                    <p><core-format-text clean="true" singleLine="true" [text]="result.lastmessage" class="addon-message-last-message"></core-format-text></p>
                 </a>
             </ion-list>