From 780aea1a3653a6c56b392efe3832f1233413c0d8 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 18 Sep 2020 12:32:33 +0100
Subject: [PATCH 1/2] Mac sends lowercase event.key even when holding Shift
 unlike Windows

---
 src/components/structures/RoomView.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index f568f31dbd..59a5efda91 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -672,6 +672,7 @@ export default class RoomView extends React.Component<IProps, IState> {
                     handled = true;
                 }
                 break;
+            case Key.U: // Mac returns lowercase
             case Key.U.toUpperCase():
                 if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev) && ev.shiftKey) {
                     dis.dispatch({ action: "upload_file" });

From d267092b192d85934d424a30897c0ed2663ac06e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Fri, 18 Sep 2020 12:33:25 +0100
Subject: [PATCH 2/2] Make the upload_file dispatch synchronous to make Firefox
 happy about it

---
 src/components/structures/RoomView.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/structures/RoomView.tsx b/src/components/structures/RoomView.tsx
index 59a5efda91..4c418e9994 100644
--- a/src/components/structures/RoomView.tsx
+++ b/src/components/structures/RoomView.tsx
@@ -675,7 +675,7 @@ export default class RoomView extends React.Component<IProps, IState> {
             case Key.U: // Mac returns lowercase
             case Key.U.toUpperCase():
                 if (isOnlyCtrlOrCmdIgnoreShiftKeyEvent(ev) && ev.shiftKey) {
-                    dis.dispatch({ action: "upload_file" });
+                    dis.dispatch({ action: "upload_file" }, true);
                     handled = true;
                 }
                 break;