From fb4a4413416cf39ab36d52a6b6b7d7f48ffaff00 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Mon, 10 Dec 2018 16:52:45 +0100
Subject: [PATCH] fix navigation to room info in group view

---
 src/components/structures/RightPanel.js                | 2 ++
 src/components/views/right_panel/GroupHeaderButtons.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/structures/RightPanel.js b/src/components/structures/RightPanel.js
index 33c09e1b16..8fd464e80d 100644
--- a/src/components/structures/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -141,6 +141,8 @@ export default class RightPanel extends React.Component {
         if (payload.action === "view_right_panel_phase") {
             this.setState({
                 phase: payload.phase,
+                groupRoomId: payload.groupRoomId,
+                groupId: payload.groupId,
                 member: payload.member,
             });
         }
diff --git a/src/components/views/right_panel/GroupHeaderButtons.js b/src/components/views/right_panel/GroupHeaderButtons.js
index 3cb0727928..cdbf027d57 100644
--- a/src/components/views/right_panel/GroupHeaderButtons.js
+++ b/src/components/views/right_panel/GroupHeaderButtons.js
@@ -45,7 +45,7 @@ export default class GroupHeaderButtons extends HeaderButtons {
         } else if (payload.action === "view_group") {
             this.setPhase(RightPanel.Phase.GroupMemberList);
         } else if (payload.action === "view_group_room") {
-            this.setPhase(RightPanel.Phase.GroupRoomInfo, {groupRoomId: payload.groupRoomId});
+            this.setPhase(RightPanel.Phase.GroupRoomInfo, {groupRoomId: payload.groupRoomId, groupId: payload.groupId});
         } else if (payload.action === "view_group_room_list") {
             this.setPhase(RightPanel.Phase.GroupRoomList);
         } else if (payload.action === "view_group_member_list") {