From d7f15985f590232a72be980570d98d81b7efd45c Mon Sep 17 00:00:00 2001
From: Heiko Carrasco <heiko.carrasco@yahoo.com>
Date: Tue, 13 Oct 2020 18:26:48 +0200
Subject: [PATCH] Close all active modals when home shortcut is used

Signed-off-by: Heiko Carrasco <heiko.carrasco@yahoo.com>
---
 src/Modal.tsx                              | 9 +++++++++
 src/components/structures/LoggedInView.tsx | 2 ++
 2 files changed, 11 insertions(+)

diff --git a/src/Modal.tsx b/src/Modal.tsx
index b0f6ef988e..b6074e4807 100644
--- a/src/Modal.tsx
+++ b/src/Modal.tsx
@@ -147,6 +147,15 @@ export class ModalManager {
         return this.appendDialogAsync<T>(...rest);
     }
 
+    public closeCurrentModal(reason: string) {
+        const modal = this.getCurrentModal();
+        if (!modal) {
+            return;
+        }
+        modal.closeReason = reason;
+        modal.close();
+    }
+
     private buildModal<T extends any[]>(
         prom: Promise<React.ComponentType>,
         props?: IProps<T>,
diff --git a/src/components/structures/LoggedInView.tsx b/src/components/structures/LoggedInView.tsx
index e7256e4cd4..98921d03a1 100644
--- a/src/components/structures/LoggedInView.tsx
+++ b/src/components/structures/LoggedInView.tsx
@@ -52,6 +52,7 @@ import RoomListStore from "../../stores/room-list/RoomListStore";
 import NonUrgentToastContainer from "./NonUrgentToastContainer";
 import { ToggleRightPanelPayload } from "../../dispatcher/payloads/ToggleRightPanelPayload";
 import { IThreepidInvite } from "../../stores/ThreepidInviteStore";
+import Modal from "../../Modal";
 
 // We need to fetch each pinned message individually (if we don't already have it)
 // so each pinned message may trigger a request. Limit the number per room for sanity.
@@ -450,6 +451,7 @@ class LoggedInView extends React.Component<IProps, IState> {
                     dis.dispatch({
                         action: 'view_home_page',
                     });
+                    Modal.closeCurrentModal("homeKeyboardShortcut");
                     handled = true;
                 }
                 break;