From c457b6ea01a8bc26d84d0464a7030896c1ecb856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Fri, 21 Dec 2018 16:38:33 +0100 Subject: [PATCH] MOBILE-2795 message: Expand option when selecting user from group info --- .../pages/group-conversations/group-conversations.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/addon/messages/pages/group-conversations/group-conversations.ts b/src/addon/messages/pages/group-conversations/group-conversations.ts index 4ab86a489..86b78189a 100644 --- a/src/addon/messages/pages/group-conversations/group-conversations.ts +++ b/src/addon/messages/pages/group-conversations/group-conversations.ts @@ -266,7 +266,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy { const conversation = this.findConversation(this.conversationId); if (conversation) { const option = this.getConversationOption(conversation); - option.expanded = true; + this.expandOption(option); return; } @@ -336,11 +336,13 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy { return conversations.find((conv) => { return conv.id == conversationId; }); - } else if (this.individual.conversations) { - return this.individual.conversations.find((conv) => { - return conv.userid == userId; - }); } + + const conversations = (this.favourites.conversations || []).concat(this.individual.conversations || []); + + return conversations.find((conv) => { + return conv.userid == userId; + }); } /**