From 92e054e3ddd308e9376fea6ce699c80e1f96f704 Mon Sep 17 00:00:00 2001
From: Dani Palou <dani@moodle.com>
Date: Wed, 30 Jun 2021 13:31:30 +0200
Subject: [PATCH] MOBILE-3320 messages: Fix two conversations selected after
 clickin push

---
 .../group-conversations/group-conversations.page.ts   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/addons/messages/pages/group-conversations/group-conversations.page.ts b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
index 0ce9915b6..f4d884458 100644
--- a/src/addons/messages/pages/group-conversations/group-conversations.page.ts
+++ b/src/addons/messages/pages/group-conversations/group-conversations.page.ts
@@ -270,10 +270,13 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
     async ngOnInit(): Promise<void> {
         this.route.queryParams.subscribe(async (params) => {
             // When a child page loads this callback is triggered too.
-            this.selectedConversationId =
-                CoreNavigator.getRouteNumberParam('conversationId', { params }) ?? this.selectedConversationId;
-            this.selectedUserId =
-                CoreNavigator.getRouteNumberParam('userId', { params }) ?? this.selectedUserId;
+            const conversationId =CoreNavigator.getRouteNumberParam('conversationId', { params });
+            const userId = CoreNavigator.getRouteNumberParam('userId', { params });
+            if (conversationId || userId) {
+                // Update the selected ones.
+                this.selectedConversationId = conversationId;
+                this.selectedUserId = userId;
+            }
         });
 
         await this.fetchData();