From 7e177f69530295da923a409357bb86c93ec478f4 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <rmidhunsuresh@gmail.com>
Date: Wed, 18 Aug 2021 17:43:40 +0530
Subject: [PATCH] Modify open-room action to fix bug

Signed-off-by: RMidhunSuresh <rmidhunsuresh@gmail.com>
---
 src/domain/navigation/index.js                      | 13 ++++++++-----
 .../session/rightpanel/MemberTileViewModel.js       |  3 ++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/domain/navigation/index.js b/src/domain/navigation/index.js
index dbac16ac..cf6e1d6f 100644
--- a/src/domain/navigation/index.js
+++ b/src/domain/navigation/index.js
@@ -132,11 +132,14 @@ export function parseUrlPath(urlPath, currentNavPath, defaultSessionId) {
                 segments.push(roomsSegmentWithRoom(rooms, roomId, currentNavPath));
             }
             segments.push(new Segment("room", roomId));
-            // Add right-panel segments from previous path
-            const previousSegments = currentNavPath.segments;
-            const i = previousSegments.findIndex(s => s.type === "right-panel");
-            if (i !== -1) {
-                segments.push(...previousSegments.slice(i));
+            if (!urlPath.includes("/member/")) {
+                // Add right-panel segments from previous path if /member is not in url
+                // fixes memberlist -> member details closing/opening grid view
+                const previousSegments = currentNavPath.segments;
+                const i = previousSegments.findIndex(s => s.type === "right-panel");
+                if (i !== -1) {
+                    segments.push(...previousSegments.slice(i));
+                }
             }
         } else if (type === "last-session") {
             let sessionSegment = currentNavPath.get("session");
diff --git a/src/domain/session/rightpanel/MemberTileViewModel.js b/src/domain/session/rightpanel/MemberTileViewModel.js
index 91a07f0c..eac6a6d4 100644
--- a/src/domain/session/rightpanel/MemberTileViewModel.js
+++ b/src/domain/session/rightpanel/MemberTileViewModel.js
@@ -47,7 +47,8 @@ export class MemberTileViewModel extends ViewModel {
     }
 
     get detailsUrl() {
-        return `${this.urlCreator.urlUntilSegment("room")}/member/${this._member.userId}`;
+        const roomId = this.navigation.path.get("room").value;
+        return `${this.urlCreator.openRoomActionUrl(roomId)}/member/${this._member.userId}`;
     }
 
     _updatePreviousName(newName) {