From e9188813fd0feda54f771827647c7b4fcd7b8327 Mon Sep 17 00:00:00 2001
From: Jed Fox <git@jedfox.com>
Date: Thu, 20 Apr 2023 18:32:51 -0400
Subject: [PATCH] Fix handling for shortcuts (#926)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It turns out that `event.key` for ctrl/cmd+Z is `z`, and it’s `Z` for
ctrl/cmd+shift+Z.

---------

Co-authored-by: Matiss Janis Aboltins <matiss@mja.lv>
---
 packages/desktop-client/src/browser-preload.browser.js | 4 ++--
 packages/desktop-client/src/components/table.js        | 2 +-
 upcoming-release-notes/926.md                          | 6 ++++++
 3 files changed, 9 insertions(+), 3 deletions(-)
 create mode 100644 upcoming-release-notes/926.md

diff --git a/packages/desktop-client/src/browser-preload.browser.js b/packages/desktop-client/src/browser-preload.browser.js
index 6d9f70521e..41695b0f4d 100644
--- a/packages/desktop-client/src/browser-preload.browser.js
+++ b/packages/desktop-client/src/browser-preload.browser.js
@@ -119,12 +119,12 @@ global.Actual = {
 document.addEventListener('keydown', e => {
   if (e.metaKey || e.ctrlKey) {
     // Cmd/Ctrl+o
-    if (e.key === 'O') {
+    if (e.key === 'o') {
       e.preventDefault();
       window.__actionsForMenu.closeBudget();
     }
     // Cmd/Ctrl+z
-    else if (e.key === 'Z') {
+    else if (e.key.toLowerCase() === 'z') {
       if (
         e.target.tagName === 'INPUT' ||
         e.target.tagName === 'TEXTAREA' ||
diff --git a/packages/desktop-client/src/components/table.js b/packages/desktop-client/src/components/table.js
index 8bdbc28c76..b93b96e27e 100644
--- a/packages/desktop-client/src/components/table.js
+++ b/packages/desktop-client/src/components/table.js
@@ -486,7 +486,7 @@ export const CellButton = React.forwardRef(
         className="cell-button"
         tabIndex="0"
         onKeyDown={e => {
-          if (e.key === 'X' || e.key === ' ') {
+          if (e.key === 'x' || e.key === ' ') {
             e.preventDefault();
             if (!disabled) {
               onSelect && onSelect();
diff --git a/upcoming-release-notes/926.md b/upcoming-release-notes/926.md
new file mode 100644
index 0000000000..74ff819e19
--- /dev/null
+++ b/upcoming-release-notes/926.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [j-f1]
+---
+
+Fix undo keyboard shortcut being ignored