Skip to content

A local-first personal finance app

change merge keybind to "g" (#6200)

Matt Fiddaman6834f4d669bc
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 fed0beb93a..aef70f683d 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 208b4986f6..8ffa516636 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 aef1d6b040..819cfcb1fd 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/src/components/modals/KeyboardShortcutModal.tsx b/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
index dc7c6609d6..0201b86a31 100644
--- a/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
+++ b/packages/desktop-client/src/components/modals/KeyboardShortcutModal.tsx
@@ -264,6 +264,16 @@ export function KeyboardShortcutModal() {
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'),
+ },
{
id: 'set-account-for-selected-transactions',
shortcut: 'A',
@@ -284,6 +294,11 @@ export function KeyboardShortcutModal() {
shortcut: 'C',
description: t('Set category for selected transactions'),
},
+ {
+ id: 'set-amount-for-selected-transactions',
+ shortcut: 'M',
+ description: t('Set amount for selected transactions'),
+ },
{
id: 'toggle-cleared-for-selected-transactions',
shortcut: 'L',
diff --git a/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx b/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
index 28775f400e..3fe66ea2ff 100644
--- a/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
+++ b/packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx
@@ -282,7 +282,7 @@ export function SelectedTransactionsButton({
);
// merge
useHotkeys(
- 'm',
+ 'g',
() => canMerge && onMergeTransactions(selectedIds),
hotKeyOptions,
[onMergeTransactions, selectedIds],
@@ -387,7 +387,7 @@ export function SelectedTransactionsButton({
{
name: 'merge-transactions',
text: t('Merge'),
- key: 'M',
+ key: 'G',
} as const,
]
: []),
diff --git a/packages/docs/docs/getting-started/tips-tricks.md b/packages/docs/docs/getting-started/tips-tricks.md
index 572456d13d..46be648101 100644
--- a/packages/docs/docs/getting-started/tips-tricks.md
+++ b/packages/docs/docs/getting-started/tips-tricks.md
@@ -46,6 +46,7 @@ through the list of available commands. You can also quickly move to any of the
- <Key k="f" /> Show only selected transactions.
- <Key k="d" /> Delete selected transactions.
- <Key k="u" /> Duplicate selected transactions.
+- <Key k="g" /> Merge selected transactions
- <Key k="t" /> Set date for selected transactions.
- <Key k="a" /> Set account for selected transactions.
- <Key k="p" /> set payee for selected transactions.
@@ -131,6 +132,6 @@ By using emojis on the accounts, you can have grouping of accounts by type, such
## Math Operators
-When entering amounts for transactions, math operators can be used to calculate a final value.
+When entering amounts for transactions, math operators can be used to calculate a final value.
For example when splitting a transaction, you can input `16.99*1.1` in the subcategory's payment field to apply a 10% tax rate to the amount, which would display `$18.69` once entered.
diff --git a/upcoming-release-notes/6200.md b/upcoming-release-notes/6200.md
new file mode 100644
index 0000000000..878a62d059
--- /dev/null
+++ b/upcoming-release-notes/6200.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [matt-fidd]
+---
+
+Change merge keyboard shortcut to "G" to prevent confusion with amount shortcut