Skip to content

A local-first personal finance app

redesign settings menu, move pages from sidebar into settings (#9110)

Matt Fiddaman0d292335fcb2
diff --git a/packages/component-library/src/theme.ts b/packages/component-library/src/theme.ts
index 52e012c7f5..c7b43b2985 100644
--- a/packages/component-library/src/theme.ts
+++ b/packages/component-library/src/theme.ts
@@ -61,6 +61,14 @@ export const theme = {
sidebarBorder: 'var(--color-sidebarBorder)',
sidebarControlBackground: 'var(--color-sidebarControlBackground)',
sidebarBrand: 'var(--color-sidebarBrand)',
+ settingsCardBackground: 'var(--color-settingsCardBackground)',
+ settingsCardBorder: 'var(--color-settingsCardBorder)',
+ settingsNavItemText: 'var(--color-settingsNavItemText)',
+ settingsNavItemBackgroundHover: 'var(--color-settingsNavItemBackgroundHover)',
+ settingsNavItemAccentSelected: 'var(--color-settingsNavItemAccentSelected)',
+ settingsNavItemTextSelected: 'var(--color-settingsNavItemTextSelected)',
+ settingsNavItemBackgroundSelected:
+ 'var(--color-settingsNavItemBackgroundSelected)',
menuBackground: 'var(--color-menuBackground)',
menuItemBackground: 'var(--color-menuItemBackground)',
menuItemBackgroundHover: 'var(--color-menuItemBackgroundHover)',
diff --git a/packages/component-library/src/themes/dark.css b/packages/component-library/src/themes/dark.css
index c230e4b3fb..fd2e1c5f62 100644
--- a/packages/component-library/src/themes/dark.css
+++ b/packages/component-library/src/themes/dark.css
@@ -81,6 +81,24 @@
--color-sidebarControlBackground: var(--color-sidebarItemBackgroundHover);
--color-sidebarBrand: var(--color-sidebarItemAccentSelected);
+ --color-settingsCardBackground: var(--color-tableBackground);
+ --color-settingsCardBorder: var(--color-tableBorder);
+ --color-settingsNavItemText: var(--color-pageText);
+ --color-settingsNavItemBackgroundHover: color-mix(
+ in srgb,
+ var(--color-settingsNavItemText) 8%,
+ transparent
+ );
+ --color-settingsNavItemAccentSelected: var(--palette-purple200);
+ --color-settingsNavItemTextSelected: var(
+ --color-settingsNavItemAccentSelected
+ );
+ --color-settingsNavItemBackgroundSelected: color-mix(
+ in srgb,
+ var(--color-settingsNavItemAccentSelected) 22%,
+ transparent
+ );
+
--color-menuBackground: var(--palette-navy800);
--color-menuItemBackground: var(--palette-navy800);
--color-menuItemBackgroundHover: var(--palette-navy500);
diff --git a/packages/component-library/src/themes/light.css b/packages/component-library/src/themes/light.css
index a10a68d2d6..36a1a1bb82 100644
--- a/packages/component-library/src/themes/light.css
+++ b/packages/component-library/src/themes/light.css
@@ -81,6 +81,22 @@
--color-sidebarControlBackground: var(--color-sidebarItemBackgroundHover);
--color-sidebarBrand: var(--color-sidebarItemAccentSelected);
+ --color-settingsCardBackground: var(--color-tableBackground);
+ --color-settingsCardBorder: var(--color-tableBorder);
+ --color-settingsNavItemText: var(--color-pageText);
+ --color-settingsNavItemBackgroundHover: color-mix(
+ in srgb,
+ var(--color-settingsNavItemText) 8%,
+ transparent
+ );
+ --color-settingsNavItemAccentSelected: var(--palette-purple500);
+ --color-settingsNavItemTextSelected: var(--palette-purple600);
+ --color-settingsNavItemBackgroundSelected: color-mix(
+ in srgb,
+ var(--color-settingsNavItemAccentSelected) 10%,
+ transparent
+ );
+
--color-menuBackground: var(--palette-white);
--color-menuItemBackground: var(--palette-navy50);
--color-menuItemBackgroundHover: var(--palette-navy100);
diff --git a/packages/component-library/src/themes/midnight.css b/packages/component-library/src/themes/midnight.css
index 7577e5c529..ae017a6e17 100644
--- a/packages/component-library/src/themes/midnight.css
+++ b/packages/component-library/src/themes/midnight.css
@@ -81,6 +81,24 @@
--color-sidebarControlBackground: var(--color-sidebarItemBackgroundHover);
--color-sidebarBrand: var(--color-sidebarItemAccentSelected);
+ --color-settingsCardBackground: var(--color-tableBackground);
+ --color-settingsCardBorder: var(--color-tableBorder);
+ --color-settingsNavItemText: var(--color-pageText);
+ --color-settingsNavItemBackgroundHover: color-mix(
+ in srgb,
+ var(--color-settingsNavItemText) 8%,
+ transparent
+ );
+ --color-settingsNavItemAccentSelected: var(--palette-purple200);
+ --color-settingsNavItemTextSelected: var(
+ --color-settingsNavItemAccentSelected
+ );
+ --color-settingsNavItemBackgroundSelected: color-mix(
+ in srgb,
+ var(--color-settingsNavItemAccentSelected) 22%,
+ transparent
+ );
+
--color-menuBackground: var(--palette-gray700);
--color-menuItemBackground: var(--palette-gray200);
--color-menuItemBackgroundHover: var(--palette-gray500);
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png
index 84281cf8ea..761136a200 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png
index 92a0a9dedd..6dcdf1fd58 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png
index 810b360659..4bd8451882 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png
index 954a71c361..2c92057830 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png
index 5779f5cc49..8c84bb8dd0 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png
index 0da67f654e..ac5d2b2984 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-1-chromium-linux.png
index 5c07fb21cc..95da0283fd 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-2-chromium-linux.png
index 2db43d704d..c18f34f3d8 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-3-chromium-linux.png
index 2112516892..ab2c2f751d 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-account-register-widens-amount-columns-for-large-balances-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-1-chromium-linux.png
index c0d76666a4..923e8e5baf 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-2-chromium-linux.png
index ef1e7dab3a..8002b80cd3 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-3-chromium-linux.png
index 16de6508a3..8d2c97208d 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-4-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-4-chromium-linux.png
index 8058a5ca8b..7edf1b0a8d 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-4-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-5-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-5-chromium-linux.png
index e9103c076b..36dcb8ea99 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-5-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-6-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-6-chromium-linux.png
index 1d4e4e88ca..827515e8e4 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-6-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-closes-an-account-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-1-chromium-linux.png
index a1bf23eb92..6f5c0c4c0f 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-2-chromium-linux.png
index e960e2af69..d9414c37e0 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-3-chromium-linux.png
index 2b48ed8e10..f15ca146b7 100644
Binary files a/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/accounts.test.ts-snapshots/Accounts-creates-a-new-account-and-views-the-initial-balance-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-1-chromium-linux.png
index ac719fe87b..a2cd04890f 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-2-chromium-linux.png
index a6c375eab0..05f5976788 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-3-chromium-linux.png
index c0718a988d..ef39671825 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-1-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-1-chromium-linux.png
index 95d63fbbc3..230ea55fb7 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-1-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-2-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-2-chromium-linux.png
index ab34c8eb3e..40bf7709a4 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-2-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-3-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-3-chromium-linux.png
index fb4024121c..d0e427eee1 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-3-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-page-handles-empty-state-gracefully-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-1-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-1-chromium-linux.png
index c7733aaefa..7c6805a944 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-1-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-2-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-2-chromium-linux.png
index 71568fd73c..6e7f1c2b57 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-2-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-3-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-3-chromium-linux.png
index 7f000938cd..46c84554e0 100644
Binary files a/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-3-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.mobile.test.ts-snapshots/Mobile-Bank-Sync-searches-for-accounts-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-1-chromium-linux.png
index 5b05e59ea5..db9486c0ed 100644
Binary files a/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-2-chromium-linux.png
index 5b67589ce7..4f58a54a21 100644
Binary files a/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-3-chromium-linux.png
index 0edef60269..8acdc61471 100644
Binary files a/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/bank-sync.test.ts-snapshots/Bank-Sync-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png
index 6910a386bc..dab762b284 100644
Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png
index e474b5b2a4..6201e2b1bc 100644
Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-3-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-3-chromium-linux.png
index 8437fd78e2..7149abc403 100644
Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-renders-the-summary-information-available-funds-overspent-budgeted-and-for-next-month-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png
index 1ca354def8..785ed1963c 100644
Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png
index 67cf75a0a7..5662ae2ddb 100644
Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png
index 543921f61a..df28fa8f43 100644
Binary files a/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.test.ts-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-1-chromium-linux.png b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-1-chromium-linux.png
index 04873a4ff8..e4b399ab79 100644
Binary files a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-1-chromium-linux.png and b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-2-chromium-linux.png b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-2-chromium-linux.png
index 7a10f5b733..3eedc987cf 100644
Binary files a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-2-chromium-linux.png and b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-3-chromium-linux.png b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-3-chromium-linux.png
index 0dbb28378a..2f68c3f865 100644
Binary files a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-3-chromium-linux.png and b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-search-works-correctly-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-1-chromium-linux.png
index 56125c90b2..8cea0b3493 100644
Binary files a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-2-chromium-linux.png
index b7ea901053..83457c8fa5 100644
Binary files a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-3-chromium-linux.png
index dc56295129..5724fa140b 100644
Binary files a/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/command-bar.test.ts-snapshots/Command-bar-Check-the-command-bar-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-1-chromium-linux.png
index b0bed1aa5a..aabf3d01d9 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-2-chromium-linux.png
index 0982d7177c..ac285d799c 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-3-chromium-linux.png
index 4e93082663..98ccf8f11b 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-help-menu-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-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 ba657a2abd..fa9ed31adf 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 cf58b7dc1e..71ec348043 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 21579028b5..4b3d01900f 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-4-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-4-chromium-linux.png
index 8e3f4ba0de..9f37972e44 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-4-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-5-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-5-chromium-linux.png
index e87e60f977..a9309c5b65 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-5-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-6-chromium-linux.png b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-6-chromium-linux.png
index e604013c19..e103a85169 100644
Binary files a/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-6-chromium-linux.png and b/packages/desktop-client/e2e/help-menu.test.ts-snapshots/Help-menu-Check-the-keyboard-shortcuts-modal-visuals-6-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 91abc60703..e90f27e8f0 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 5cb59de4f0..3f58604827 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 1c1145e7b3..fb2e97e291 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/e2e/page-models/mobile-navigation.ts b/packages/desktop-client/e2e/page-models/mobile-navigation.ts
index b42f2f73ef..f1a0314def 100644
--- a/packages/desktop-client/e2e/page-models/mobile-navigation.ts
+++ b/packages/desktop-client/e2e/page-models/mobile-navigation.ts
@@ -12,24 +12,14 @@ import { MobileSchedulesPage } from './mobile-schedules-page';
import { MobileTransactionEntryPage } from './mobile-transaction-entry-page';
import { SettingsPage } from './settings-page';
-const NAVBAR_ROWS = 3;
-const NAV_LINKS_HIDDEN_BY_DEFAULT = [
- 'Reports',
- 'Schedules',
- 'Payees',
- 'Rules',
- 'Bank Sync',
- 'Settings',
-];
+const NAVBAR_ROWS = 2;
+const NAV_LINKS_HIDDEN_BY_DEFAULT = ['Reports', 'Schedules', 'Settings'];
const ROUTES_BY_PAGE = {
Budget: '/budget',
Accounts: '/accounts',
Transaction: '/transactions/new',
Reports: '/reports',
Schedules: '/schedules',
- Payees: '/payees',
- Rules: '/rules',
- 'Bank Sync': '/bank-sync',
Settings: '/settings',
};
@@ -43,9 +33,9 @@ export class MobileNavigation {
constructor(page: Page) {
this.page = page;
this.heading = page.getByRole('heading');
- this.navbar = page.getByRole('navigation');
+ this.navbar = page.locator('[data-navbar-state]');
this.mainContentSelector = '[role=main]';
- this.navbarSelector = '[role=navigation]';
+ this.navbarSelector = '[data-navbar-state]';
}
async dragNavbarUp() {
@@ -179,10 +169,12 @@ export class MobileNavigation {
}
async goToPayeesPage() {
- return await this.navigateToPage(
- 'Payees',
- () => new MobilePayeesPage(this.page),
- );
+ const settingsPage = await this.goToSettingsPage();
+ await settingsPage.goToSection('Payees');
+
+ const payeesPage = new MobilePayeesPage(this.page);
+ await payeesPage.waitFor();
+ return payeesPage;
}
async goToSchedulesPage() {
@@ -193,17 +185,21 @@ export class MobileNavigation {
}
async goToRulesPage() {
- return await this.navigateToPage(
- 'Rules',
- () => new MobileRulesPage(this.page),
- );
+ const settingsPage = await this.goToSettingsPage();
+ await settingsPage.goToSection('Rules');
+
+ const rulesPage = new MobileRulesPage(this.page);
+ await rulesPage.waitFor();
+ return rulesPage;
}
async goToBankSyncPage() {
- return await this.navigateToPage(
- 'Bank Sync',
- () => new MobileBankSyncPage(this.page),
- );
+ const settingsPage = await this.goToSettingsPage();
+ await settingsPage.goToSection('Bank Sync');
+
+ const bankSyncPage = new MobileBankSyncPage(this.page);
+ await bankSyncPage.waitFor();
+ return bankSyncPage;
}
async goToSettingsPage() {
diff --git a/packages/desktop-client/e2e/page-models/navigation.ts b/packages/desktop-client/e2e/page-models/navigation.ts
index bf1e10df78..4bbc002dfa 100644
--- a/packages/desktop-client/e2e/page-models/navigation.ts
+++ b/packages/desktop-client/e2e/page-models/navigation.ts
@@ -100,53 +100,28 @@ export class Navigation {
}
async goToRulesPage() {
- const rulesLink = this.page.getByRole('link', { name: 'Rules' });
-
- // Expand the "more" menu only if it is not already expanded
- if (!(await rulesLink.isVisible())) {
- await this.page.getByRole('button', { name: 'More' }).click();
- }
-
- await rulesLink.click();
+ const settingsPage = await this.goToSettingsPage();
+ await settingsPage.goToSection('Rules');
return new RulesPage(this.page);
}
async goToPayeesPage() {
- const payeesLink = this.page.getByRole('link', { name: 'Payees' });
-
- // Expand the "More" menu only if the Payees link is not visible
- if (!(await payeesLink.isVisible())) {
- await this.page.getByRole('button', { name: 'More' }).click();
- }
-
- await payeesLink.click();
+ const settingsPage = await this.goToSettingsPage();
+ await settingsPage.goToSection('Payees');
return new PayeesPage(this.page);
}
async goToBankSyncPage() {
- const bankSyncLink = this.page.getByRole('link', { name: 'Bank Sync' });
-
- // Expand the "more" menu only if it is not already expanded
- if (!(await bankSyncLink.isVisible())) {
- await this.page.getByRole('button', { name: 'More' }).click();
- }
-
- await bankSyncLink.click();
+ const settingsPage = await this.goToSettingsPage();
+ await settingsPage.goToSection('Bank Sync');
return new BankSyncPage(this.page);
}
async goToSettingsPage() {
- const settingsLink = this.page.getByRole('link', { name: 'Settings' });
-
- // Expand the "more" menu only if it is not already expanded
- if (!(await settingsLink.isVisible())) {
- await this.page.getByRole('button', { name: 'More' }).click();
- }
-
- await settingsLink.click();
+ await this.page.getByRole('link', { name: 'Settings' }).click();
return new SettingsPage(this.page);
}
diff --git a/packages/desktop-client/e2e/page-models/settings-page.ts b/packages/desktop-client/e2e/page-models/settings-page.ts
index 06134fd8ed..049cfd50ec 100644
--- a/packages/desktop-client/e2e/page-models/settings-page.ts
+++ b/packages/desktop-client/e2e/page-models/settings-page.ts
@@ -1,38 +1,62 @@
import type { Locator, Page } from '@playwright/test';
+type SettingsSection =
+ | 'General'
+ | 'Payees'
+ | 'Rules'
+ | 'Bank Sync'
+ | 'Tags'
+ | 'Advanced'
+ | 'Experimental';
+
export class SettingsPage {
readonly page: Page;
readonly settings: Locator;
+ readonly settingsNav: Locator;
+ readonly backButton: Locator;
readonly exportDataButton: Locator;
readonly switchBudgetTypeButton: Locator;
- readonly advancedSettingsButton: Locator;
- readonly experimentalSettingsButton: Locator;
constructor(page: Page) {
this.page = page;
this.settings = page.getByTestId('settings');
+ this.settingsNav = page.getByRole('navigation', { name: 'Settings' });
+ this.backButton = page.getByRole('button', { name: 'Back' });
this.exportDataButton = this.settings.getByRole('button', {
name: 'Export data',
});
this.switchBudgetTypeButton = this.settings.getByRole('button', {
name: /^Switch to (envelope|tracking) budgeting$/i,
});
- this.advancedSettingsButton =
- this.settings.getByTestId('advanced-settings');
- this.experimentalSettingsButton = this.settings.getByTestId(
- 'experimental-settings',
- );
}
async waitFor(...options: Parameters<Locator['waitFor']>) {
await this.settings.waitFor(...options);
}
+ async goToSection(name: SettingsSection) {
+ const sectionLink = this.settingsNav.getByRole('link', {
+ name,
+ exact: true,
+ });
+
+ // Narrow layouts only show the settings nav on the settings landing page
+ const viewport = this.page.viewportSize();
+ const isNarrow = viewport != null && viewport.width < 512;
+ if (isNarrow && !(await sectionLink.isVisible())) {
+ await this.backButton.click();
+ }
+
+ await sectionLink.click();
+ }
+
async exportData() {
+ await this.goToSection('General');
await this.exportDataButton.click();
}
async useBudgetType(budgetType: 'Envelope' | 'Tracking') {
+ await this.goToSection('General');
await this.switchBudgetTypeButton.waitFor();
const buttonText = await this.switchBudgetTypeButton.textContent();
@@ -42,17 +66,7 @@ export class SettingsPage {
}
async enableExperimentalFeature(featureName: string) {
- await this.advancedSettingsButton.waitFor({
- state: 'visible',
- timeout: 2000,
- });
- await this.advancedSettingsButton.click();
-
- await this.experimentalSettingsButton.waitFor({
- state: 'visible',
- timeout: 2000,
- });
- await this.experimentalSettingsButton.click();
+ await this.goToSection('Experimental');
const featureCheckbox = this.page.getByRole('checkbox', {
name: featureName,
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-1-chromium-linux.png
index 520bc31588..4f31f48352 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-2-chromium-linux.png
index 73eed59e81..8d4a736973 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-3-chromium-linux.png
index 897786e90d..44ae8986b3 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-1-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-1-chromium-linux.png
index 598cdc7129..4a215a104d 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-1-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-2-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-2-chromium-linux.png
index 9db9e6a04b..65adb496c3 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-2-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-3-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-3-chromium-linux.png
index a91bd8fcf6..59f9c8b87e 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-3-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-filters-out-unrelated-payees-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-1-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-1-chromium-linux.png
index 357d12b5ad..abbd77ffff 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-1-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-2-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-2-chromium-linux.png
index 647baae7ac..b5f9137817 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-2-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-3-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-3-chromium-linux.png
index 946808c09c..046b8ef69d 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-3-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-page-handles-empty-state-gracefully-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-1-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-1-chromium-linux.png
index 852b5c8307..b5dfb0e522 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-1-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-2-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-2-chromium-linux.png
index f0b4653696..f5dfa5e875 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-2-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-3-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-3-chromium-linux.png
index fd1ce91afc..27cb7f4da0 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-3-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-4-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-4-chromium-linux.png
index b8ae057339..619dd3f81a 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-4-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-5-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-5-chromium-linux.png
index abbba88ece..1d5e28ddda 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-5-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-6-chromium-linux.png b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-6-chromium-linux.png
index 7fac9e0c14..fb57315711 100644
Binary files a/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-6-chromium-linux.png and b/packages/desktop-client/e2e/payees.mobile.test.ts-snapshots/Mobile-Payees-search-functionality-works-correctly-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-1-chromium-linux.png
index fbef82c479..f662ba7bcb 100644
Binary files a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-2-chromium-linux.png
index 6198feb914..2ddf506271 100644
Binary files a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-3-chromium-linux.png
index cc1ee19607..8967b501ed 100644
Binary files a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-4-chromium-linux.png b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-4-chromium-linux.png
index 03572ce4cb..0cdd257370 100644
Binary files a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-4-chromium-linux.png and b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-5-chromium-linux.png b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-5-chromium-linux.png
index af8f24daf0..52f468aa9a 100644
Binary files a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-5-chromium-linux.png and b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-6-chromium-linux.png b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-6-chromium-linux.png
index df2b54ab42..b3d1aa534c 100644
Binary files a/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-6-chromium-linux.png and b/packages/desktop-client/e2e/payees.test.ts-snapshots/Payees-checks-the-payees-page-visuals-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-1-chromium-linux.png
index d11cf0fed2..c99a51941a 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-2-chromium-linux.png
index ff41f80867..21c2cacc4d 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-3-chromium-linux.png
index ae381ce545..7c11c38e6b 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-balance-forecast-report-with-monthly-granularity-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-1-chromium-linux.png
index 0074364b9b..b57eda6a32 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-2-chromium-linux.png
index 80ea1db5d4..582632ce92 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-3-chromium-linux.png
index 96056c5560..f8cbe8ebe4 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-loads-tracking-budget-forecast-report-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-1-chromium-linux.png
index 045d81fcef..86e8227fd8 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-2-chromium-linux.png
index 16547675c3..ed31b9725b 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-3-chromium-linux.png
index 1b39fb80b9..e491c8fe5b 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-balance-forecast-switches-to-daily-granularity-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-1-chromium-linux.png
index d58241d13b..cc2c92cc73 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-2-chromium-linux.png
index 3fabcfdab4..0e85333477 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-3-chromium-linux.png
index 20544e6c34..ba6b5ba88e 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Area-Graph-and-checks-the-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-1-chromium-linux.png
index e46b7cf67c..24b4a20d15 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-2-chromium-linux.png
index a38cb9533d..0b9e760593 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-3-chromium-linux.png
index 6559a1337d..ab1a11668d 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Bar-Graph-and-checks-the-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-1-chromium-linux.png
index 4d0e5fb727..33933377b0 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-2-chromium-linux.png
index feb81652d4..2df5533f99 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-3-chromium-linux.png
index 5369674d33..e85a920519 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Data-Table-and-checks-the-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png
index d353f28a3a..d42f4a1869 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-2-chromium-linux.png
index 4c6cb1af33..5e233b1814 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-3-chromium-linux.png
index 50b9e4224b..0a74db0312 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Donut-Graph-and-checks-the-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-1-chromium-linux.png
index 5c1eabf365..7d654346af 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-2-chromium-linux.png
index 246dc52c07..c1c6af24ca 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-3-chromium-linux.png
index c5e75d2c24..5227849a97 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Switches-to-Line-Graph-and-checks-the-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-1-chromium-linux.png
index da67ee1ccd..29f1433e9a 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-2-chromium-linux.png
index db955c4c64..b262002b4e 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-3-chromium-linux.png
index 482a1530bf..774141c55a 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-labels-button-shows-the-labels-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-1-chromium-linux.png
index 0d8a8cdf76..2f1094994e 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-2-chromium-linux.png
index 33a2ff4fa2..5eec1ea495 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-3-chromium-linux.png
index b034b03b5d..d78efbfa53 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-legend-button-shows-the-legend-side-bar-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-1-chromium-linux.png
index 517096faf7..69139925aa 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-2-chromium-linux.png
index cef069c2cb..c93283d0dc 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-3-chromium-linux.png
index 525c67fb19..96da978a75 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-custom-reports-Validates-that-show-summary-button-shows-the-summary-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png
index dff147a00b..3c380a19ff 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png
index b6a48c9ed6..c14687fe10 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png
index 6a4d6ac396..8f2f675db3 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png
index 168d475da1..38a06311dd 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png
index 70b27e7051..bf1df33270 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png
index 6b0b2e5656..a6ad301893 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-and-cash-flow-reports-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png
index bd1dc4231e..ed382a249b 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png
index 7788eedb0d..2f85bc7378 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png
index 16a380a916..609b6e5670 100644
Binary files a/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.ts-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-1-chromium-linux.png
index 95e9345bcc..498b8cb4de 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-2-chromium-linux.png
index f3b7a46de4..bad7224185 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-3-chromium-linux.png
index 75d8da4825..3b2b797227 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-1-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-1-chromium-linux.png
index 2d013c7cda..1a6abde5da 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-1-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-2-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-2-chromium-linux.png
index 11d6178178..a2dc341482 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-2-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-3-chromium-linux.png b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-3-chromium-linux.png
index eb5d62e099..b6ad77a2e8 100644
Binary files a/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-3-chromium-linux.png and b/packages/desktop-client/e2e/rules.mobile.test.ts-snapshots/Mobile-Rules-page-handles-empty-state-gracefully-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-1-chromium-linux.png
index 60c141a24b..24e2f50723 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-2-chromium-linux.png
index bc38b066c1..012e2da5cb 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-3-chromium-linux.png
index 23279eab65..d684b22f03 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png
index 3447395c9b..eb93d107cc 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png
index 1888275fea..231b0f9175 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png
index 60d804c8f5..55ba67e4ed 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png
index 5ab781a1e2..52856a9b69 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-5-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-5-chromium-linux.png
index ff72e28fda..13c5fd6772 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-5-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-6-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-6-chromium-linux.png
index ddbe2d942f..1fcb19b9b3 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-6-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png
index cc55a7281e..82fdce0079 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png
index 32f532d146..9067fc7826 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png
index c48f994012..1108a9abd3 100644
Binary files a/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/rules.test.ts-snapshots/Rules-creates-a-split-transaction-rule-and-makes-sure-it-is-applied-when-creating-a-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-1-chromium-linux.png
index 69b26ccef6..d89d68d700 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-2-chromium-linux.png
index b1923ee2ab..dcd47ca569 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-3-chromium-linux.png
index ad9d4671ea..5db6140501 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-1-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-1-chromium-linux.png
index c3c4fc3750..e0f2241e0a 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-1-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-2-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-2-chromium-linux.png
index 9e8cb217a4..f5c56bb5a3 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-2-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-3-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-3-chromium-linux.png
index 6d8f145d26..62e60a2307 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-3-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-full-list-of-schedules-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-1-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-1-chromium-linux.png
index cbec5bae48..1d5efb23a3 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-1-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-10-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-10-chromium-linux.png
index c2f9438f20..dda6ee69a5 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-10-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-10-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-11-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-11-chromium-linux.png
index 228f79c337..32da32379d 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-11-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-11-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png
index 5a0ff2c91b..3c46e0b4aa 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-12-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-2-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-2-chromium-linux.png
index af56aa91ad..173f59f319 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-2-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-3-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-3-chromium-linux.png
index 5e85d616d0..2577c97dfb 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-3-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-4-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-4-chromium-linux.png
index 9463259384..521a742815 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-4-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-5-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-5-chromium-linux.png
index c38b61719c..2b605960e6 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-5-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-6-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-6-chromium-linux.png
index 67b0bf4a52..e658271b90 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-6-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png
index ef284e75ca..1e25ba0a05 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-8-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-8-chromium-linux.png
index 2feadce071..02e5a48003 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-8-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-9-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-9-chromium-linux.png
index 44b17e79bf..d9f6aa2210 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-9-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-a-new-schedule-posts-the-transaction-and-later-completes-it-9-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-1-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-1-chromium-linux.png
index fa4a81b29f..0c694254f7 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-1-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-10-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-10-chromium-linux.png
index f32b66d4f0..0b5ef1d27b 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-10-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-10-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-11-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-11-chromium-linux.png
index edb9aa6a5d..08ee75d346 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-11-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-11-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-12-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-12-chromium-linux.png
index 662c16df4a..585ae2d502 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-12-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-12-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-13-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-13-chromium-linux.png
index 7744ceb0a4..d1d2520fb9 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-13-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-13-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-14-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-14-chromium-linux.png
index eb2d34e6a8..ef3c98895a 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-14-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-14-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-15-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-15-chromium-linux.png
index cccb6444c6..a019c40fba 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-15-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-15-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-16-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-16-chromium-linux.png
index 313db8f7a6..9f0f46a51e 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-16-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-16-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-17-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-17-chromium-linux.png
index 999c64f26e..fc0866862b 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-17-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-17-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-18-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-18-chromium-linux.png
index 8e5a330da6..499f167d59 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-18-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-18-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-2-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-2-chromium-linux.png
index 9f2904de78..b8b6b3521c 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-2-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-3-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-3-chromium-linux.png
index 36f8d0e3b3..1400d17587 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-3-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-4-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-4-chromium-linux.png
index fa4a81b29f..0c694254f7 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-4-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-5-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-5-chromium-linux.png
index 9f2904de78..b8b6b3521c 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-5-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-6-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-6-chromium-linux.png
index 36f8d0e3b3..1400d17587 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-6-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-7-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-7-chromium-linux.png
index 3f105dce5e..66a3db7e17 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-7-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-8-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-8-chromium-linux.png
index 65bf9796b9..754f187414 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-8-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-9-chromium-linux.png b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-9-chromium-linux.png
index 1bb754f10d..e01c0293d3 100644
Binary files a/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-9-chromium-linux.png and b/packages/desktop-client/e2e/schedules.test.ts-snapshots/Schedules-creates-two-new-schedules-posts-both-transactions-and-later-completes-one-9-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-1-chromium-linux.png b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-1-chromium-linux.png
index 68ef8e6744..76e9504f80 100644
Binary files a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-1-chromium-linux.png and b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-2-chromium-linux.png b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-2-chromium-linux.png
index 435fc1d1fb..37df7a9cb3 100644
Binary files a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-2-chromium-linux.png and b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-3-chromium-linux.png b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-3-chromium-linux.png
index 8541209a56..ec18264707 100644
Binary files a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-3-chromium-linux.png and b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-4-chromium-linux.png b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-4-chromium-linux.png
index 1497cd06c8..c20bd7e890 100644
Binary files a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-4-chromium-linux.png and b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-5-chromium-linux.png b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-5-chromium-linux.png
index fed25c5282..511d2fb36d 100644
Binary files a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-5-chromium-linux.png and b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-6-chromium-linux.png b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-6-chromium-linux.png
index 6bcd474c5f..4bdb25a1ad 100644
Binary files a/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-6-chromium-linux.png and b/packages/desktop-client/e2e/settings.mobile.test.ts-snapshots/Mobile-Settings-checks-that-settings-page-can-be-opened-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png
index 4fbb16085e..a8fc3b55ba 100644
Binary files a/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png
index fe02b12d90..3fa10b7527 100644
Binary files a/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png
index 6926c38e3e..f150e8e931 100644
Binary files a/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.ts-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png
index 5a933c4e37..5402905f79 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png
index fe5451a192..657802bc63 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-3-chromium-linux.png
index 304bd79ae0..fb58fab7c2 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-checks-the-page-visuals-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-1-chromium-linux.png
index 865a178251..b7f7948ebb 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-2-chromium-linux.png
index d8b49f3747..8597701f12 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-3-chromium-linux.png
index fa37073b59..b35cdaef1d 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-4-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-4-chromium-linux.png
index d9020a8194..2531c53530 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-4-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-5-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-5-chromium-linux.png
index b54c08dcc5..e637f1fa9c 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-5-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-6-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-6-chromium-linux.png
index 8715364745..7f39e6ae8f 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-6-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-column-manager-hides-and-reorders-columns-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png
index ae1696b77d..aa03709a3d 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png
index 6fd05a8687..9468bdfde7 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-3-chromium-linux.png
index 0b2fea90c7..b362f67058 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-split-test-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png
index a39d53e659..728a7be09d 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png
index 32938de746..1ff4889ace 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-3-chromium-linux.png
index 4901e002ac..0284678c3b 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-test-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-1-chromium-linux.png
index c082e73f2c..d0d5b1d20c 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-2-chromium-linux.png
index b1c61fca2c..3604662555 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-3-chromium-linux.png
index 345aed46f9..08dd64532b 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-4-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-4-chromium-linux.png
index b628929c69..70a9e31800 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-4-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-4-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-5-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-5-chromium-linux.png
index 00c7dad17b..c1b33c2031 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-5-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-5-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-6-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-6-chromium-linux.png
index a907e2bb10..9d49fe7b0d 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-6-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-creates-a-transfer-test-transaction-6-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-10-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-10-chromium-linux.png
index 92d51b8362..cf7080ec4c 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-10-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-10-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-11-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-11-chromium-linux.png
index 2ef40ff208..b187a8638a 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-11-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-11-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-12-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-12-chromium-linux.png
index 3b0b706455..ce1637a290 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-12-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-12-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-10-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-10-chromium-linux.png
index e08fcf6a2f..034744c111 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-10-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-10-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-11-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-11-chromium-linux.png
index 8a32203b23..1978351c78 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-11-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-11-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-12-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-12-chromium-linux.png
index 93437d6a97..e2ec53b400 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-12-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-category-group-12-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-7-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-7-chromium-linux.png
index 8136d4bf49..bd03cd4c50 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-7-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-8-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-8-chromium-linux.png
index 2bd4740046..082c094c3f 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-8-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-9-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-9-chromium-linux.png
index b26a0c7fab..c8689061f2 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-9-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-date-9-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-7-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-7-chromium-linux.png
index bc8940519c..779b04f473 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-7-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-8-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-8-chromium-linux.png
index dc2048f93a..7ef7a9ee30 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-8-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-9-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-9-chromium-linux.png
index 67818c99ce..dadb1f4b5a 100644
Binary files a/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-9-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.ts-snapshots/Transactions-filters-transactions-by-payee-9-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/CommandBar.tsx b/packages/desktop-client/src/components/CommandBar.tsx
index e38eb104a9..074aabc111 100644
--- a/packages/desktop-client/src/components/CommandBar.tsx
+++ b/packages/desktop-client/src/components/CommandBar.tsx
@@ -116,9 +116,19 @@ export function CommandBar() {
path: '/schedules',
Icon: SvgCalendar3,
},
- { id: 'payees', name: t('Payees'), path: '/payees', Icon: SvgStoreFront },
- { id: 'rules', name: t('Rules'), path: '/rules', Icon: SvgTuning },
- { id: 'tags', name: t('Tags'), path: '/tags', Icon: SvgTag },
+ {
+ id: 'payees',
+ name: t('Payees'),
+ path: '/settings/payees',
+ Icon: SvgStoreFront,
+ },
+ {
+ id: 'rules',
+ name: t('Rules'),
+ path: '/settings/rules',
+ Icon: SvgTuning,
+ },
+ { id: 'tags', name: t('Tags'), path: '/settings/tags', Icon: SvgTag },
{ id: 'settings', name: t('Settings'), path: '/settings', Icon: SvgCog },
{
id: 'accounts',
diff --git a/packages/desktop-client/src/components/FinancesApp.tsx b/packages/desktop-client/src/components/FinancesApp.tsx
index 62cc80172d..4929f71c83 100644
--- a/packages/desktop-client/src/components/FinancesApp.tsx
+++ b/packages/desktop-client/src/components/FinancesApp.tsx
@@ -39,7 +39,13 @@ import { MobilePageHeaderProvider, MobilePageHeaderSlot } from './Page';
import { Reports } from './reports';
import { NarrowAlternate, WideComponent } from './responsive';
import { useMultiuserEnabled } from './ServerContext';
-import { Settings } from './settings';
+import {
+ AdvancedSettings,
+ ExperimentalSettings,
+ GeneralSettings,
+ Settings,
+ SettingsIndex,
+} from './settings';
import { FloatableSidebar } from './sidebar';
import { ManageTagsPage } from './tags/ManageTagsPage';
import { Titlebar } from './Titlebar';
@@ -298,17 +304,6 @@ export function FinancesApp() {
}
/>
- <Route
- path="/payees"
- element={
- <ErrorBoundary
- FallbackComponent={FeatureErrorFallback}
- resetKeys={[location.pathname]}
- >
- <NarrowAlternate name="Payees" />
- </ErrorBoundary>
- }
- />
<Route
path="/payees/:id"
element={
@@ -316,23 +311,12 @@ export function FinancesApp() {
FallbackComponent={FeatureErrorFallback}
resetKeys={[location.pathname]}
>
- <WideNotSupported>
+ <WideNotSupported redirectTo="/settings/payees">
<NarrowAlternate name="PayeeEdit" />
</WideNotSupported>
</ErrorBoundary>
}
/>
- <Route
- path="/rules"
- element={
- <ErrorBoundary
- FallbackComponent={FeatureErrorFallback}
- resetKeys={[location.pathname]}
- >
- <NarrowAlternate name="Rules" />
- </ErrorBoundary>
- }
- />
<Route
path="/rules/:id"
element={
@@ -340,18 +324,9 @@ export function FinancesApp() {
FallbackComponent={FeatureErrorFallback}
resetKeys={[location.pathname]}
>
- <NarrowAlternate name="RuleEdit" />
- </ErrorBoundary>
- }
- />
- <Route
- path="/bank-sync"
- element={
- <ErrorBoundary
- FallbackComponent={FeatureErrorFallback}
- resetKeys={[location.pathname]}
- >
- <NarrowAlternate name="BankSync" />
+ <WideNotSupported redirectTo="/settings/rules">
+ <NarrowAlternate name="RuleEdit" />
+ </WideNotSupported>
</ErrorBoundary>
}
/>
@@ -362,18 +337,59 @@ export function FinancesApp() {
FallbackComponent={FeatureErrorFallback}
resetKeys={[location.pathname]}
>
- <WideNotSupported redirectTo="/bank-sync">
+ <WideNotSupported redirectTo="/settings/bank-sync">
<MobileBankSyncAccountEditPage />
</WideNotSupported>
</ErrorBoundary>
}
/>
- <Route path="/tags" element={<ManageTagsPage />} />
<Route
path="/notifications"
element={<NotificationsPage />}
/>
- <Route path="/settings" element={<Settings />} />
+ <Route path="/settings" element={<Settings />}>
+ <Route index element={<SettingsIndex />} />
+ <Route path="general" element={<GeneralSettings />} />
+ <Route
+ path="payees"
+ element={
+ <ErrorBoundary
+ FallbackComponent={FeatureErrorFallback}
+ resetKeys={[location.pathname]}
+ >
+ <NarrowAlternate name="Payees" />
+ </ErrorBoundary>
+ }
+ />
+ <Route path="tags" element={<ManageTagsPage />} />
+ <Route
+ path="rules"
+ element={
+ <ErrorBoundary
+ FallbackComponent={FeatureErrorFallback}
+ resetKeys={[location.pathname]}
+ >
+ <NarrowAlternate name="Rules" />
+ </ErrorBoundary>
+ }
+ />
+ <Route
+ path="bank-sync"
+ element={
+ <ErrorBoundary
+ FallbackComponent={FeatureErrorFallback}
+ resetKeys={[location.pathname]}
+ >
+ <NarrowAlternate name="BankSync" />
+ </ErrorBoundary>
+ }
+ />
+ <Route path="advanced" element={<AdvancedSettings />} />
+ <Route
+ path="experimental"
+ element={<ExperimentalSettings />}
+ />
+ </Route>
<Route
path="/gocardless/link"
@@ -472,16 +488,13 @@ export function FinancesApp() {
<Routes>
<Route path="/budget" element={<MobileNavTabs />} />
<Route path="/accounts" element={<MobileNavTabs />} />
- <Route path="/settings" element={<MobileNavTabs />} />
+ <Route path="/settings/*" element={<MobileNavTabs />} />
<Route path="/notifications" element={<MobileNavTabs />} />
<Route path="/reports" element={<MobileNavTabs />} />
<Route
path="/reports/:dashboardId"
element={<MobileNavTabs />}
/>
- <Route path="/bank-sync" element={<MobileNavTabs />} />
- <Route path="/rules" element={<MobileNavTabs />} />
- <Route path="/payees" element={<MobileNavTabs />} />
<Route path="/schedules" element={<MobileNavTabs />} />
<Route path="*" element={null} />
</Routes>
diff --git a/packages/desktop-client/src/components/HelpMenu.tsx b/packages/desktop-client/src/components/HelpMenu.tsx
index 2e859e9209..1737a0911c 100644
--- a/packages/desktop-client/src/components/HelpMenu.tsx
+++ b/packages/desktop-client/src/components/HelpMenu.tsx
@@ -24,11 +24,19 @@ const getPageDocs = (page: string) => {
return 'https://actualbudget.org/docs/reports/';
case '/schedules':
return 'https://actualbudget.org/docs/schedules';
- case '/payees':
+ case '/settings/payees':
return 'https://actualbudget.org/docs/transactions/payees';
- case '/rules':
+ case '/settings/rules':
return 'https://actualbudget.org/docs/budgeting/rules';
+ case '/settings/tags':
+ return 'https://actualbudget.org/docs/transactions/tags';
+ case '/settings/bank-sync':
+ return 'https://actualbudget.org/docs/advanced/bank-sync';
+ case '/settings/experimental':
+ return 'https://actualbudget.org/docs/experimental';
case '/settings':
+ case '/settings/general':
+ case '/settings/advanced':
return 'https://actualbudget.org/docs/settings';
case '/notifications':
return 'https://actualbudget.org/docs/notifications';
diff --git a/packages/desktop-client/src/components/ManageRulesPage.tsx b/packages/desktop-client/src/components/ManageRulesPage.tsx
index 615f256e17..8f370769b1 100644
--- a/packages/desktop-client/src/components/ManageRulesPage.tsx
+++ b/packages/desktop-client/src/components/ManageRulesPage.tsx
@@ -1,19 +1,14 @@
import React from 'react';
import { ErrorBoundary } from 'react-error-boundary';
-import { useTranslation } from 'react-i18next';
import { FeatureErrorFallback } from '#components/FeatureErrorFallback';
import { ManageRules } from './ManageRules';
-import { Page } from './Page';
export function ManageRulesPage() {
- const { t } = useTranslation();
return (
<ErrorBoundary FallbackComponent={FeatureErrorFallback}>
- <Page header={t('Rules')}>
- <ManageRules isModal={false} payeeId={null} />
- </Page>
+ <ManageRules isModal={false} payeeId={null} />
</ErrorBoundary>
);
}
diff --git a/packages/desktop-client/src/components/banksync/index.tsx b/packages/desktop-client/src/components/banksync/index.tsx
index e6cea18ac3..ce0218a43f 100644
--- a/packages/desktop-client/src/components/banksync/index.tsx
+++ b/packages/desktop-client/src/components/banksync/index.tsx
@@ -1,16 +1,13 @@
import { useCallback, useMemo, useState } from 'react';
import { Trans, useTranslation } from 'react-i18next';
-import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import { styles } from '@actual-app/components/styles';
import { Text } from '@actual-app/components/text';
import { View } from '@actual-app/components/view';
import type { AccountEntity } from '@actual-app/core/types/models';
import { MOBILE_NAV_HEIGHT } from '#components/mobile/MobileNavTabs';
-import { Page } from '#components/Page';
import { useAccounts } from '#hooks/useAccounts';
-import { useGlobalPref } from '#hooks/useGlobalPref';
import { pushModal } from '#modals/modalsSlice';
import { useDispatch } from '#redux';
@@ -27,10 +24,8 @@ import { useBuiltInBankSyncProviders } from './useBuiltInBankSyncProviders';
export function BankSync() {
const { t } = useTranslation();
- const [floatingSidebar] = useGlobalPref('floatingSidebar');
const { data: accounts = [] } = useAccounts();
const dispatch = useDispatch();
- const { isNarrowWidth } = useResponsive();
const syncSourceReadable = useMemo(() => getSyncSourceReadable(t), [t]);
const { providers, syncServerStatus, permissionWarning } =
useBuiltInBankSyncProviders();
@@ -87,57 +82,46 @@ export function BankSync() {
}, []);
return (
- <Page
- header={t('Bank Sync')}
- style={{
- minHeight: 'initial',
- marginInline: floatingSidebar && !isNarrowWidth ? 'auto' : 0,
- paddingBottom: MOBILE_NAV_HEIGHT,
- }}
- >
- <View style={{ marginTop: '1em', gap: 24 }}>
- <BuiltInProviders
- providers={providers}
- syncServerStatus={syncServerStatus}
- permissionWarning={permissionWarning}
- />
+ <View style={{ flexShrink: 0, gap: 24, paddingBottom: MOBILE_NAV_HEIGHT }}>
+ <BuiltInProviders
+ providers={providers}
+ syncServerStatus={syncServerStatus}
+ permissionWarning={permissionWarning}
+ />
- {hasLinkedAccounts && <AutomaticSyncSettings />}
+ {hasLinkedAccounts && <AutomaticSyncSettings />}
- {openAccounts.length === 0 && (
- <Text style={{ fontSize: '1.1rem' }}>
- <Trans>
- No accounts yet. Once a provider is set up, use{' '}
- <strong>Link bank account</strong> to connect your bank and create
- your accounts automatically. You can also add accounts manually
- and connect them here later.
- </Trans>
- </Text>
- )}
+ {openAccounts.length === 0 && (
+ <Text style={{ fontSize: '1.1rem' }}>
+ <Trans>
+ No accounts yet. Once a provider is set up, use{' '}
+ <strong>Link bank account</strong> to connect your bank and create
+ your accounts automatically. You can also add accounts manually and
+ connect them here later.
+ </Trans>
+ </Text>
+ )}
- {groupedAccountEntries.map(([syncProvider, accounts]) => {
- return (
- <View key={syncProvider} style={{ minHeight: 'initial' }}>
- {groupedAccountEntries.length > 1 && (
- <Text
- style={{ fontWeight: 500, fontSize: 20, margin: '.5em 0' }}
- >
- {syncSourceReadable[syncProvider]}
- </Text>
- )}
- <View style={styles.tableContainer}>
- <AccountsHeader unlinked={syncProvider === 'unlinked'} />
- <AccountsList
- accounts={accounts}
- hoveredAccount={hoveredAccount}
- onHover={onHover}
- onAction={onAction}
- />
- </View>
+ {groupedAccountEntries.map(([syncProvider, accounts]) => {
+ return (
+ <View key={syncProvider} style={{ minHeight: 'initial' }}>
+ {groupedAccountEntries.length > 1 && (
+ <Text style={{ fontWeight: 500, fontSize: 20, margin: '.5em 0' }}>
+ {syncSourceReadable[syncProvider]}
+ </Text>
+ )}
+ <View style={styles.tableContainer}>
+ <AccountsHeader unlinked={syncProvider === 'unlinked'} />
+ <AccountsList
+ accounts={accounts}
+ hoveredAccount={hoveredAccount}
+ onHover={onHover}
+ onAction={onAction}
+ />
</View>
- );
- })}
- </View>
- </Page>
+ </View>
+ );
+ })}
+ </View>
);
}
diff --git a/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx b/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
index bce73e1196..de289dd6ad 100644
--- a/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
+++ b/packages/desktop-client/src/components/mobile/MobileNavTabs.tsx
@@ -8,11 +8,8 @@ import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import {
SvgAdd,
SvgCog,
- SvgCreditCard,
SvgPiggyBank,
SvgReports,
- SvgStoreFront,
- SvgTuning,
SvgWallet,
} from '@actual-app/components/icons/v1';
import { SvgCalendar3 } from '@actual-app/components/icons/v2';
@@ -23,12 +20,12 @@ import { useDrag } from '@use-gesture/react';
import { useIsTestEnv } from '#hooks/useIsTestEnv';
import { useScrollListener } from '#hooks/useScrollListener';
-import { useSyncServerStatus } from '#hooks/useSyncServerStatus';
const COLUMN_COUNT = 3;
+const ROW_COUNT = 2;
const PILL_HEIGHT = 15;
const ROW_HEIGHT = 70;
-const TOTAL_HEIGHT = ROW_HEIGHT * COLUMN_COUNT;
+const TOTAL_HEIGHT = ROW_HEIGHT * ROW_COUNT;
const OPEN_FULL_Y = 1;
const OPEN_DEFAULT_Y = TOTAL_HEIGHT - ROW_HEIGHT;
const HIDDEN_Y = TOTAL_HEIGHT;
@@ -38,9 +35,7 @@ export const MOBILE_NAV_HEIGHT = ROW_HEIGHT + PILL_HEIGHT;
export function MobileNavTabs() {
const { t } = useTranslation();
const { isNarrowWidth } = useResponsive();
- const syncServerStatus = useSyncServerStatus();
const isTestEnv = useIsTestEnv();
- const isUsingServer = syncServerStatus !== 'no-server' || isTestEnv;
const [navbarState, setNavbarState] = useState<'default' | 'open' | 'hidden'>(
'default',
);
@@ -123,28 +118,6 @@ export function MobileNavTabs() {
style: navTabStyle,
Icon: SvgCalendar3,
},
- {
- name: t('Payees'),
- path: '/payees',
- style: navTabStyle,
- Icon: SvgStoreFront,
- },
- {
- name: t('Rules'),
- path: '/rules',
- style: navTabStyle,
- Icon: SvgTuning,
- },
- ...(isUsingServer
- ? [
- {
- name: t('Bank Sync'),
- path: '/bank-sync',
- style: navTabStyle,
- Icon: SvgCreditCard,
- },
- ]
- : []),
{
name: t('Settings'),
path: '/settings',
@@ -155,11 +128,6 @@ export function MobileNavTabs() {
<NavTab key={tab.path} onClick={() => openDefault()} {...tab} />
));
- const bufferTabsCount = COLUMN_COUNT - (navTabs.length % COLUMN_COUNT);
- const bufferTabs = Array.from({ length: bufferTabsCount }).map((_, idx) => (
- <div key={idx} style={navTabStyle} />
- ));
-
useScrollListener(
useCallback(
({ isScrolling, hasScrolledToEnd }) => {
@@ -250,7 +218,7 @@ export function MobileNavTabs() {
width: '100%',
}}
>
- {[navTabs, bufferTabs]}
+ {navTabs}
</View>
</View>
</animated.div>
diff --git a/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncAccountEditPage.tsx b/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncAccountEditPage.tsx
index 325cb87f73..c69ddf554b 100644
--- a/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncAccountEditPage.tsx
+++ b/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncAccountEditPage.tsx
@@ -47,12 +47,12 @@ export function MobileBankSyncAccountEditPage() {
} = useBankSyncAccountSettings(accountId!);
const handleCancel = () => {
- void navigate('/bank-sync');
+ void navigate('/settings/bank-sync');
};
const handleSave = async () => {
saveSettings();
- void navigate('/bank-sync');
+ void navigate('/settings/bank-sync');
};
const unlinkAccount = useUnlinkAccountMutation();
@@ -69,7 +69,7 @@ export function MobileBankSyncAccountEditPage() {
unlinkAccount.mutate(
{ id: accountId },
{
- onSuccess: () => navigate('/bank-sync'),
+ onSuccess: () => navigate('/settings/bank-sync'),
},
);
}
diff --git a/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncPage.tsx b/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncPage.tsx
index e35680fc88..9546359f4c 100644
--- a/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncPage.tsx
+++ b/packages/desktop-client/src/components/mobile/banksync/MobileBankSyncPage.tsx
@@ -18,6 +18,7 @@ import { BuiltInProviders } from '#components/banksync/BuiltInProviders';
import { useBuiltInBankSyncProviders } from '#components/banksync/useBuiltInBankSyncProviders';
import { Search } from '#components/common/Search';
import { MobilePageHeader, Page } from '#components/Page';
+import { SettingsBackButton } from '#components/settings/SettingsBackButton';
import { useAccounts } from '#hooks/useAccounts';
import { useLocalPref } from '#hooks/useLocalPref';
import { useNavigate } from '#hooks/useNavigate';
@@ -101,7 +102,15 @@ export function MobileBankSyncPage() {
}, []);
return (
- <Page header={<MobilePageHeader title={t('Bank Sync')} />} padding={0}>
+ <Page
+ header={
+ <MobilePageHeader
+ title={t('Bank Sync')}
+ leftContent={<SettingsBackButton />}
+ />
+ }
+ padding={0}
+ >
<View style={{ padding: 15, flexShrink: 0 }}>
<BuiltInProviders
providers={providers}
diff --git a/packages/desktop-client/src/components/mobile/payees/MobilePayeeEditPage.tsx b/packages/desktop-client/src/components/mobile/payees/MobilePayeeEditPage.tsx
index 2b09c1a62f..22bfb7760a 100644
--- a/packages/desktop-client/src/components/mobile/payees/MobilePayeeEditPage.tsx
+++ b/packages/desktop-client/src/components/mobile/payees/MobilePayeeEditPage.tsx
@@ -26,7 +26,7 @@ export function MobilePayeeEditPage() {
const location = useLocation();
const dispatch = useDispatch();
// Carries the payees list filter so it survives the round trip.
- const payeesListPath = `/payees${location.search}`;
+ const payeesListPath = `/settings/payees${location.search}`;
const { showUndoNotification } = useUndo();
const { data: payees = [] } = usePayees();
diff --git a/packages/desktop-client/src/components/mobile/payees/MobilePayeesPage.tsx b/packages/desktop-client/src/components/mobile/payees/MobilePayeesPage.tsx
index 12634f2eee..2d336089de 100644
--- a/packages/desktop-client/src/components/mobile/payees/MobilePayeesPage.tsx
+++ b/packages/desktop-client/src/components/mobile/payees/MobilePayeesPage.tsx
@@ -12,6 +12,7 @@ import type { PayeeEntity, RuleEntity } from '@actual-app/core/types/models';
import { Search } from '#components/common/Search';
import { withFilterParam } from '#components/mobile/utils';
import { MobilePageHeader, Page } from '#components/Page';
+import { SettingsBackButton } from '#components/settings/SettingsBackButton';
import { useNavigate } from '#hooks/useNavigate';
import { usePayeeRuleCounts } from '#hooks/usePayeeRuleCounts';
import { usePayees } from '#hooks/usePayees';
@@ -76,12 +77,12 @@ export function MobilePayeesPage() {
id: payee.id,
});
const ruleIds = associatedRules.map(rule => rule.id).join(',');
- void navigate(`/rules?visible-rules=${ruleIds}`);
+ void navigate(`/settings/rules?visible-rules=${ruleIds}`);
return;
} catch (error) {
console.error('Failed to fetch payee rules:', error);
// Fallback to general rules page
- void navigate('/rules');
+ void navigate('/settings/rules');
return;
}
}
@@ -130,7 +131,15 @@ export function MobilePayeesPage() {
);
return (
- <Page header={<MobilePageHeader title={t('Payees')} />} padding={0}>
+ <Page
+ header={
+ <MobilePageHeader
+ title={t('Payees')}
+ leftContent={<SettingsBackButton />}
+ />
+ }
+ padding={0}
+ >
<View
style={{
flexDirection: 'row',
diff --git a/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx b/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
index b096407740..0dee6e8984 100644
--- a/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
+++ b/packages/desktop-client/src/components/mobile/rules/MobileRuleEditPage.tsx
@@ -27,7 +27,7 @@ export function MobileRuleEditPage() {
const dispatch = useDispatch();
const { showUndoNotification } = useUndo();
// Carries the rules list filter so it survives the round trip.
- const rulesListPath = `/rules${location.search}`;
+ const rulesListPath = `/settings/rules${location.search}`;
const [rule, setRule] = useState<RuleEntity | null>(null);
const [isLoading, setIsLoading] = useState(false);
diff --git a/packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx b/packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx
index c24bf52abc..521e9bd47f 100644
--- a/packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx
+++ b/packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx
@@ -15,6 +15,7 @@ import { Search } from '#components/common/Search';
import { ruleToString } from '#components/ManageRules';
import { withFilterParam } from '#components/mobile/utils';
import { MobilePageHeader, Page } from '#components/Page';
+import { SettingsBackButton } from '#components/settings/SettingsBackButton';
import { useAccounts } from '#hooks/useAccounts';
import { useCategories } from '#hooks/useCategories';
import { useNavigate } from '#hooks/useNavigate';
@@ -184,7 +185,11 @@ export function MobileRulesPage() {
return (
<Page
header={
- <MobilePageHeader title={t('Rules')} rightContent={<AddRuleButton />} />
+ <MobilePageHeader
+ title={t('Rules')}
+ leftContent={<SettingsBackButton />}
+ rightContent={<AddRuleButton />}
+ />
}
padding={0}
>
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx b/packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx
index ba67ff81a6..082272c9b1 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx
@@ -532,7 +532,7 @@ function SelectedTransactionsFloatingActionBar({
void navigate(`/categories/${String(value)}`);
break;
case 'payee':
- void navigate(`/payees`);
+ void navigate('/settings/payees');
break;
default:
break;
diff --git a/packages/desktop-client/src/components/modals/CreateAccountModal.tsx b/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
index dbcebc4cbd..e5b41199bf 100644
--- a/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
+++ b/packages/desktop-client/src/components/modals/CreateAccountModal.tsx
@@ -122,7 +122,7 @@ export function CreateAccountModal({
<Button
onPress={() => {
state.close();
- void navigate('/bank-sync');
+ void navigate('/settings/bank-sync');
}}
style={{
padding: '10px 0',
diff --git a/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx b/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
index 82c1b4c2a1..80799fb4fa 100644
--- a/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
+++ b/packages/desktop-client/src/components/modals/PayeeAutocompleteModal.tsx
@@ -38,7 +38,7 @@ export function PayeeAutocompleteModal({
containerProps: { style: { height: isNarrowWidth ? '90vh' : 275 } },
};
- const onManagePayees = () => navigate('/payees');
+ const onManagePayees = () => navigate('/settings/payees');
return (
<Modal
diff --git a/packages/desktop-client/src/components/payees/ManagePayeesPage.tsx b/packages/desktop-client/src/components/payees/ManagePayeesPage.tsx
index 742aafbde5..1394ad28c9 100644
--- a/packages/desktop-client/src/components/payees/ManagePayeesPage.tsx
+++ b/packages/desktop-client/src/components/payees/ManagePayeesPage.tsx
@@ -1,24 +1,16 @@
import React from 'react';
-import { useTranslation } from 'react-i18next';
import { useLocation } from 'react-router';
import type { PayeeEntity } from '@actual-app/core/types/models';
-import { Page } from '#components/Page';
-
import { ManagePayeesWithData } from './ManagePayeesWithData';
export function ManagePayeesPage() {
- const { t } = useTranslation();
const location = useLocation();
const locationState = location.state;
const initialSelectedIds =
locationState && 'selectedPayee' in locationState
? [locationState.selectedPayee as PayeeEntity['id']]
: [];
- return (
- <Page header={t('Payees')}>
- <ManagePayeesWithData initialSelectedIds={initialSelectedIds} />
- </Page>
- );
+ return <ManagePayeesWithData initialSelectedIds={initialSelectedIds} />;
}
diff --git a/packages/desktop-client/src/components/settings/Experimental.tsx b/packages/desktop-client/src/components/settings/Experimental.tsx
index 3457a9db3a..9ac170ad40 100644
--- a/packages/desktop-client/src/components/settings/Experimental.tsx
+++ b/packages/desktop-client/src/components/settings/Experimental.tsx
@@ -1,4 +1,3 @@
-import { useState } from 'react';
import type { ReactNode } from 'react';
import { Trans } from 'react-i18next';
@@ -151,8 +150,6 @@ function ServerFeatureToggle({
}
export function ExperimentalFeatures() {
- const [expanded, setExpanded] = useState(false);
-
const goalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');
const goalTemplatesUIEnabled = useFeatureFlag('goalTemplatesUIEnabled');
const showGoalTemplatesUI = goalTemplatesEnabled || goalTemplatesUIEnabled;
@@ -163,117 +160,102 @@ export function ExperimentalFeatures() {
return (
<Setting
primaryAction={
- expanded ? (
- <View style={{ gap: '1em' }}>
- <FeatureToggle flag="goalTemplatesEnabled">
- <Trans>Goal templates</Trans>
- </FeatureToggle>
- {showGoalTemplatesUI && (
- <View style={{ paddingLeft: 22 }}>
- <FeatureToggle
- flag="goalTemplatesUIEnabled"
- feedbackLink="https://github.com/actualbudget/actual/issues/7692"
- >
- <Trans>Subfeature: Budget automations UI</Trans>
- </FeatureToggle>
- </View>
- )}
- <FeatureToggle
- flag="actionTemplating"
- feedbackLink="https://github.com/actualbudget/actual/issues/3606"
- note={
- <Trans>
- Deprecated: this feature will be removed in a future release.
- Use Excel formula mode (Rule formulae) instead.
- </Trans>
- }
- >
- <Trans>Rule action templating</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="formulaMode"
- feedbackLink="https://github.com/actualbudget/actual/issues/5949"
- >
- <Trans>Excel formula mode (Formula cards & Rule formulas)</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="currency"
- feedbackLink="https://github.com/actualbudget/actual/issues/5191"
- >
- <Trans>Currency support</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="mobileCalculator"
- feedbackLink="https://github.com/actualbudget/actual/issues/8255"
- >
- <Trans>Mobile calculator</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="newSidebarUI"
- feedbackLink="https://github.com/actualbudget/actual/issues/9007"
- >
- <Trans>Redesigned sidebar</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="sankeyReport"
- feedbackLink="https://github.com/actualbudget/actual/issues/1919"
- >
- <Trans>Sankey report</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="balanceForecastReport"
- feedbackLink="https://github.com/actualbudget/actual/issues/7669"
- >
- <Trans>Balance Forecast Report</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="budgetAnalysisReport"
- feedbackLink="https://github.com/actualbudget/actual/issues/6742"
- >
- <Trans>Budget Analysis Report</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="monteCarloReport"
- feedbackLink="https://github.com/actualbudget/actual/issues/8571"
- >
- <Trans>Monte Carlo Analysis Report</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="enableBanking"
- feedbackLink="https://github.com/actualbudget/actual/issues/7799"
- >
- <Trans>Enable Banking sync (EU banks)</Trans>
- </FeatureToggle>
- <FeatureToggle
- flag="akahuBankSync"
- feedbackLink="https://github.com/actualbudget/actual/issues/8020"
- >
- <Trans>Akahu Bank Sync (NZ banks)</Trans>
- </FeatureToggle>
- {showServerPrefs && (
- <ServerFeatureToggle
- prefName="flags.plugins"
- disableToggle
- feedbackLink="https://github.com/actualbudget/actual/issues/5950"
+ <View style={{ gap: '1em' }}>
+ <FeatureToggle flag="goalTemplatesEnabled">
+ <Trans>Goal templates</Trans>
+ </FeatureToggle>
+ {showGoalTemplatesUI && (
+ <View style={{ paddingLeft: 22 }}>
+ <FeatureToggle
+ flag="goalTemplatesUIEnabled"
+ feedbackLink="https://github.com/actualbudget/actual/issues/7692"
>
- <Trans>Client-Side plugins (soon)</Trans>
- </ServerFeatureToggle>
- )}
- </View>
- ) : (
- <Link
- variant="text"
- onClick={() => setExpanded(true)}
- data-testid="experimental-settings"
- style={{
- flexShrink: 0,
- alignSelf: 'flex-start',
- color: theme.pageTextPositive,
- }}
+ <Trans>Subfeature: Budget automations UI</Trans>
+ </FeatureToggle>
+ </View>
+ )}
+ <FeatureToggle
+ flag="actionTemplating"
+ feedbackLink="https://github.com/actualbudget/actual/issues/3606"
+ note={
+ <Trans>
+ Deprecated: this feature will be removed in a future release.
+ Use Excel formula mode (Rule formulae) instead.
+ </Trans>
+ }
+ >
+ <Trans>Rule action templating</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="formulaMode"
+ feedbackLink="https://github.com/actualbudget/actual/issues/5949"
+ >
+ <Trans>Excel formula mode (Formula cards & Rule formulas)</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="currency"
+ feedbackLink="https://github.com/actualbudget/actual/issues/5191"
+ >
+ <Trans>Currency support</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="mobileCalculator"
+ feedbackLink="https://github.com/actualbudget/actual/issues/8255"
+ >
+ <Trans>Mobile calculator</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="newSidebarUI"
+ feedbackLink="https://github.com/actualbudget/actual/issues/9007"
+ >
+ <Trans>Redesigned sidebar</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="sankeyReport"
+ feedbackLink="https://github.com/actualbudget/actual/issues/1919"
+ >
+ <Trans>Sankey report</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="balanceForecastReport"
+ feedbackLink="https://github.com/actualbudget/actual/issues/7669"
>
- <Trans>I understand the risks, show experimental features</Trans>
- </Link>
- )
+ <Trans>Balance Forecast Report</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="budgetAnalysisReport"
+ feedbackLink="https://github.com/actualbudget/actual/issues/6742"
+ >
+ <Trans>Budget Analysis Report</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="monteCarloReport"
+ feedbackLink="https://github.com/actualbudget/actual/issues/8571"
+ >
+ <Trans>Monte Carlo Analysis Report</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="enableBanking"
+ feedbackLink="https://github.com/actualbudget/actual/issues/7799"
+ >
+ <Trans>Enable Banking sync (EU banks)</Trans>
+ </FeatureToggle>
+ <FeatureToggle
+ flag="akahuBankSync"
+ feedbackLink="https://github.com/actualbudget/actual/issues/8020"
+ >
+ <Trans>Akahu Bank Sync (NZ banks)</Trans>
+ </FeatureToggle>
+ {showServerPrefs && (
+ <ServerFeatureToggle
+ prefName="flags.plugins"
+ disableToggle
+ feedbackLink="https://github.com/actualbudget/actual/issues/5950"
+ >
+ <Trans>Client-Side plugins (soon)</Trans>
+ </ServerFeatureToggle>
+ )}
+ </View>
}
>
<Text>
diff --git a/packages/desktop-client/src/components/settings/SettingsBackButton.tsx b/packages/desktop-client/src/components/settings/SettingsBackButton.tsx
new file mode 100644
index 0000000000..b586380703
--- /dev/null
+++ b/packages/desktop-client/src/components/settings/SettingsBackButton.tsx
@@ -0,0 +1,8 @@
+import { MobileBackButton } from '#components/mobile/MobileBackButton';
+import { useNavigate } from '#hooks/useNavigate';
+
+export function SettingsBackButton() {
+ const navigate = useNavigate();
+
+ return <MobileBackButton onPress={() => navigate('/settings')} />;
+}
diff --git a/packages/desktop-client/src/components/settings/SettingsNav.test.tsx b/packages/desktop-client/src/components/settings/SettingsNav.test.tsx
new file mode 100644
index 0000000000..da84c4cd5c
--- /dev/null
+++ b/packages/desktop-client/src/components/settings/SettingsNav.test.tsx
@@ -0,0 +1,70 @@
+import { MemoryRouter } from 'react-router';
+
+import { render, screen } from '@testing-library/react';
+
+import { useIsTestEnv } from '#hooks/useIsTestEnv';
+import { useSyncServerStatus } from '#hooks/useSyncServerStatus';
+
+import { SettingsNav } from './SettingsNav';
+
+vi.mock('#hooks/useSyncServerStatus', () => ({
+ useSyncServerStatus: vi.fn(),
+}));
+vi.mock('#hooks/useIsTestEnv', () => ({
+ useIsTestEnv: vi.fn(),
+}));
+
+function renderNav(initialPath: string) {
+ return render(
+ <MemoryRouter initialEntries={[initialPath]}>
+ <SettingsNav />
+ </MemoryRouter>,
+ );
+}
+
+describe('SettingsNav', () => {
+ beforeEach(() => {
+ vi.mocked(useSyncServerStatus).mockReturnValue('online');
+ vi.mocked(useIsTestEnv).mockReturnValue(false);
+ });
+
+ it('links every section under /settings', () => {
+ renderNav('/settings');
+
+ const hrefs = screen
+ .getAllByRole('link')
+ .map(link => link.getAttribute('href'));
+
+ expect(hrefs).toEqual([
+ '/settings/general',
+ '/settings/payees',
+ '/settings/tags',
+ '/settings/rules',
+ '/settings/bank-sync',
+ '/settings/advanced',
+ '/settings/experimental',
+ ]);
+ });
+
+ it('hides bank sync without a server', () => {
+ vi.mocked(useSyncServerStatus).mockReturnValue('no-server');
+
+ renderNav('/settings');
+
+ expect(
+ screen.queryByRole('link', { name: 'Bank Sync' }),
+ ).not.toBeInTheDocument();
+ });
+
+ it('marks the current section as active', () => {
+ renderNav('/settings/rules');
+
+ expect(screen.getByRole('link', { name: 'Rules' })).toHaveAttribute(
+ 'aria-current',
+ 'page',
+ );
+ expect(screen.getByRole('link', { name: 'General' })).not.toHaveAttribute(
+ 'aria-current',
+ );
+ });
+});
diff --git a/packages/desktop-client/src/components/settings/SettingsNav.tsx b/packages/desktop-client/src/components/settings/SettingsNav.tsx
new file mode 100644
index 0000000000..e05271d396
--- /dev/null
+++ b/packages/desktop-client/src/components/settings/SettingsNav.tsx
@@ -0,0 +1,81 @@
+import { useTranslation } from 'react-i18next';
+
+import { useResponsive } from '@actual-app/components/hooks/useResponsive';
+import {
+ SvgCog,
+ SvgLibrary,
+ SvgPylon,
+ SvgTag,
+ SvgTuning,
+ SvgUserGroup,
+} from '@actual-app/components/icons/v1';
+import { SvgSettingsSliderAlternate } from '@actual-app/components/icons/v2';
+import { theme } from '@actual-app/components/theme';
+import { spacing } from '@actual-app/components/tokens';
+import { View } from '@actual-app/components/view';
+
+import { useIsTestEnv } from '#hooks/useIsTestEnv';
+import { useSyncServerStatus } from '#hooks/useSyncServerStatus';
+
+import { SettingsNavLink } from './SettingsNavLink';
+
+export function SettingsNav() {
+ const { t } = useTranslation();
+ const { isNarrowWidth } = useResponsive();
+ const syncServerStatus = useSyncServerStatus();
+ const isTestEnv = useIsTestEnv();
+ const isUsingServer = syncServerStatus !== 'no-server' || isTestEnv;
+
+ return (
+ <View
+ role="navigation"
+ aria-label={t('Settings')}
+ style={
+ isNarrowWidth
+ ? {
+ flexShrink: 0,
+ backgroundColor: theme.settingsCardBackground,
+ border: `1px solid ${theme.settingsCardBorder}`,
+ borderRadius: 6,
+ }
+ : { width: 180, flexShrink: 0, gap: spacing.xxs }
+ }
+ >
+ <SettingsNavLink
+ title={t('General')}
+ Icon={SvgCog}
+ to="/settings/general"
+ />
+ <SettingsNavLink
+ title={t('Payees')}
+ Icon={SvgUserGroup}
+ to="/settings/payees"
+ />
+ {!isNarrowWidth && (
+ <SettingsNavLink title={t('Tags')} Icon={SvgTag} to="/settings/tags" />
+ )}
+ <SettingsNavLink
+ title={t('Rules')}
+ Icon={SvgTuning}
+ to="/settings/rules"
+ />
+ {isUsingServer && (
+ <SettingsNavLink
+ title={t('Bank Sync')}
+ Icon={SvgLibrary}
+ to="/settings/bank-sync"
+ />
+ )}
+ <SettingsNavLink
+ title={t('Advanced')}
+ Icon={SvgSettingsSliderAlternate}
+ to="/settings/advanced"
+ />
+ <SettingsNavLink
+ title={t('Experimental')}
+ Icon={SvgPylon}
+ to="/settings/experimental"
+ />
+ </View>
+ );
+}
diff --git a/packages/desktop-client/src/components/settings/SettingsNavLink.tsx b/packages/desktop-client/src/components/settings/SettingsNavLink.tsx
new file mode 100644
index 0000000000..7781693c9e
--- /dev/null
+++ b/packages/desktop-client/src/components/settings/SettingsNavLink.tsx
@@ -0,0 +1,80 @@
+import type { ComponentType, SVGProps } from 'react';
+import { NavLink } from 'react-router';
+
+import { useResponsive } from '@actual-app/components/hooks/useResponsive';
+import { SvgCheveronRight } from '@actual-app/components/icons/v1';
+import { styles } from '@actual-app/components/styles';
+import { theme } from '@actual-app/components/theme';
+import { radius, spacing } from '@actual-app/components/tokens';
+import { css } from '@emotion/css';
+
+type SettingsNavLinkProps = {
+ title: string;
+ Icon:
+ | ComponentType<SVGProps<SVGElement>>
+ | ComponentType<SVGProps<SVGSVGElement>>;
+ to: string;
+};
+
+export function SettingsNavLink({ title, Icon, to }: SettingsNavLinkProps) {
+ const { isNarrowWidth } = useResponsive();
+
+ if (isNarrowWidth) {
+ return (
+ <NavLink
+ to={to}
+ className={css({
+ ...styles.mediumText,
+ display: 'flex',
+ alignItems: 'center',
+ gap: spacing.md,
+ minHeight: styles.mobileMinHeight,
+ paddingInline: spacing.lg,
+ textDecoration: 'none',
+ color: theme.settingsNavItemText,
+ '& + &': { borderTop: `1px solid ${theme.settingsCardBorder}` },
+ })}
+ >
+ <Icon width={16} height={16} style={{ flexShrink: 0 }} />
+ <span style={{ flex: 1 }}>{title}</span>
+ <SvgCheveronRight
+ width={20}
+ height={20}
+ style={{ flexShrink: 0, opacity: 0.5 }}
+ />
+ </NavLink>
+ );
+ }
+
+ return (
+ <NavLink
+ to={to}
+ className={({ isActive }) =>
+ css({
+ ...styles.smallText,
+ display: 'flex',
+ alignItems: 'center',
+ gap: spacing.sm,
+ padding: spacing.sm,
+ borderRadius: radius.sm,
+ textDecoration: 'none',
+ fontWeight: isActive ? 600 : 500,
+ color: isActive
+ ? theme.settingsNavItemTextSelected
+ : theme.settingsNavItemText,
+ backgroundColor: isActive
+ ? theme.settingsNavItemBackgroundSelected
+ : 'transparent',
+ ':hover': {
+ backgroundColor: isActive
+ ? theme.settingsNavItemBackgroundSelected
+ : theme.settingsNavItemBackgroundHover,
+ },
+ })
+ }
+ >
+ <Icon width={15} height={15} style={{ flexShrink: 0 }} />
+ {title}
+ </NavLink>
+ );
+}
diff --git a/packages/desktop-client/src/components/settings/UI.tsx b/packages/desktop-client/src/components/settings/UI.tsx
index f8af89e26b..828d345810 100644
--- a/packages/desktop-client/src/components/settings/UI.tsx
+++ b/packages/desktop-client/src/components/settings/UI.tsx
@@ -1,17 +1,12 @@
-import React, { useState } from 'react';
+import React from 'react';
import type { ReactNode } from 'react';
-import { Trans } from 'react-i18next';
-import { useLocation } from 'react-router';
import type { CSSProperties } from '@actual-app/components/styles';
import { Text } from '@actual-app/components/text';
import { theme } from '@actual-app/components/theme';
-import { tokens } from '@actual-app/components/tokens';
import { View } from '@actual-app/components/view';
import { css } from '@emotion/css';
-import { Link } from '#components/common/Link';
-
type SettingProps = {
primaryAction?: ReactNode;
style?: CSSProperties;
@@ -23,12 +18,12 @@ export const Setting = ({ primaryAction, style, children }: SettingProps) => {
<View
className={css([
{
- backgroundColor: theme.pillBackground,
+ backgroundColor: theme.settingsCardBackground,
alignSelf: 'flex-start',
alignItems: 'flex-start',
padding: 15,
- borderRadius: 4,
- border: '1px solid ' + theme.pillBorderDark,
+ borderRadius: 6,
+ border: '1px solid ' + theme.settingsCardBorder,
width: '100%',
},
style,
@@ -48,56 +43,6 @@ export const Setting = ({ primaryAction, style, children }: SettingProps) => {
);
};
-type AdvancedToggleProps = {
- children: ReactNode;
-};
-
-export const AdvancedToggle = ({ children }: AdvancedToggleProps) => {
- const location = useLocation();
- const [expanded, setExpanded] = useState(location.hash === '#advanced');
-
- return expanded ? (
- <View
- id="advanced"
- style={{
- gap: 20,
- alignItems: 'flex-start',
- marginBottom: 25,
- width: '100%',
- }}
- className={css({
- [`@media (min-width: ${tokens.breakpoint_small})`]: {
- width: 'auto',
- },
- })}
- innerRef={el => {
- if (el && location.hash === '#advanced') {
- el.scrollIntoView(true);
- }
- }}
- >
- <View style={{ fontSize: 20, fontWeight: 500, flexShrink: 0 }}>
- <Trans>Advanced Settings</Trans>
- </View>
- {children}
- </View>
- ) : (
- <Link
- variant="text"
- onClick={() => setExpanded(true)}
- data-testid="advanced-settings"
- style={{
- flexShrink: 0,
- alignSelf: 'flex-start',
- color: theme.pageTextPositive,
- marginBottom: 25,
- }}
- >
- <Trans>Show advanced settings</Trans>
- </Link>
- );
-};
-
export function Column({
title,
children,
diff --git a/packages/desktop-client/src/components/settings/index.tsx b/packages/desktop-client/src/components/settings/index.tsx
index 3e99bc1a7b..5743f95f9d 100644
--- a/packages/desktop-client/src/components/settings/index.tsx
+++ b/packages/desktop-client/src/components/settings/index.tsx
@@ -1,13 +1,14 @@
import React, { useEffect } from 'react';
import type { ReactNode } from 'react';
import { Trans, useTranslation } from 'react-i18next';
+import { Navigate, Outlet } from 'react-router';
import { Button } from '@actual-app/components/button';
import { useResponsive } from '@actual-app/components/hooks/useResponsive';
import { Input } from '@actual-app/components/input';
import { Text } from '@actual-app/components/text';
import { theme } from '@actual-app/components/theme';
-import { tokens } from '@actual-app/components/tokens';
+import { spacing, tokens } from '@actual-app/components/tokens';
import { View } from '@actual-app/components/view';
import { listen } from '@actual-app/core/platform/client/connection';
import { isElectron } from '@actual-app/core/shared/environment';
@@ -18,7 +19,7 @@ import { closeBudget } from '#budgetfiles/budgetfilesSlice';
import { Link } from '#components/common/Link';
import { Checkbox, FormField, FormLabel } from '#components/forms';
import { MOBILE_NAV_HEIGHT } from '#components/mobile/MobileNavTabs';
-import { Page } from '#components/Page';
+import { MobilePageHeader, Page } from '#components/Page';
import { useServerVersion } from '#components/ServerContext';
import { useFeatureFlag } from '#hooks/useFeatureFlag';
import { useGlobalPref } from '#hooks/useGlobalPref';
@@ -37,8 +38,10 @@ import { FormatSettings } from './Format';
import { LanguageSettings } from './LanguageSettings';
import { RepairTransactions } from './RepairTransactions';
import { ResetCache, ResetSync } from './Reset';
+import { SettingsBackButton } from './SettingsBackButton';
+import { SettingsNav } from './SettingsNav';
import { ThemeSettings } from './Themes';
-import { AdvancedToggle, Setting } from './UI';
+import { Setting } from './UI';
function About() {
const version = useServerVersion();
@@ -187,16 +190,144 @@ function AdvancedAbout() {
);
}
-export function Settings() {
+type SettingsSectionsProps = {
+ title: string;
+ children: ReactNode;
+};
+
+function SettingsSections({ title, children }: SettingsSectionsProps) {
+ const { isNarrowWidth } = useResponsive();
+
+ const sections = (
+ <View
+ data-testid="settings"
+ style={{
+ marginTop: isNarrowWidth ? 10 : 0,
+ flexShrink: 0,
+ maxWidth: 530,
+ width: '100%',
+ gap: 30,
+ paddingBottom: MOBILE_NAV_HEIGHT,
+ }}
+ >
+ {children}
+ </View>
+ );
+
+ if (!isNarrowWidth) {
+ return sections;
+ }
+
+ return (
+ <Page
+ header={
+ <MobilePageHeader title={title} leftContent={<SettingsBackButton />} />
+ }
+ >
+ {sections}
+ </Page>
+ );
+}
+
+export function SettingsIndex() {
const { t } = useTranslation();
- const [floatingSidebar] = useGlobalPref('floatingSidebar');
+ const { isNarrowWidth } = useResponsive();
const [budgetName] = useMetadataPref('budgetName');
const dispatch = useDispatch();
+
+ if (!isNarrowWidth) {
+ return <Navigate to="/settings/general" replace />;
+ }
+
+ return (
+ <Page header={t('Settings')}>
+ <View
+ data-testid="settings"
+ style={{
+ marginTop: 10,
+ flexShrink: 0,
+ gap: 30,
+ paddingBottom: MOBILE_NAV_HEIGHT,
+ }}
+ >
+ <View
+ style={{
+ gap: 10,
+ flexDirection: 'row',
+ alignItems: 'flex-end',
+ width: '100%',
+ }}
+ >
+ {/* The only spot to close a budget on mobile */}
+ <FormField style={{ flex: 1 }}>
+ <FormLabel title={t('Budget name')} />
+ <Input
+ value={budgetName}
+ disabled
+ style={{ color: theme.buttonNormalDisabledText }}
+ />
+ </FormField>
+ <Button
+ onPress={() => void dispatch(closeBudget())}
+ style={{ flexShrink: 0 }}
+ >
+ <Trans>Switch file</Trans>
+ </Button>
+ </View>
+ <SettingsNav />
+ </View>
+ </Page>
+ );
+}
+
+export function GeneralSettings() {
+ const { t } = useTranslation();
const isCurrencyExperimentalEnabled = useFeatureFlag('currency');
- const onCloseBudget = () => {
- void dispatch(closeBudget());
- };
+ return (
+ <SettingsSections title={t('General')}>
+ <About />
+ <ThemeSettings />
+ <FormatSettings />
+ {isCurrencyExperimentalEnabled && <CurrencySettings />}
+ <LanguageSettings />
+ <AuthSettings />
+ <EncryptionSettings />
+ <BudgetTypeSettings />
+ {isElectron() && <Backups />}
+ <ExportBudget />
+ </SettingsSections>
+ );
+}
+
+export function AdvancedSettings() {
+ const { t } = useTranslation();
+
+ return (
+ <SettingsSections title={t('Advanced')}>
+ <AdvancedAbout />
+ <ResetCache />
+ <ResetSync />
+ <RepairTransactions />
+ </SettingsSections>
+ );
+}
+
+export function ExperimentalSettings() {
+ const { t } = useTranslation();
+
+ return (
+ <SettingsSections title={t('Experimental')}>
+ <ExperimentalFeatures />
+ </SettingsSections>
+ );
+}
+
+export function Settings() {
+ const { t } = useTranslation();
+ const { isNarrowWidth } = useResponsive();
+ const dispatch = useDispatch();
+ const isCurrencyExperimentalEnabled = useFeatureFlag('currency');
useEffect(() => {
const unlisten = listen('prefs-updated', () => {
@@ -213,66 +344,24 @@ export function Settings() {
}
}, [dispatch, isCurrencyExperimentalEnabled]);
- const { isNarrowWidth } = useResponsive();
+ if (isNarrowWidth) {
+ return <Outlet />;
+ }
return (
- <Page
- header={t('Settings')}
- style={{
- marginInline: floatingSidebar && !isNarrowWidth ? 'auto' : 0,
- }}
- >
+ <Page header={t('Settings')}>
<View
- data-testid="settings"
style={{
- marginTop: 10,
- flexShrink: 0,
- maxWidth: 530,
- width: '100%',
- gap: 30,
- paddingBottom: MOBILE_NAV_HEIGHT,
+ flexDirection: 'row',
+ flex: 1,
+ gap: spacing.xl,
+ paddingTop: 10,
}}
>
- {isNarrowWidth && (
- <View
- style={{
- gap: 10,
- flexDirection: 'row',
- alignItems: 'flex-end',
- width: '100%',
- }}
- >
- {/* The only spot to close a budget on mobile */}
- <FormField style={{ flex: 1 }}>
- <FormLabel title={t('Budget name')} />
- <Input
- value={budgetName}
- disabled
- style={{ color: theme.buttonNormalDisabledText }}
- />
- </FormField>
- <Button onPress={onCloseBudget} style={{ flexShrink: 0 }}>
- <Trans>Switch file</Trans>
- </Button>
- </View>
- )}
- <About />
- <ThemeSettings />
- <FormatSettings />
- {isCurrencyExperimentalEnabled && <CurrencySettings />}
- <LanguageSettings />
- <AuthSettings />
- <EncryptionSettings />
- <BudgetTypeSettings />
- {isElectron() && <Backups />}
- <ExportBudget />
- <AdvancedToggle>
- <AdvancedAbout />
- <ResetCache />
- <ResetSync />
- <RepairTransactions />
- <ExperimentalFeatures />
- </AdvancedToggle>
+ <SettingsNav />
+ <View style={{ flex: 1, overflowY: 'auto' }}>
+ <Outlet />
+ </View>
</View>
</Page>
);
diff --git a/packages/desktop-client/src/components/sidebar/PrimaryButtons.tsx b/packages/desktop-client/src/components/sidebar/PrimaryButtons.tsx
index 2302405160..92ecb0215a 100644
--- a/packages/desktop-client/src/components/sidebar/PrimaryButtons.tsx
+++ b/packages/desktop-client/src/components/sidebar/PrimaryButtons.tsx
@@ -1,99 +1,21 @@
-import React, { useCallback, useEffect, useState } from 'react';
+import React from 'react';
import { useTranslation } from 'react-i18next';
-import { useLocation } from 'react-router';
-import {
- SvgCheveronDown,
- SvgCheveronRight,
- SvgCog,
- SvgCreditCard,
- SvgReports,
- SvgStoreFront,
- SvgTag,
- SvgTuning,
- SvgWallet,
-} from '@actual-app/components/icons/v1';
+import { SvgCog, SvgReports, SvgWallet } from '@actual-app/components/icons/v1';
import { SvgCalendar3 } from '@actual-app/components/icons/v2';
import { View } from '@actual-app/components/view';
-import { useIsTestEnv } from '#hooks/useIsTestEnv';
-import { useSyncServerStatus } from '#hooks/useSyncServerStatus';
-
import { Item } from './Item';
-import { SecondaryItem } from './SecondaryItem';
export function PrimaryButtons() {
const { t } = useTranslation();
- const [isOpen, setOpen] = useState(false);
- const onToggle = useCallback(() => setOpen(open => !open), []);
- const location = useLocation();
-
- const syncServerStatus = useSyncServerStatus();
- const isTestEnv = useIsTestEnv();
- const isUsingServer = syncServerStatus !== 'no-server' || isTestEnv;
-
- const isActive = [
- '/payees',
- '/rules',
- '/bank-sync',
- '/settings',
- '/tools',
- ].some(route => location.pathname.startsWith(route));
-
- useEffect(() => {
- if (isActive) {
- setOpen(true);
- }
- }, [isActive, location.pathname]);
return (
<View data-testid="sidebar-primary-buttons" style={{ flexShrink: 0 }}>
<Item title={t('Budget')} Icon={SvgWallet} to="/budget" />
<Item title={t('Reports')} Icon={SvgReports} to="/reports" />
<Item title={t('Schedules')} Icon={SvgCalendar3} to="/schedules" />
- <Item
- title={t('More')}
- Icon={isOpen ? SvgCheveronDown : SvgCheveronRight}
- onClick={onToggle}
- style={{ marginBottom: isOpen ? 8 : 0 }}
- forceActive={!isOpen && isActive}
- />
- {isOpen && (
- <>
- <SecondaryItem
- title={t('Payees')}
- Icon={SvgStoreFront}
- to="/payees"
- indent={15}
- />
- <SecondaryItem
- title={t('Rules')}
- Icon={SvgTuning}
- to="/rules"
- indent={15}
- />
- {isUsingServer && (
- <SecondaryItem
- title={t('Bank Sync')}
- Icon={SvgCreditCard}
- to="/bank-sync"
- indent={15}
- />
- )}
- <SecondaryItem
- title={t('Tags')}
- Icon={SvgTag}
- to="/tags"
- indent={15}
- />
- <SecondaryItem
- title={t('Settings')}
- Icon={SvgCog}
- to="/settings"
- indent={15}
- />
- </>
- )}
+ <Item title={t('Settings')} Icon={SvgCog} to="/settings" />
</View>
);
}
diff --git a/packages/desktop-client/src/components/sidebar/redesign/PrimaryNav.tsx b/packages/desktop-client/src/components/sidebar/redesign/PrimaryNav.tsx
index 3d30d46a36..4a65b7cc76 100644
--- a/packages/desktop-client/src/components/sidebar/redesign/PrimaryNav.tsx
+++ b/packages/desktop-client/src/components/sidebar/redesign/PrimaryNav.tsx
@@ -1,27 +1,14 @@
import { useTranslation } from 'react-i18next';
-import {
- SvgLibrary,
- SvgReports,
- SvgTag,
- SvgTuning,
- SvgUserGroup,
- SvgWallet,
-} from '@actual-app/components/icons/v1';
+import { SvgReports, SvgWallet } from '@actual-app/components/icons/v1';
import { SvgCalendar3 } from '@actual-app/components/icons/v2';
import { spacing } from '@actual-app/components/tokens';
import { View } from '@actual-app/components/view';
-import { useIsTestEnv } from '#hooks/useIsTestEnv';
-import { useSyncServerStatus } from '#hooks/useSyncServerStatus';
-
import { NavRow } from './NavRow';
export function PrimaryNav() {
const { t } = useTranslation();
- const syncServerStatus = useSyncServerStatus();
- const isTestEnv = useIsTestEnv();
- const isUsingServer = syncServerStatus !== 'no-server' || isTestEnv;
return (
<View
@@ -34,12 +21,6 @@ export function PrimaryNav() {
<NavRow title={t('Budget')} Icon={SvgWallet} to="/budget" />
<NavRow title={t('Reports')} Icon={SvgReports} to="/reports" />
<NavRow title={t('Schedules')} Icon={SvgCalendar3} to="/schedules" />
- <NavRow title={t('Payees')} Icon={SvgUserGroup} to="/payees" />
- <NavRow title={t('Rules')} Icon={SvgTuning} to="/rules" />
- {isUsingServer && (
- <NavRow title={t('Bank Sync')} Icon={SvgLibrary} to="/bank-sync" />
- )}
- <NavRow title={t('Tags')} Icon={SvgTag} to="/tags" />
</View>
);
}
diff --git a/packages/desktop-client/src/components/tags/ManageTagsPage.tsx b/packages/desktop-client/src/components/tags/ManageTagsPage.tsx
index 3d2c4d88a3..a44e7951b1 100644
--- a/packages/desktop-client/src/components/tags/ManageTagsPage.tsx
+++ b/packages/desktop-client/src/components/tags/ManageTagsPage.tsx
@@ -1,15 +1,30 @@
import React from 'react';
import { useTranslation } from 'react-i18next';
-import { Page } from '#components/Page';
+import { useResponsive } from '@actual-app/components/hooks/useResponsive';
+
+import { MobilePageHeader, Page } from '#components/Page';
+import { SettingsBackButton } from '#components/settings/SettingsBackButton';
import { ManageTags } from './ManageTags';
export const ManageTagsPage = () => {
const { t } = useTranslation();
+ const { isNarrowWidth } = useResponsive();
+
+ if (!isNarrowWidth) {
+ return <ManageTags />;
+ }
return (
- <Page header={t('Tags')}>
+ <Page
+ header={
+ <MobilePageHeader
+ title={t('Tags')}
+ leftContent={<SettingsBackButton />}
+ />
+ }
+ >
<ManageTags />
</Page>
);
diff --git a/packages/desktop-client/src/components/tour/steps.tsx b/packages/desktop-client/src/components/tour/steps.tsx
index 6165f4bd73..aef5453e35 100644
--- a/packages/desktop-client/src/components/tour/steps.tsx
+++ b/packages/desktop-client/src/components/tour/steps.tsx
@@ -191,8 +191,8 @@ function getBudgetTourSteps({ navigate, budgetType }: TourStepDeps): Step[] {
content: (
<Trans>
The sidebar takes you to your budget, reports, and scheduled
- transactions. You can find payees, rules, and the settings under{' '}
- <strong>More</strong>.
+ transactions. You can find payees, rules, and tags under{' '}
+ <strong>Settings</strong>.
</Trans>
),
},
diff --git a/packages/desktop-client/src/components/transactions/TransactionList.tsx b/packages/desktop-client/src/components/transactions/TransactionList.tsx
index cfd97e1a2b..555475e1cc 100644
--- a/packages/desktop-client/src/components/transactions/TransactionList.tsx
+++ b/packages/desktop-client/src/components/transactions/TransactionList.tsx
@@ -296,7 +296,7 @@ export function TransactionList({
const onManagePayees = useCallback(
(id: PayeeEntity['id']) => {
void navigate(
- '/payees',
+ '/settings/payees',
id ? { state: { selectedPayee: id } } : undefined,
);
},
diff --git a/upcoming-release-notes/settings-page-navigation.md b/upcoming-release-notes/settings-page-navigation.md
new file mode 100644
index 0000000000..50321fee72
--- /dev/null
+++ b/upcoming-release-notes/settings-page-navigation.md
@@ -0,0 +1,6 @@
+---
+category: Enhancements
+authors: [StephenBrown2, matt-fidd]
+---
+
+Move payees, rules, bank sync and tags from the sidebar into the settings page, which now has its own navigation