Skip to content

A local-first personal finance app

fix: Keyboard shortcuts modal: Rearrange and add date shortcut "E" (#6573)

Juulzea551608df1c
diff --git a/packages/desktop-client/e2e/help-menu.test.ts b/packages/desktop-client/e2e/help-menu.test.ts
index 2cf62078dc..2c6c2c3c07 100644
--- a/packages/desktop-client/e2e/help-menu.test.ts
+++ b/packages/desktop-client/e2e/help-menu.test.ts
@@ -58,7 +58,7 @@ test.describe('Help menu', () => {
await backButton.click();
await expect(searchBox).toHaveValue('');
- await keyboardShortcutsModal.getByText('General').click();
+ await keyboardShortcutsModal.getByText('Global').click();
await expect(
keyboardShortcutsModal.getByText('Open the help menu'),
).toBeVisible();
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-1-chromium-linux.png
index faca0fcf60..4dbbb1511f 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-2-chromium-linux.png
index 3037aa7906..2392acfcef 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-3-chromium-linux.png
index 8ce0e9ff05..a69d1b9d09 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-7-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-7-chromium-linux.png
index 383647da0e..7977f63541 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-7-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-8-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-8-chromium-linux.png
index f48c39c5f5..d007fbc03c 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-8-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-9-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-9-chromium-linux.png
index 6265a4d497..5a00aa2a6e 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-9-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-9-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx b/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
index 56a95563a5..aa17121012 100644
--- a/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
+++ b/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
@@ -161,8 +161,8 @@ export function KeyboardShortcutModal() {
const defaultShortcuts: ShortcutCategories[] = useMemo(
() => [
{
- name: t('General'),
- id: 'general',
+ name: t('Global'),
+ id: 'global',
items: [
{
id: 'help',
@@ -207,6 +207,17 @@ export function KeyboardShortcutModal() {
id: 'budget-page',
name: t('Budget page'),
items: [
+ {
+ id: 'budget-down',
+ shortcut: 'Enter',
+ description: t('Move down to next category'),
+ },
+ {
+ id: 'budget-up',
+ shortcut: 'Enter',
+ shift: true,
+ description: t('Move up to next category'),
+ },
{
id: 'current-month',
shortcut: '0',
@@ -228,19 +239,14 @@ export function KeyboardShortcutModal() {
],
},
{
- id: 'account-page',
- name: t('Account page'),
+ id: 'account-page-general',
+ name: t('Account page general'),
items: [
{
- id: 'move-down',
- shortcut: 'Enter',
- description: t('Move down when editing'),
- },
- {
- id: 'move-up',
- shortcut: 'Enter',
- shift: true,
- description: t('Move up when editing'),
+ id: 'bank-sync',
+ shortcut: 'B',
+ meta: ctrl,
+ description: t('Bank sync'),
},
{
id: 'import-transactions',
@@ -249,76 +255,89 @@ export function KeyboardShortcutModal() {
description: t('Import transactions'),
},
{
- id: 'bank-sync',
- shortcut: 'B',
- meta: ctrl,
- description: t('Bank sync'),
+ id: 'add-new-transaction',
+ shortcut: 'T',
+ description: t('Add new transaction'),
},
{
- id: 'filter-to-selected-transactions',
+ id: 'filter-menu',
shortcut: 'F',
- description: t('Filter to the selected transactions'),
- },
- {
- id: 'delete-selected-transactions',
- shortcut: 'D',
- description: t('Delete the selected transactions'),
+ description: t(
+ 'Show filter dropdown when no transactions are selected',
+ ),
},
+ ],
+ },
+ {
+ id: 'account-transaction-selection',
+ name: t('Account transaction selection'),
+ items: [
{
- id: 'duplicate-selected-transactions',
- shortcut: 'U',
- description: t('Duplicate the selected transactions'),
+ id: 'select-all-transactions',
+ shortcut: 'A',
+ description: t('Select all transactions'),
+ meta: ctrl,
},
{
- id: 'merge-selected-transactions',
- shortcut: 'G',
- description: t('Merge the selected transactions'),
+ id: 'toggle-selection-current-transaction',
+ shortcut: 'Space',
+ description: t('Toggle selection of current transaction'),
},
{
- id: 'set-account-for-selected-transactions',
- shortcut: 'A',
- description: t('Set account for selected transactions'),
+ id: 'toggle-selection-all-transactions',
+ shortcut: 'Space',
+ description: t(
+ 'Toggle transactions between current and most recently selected transaction',
+ ),
+ shift: true,
},
{
- id: 'set-payee-for-selected-transactions',
- shortcut: 'P',
- description: t('Set payee for selected transactions'),
+ id: 'move-next-transaction',
+ shortcut: 'J',
+ description: t('Move down to the next transaction'),
},
{
- id: 'set-notes-for-selected-transactions',
- shortcut: 'N',
- description: t('Set notes for selected transactions'),
+ id: 'move-next-transaction-scroll',
+ shortcut: '↓',
+ description: t('Move down to the next transaction and scroll'),
},
{
- id: 'set-category-for-selected-transactions',
- shortcut: 'C',
- description: t('Set category for selected transactions'),
+ id: 'move-previous-transaction',
+ shortcut: 'K',
+ description: t('Move up to the next transaction'),
},
{
- id: 'set-amount-for-selected-transactions',
- shortcut: 'M',
- description: t('Set amount for selected transactions'),
+ id: 'move-previous-transaction-scroll',
+ shortcut: '↑',
+ description: t('Move up to the next transaction and scroll'),
},
+ ],
+ },
+ {
+ id: 'account-transaction-editing',
+ name: t('Account transaction editing'),
+ items: [
{
- id: 'set-date-for-selected-transactions',
- shortcut: 'E',
- description: t('Set date for selected transactions'),
+ id: 'move-down',
+ shortcut: 'Enter',
+ description: t('Move down when editing'),
},
{
- id: 'toggle-cleared-for-selected-transactions',
- shortcut: 'L',
- description: t('Toggle cleared for selected transactions'),
+ id: 'move-up',
+ shortcut: 'Enter',
+ shift: true,
+ description: t('Move up when editing'),
},
{
- id: 'link-or-view-schedule-for-selected-transactions',
- shortcut: 'S',
- description: t('Link or view schedule for selected transactions'),
+ id: 'add-transaction-and-close',
+ shortcut: 'Enter',
+ meta: ctrl,
+ description: t('Add transaction and close form'),
},
{
- id: 'select-all-transactions',
- shortcut: 'A',
- description: t('Select all transactions'),
- meta: ctrl,
+ id: 'move-right-when-editing',
+ shortcut: 'Tab',
+ description: t('Move right when editing'),
},
{
id: 'move-left-when-editing',
@@ -326,59 +345,71 @@ export function KeyboardShortcutModal() {
description: t('Move left when editing'),
shift: true,
},
+ ],
+ },
+ {
+ id: 'account-transaction-management',
+ name: t('Account transaction management'),
+ items: [
{
- id: 'move-right-when-editing',
- shortcut: 'Tab',
- description: t('Move right when editing'),
+ id: 'set-date-for-selected-transactions',
+ shortcut: 'E',
+ description: t('Set date for selected transactions'),
},
{
- id: 'add-new-transaction',
- shortcut: 'T',
- description: t('Add a new transaction'),
+ id: 'set-payee-for-selected-transactions',
+ shortcut: 'P',
+ description: t('Set payee for selected transactions'),
},
{
- id: 'add-transaction-and-close',
- shortcut: 'Enter',
- meta: ctrl,
- description: t('Add transaction and close form'),
+ id: 'set-notes-for-selected-transactions',
+ shortcut: 'N',
+ description: t('Set notes for selected transactions'),
},
{
- id: 'filter-transactions',
- shortcut: 'F',
- description: t('Filter transactions'),
+ id: 'set-category-for-selected-transactions',
+ shortcut: 'C',
+ description: t('Set category for selected transactions'),
},
{
- id: 'move-next-transaction',
- shortcut: 'J',
- description: t('Move to the next transaction down'),
+ id: 'set-amount-for-selected-transactions',
+ shortcut: 'M',
+ description: t('Set amount for selected transactions'),
},
{
- id: 'move-previous-transaction',
- shortcut: 'K',
- description: t('Move to the next transaction up'),
+ id: 'toggle-cleared-for-selected-transactions',
+ shortcut: 'L',
+ description: t('Toggle cleared status for selected transactions'),
},
{
- id: 'move-previous-transaction-scroll',
- shortcut: '↑',
- description: t('Move to the previous transaction and scroll'),
+ id: 'set-account-for-selected-transactions',
+ shortcut: 'A',
+ description: t('Set account for selected transactions'),
},
{
- id: 'move-next-transaction-scroll',
- shortcut: '↓',
- description: t('Move to the next transaction and scroll'),
+ id: 'link-or-view-schedule-for-selected-transactions',
+ shortcut: 'S',
+ description: t('Link or view schedule for selected transactions'),
},
{
- id: 'toggle-selection-current-transaction',
- shortcut: 'Space',
- description: t('Toggle selection of current transaction'),
+ id: 'filter-selected-transactions',
+ shortcut: 'F',
+ description: t('Filter to the selected transactions'),
},
{
- id: 'toggle-selection-all-transactions',
- shortcut: 'Space',
- description: t(
- 'Toggle transactions between current and most recently selected transaction',
- ),
- shift: true,
+ id: 'delete-selected-transactions',
+ shortcut: 'D',
+ description: t('Delete the selected transactions'),
+ },
+ {
+ id: 'duplicate-selected-transactions',
+ shortcut: 'U',
+ description: t('Duplicate the selected transactions'),
+ },
+ {
+ id: 'merge-selected-transactions',
+ shortcut: 'G',
+ description: t('Merge the selected transactions'),
},
],
},
diff --git a/upcoming-release-notes/6573.md b/upcoming-release-notes/6573.md
new file mode 100644
index 0000000000..7ce3d11fda
--- /dev/null
+++ b/upcoming-release-notes/6573.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [Juulz]
+---
+
+Update KeybordShortcutModal.tsx so "E" is set date for selected transactions. Regroup and rearrange list to match docs.