A local-first personal finance app
use sheet style menus for mobile instead of modals (#9127)
Matt Fiddaman18cc7da0d71f
diff --git a/DESIGN.md b/DESIGN.mdindex 3763b8f53b..8d88630892 100644--- a/DESIGN.md+++ b/DESIGN.md@@ -42,6 +42,7 @@ typography:rounded:sm: '4px'md: '6px'+ sheet: '18px'spacing:xs: '5px'sm: '10px'@@ -132,6 +133,7 @@ All hex values in this file (frontmatter included) are the light-theme palette m- **Display** (600, 30px): Page-level headings and large balances. Rare.- **Headline** (700, 20px, 0.5px letter-spacing): Section titles.- **Title** (500, 15px): Emphasized in-table and card text.+- **Sheet title** (600, 18px): Centred title of a mobile bottom sheet. Mobile only.- **Body** (400, 16px): Default text.- **Label** (400, 13px): Table meta, menus, dense secondary text; 12px and 10px steps exist for the tightest spots.@@ -196,7 +198,7 @@ Utilitarian and quick: compact paddings, instant state feedback, built for daily### Cards / Containers-- **Corner Style:** 6px radius on table containers (top corners), 4px elsewhere+- **Corner Style:** 6px radius on table containers (top corners), 4px elsewhere; mobile bottom sheets use 18px top corners and a flat bottom edge- **Background:** Surface White on Navy Mist page background- **Shadow Strategy:** Card shadow at most; structure via 1px Navy Mist border- **Internal Padding:** 16-20px@@ -205,6 +207,7 @@ Utilitarian and quick: compact paddings, instant state feedback, built for daily- **Sidebar:** Navy Ink background, light navy text; hover darkens the row, selection marked with a purple accent and purple text. Status states (pending/positive/failed) tint the item background gold/green/red- **Mobile:** Purple header, white nav bar, purple selected item+- **Mobile sheets:** Menus open as bottom sheets on the modal surface (`modalBackground`) with a grab handle in `pageTextSubdued` and hairline row dividers in `tooltipBorder`. Rows are full-width bare buttons, destructive rows in `errorText`, section labels in sentence case only when a sheet has two or more groups. Dismiss by swipe down, tap outside or Escape; no close button### Pills / Chipsdiff --git a/packages/component-library/src/styles.ts b/packages/component-library/src/styles.tsindex 0ba2ee833d..8af950c8b5 100644--- a/packages/component-library/src/styles.ts+++ b/packages/component-library/src/styles.ts@@ -12,6 +12,10 @@ const shadowLarge = {boxShadow: '0 15px 30px 0 rgba(0,0,0,0.11), 0 5px 15px 0 rgba(0,0,0,0.08)',};+const shadowSheet = {+ boxShadow: '0 -4px 24px rgba(0,0,0,0.2)',+};+export const styles: CSSProperties = {incomeHeaderHeight: 70,cardShadow: '0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24)',@@ -89,6 +93,7 @@ export const styles: CSSProperties = {boxShadow: '0 2px 4px 0 rgba(0,0,0,0.1)',},shadowLarge,+ shadowSheet,tnum: {// tnum: Tabular numbers// ss01: Open digitsdiff --git a/packages/component-library/src/tokens.ts b/packages/component-library/src/tokens.tsindex 4a130fe3d8..3c15387480 100644--- a/packages/component-library/src/tokens.ts+++ b/packages/component-library/src/tokens.ts@@ -45,10 +45,11 @@ export const spacing: Record<SpacingSize, number> = {xl: 24,};-type RadiusSize = 'sm' | 'pill';+type RadiusSize = 'sm' | 'sheet' | 'pill';export const radius: Record<RadiusSize, number> = {sm: 4,+ sheet: 18,pill: 999,};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.pngindex 923e8e5baf..6b1bc1d67a 100644Binary 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 differdiff --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.pngindex 8002b80cd3..362577a63d 100644Binary 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 differdiff --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.pngindex 8d2c97208d..5abeec88df 100644Binary 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 differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts b/packages/desktop-client/e2e/budget.mobile.test.tsindex 7770f2c617..4a7f14d5c9 100644--- a/packages/desktop-client/e2e/budget.mobile.test.ts+++ b/packages/desktop-client/e2e/budget.mobile.test.ts@@ -16,7 +16,6 @@ const copyLastMonthBudget = async () => {const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);await budgetMenuModal.copyLastMonthBudget();- await budgetMenuModal.close();};const setTo3MonthAverage = async (@@ -25,7 +24,6 @@ const setTo3MonthAverage = async () => {const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);await budgetMenuModal.setTo3MonthAverage();- await budgetMenuModal.close();};const setTo6MonthAverage = async (@@ -34,7 +32,6 @@ const setTo6MonthAverage = async () => {const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);await budgetMenuModal.setTo6MonthAverage();- await budgetMenuModal.close();};const setToYearlyAverage = async (@@ -43,7 +40,6 @@ const setToYearlyAverage = async () => {const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);await budgetMenuModal.setToYearlyAverage();- await budgetMenuModal.close();};function getAverageStartMonth(month: string) {@@ -326,13 +322,14 @@ budgetTypes.forEach(budgetType => {await categoryGroupMenuModal.delete();- const confirmDeleteModal = page.getByTestId(- 'confirm-category-delete-modal',+ await expect(categoryGroupMenuModal.locator).toContainText(+ 'Are you sure you want to delete it?',);- await expect(confirmDeleteModal.getByRole('heading')).toHaveText(- 'Confirm Delete',- );- await expect(confirmDeleteModal).toContainText('Transfer to:');+ await expect(+ categoryGroupMenuModal.locator.getByRole('button', {+ name: 'Category',+ }),+ ).toBeVisible();});test('opens the transfer confirmation when deleting a category with transactions', async () => {@@ -343,13 +340,12 @@ budgetTypes.forEach(budgetType => {await categoryMenuModal.delete();- const confirmDeleteModal = page.getByTestId(- 'confirm-category-delete-modal',+ await expect(categoryMenuModal.locator).toContainText(+ 'Are you sure you want to delete it?',);- await expect(confirmDeleteModal.getByRole('heading')).toHaveText(- 'Confirm Delete',- );- await expect(confirmDeleteModal).toContainText('Transfer to:');+ await expect(+ categoryMenuModal.locator.getByRole('button', { name: 'Category' }),+ ).toBeVisible();});// Budgeted Cell Tests@@ -475,7 +471,6 @@ budgetTypes.forEach(budgetType => {const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);await budgetMenuModal.applyBudgetTemplate();- await budgetMenuModal.close();await expect(budgetedButton).toHaveText(amountToCurrency(amountToTemplate),diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--14404-in-the-page-header-opens-the-month-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--14404-in-the-page-header-opens-the-month-menu-modal-3-chromium-linux.pngindex 2c49483fa9..04dd60f7b3 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--14404-in-the-page-header-opens-the-month-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--14404-in-the-page-header-opens-the-month-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--321fd-ed-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--321fd-ed-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.pngindex 562324d1c2..d282581a8c 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--321fd-ed-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--321fd-ed-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--4bb70-ed-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--4bb70-ed-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.pngindex 3855492c00..8984b10ca2 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--4bb70-ed-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--4bb70-ed-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--6ab37-roup-name-opens-the-category-group-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--6ab37-roup-name-opens-the-category-group-menu-modal-1-chromium-linux.pngindex 8bff3630cf..b684b4c7d0 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--6ab37-roup-name-opens-the-category-group-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--6ab37-roup-name-opens-the-category-group-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a79-roup-name-opens-the-category-group-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a79-roup-name-opens-the-category-group-menu-modal-2-chromium-linux.pngindex ef8ae42b77..c96ac2d5bb 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a79-roup-name-opens-the-category-group-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a79-roup-name-opens-the-category-group-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a85-ed-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a85-ed-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.pngindex 00135155d0..2b11ec2741 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a85-ed-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--94a85-ed-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--9e6aa-in-the-page-header-opens-the-budget-page-menu-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--9e6aa-in-the-page-header-opens-the-budget-page-menu-1-chromium-linux.pngindex 02999b6916..aab424463f 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--9e6aa-in-the-page-header-opens-the-budget-page-menu-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--9e6aa-in-the-page-header-opens-the-budget-page-menu-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--bbde3-roup-name-opens-the-category-group-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--bbde3-roup-name-opens-the-category-group-menu-modal-3-chromium-linux.pngindex f7f58c20b8..60f9a27d11 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--bbde3-roup-name-opens-the-category-group-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--bbde3-roup-name-opens-the-category-group-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--bed18-in-the-page-header-opens-the-month-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--bed18-in-the-page-header-opens-the-month-menu-modal-1-chromium-linux.pngindex a4e49e0522..f1799cbb5e 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--bed18-in-the-page-header-opens-the-month-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--bed18-in-the-page-header-opens-the-month-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--ceb3a-in-the-page-header-opens-the-month-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--ceb3a-in-the-page-header-opens-the-month-menu-modal-2-chromium-linux.pngindex dcb21b07d2..f86537d868 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--ceb3a-in-the-page-header-opens-the-month-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--ceb3a-in-the-page-header-opens-the-month-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--d270d-in-the-page-header-opens-the-budget-page-menu-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--d270d-in-the-page-header-opens-the-budget-page-menu-2-chromium-linux.pngindex 82165692bd..061423b659 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--d270d-in-the-page-header-opens-the-budget-page-menu-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--d270d-in-the-page-header-opens-the-budget-page-menu-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--fdd57-in-the-page-header-opens-the-budget-page-menu-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--fdd57-in-the-page-header-opens-the-budget-page-menu-3-chromium-linux.pngindex fe87662c7b..349eb25a40 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--fdd57-in-the-page-header-opens-the-budget-page-menu-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking--fdd57-in-the-page-header-opens-the-budget-page-menu-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-1-chromium-linux.pngindex 1dc63cc8e9..f038dbabea 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-2-chromium-linux.pngindex df18353657..04882f48c3 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-3-chromium-linux.pngindex 5304aed3d5..34b31a0d63 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.pngindex c0e32f1b89..826a179d7e 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.pngindex 941f9464e6..00292a9f2b 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.pngindex 20d838c866..cf5772125c 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-1-chromium-linux.pngindex 361c0c962b..112715e58d 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-2-chromium-linux.pngindex 898cd68dce..9081624c7b 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-3-chromium-linux.pngindex 940625d409..db5f667789 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-checks-that-clicking-the-category-name-opens-the-category-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-1-chromium-linux.pngindex a2f2cda01a..046c85f781 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-2-chromium-linux.pngindex 11062329c6..00a9ab4ea3 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-3-chromium-linux.pngindex 2b277c393f..3344420f06 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Envelope-updates-the-budgeted-amount-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--0ba04-nt-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--0ba04-nt-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.pngindex 82051e0e11..ce062ab9bc 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--0ba04-nt-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--0ba04-nt-amount-opens-the-budget-summary-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--1ce6d-nt-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--1ce6d-nt-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.pngindex 70dc1b3989..9913aab79d 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--1ce6d-nt-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--1ce6d-nt-amount-opens-the-budget-summary-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--42062-in-the-page-header-opens-the-month-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--42062-in-the-page-header-opens-the-month-menu-modal-2-chromium-linux.pngindex f98dee80b3..edfa0f1abf 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--42062-in-the-page-header-opens-the-month-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--42062-in-the-page-header-opens-the-month-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--49fb6-in-the-page-header-opens-the-month-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--49fb6-in-the-page-header-opens-the-month-menu-modal-3-chromium-linux.pngindex 985591bd73..34ca5c24c8 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--49fb6-in-the-page-header-opens-the-month-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--49fb6-in-the-page-header-opens-the-month-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--5f098-roup-name-opens-the-category-group-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--5f098-roup-name-opens-the-category-group-menu-modal-1-chromium-linux.pngindex 05da7a0b43..76133710af 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--5f098-roup-name-opens-the-category-group-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--5f098-roup-name-opens-the-category-group-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--929be-roup-name-opens-the-category-group-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--929be-roup-name-opens-the-category-group-menu-modal-3-chromium-linux.pngindex 6dad0c5ba2..ce40063ba7 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--929be-roup-name-opens-the-category-group-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--929be-roup-name-opens-the-category-group-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--a3783-in-the-page-header-opens-the-budget-page-menu-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--a3783-in-the-page-header-opens-the-budget-page-menu-1-chromium-linux.pngindex 4a40f27848..af790c8822 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--a3783-in-the-page-header-opens-the-budget-page-menu-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--a3783-in-the-page-header-opens-the-budget-page-menu-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--a8b5e-in-the-page-header-opens-the-budget-page-menu-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--a8b5e-in-the-page-header-opens-the-budget-page-menu-3-chromium-linux.pngindex cf0f6f0f7e..b2f7bb46d6 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--a8b5e-in-the-page-header-opens-the-budget-page-menu-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--a8b5e-in-the-page-header-opens-the-budget-page-menu-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--b1562-in-the-page-header-opens-the-month-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--b1562-in-the-page-header-opens-the-month-menu-modal-1-chromium-linux.pngindex 3b29718e99..18dd6ef142 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--b1562-in-the-page-header-opens-the-month-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--b1562-in-the-page-header-opens-the-month-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--dc927-roup-name-opens-the-category-group-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--dc927-roup-name-opens-the-category-group-menu-modal-2-chromium-linux.pngindex 255e73bb37..624d961c6d 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--dc927-roup-name-opens-the-category-group-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--dc927-roup-name-opens-the-category-group-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f224f-nt-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f224f-nt-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.pngindex 3bdbf0f084..78fae3934a 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f224f-nt-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f224f-nt-amount-opens-the-budget-summary-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f8a19-in-the-page-header-opens-the-budget-page-menu-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f8a19-in-the-page-header-opens-the-budget-page-menu-2-chromium-linux.pngindex 287bf5f5fa..26adcf60be 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f8a19-in-the-page-header-opens-the-budget-page-menu-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking--f8a19-in-the-page-header-opens-the-budget-page-menu-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-1-chromium-linux.pngindex 39e84aafc7..53a6ef33d0 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-2-chromium-linux.pngindex 809489100d..97758e8127 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-3-chromium-linux.pngindex 5f4d0ef479..12bac467f2 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-balance-cell-opens-the-balance-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.pngindex f5cdc8560f..48b13624c9 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.pngindex 7da9d8f0a0..4f70e148af 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.pngindex dd23719b82..d9cc0270f6 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-budgeted-cell-opens-the-budget-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-1-chromium-linux.pngindex 7dbac996a1..c71eca8a5f 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-2-chromium-linux.pngindex 981a47e73f..96860d97eb 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-3-chromium-linux.pngindex 50e41a672c..74d8b2579d 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-checks-that-clicking-the-category-name-opens-the-category-menu-modal-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-1-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-1-chromium-linux.pngindex 66eb9c0351..bed3523173 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-1-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-2-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-2-chromium-linux.pngindex ddd27e1ad4..30e5fc81e5 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-2-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-3-chromium-linux.png b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-3-chromium-linux.pngindex 1ecf98f158..467d3aa74c 100644Binary files a/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-3-chromium-linux.png and b/packages/desktop-client/e2e/budget.mobile.test.ts-snapshots/Mobile-Budget-Tracking-updates-the-budgeted-amount-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/page-models/mobile-account-page.ts b/packages/desktop-client/e2e/page-models/mobile-account-page.tsindex c28fae8d60..d11bacd3ea 100644--- a/packages/desktop-client/e2e/page-models/mobile-account-page.ts+++ b/packages/desktop-client/e2e/page-models/mobile-account-page.ts@@ -77,7 +77,7 @@ export class MobileAccountPage {await this.accountMenuButton.click();await this.page.getByTestId('account-menu-modal')- .getByRole('button', { name: 'Reconcile' })+ .getByRole('button', { name: 'Reconcile', exact: true }).click();const reconcileModal = this.page.getByTestId('account-reconcile-modal');const amountInput = reconcileModal.getByTestId('amount-input');diff --git a/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.ts b/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.tsindex b81a19a7bf..65fc880ee0 100644--- a/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.ts+++ b/packages/desktop-client/e2e/page-models/mobile-balance-menu-modal.ts@@ -31,6 +31,6 @@ export class BalanceMenuModal {}async close() {- await this.heading.getByRole('button', { name: 'Close' }).click();+ await this.page.keyboard.press('Escape');}}diff --git a/packages/desktop-client/e2e/page-models/mobile-budget-menu-modal.ts b/packages/desktop-client/e2e/page-models/mobile-budget-menu-modal.tsindex 04c01ceaed..e19268cc24 100644--- a/packages/desktop-client/e2e/page-models/mobile-budget-menu-modal.ts+++ b/packages/desktop-client/e2e/page-models/mobile-budget-menu-modal.ts@@ -5,7 +5,6 @@ export class BudgetMenuModal {readonly locator: Locator;readonly heading: Locator;readonly budgetAmountInput: Locator;- readonly actionsButton: Locator;readonly copyLastMonthBudgetButton: Locator;readonly setTo3MonthAverageButton: Locator;readonly setTo6MonthAverageButton: Locator;@@ -18,9 +17,6 @@ export class BudgetMenuModal {this.heading = locator.getByRole('heading');this.budgetAmountInput = locator.getByTestId('amount-input');- this.actionsButton = locator.getByRole('button', {- name: 'Actions',- });this.copyLastMonthBudgetButton = locator.getByRole('button', {name: "Copy last month's budget",});@@ -39,41 +35,37 @@ export class BudgetMenuModal {}async close() {- await this.heading.getByRole('button', { name: 'Close' }).click();- }-- async showActions() {- await this.actionsButton.click();+ await this.page.keyboard.press('Escape');}async setBudgetAmount(newAmount: string) {+ if (!(await this.budgetAmountInput.isVisible())) {+ await this.locator+ .getByRole('button', { name: /^-?[\d,]+\.\d{2}$/ })+ .click();+ }await this.budgetAmountInput.fill(newAmount);await this.budgetAmountInput.blur();await this.close();}async copyLastMonthBudget() {- await this.showActions();await this.copyLastMonthBudgetButton.click();}async setTo3MonthAverage() {- await this.showActions();await this.setTo3MonthAverageButton.click();}async setTo6MonthAverage() {- await this.showActions();await this.setTo6MonthAverageButton.click();}async setToYearlyAverage() {- await this.showActions();await this.setToYearlyAverageButton.click();}async applyBudgetTemplate() {- await this.showActions();await this.applyBudgetTemplateButton.click();}}diff --git a/packages/desktop-client/e2e/page-models/mobile-budget-page.ts b/packages/desktop-client/e2e/page-models/mobile-budget-page.tsindex bff895f3cb..67c2d02bd7 100644--- a/packages/desktop-client/e2e/page-models/mobile-budget-page.ts+++ b/packages/desktop-client/e2e/page-models/mobile-budget-page.ts@@ -162,11 +162,7 @@ export class MobileBudgetPage {await this.#getButtonForCategoryGroup(categoryGroupName);await categoryGroupButton.click();- return new CategoryGroupMenuModal(- this.page.getByRole('dialog', {- name: 'Modal dialog',- }),- );+ return new CategoryGroupMenuModal(this.page.getByRole('dialog'));}async getCategoryNameForRow(idx: number) {@@ -188,11 +184,7 @@ export class MobileBudgetPage {const categoryButton = await this.#getButtonForCategory(categoryName);await categoryButton.click();- return new CategoryMenuModal(- this.page.getByRole('dialog', {- name: 'Modal dialog',- }),- );+ return new CategoryMenuModal(this.page.getByRole('dialog'));}async #getButtonForCell(@@ -234,11 +226,7 @@ export class MobileBudgetPage {const budgetedButton = await this.getButtonForBudgeted(categoryName);await budgetedButton.click();- return new BudgetMenuModal(- this.page.getByRole('dialog', {- name: 'Modal dialog',- }),- );+ return new BudgetMenuModal(this.page.getByRole('dialog'));}async openSpentPage(categoryName: string) {@@ -255,11 +243,7 @@ export class MobileBudgetPage {if (await balanceButton.isVisible()) {await balanceButton.click();- return new BalanceMenuModal(- this.page.getByRole('dialog', {- name: 'Modal dialog',- }),- );+ return new BalanceMenuModal(this.page.getByRole('dialog'));} else {throw new Error(`Balance button for category ${categoryName} not found or not visible.`,@@ -328,11 +312,7 @@ export class MobileBudgetPage {}await budgetSummaryButton.click();- return new EnvelopeBudgetSummaryModal(- this.page.getByRole('dialog', {- name: 'Modal dialog',- }),- );+ return new EnvelopeBudgetSummaryModal(this.page.getByRole('dialog'));}async #getButtonForTrackingBudgetSummary({@@ -358,10 +338,6 @@ export class MobileBudgetPage {}await budgetSummaryButton.click();- return new TrackingBudgetSummaryModal(- this.page.getByRole('dialog', {- name: 'Modal dialog',- }),- );+ return new TrackingBudgetSummaryModal(this.page.getByRole('dialog'));}}diff --git a/packages/desktop-client/e2e/page-models/mobile-category-group-menu-modal.ts b/packages/desktop-client/e2e/page-models/mobile-category-group-menu-modal.tsindex 7af530ad6f..47f67a426a 100644--- a/packages/desktop-client/e2e/page-models/mobile-category-group-menu-modal.ts+++ b/packages/desktop-client/e2e/page-models/mobile-category-group-menu-modal.ts@@ -4,21 +4,28 @@ export class CategoryGroupMenuModal {readonly page: Page;readonly locator: Locator;readonly heading: Locator;- readonly menuButton: Locator;+ readonly addCategoryButton: Locator;+ readonly deleteButton: Locator;constructor(locator: Locator) {this.locator = locator;this.page = locator.page();this.heading = locator.getByRole('heading');- this.menuButton = this.heading.getByRole('button', { name: 'Menu' });+ this.addCategoryButton = locator.getByRole('button', {+ name: 'Add category',+ });+ this.deleteButton = locator.getByRole('button', {+ name: 'Delete',+ exact: true,+ });+ }++ async close() {+ await this.page.keyboard.press('Escape');}async delete() {- await this.menuButton.click();- await this.page- .locator('[data-popover]')- .getByRole('button', { name: 'Delete' })- .click();+ await this.deleteButton.click();}}diff --git a/packages/desktop-client/e2e/page-models/mobile-category-menu-modal.ts b/packages/desktop-client/e2e/page-models/mobile-category-menu-modal.tsindex e78635a470..672360a5a6 100644--- a/packages/desktop-client/e2e/page-models/mobile-category-menu-modal.ts+++ b/packages/desktop-client/e2e/page-models/mobile-category-menu-modal.ts@@ -6,26 +6,27 @@ export class CategoryMenuModal {readonly page: Page;readonly locator: Locator;readonly heading: Locator;- readonly menuButton: Locator;- readonly budgetAmountInput: Locator;readonly editNotesButton: Locator;readonly budgetAutomationsButton: Locator;+ readonly deleteButton: Locator;constructor(locator: Locator) {this.locator = locator;this.page = locator.page();this.heading = locator.getByRole('heading');- this.menuButton = this.heading.getByRole('button', { name: 'Menu' });- this.budgetAmountInput = locator.getByTestId('amount-input');this.editNotesButton = locator.getByRole('button', { name: 'Edit notes' });this.budgetAutomationsButton = locator.getByRole('button', {name: 'Budget automations',});+ this.deleteButton = locator.getByRole('button', {+ name: 'Delete',+ exact: true,+ });}async close() {- await this.heading.getByRole('button', { name: 'Close' }).click();+ await this.page.keyboard.press('Escape');}async editNotes() {@@ -45,10 +46,6 @@ export class CategoryMenuModal {}async delete() {- await this.menuButton.click();- await this.page- .locator('[data-popover]')- .getByRole('button', { name: 'Delete' })- .click();+ await this.deleteButton.click();}}diff --git a/packages/desktop-client/e2e/page-models/mobile-envelope-budget-summary-modal.ts b/packages/desktop-client/e2e/page-models/mobile-envelope-budget-summary-modal.tsindex 213e69bf42..97048f3909 100644--- a/packages/desktop-client/e2e/page-models/mobile-envelope-budget-summary-modal.ts+++ b/packages/desktop-client/e2e/page-models/mobile-envelope-budget-summary-modal.ts@@ -13,6 +13,6 @@ export class EnvelopeBudgetSummaryModal {}async close() {- await this.heading.getByRole('button', { name: 'Close' }).click();+ await this.page.keyboard.press('Escape');}}diff --git a/packages/desktop-client/e2e/page-models/mobile-tracking-budget-summary-modal.ts b/packages/desktop-client/e2e/page-models/mobile-tracking-budget-summary-modal.tsindex c4ae152870..e7e601f62c 100644--- a/packages/desktop-client/e2e/page-models/mobile-tracking-budget-summary-modal.ts+++ b/packages/desktop-client/e2e/page-models/mobile-tracking-budget-summary-modal.ts@@ -13,6 +13,6 @@ export class TrackingBudgetSummaryModal {}async close() {- await this.heading.getByRole('button', { name: 'Close' }).click();+ await this.page.keyboard.press('Escape');}}diff --git a/packages/desktop-client/src/budget/mutations.ts b/packages/desktop-client/src/budget/mutations.tsindex 6c1e7d74f8..f409d62bdd 100644--- a/packages/desktop-client/src/budget/mutations.ts+++ b/packages/desktop-client/src/budget/mutations.ts@@ -248,6 +248,7 @@ export function useSaveCategoryMutation() {type DeleteCategoryPayload = {id: CategoryEntity['id'];+ transferId?: CategoryEntity['id'];};export function useDeleteCategoryMutation() {@@ -266,7 +267,13 @@ export function useDeleteCategoryMutation() {};return useMutation({- mutationFn: async ({ id }: DeleteCategoryPayload) => {+ mutationFn: async ({ id, transferId }: DeleteCategoryPayload) => {+ if (transferId) {+ if (id !== transferId) {+ await deleteCategory({ id, transferId });+ }+ return;+ }const mustTransfer = await send('must-category-transfer', { id });if (mustTransfer) {@@ -462,6 +469,7 @@ export function useSaveCategoryGroupMutation() {type DeleteCategoryGroupPayload = {id: CategoryGroupEntity['id'];+ transferId?: CategoryEntity['id'];};export function useDeleteCategoryGroupMutation() {@@ -470,7 +478,11 @@ export function useDeleteCategoryGroupMutation() {const { t } = useTranslation();return useMutation({- mutationFn: async ({ id }: DeleteCategoryGroupPayload) => {+ mutationFn: async ({ id, transferId }: DeleteCategoryGroupPayload) => {+ if (transferId) {+ await send('category-group-delete', { id, transferId });+ return;+ }const { grouped: categoryGroups } = await queryClient.ensureQueryData(categoryQueries.list(),);diff --git a/packages/desktop-client/src/components/Modals.tsx b/packages/desktop-client/src/components/Modals.tsxindex 6dd517a164..be84286048 100644--- a/packages/desktop-client/src/components/Modals.tsx+++ b/packages/desktop-client/src/components/Modals.tsx@@ -46,7 +46,6 @@ import { EnvelopeBudgetMenuModal } from './modals/EnvelopeBudgetMenuModal';import { EnvelopeBudgetMonthMenuModal } from './modals/EnvelopeBudgetMonthMenuModal';import { EnvelopeBudgetSummaryModal } from './modals/EnvelopeBudgetSummaryModal';import { EnvelopeIncomeBalanceMenuModal } from './modals/EnvelopeIncomeBalanceMenuModal';-import { EnvelopeToBudgetMenuModal } from './modals/EnvelopeToBudgetMenuModal';import { FixEncryptionKeyModal } from './modals/FixEncryptionKeyModal';import { GoalTemplateModal } from './modals/GoalTemplateModal';import { GoCardlessExternalMsgModal } from './modals/GoCardlessExternalMsgModal';@@ -338,16 +337,6 @@ export function Modals() {</SheetNameProvider>);- case 'envelope-summary-to-budget-menu':- return (- <SheetNameProvider- key={key}- name={monthUtils.sheetForMonth(modal.options.month)}- >- <EnvelopeToBudgetMenuModal {...modal.options} />- </SheetNameProvider>- );-case 'hold-buffer':return (<SheetNameProviderdiff --git a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsxindex 205480ba57..3d63ca031b 100644--- a/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx+++ b/packages/desktop-client/src/components/budget/BalanceWithCarryover.tsx@@ -145,8 +145,8 @@ export function BalanceWithCarryover({textAlign: 'right',...(!isDisabled && {cursor: 'pointer',+ ':hover': { textDecoration: 'underline' },}),- ':hover': { textDecoration: 'underline' },}),[getBalanceAmountStyle, isDisabled],);diff --git a/packages/desktop-client/src/components/budget/CategoryDeleteMessage.tsx b/packages/desktop-client/src/components/budget/CategoryDeleteMessage.tsxnew file mode 100644index 0000000000..37ab9dc942--- /dev/null+++ b/packages/desktop-client/src/components/budget/CategoryDeleteMessage.tsx@@ -0,0 +1,56 @@+import { Trans } from 'react-i18next';++import type {+ CategoryEntity,+ CategoryGroupEntity,+} from '@actual-app/core/types/models';+import type { TransObjectLiteral } from '@actual-app/core/types/util';++type CategoryDeleteMessageProps = {+ category?: CategoryEntity;+ group?: CategoryGroupEntity;+};++export function CategoryDeleteMessage({+ category,+ group,+}: CategoryDeleteMessageProps) {+ const isIncome = Boolean((category ?? group)?.is_income);++ return (+ <>+ {group ? (+ isIncome ? (+ <Trans>+ Categories in the group{' '}+ <strong>{{ group: group.name } as TransObjectLiteral}</strong> are+ used by existing transactions or it has a positive leftover balance+ currently.+ </Trans>+ ) : (+ <Trans>+ Categories in the group{' '}+ <strong>{{ group: group.name } as TransObjectLiteral}</strong> are+ used by existing transactions.+ </Trans>+ )+ ) : isIncome ? (+ <Trans>+ <strong>{{ category: category?.name } as TransObjectLiteral}</strong>{' '}+ is used by existing transactions or it has a positive leftover balance+ currently.+ </Trans>+ ) : (+ <Trans>+ <strong>{{ category: category?.name } as TransObjectLiteral}</strong>{' '}+ is used by existing transactions.+ </Trans>+ )}{' '}+ <Trans>+ <strong>Are you sure you want to delete it?</strong> If so, you must+ select another category to transfer existing transactions and balance+ to.+ </Trans>+ </>+ );+}diff --git a/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx b/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsxindex 8205b96e0c..56249c3a02 100644--- a/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx+++ b/packages/desktop-client/src/components/budget/envelope/BalanceMenu.tsx@@ -3,28 +3,25 @@ import type { ComponentPropsWithoutRef } from 'react';import { useTranslation } from 'react-i18next';import { Menu } from '@actual-app/components/menu';+import type { MenuItemObject } from '@actual-app/components/menu';import { envelopeBudget } from '#spreadsheet/bindings';import { useEnvelopeSheetValue } from './EnvelopeBudgetComponents';-type BalanceMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {+export type BalanceMenuActions = {categoryId: string;onTransfer?: () => void;onCarryover?: (carryOver: boolean) => void;onCover?: () => void;};-export function BalanceMenu({+export function useBalanceMenu({categoryId,onTransfer,onCarryover,onCover,- ...props-}: BalanceMenuProps) {+}: BalanceMenuActions) {const { t } = useTranslation();const carryover = useEnvelopeSheetValue(@@ -33,48 +30,69 @@ export function BalanceMenu({const balance =useEnvelopeSheetValue(envelopeBudget.catBalance(categoryId)) ?? 0;- return (- <Menu- {...props}- onMenuSelect={name => {- switch (name) {- case 'transfer':- onTransfer?.();- break;- case 'carryover':- onCarryover?.(!carryover);- break;- case 'cover':- onCover?.();- break;- default:- throw new Error(`Unrecognized menu option: ${name}`);- }- }}- items={[- ...(balance > 0- ? [- {- name: 'transfer',- text: t('Transfer to another category'),- },- ]- : []),- ...(balance < 0- ? [- {- name: 'cover',- text: t('Cover overspending'),- },- ]- : []),- {- name: 'carryover',- text: carryover- ? t('Remove overspending rollover')- : t('Rollover overspending'),- },- ]}- />- );+ const onMenuSelect = (name: string) => {+ switch (name) {+ case 'transfer':+ onTransfer?.();+ break;+ case 'carryover':+ onCarryover?.(!carryover);+ break;+ case 'cover':+ onCover?.();+ break;+ default:+ throw new Error(`Unrecognized menu option: ${name}`);+ }+ };++ const items: MenuItemObject<string>[] = [+ ...(balance > 0+ ? [+ {+ name: 'transfer',+ text: t('Transfer to another category'),+ },+ ]+ : []),+ ...(balance < 0+ ? [+ {+ name: 'cover',+ text: t('Cover overspending'),+ },+ ]+ : []),+ {+ name: 'carryover',+ text: carryover+ ? t('Remove overspending rollover')+ : t('Rollover overspending'),+ },+ ];++ return { items, onMenuSelect };+}++type BalanceMenuProps = Omit<+ ComponentPropsWithoutRef<typeof Menu>,+ 'onMenuSelect' | 'items'+> &+ BalanceMenuActions;++export function BalanceMenu({+ categoryId,+ onTransfer,+ onCarryover,+ onCover,+ ...props+}: BalanceMenuProps) {+ const { items, onMenuSelect } = useBalanceMenu({+ categoryId,+ onTransfer,+ onCarryover,+ onCover,+ });++ return <Menu {...props} onMenuSelect={onMenuSelect} items={items} />;}diff --git a/packages/desktop-client/src/components/budget/envelope/BudgetMenu.tsx b/packages/desktop-client/src/components/budget/envelope/BudgetMenu.tsxindex 87571ab4cd..313bb91c10 100644--- a/packages/desktop-client/src/components/budget/envelope/BudgetMenu.tsx+++ b/packages/desktop-client/src/components/budget/envelope/BudgetMenu.tsx@@ -3,26 +3,24 @@ import type { ComponentPropsWithoutRef } from 'react';import { useTranslation } from 'react-i18next';import { Menu } from '@actual-app/components/menu';+import type { MenuItemObject } from '@actual-app/components/menu';import { useFeatureFlag } from '#hooks/useFeatureFlag';-type BudgetMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {+export type BudgetMenuActions = {onCopyLastMonthAverage: () => void;onSetMonthsAverage: (numberOfMonths: number) => void;onApplyBudgetTemplate: () => void;};-export function BudgetMenu({++export function useBudgetMenu({onCopyLastMonthAverage,onSetMonthsAverage,onApplyBudgetTemplate,- ...props-}: BudgetMenuProps) {+}: BudgetMenuActions) {const { t } = useTranslation();-const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');+const onMenuSelect = (name: string) => {switch (name) {case 'copy-single-last':@@ -45,36 +43,53 @@ export function BudgetMenu({}};- return (- <Menu- {...props}- onMenuSelect={onMenuSelect}- items={[- {- name: 'copy-single-last',- text: t("Copy last month's budget"),- },- {- name: 'set-single-3-avg',- text: t('Set to 3 month average'),- },- {- name: 'set-single-6-avg',- text: t('Set to 6 month average'),- },- {- name: 'set-single-12-avg',- text: t('Set to yearly average'),- },- ...(isGoalTemplatesEnabled- ? [- {- name: 'apply-single-category-template',- text: t('Overwrite with template'),- },- ]- : []),- ]}- />- );+ const items: MenuItemObject<string>[] = [+ {+ name: 'copy-single-last',+ text: t("Copy last month's budget"),+ },+ {+ name: 'set-single-3-avg',+ text: t('Set to 3 month average'),+ },+ {+ name: 'set-single-6-avg',+ text: t('Set to 6 month average'),+ },+ {+ name: 'set-single-12-avg',+ text: t('Set to yearly average'),+ },+ ...(isGoalTemplatesEnabled+ ? [+ {+ name: 'apply-single-category-template',+ text: t('Overwrite with template'),+ },+ ]+ : []),+ ];++ return { items, onMenuSelect };+}++type BudgetMenuProps = Omit<+ ComponentPropsWithoutRef<typeof Menu>,+ 'onMenuSelect' | 'items'+> &+ BudgetMenuActions;++export function BudgetMenu({+ onCopyLastMonthAverage,+ onSetMonthsAverage,+ onApplyBudgetTemplate,+ ...props+}: BudgetMenuProps) {+ const { items, onMenuSelect } = useBudgetMenu({+ onCopyLastMonthAverage,+ onSetMonthsAverage,+ onApplyBudgetTemplate,+ });++ return <Menu {...props} onMenuSelect={onMenuSelect} items={items} />;}diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetMonthMenu.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetMonthMenu.tsxindex 5ee1983ac2..3299ddee8b 100644--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetMonthMenu.tsx+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/BudgetMonthMenu.tsx@@ -3,13 +3,11 @@ import type { ComponentPropsWithoutRef } from 'react';import { useTranslation } from 'react-i18next';import { Menu } from '@actual-app/components/menu';+import type { MenuItemObject } from '@actual-app/components/menu';import { useFeatureFlag } from '#hooks/useFeatureFlag';-type BudgetMonthMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {+export type BudgetMonthMenuActions = {onCopyLastMonthBudget: () => void;onSetBudgetsToZero: () => void;onSetMonthsAverage: (numberOfMonths: number) => void;@@ -18,6 +16,99 @@ type BudgetMonthMenuProps = Omit<onOverwriteWithBudgetTemplates: () => void;onEndOfMonthCleanup: () => void;};++export function useBudgetMonthMenu({+ onCopyLastMonthBudget,+ onSetBudgetsToZero,+ onSetMonthsAverage,+ onCheckTemplates,+ onApplyBudgetTemplates,+ onOverwriteWithBudgetTemplates,+ onEndOfMonthCleanup,+}: BudgetMonthMenuActions) {+ const { t } = useTranslation();+ const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');++ const onMenuSelect = (name: string) => {+ switch (name) {+ case 'copy-last':+ onCopyLastMonthBudget();+ break;+ case 'set-zero':+ onSetBudgetsToZero();+ break;+ case 'set-3-avg':+ onSetMonthsAverage(3);+ break;+ case 'set-6-avg':+ onSetMonthsAverage(6);+ break;+ case 'set-12-avg':+ onSetMonthsAverage(12);+ break;+ case 'check-templates':+ onCheckTemplates();+ break;+ case 'apply-goal-template':+ onApplyBudgetTemplates();+ break;+ case 'overwrite-goal-template':+ onOverwriteWithBudgetTemplates();+ break;+ case 'cleanup-goal-template':+ onEndOfMonthCleanup();+ break;+ default:+ throw new Error(`Unrecognized menu option: ${name}`);+ }+ };++ const items: MenuItemObject<string>[] = [+ { name: 'copy-last', text: t("Copy last month's budget") },+ { name: 'set-zero', text: t('Set budgets to zero') },+ {+ name: 'set-3-avg',+ text: t('Set budgets to 3 month average'),+ },+ {+ name: 'set-6-avg',+ text: t('Set budgets to 6 month average'),+ },+ {+ name: 'set-12-avg',+ text: t('Set budgets to 12 month average'),+ },+ ...(isGoalTemplatesEnabled+ ? [+ {+ name: 'check-templates',+ text: t('Check templates'),+ },+ {+ name: 'apply-goal-template',+ text: t('Apply budget template'),+ },+ {+ name: 'overwrite-goal-template',+ text: t('Overwrite with budget template'),+ },+ {+ name: 'cleanup-goal-template',+ text: t('End of month cleanup'),+ },+ ]+ : []),+ ];++ return { items, onMenuSelect };+}++type BudgetMonthMenuProps = Omit<+ ComponentPropsWithoutRef<typeof Menu>,+ 'onMenuSelect' | 'items'+> &+ BudgetMonthMenuActions;+export function BudgetMonthMenu({onCopyLastMonthBudget,onSetBudgetsToZero,@@ -28,81 +119,15 @@ export function BudgetMonthMenu({onEndOfMonthCleanup,...props}: BudgetMonthMenuProps) {- const { t } = useTranslation();+ const { items, onMenuSelect } = useBudgetMonthMenu({+ onCopyLastMonthBudget,+ onSetBudgetsToZero,+ onSetMonthsAverage,+ onCheckTemplates,+ onApplyBudgetTemplates,+ onOverwriteWithBudgetTemplates,+ onEndOfMonthCleanup,+ });- const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');- return (- <Menu- {...props}- onMenuSelect={name => {- switch (name) {- case 'copy-last':- onCopyLastMonthBudget();- break;- case 'set-zero':- onSetBudgetsToZero();- break;- case 'set-3-avg':- onSetMonthsAverage(3);- break;- case 'set-6-avg':- onSetMonthsAverage(6);- break;- case 'set-12-avg':- onSetMonthsAverage(12);- break;- case 'check-templates':- onCheckTemplates();- break;- case 'apply-goal-template':- onApplyBudgetTemplates();- break;- case 'overwrite-goal-template':- onOverwriteWithBudgetTemplates();- break;- case 'cleanup-goal-template':- onEndOfMonthCleanup();- break;- default:- throw new Error(`Unrecognized menu option: ${name}`);- }- }}- items={[- { name: 'copy-last', text: t("Copy last month's budget") },- { name: 'set-zero', text: t('Set budgets to zero') },- {- name: 'set-3-avg',- text: t('Set budgets to 3 month average'),- },- {- name: 'set-6-avg',- text: t('Set budgets to 6 month average'),- },- {- name: 'set-12-avg',- text: t('Set budgets to 12 month average'),- },- ...(isGoalTemplatesEnabled- ? [- {- name: 'check-templates',- text: t('Check templates'),- },- {- name: 'apply-goal-template',- text: t('Apply budget template'),- },- {- name: 'overwrite-goal-template',- text: t('Overwrite with budget template'),- },- {- name: 'cleanup-goal-template',- text: t('End of month cleanup'),- },- ]- : []),- ]}- />- );+ return <Menu {...props} onMenuSelect={onMenuSelect} items={items} />;}diff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsxindex d8c46b0c58..a028742b51 100644--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetAmount.tsx@@ -24,7 +24,7 @@ type ToBudgetAmountProps = {prevMonthName: string;style?: CSSProperties;amountStyle?: CSSProperties;- onClick: () => void;+ onClick?: () => void;onContextMenu?: MouseEventHandler;isTotalsListTooltipDisabled?: boolean;};@@ -85,7 +85,7 @@ export function ToBudgetAmount({{fontWeight: 400,userSelect: 'none',- cursor: 'pointer',+ cursor: onClick ? 'pointer' : 'default',color: isPositive? theme.toBudgetPositive: isNegativediff --git a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsxindex 831548cc10..730731571d 100644--- a/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx+++ b/packages/desktop-client/src/components/budget/envelope/budgetsummary/ToBudgetMenu.tsx@@ -3,14 +3,12 @@ import type { ComponentPropsWithoutRef } from 'react';import { useTranslation } from 'react-i18next';import { Menu } from '@actual-app/components/menu';+import type { MenuItemObject } from '@actual-app/components/menu';import { useEnvelopeSheetValue } from '#components/budget/envelope/EnvelopeBudgetComponents';import { envelopeBudget } from '#spreadsheet/bindings';-type ToBudgetMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {+export type ToBudgetMenuActions = {onTransfer: () => void;onCover: () => void;onHoldBuffer: () => void;@@ -19,15 +17,14 @@ type ToBudgetMenuProps = Omit<month: string;};-export function ToBudgetMenu({+export function useToBudgetMenu({onTransfer,onCover,onHoldBuffer,onResetHoldBuffer,onBudgetAction,month,- ...props-}: ToBudgetMenuProps) {+}: ToBudgetMenuActions) {const { t } = useTranslation();const toBudget = useEnvelopeSheetValue(envelopeBudget.toBudget) ?? 0;@@ -35,7 +32,8 @@ export function ToBudgetMenu({const manualBuffered =useEnvelopeSheetValue(envelopeBudget.manualBuffered) ?? 0;const autoBuffered = useEnvelopeSheetValue(envelopeBudget.autoBuffered) ?? 0;- const items = [++ const availableItems: MenuItemObject<string>[] = [...(toBudget > 0? [{@@ -78,42 +76,66 @@ export function ToBudgetMenu({: []),];- return (- <Menu- {...props}- onMenuSelect={name => {- switch (name) {- case 'transfer':- onTransfer?.();- break;- case 'cover':- onCover?.();- break;- case 'buffer':- onHoldBuffer?.();- onBudgetAction?.(month, 'reset-income-carryover', {});- break;- case 'reset-buffer':- onResetHoldBuffer?.();- break;- case 'disable-auto-buffer':- onBudgetAction?.(month, 'reset-income-carryover', {});- break;- default:- throw new Error(`Unrecognized menu option: ${name}`);- }- }}- items={- items.length > 0- ? items- : [- {- name: 'none',- text: t('No actions available'),- disabled: true,- },- ]- }- />- );+ const items: MenuItemObject<string>[] =+ availableItems.length > 0+ ? availableItems+ : [+ {+ name: 'none',+ text: t('No actions available'),+ disabled: true,+ },+ ];++ const onMenuSelect = (name: string) => {+ switch (name) {+ case 'transfer':+ onTransfer?.();+ break;+ case 'cover':+ onCover?.();+ break;+ case 'buffer':+ onHoldBuffer?.();+ onBudgetAction?.(month, 'reset-income-carryover', {});+ break;+ case 'reset-buffer':+ onResetHoldBuffer?.();+ break;+ case 'disable-auto-buffer':+ onBudgetAction?.(month, 'reset-income-carryover', {});+ break;+ default:+ throw new Error(`Unrecognized menu option: ${name}`);+ }+ };++ return { items, onMenuSelect };+}++type ToBudgetMenuProps = Omit<+ ComponentPropsWithoutRef<typeof Menu>,+ 'onMenuSelect' | 'items'+> &+ ToBudgetMenuActions;++export function ToBudgetMenu({+ onTransfer,+ onCover,+ onHoldBuffer,+ onResetHoldBuffer,+ onBudgetAction,+ month,+ ...props+}: ToBudgetMenuProps) {+ const { items, onMenuSelect } = useToBudgetMenu({+ onTransfer,+ onCover,+ onHoldBuffer,+ onResetHoldBuffer,+ onBudgetAction,+ month,+ });++ return <Menu {...props} onMenuSelect={onMenuSelect} items={items} />;}diff --git a/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx b/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsxindex a85f7ddf4d..6cfceac832 100644--- a/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx+++ b/packages/desktop-client/src/components/budget/tracking/BalanceMenu.tsx@@ -3,48 +3,60 @@ import type { ComponentPropsWithoutRef } from 'react';import { useTranslation } from 'react-i18next';import { Menu } from '@actual-app/components/menu';+import type { MenuItemObject } from '@actual-app/components/menu';import { trackingBudget } from '#spreadsheet/bindings';import { useTrackingSheetValue } from './TrackingBudgetComponents';-type BalanceMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {+export type BalanceMenuActions = {categoryId: string;onCarryover: (carryover: boolean) => void;};-export function BalanceMenu({+export function useBalanceMenu({categoryId,onCarryover,- ...props-}: BalanceMenuProps) {+}: BalanceMenuActions) {const { t } = useTranslation();const carryover = useTrackingSheetValue(trackingBudget.catCarryover(categoryId),);- return (- <Menu- {...props}- onMenuSelect={name => {- switch (name) {- case 'carryover':- onCarryover?.(!carryover);- break;- default:- throw new Error(`Unrecognized menu option: ${String(name)}`);- }- }}- items={[- {- name: 'carryover',- text: carryover- ? t('Remove overspending rollover')- : t('Rollover overspending'),- },- ]}- />- );++ const onMenuSelect = (name: string) => {+ switch (name) {+ case 'carryover':+ onCarryover?.(!carryover);+ break;+ default:+ throw new Error(`Unrecognized menu option: ${String(name)}`);+ }+ };++ const items: MenuItemObject<string>[] = [+ {+ name: 'carryover',+ text: carryover+ ? t('Remove overspending rollover')+ : t('Rollover overspending'),+ },+ ];++ return { items, onMenuSelect };+}++type BalanceMenuProps = Omit<+ ComponentPropsWithoutRef<typeof Menu>,+ 'onMenuSelect' | 'items'+> &+ BalanceMenuActions;++export function BalanceMenu({+ categoryId,+ onCarryover,+ ...props+}: BalanceMenuProps) {+ const { items, onMenuSelect } = useBalanceMenu({ categoryId, onCarryover });++ return <Menu {...props} onMenuSelect={onMenuSelect} items={items} />;}diff --git a/packages/desktop-client/src/components/budget/tracking/BudgetMenu.tsx b/packages/desktop-client/src/components/budget/tracking/BudgetMenu.tsxindex 44a7aebd41..b2da615db3 100644--- a/packages/desktop-client/src/components/budget/tracking/BudgetMenu.tsx+++ b/packages/desktop-client/src/components/budget/tracking/BudgetMenu.tsx@@ -3,27 +3,26 @@ import type { ComponentPropsWithoutRef } from 'react';import { useTranslation } from 'react-i18next';import { Menu } from '@actual-app/components/menu';+import type { MenuItemObject } from '@actual-app/components/menu';import { useFeatureFlag } from '#hooks/useFeatureFlag';-type BudgetMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {+export type BudgetMenuActions = {onCopyLastMonthAverage: () => void;onSetMonthsAverage: (numberOfMonths: number) => void;onApplyBudgetTemplate: () => void;onCopyUntilYearEnd: () => void;};-export function BudgetMenu({++export function useBudgetMenu({onCopyLastMonthAverage,onSetMonthsAverage,onApplyBudgetTemplate,onCopyUntilYearEnd,- ...props-}: BudgetMenuProps) {+}: BudgetMenuActions) {const { t } = useTranslation();const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');+const onMenuSelect = (name: string) => {switch (name) {case 'copy-single-last':@@ -49,40 +48,59 @@ export function BudgetMenu({}};- return (- <Menu- {...props}- onMenuSelect={onMenuSelect}- items={[- {- name: 'copy-single-last',- text: t("Copy last month's budget"),- },- {- name: 'set-single-3-avg',- text: t('Set to 3 month average'),- },- {- name: 'set-single-6-avg',- text: t('Set to 6 month average'),- },- {- name: 'set-single-12-avg',- text: t('Set to yearly average'),- },- {- name: 'copy-until-year-end',- text: t('Copy until year end'),- },- ...(isGoalTemplatesEnabled- ? [- {- name: 'apply-single-category-template',- text: t('Overwrite with template'),- },- ]- : []),- ]}- />- );+ const items: MenuItemObject<string>[] = [+ {+ name: 'copy-single-last',+ text: t("Copy last month's budget"),+ },+ {+ name: 'set-single-3-avg',+ text: t('Set to 3 month average'),+ },+ {+ name: 'set-single-6-avg',+ text: t('Set to 6 month average'),+ },+ {+ name: 'set-single-12-avg',+ text: t('Set to yearly average'),+ },+ {+ name: 'copy-until-year-end',+ text: t('Copy until year end'),+ },+ ...(isGoalTemplatesEnabled+ ? [+ {+ name: 'apply-single-category-template',+ text: t('Overwrite with template'),+ },+ ]+ : []),+ ];++ return { items, onMenuSelect };+}++type BudgetMenuProps = Omit<+ ComponentPropsWithoutRef<typeof Menu>,+ 'onMenuSelect' | 'items'+> &+ BudgetMenuActions;++export function BudgetMenu({+ onCopyLastMonthAverage,+ onSetMonthsAverage,+ onApplyBudgetTemplate,+ onCopyUntilYearEnd,+ ...props+}: BudgetMenuProps) {+ const { items, onMenuSelect } = useBudgetMenu({+ onCopyLastMonthAverage,+ onSetMonthsAverage,+ onApplyBudgetTemplate,+ onCopyUntilYearEnd,+ });++ return <Menu {...props} onMenuSelect={onMenuSelect} items={items} />;}diff --git a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetMonthMenu.tsx b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetMonthMenu.tsxindex 2cfa8d0af9..23e56b870a 100644--- a/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetMonthMenu.tsx+++ b/packages/desktop-client/src/components/budget/tracking/budgetsummary/BudgetMonthMenu.tsx@@ -3,13 +3,11 @@ import type { ComponentPropsWithoutRef } from 'react';import { useTranslation } from 'react-i18next';import { Menu } from '@actual-app/components/menu';+import type { MenuItemObject } from '@actual-app/components/menu';import { useFeatureFlag } from '#hooks/useFeatureFlag';-type BudgetMonthMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {+export type BudgetMonthMenuActions = {onCopyLastMonthBudget: () => void;onSetBudgetsToZero: () => void;onSetMonthsAverage: (numberOfMonths: number) => void;@@ -18,6 +16,90 @@ type BudgetMonthMenuProps = Omit<onOverwriteWithBudgetTemplates: () => void;};+export function useBudgetMonthMenu({+ onCopyLastMonthBudget,+ onSetBudgetsToZero,+ onSetMonthsAverage,+ onCheckTemplates,+ onApplyBudgetTemplates,+ onOverwriteWithBudgetTemplates,+}: BudgetMonthMenuActions) {+ const { t } = useTranslation();+ const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');++ const onMenuSelect = (name: string) => {+ switch (name) {+ case 'copy-last':+ onCopyLastMonthBudget();+ break;+ case 'set-zero':+ onSetBudgetsToZero();+ break;+ case 'set-3-avg':+ onSetMonthsAverage(3);+ break;+ case 'set-6-avg':+ onSetMonthsAverage(6);+ break;+ case 'set-12-avg':+ onSetMonthsAverage(12);+ break;+ case 'check-templates':+ onCheckTemplates();+ break;+ case 'apply-goal-template':+ onApplyBudgetTemplates();+ break;+ case 'overwrite-goal-template':+ onOverwriteWithBudgetTemplates();+ break;+ default:+ throw new Error(`Unrecognized menu option: ${name}`);+ }+ };++ const items: MenuItemObject<string>[] = [+ { name: 'copy-last', text: t("Copy last month's budget") },+ { name: 'set-zero', text: t('Set budgets to zero') },+ {+ name: 'set-3-avg',+ text: t('Set budgets to 3 month average'),+ },+ {+ name: 'set-6-avg',+ text: t('Set budgets to 6 month average'),+ },+ {+ name: 'set-12-avg',+ text: t('Set budgets to 12 month average'),+ },+ ...(isGoalTemplatesEnabled+ ? [+ {+ name: 'check-templates',+ text: t('Check templates'),+ },+ {+ name: 'apply-goal-template',+ text: t('Apply budget template'),+ },+ {+ name: 'overwrite-goal-template',+ text: t('Overwrite with budget template'),+ },+ ]+ : []),+ ];++ return { items, onMenuSelect };+}++type BudgetMonthMenuProps = Omit<+ ComponentPropsWithoutRef<typeof Menu>,+ 'onMenuSelect' | 'items'+> &+ BudgetMonthMenuActions;+export function BudgetMonthMenu({onCopyLastMonthBudget,onSetBudgetsToZero,@@ -27,73 +109,14 @@ export function BudgetMonthMenu({onOverwriteWithBudgetTemplates,...props}: BudgetMonthMenuProps) {- const { t } = useTranslation();- const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');- return (- <Menu- {...props}- onMenuSelect={name => {- switch (name) {- case 'copy-last':- onCopyLastMonthBudget();- break;- case 'set-zero':- onSetBudgetsToZero();- break;- case 'set-3-avg':- onSetMonthsAverage(3);- break;- case 'set-6-avg':- onSetMonthsAverage(6);- break;- case 'set-12-avg':- onSetMonthsAverage(12);- break;- case 'check-templates':- onCheckTemplates();- break;- case 'apply-goal-template':- onApplyBudgetTemplates();- break;- case 'overwrite-goal-template':- onOverwriteWithBudgetTemplates();- break;- default:- throw new Error(`Unrecognized menu option: ${name}`);- }- }}- items={[- { name: 'copy-last', text: t("Copy last month's budget") },- { name: 'set-zero', text: t('Set budgets to zero') },- {- name: 'set-3-avg',- text: t('Set budgets to 3 month average'),- },- {- name: 'set-6-avg',- text: t('Set budgets to 6 month average'),- },- {- name: 'set-12-avg',- text: t('Set budgets to 12 month average'),- },- ...(isGoalTemplatesEnabled- ? [- {- name: 'check-templates',- text: t('Check templates'),- },- {- name: 'apply-goal-template',- text: t('Apply budget template'),- },- {- name: 'overwrite-goal-template',- text: t('Overwrite with budget template'),- },- ]- : []),- ]}- />- );+ const { items, onMenuSelect } = useBudgetMonthMenu({+ onCopyLastMonthBudget,+ onSetBudgetsToZero,+ onSetMonthsAverage,+ onCheckTemplates,+ onApplyBudgetTemplates,+ onOverwriteWithBudgetTemplates,+ });++ return <Menu {...props} onMenuSelect={onMenuSelect} items={items} />;}diff --git a/packages/desktop-client/src/components/common/Modal.tsx b/packages/desktop-client/src/components/common/Modal.tsxindex 89ff08b49a..b0fd615a98 100644--- a/packages/desktop-client/src/components/common/Modal.tsx+++ b/packages/desktop-client/src/components/common/Modal.tsx@@ -24,17 +24,71 @@ import { styles } from '@actual-app/components/styles';import { Text } from '@actual-app/components/text';import { TextOneLine } from '@actual-app/components/text-one-line';import { theme } from '@actual-app/components/theme';-import { tokens } from '@actual-app/components/tokens';+import { radius, spacing, tokens } from '@actual-app/components/tokens';import { View } from '@actual-app/components/view';-import { css } from '@emotion/css';+import { css, keyframes } from '@emotion/css';import { AutoTextSize } from 'auto-text-size';import { FeatureErrorFallback } from '#components/FeatureErrorFallback';import { useModalState } from '#hooks/useModalState';+import { useReducedMotion } from '#hooks/useReducedMotion';+import { useSwipeToDismiss } from '#hooks/useSwipeToDismiss';+import { collapseModals } from '#modals/modalsSlice';+import { useDispatch } from '#redux';export const MODAL_Z_INDEX = 3000;+const mobileSheetContainerStyle: CSSProperties = {+ minWidth: '100%',+ maxWidth: '100%',+ borderRadius: `${radius.sheet}px ${radius.sheet}px 0 0`,+ ...styles.shadowSheet,+};++const SHEET_EXIT_MS = 180;++const sheetSlideIn = keyframes({+ from: { transform: 'translateY(100%)' },+ to: { transform: 'translateY(0)' },+});++const sheetSlideOut = keyframes({+ to: { transform: 'translateY(100%)' },+});++const overlayFadeIn = keyframes({ from: { opacity: 0 }, to: { opacity: 1 } });+const overlayFadeOut = keyframes({ from: { opacity: 1 }, to: { opacity: 0 } });++const mobileSheetModalClassName = css({+ '&[data-entering]': {+ animation: `${sheetSlideIn} 240ms cubic-bezier(0.22, 1, 0.36, 1)`,+ },+ '&[data-exiting]': {+ animation: `${sheetSlideOut} ${SHEET_EXIT_MS}ms ease-in forwards`,+ },+});++const mobileSheetOverlayClassName = css({+ '&[data-entering]': { animation: `${overlayFadeIn} 180ms ease-out` },+ '&[data-exiting]': {+ animation: `${overlayFadeOut} ${SHEET_EXIT_MS}ms ease-in forwards`,+ },+});++const mobileSheetHandleStyle: CSSProperties = {+ width: 36,+ height: 4,+ borderRadius: radius.pill,+ backgroundColor: theme.pageTextSubdued,+ alignSelf: 'center',+ marginTop: spacing.sm,+ marginBottom: spacing.sm,+ flexShrink: 0,+};+type ModalProps = ComponentPropsWithRef<typeof ReactAriaModal> & {+ presentation?: 'dialog' | 'sheet';+ ariaLabelledBy?: string;name: string;isLoading?: boolean;noAnimation?: boolean;@@ -57,10 +111,13 @@ export const Modal = ({onClose,wrapperProps,containerProps,+ presentation = 'dialog',+ ariaLabelledBy,...props}: ModalProps) => {const { t } = useTranslation();const { isNarrowWidth } = useResponsive();+ const isSheet = presentation === 'sheet' && isNarrowWidth;const { enableScope, disableScope } = useHotkeysContext();// This deactivates any key handlers in the "app" scope@@ -70,19 +127,62 @@ export const Modal = ({}, [enableScope, disableScope, name]);const { isHidden, isActive, onClose: closeModal } = useModalState();+ const dispatch = useDispatch();+ const prefersReducedMotion = useReducedMotion();+ const isAnimatedSheet = isSheet && !prefersReducedMotion;+ const [isOpen, setIsOpen] = useState(true);+ const isClosingRef = useRef(false);+ const closeTimerRef = useRef<ReturnType<typeof setTimeout> | null>(null);++ useEffect(() => {+ return () => {+ if (closeTimerRef.current) {+ clearTimeout(closeTimerRef.current);+ }+ };+ }, []);const handleOnClose = () => {- closeModal();- onClose?.();+ if (isClosingRef.current) {+ return;+ }+ isClosingRef.current = true;+ const finishClose = () => {+ if (isSheet) {+ dispatch(collapseModals({ rootModalName: name }));+ } else {+ closeModal();+ }+ onClose?.();+ };+ if (isAnimatedSheet) {+ closeTimerRef.current = setTimeout(finishClose, SHEET_EXIT_MS);+ return;+ }+ finishClose();};+ const sheetRef = useSwipeToDismiss({+ isEnabled: isSheet,+ onDismiss: () => {+ setIsOpen(false);+ handleOnClose();+ },+ });+return (<ErrorBoundary FallbackComponent={FeatureErrorFallback}><ReactAriaModalOverlaydata-testid={`${name}-modal`}+ className={isAnimatedSheet ? mobileSheetOverlayClassName : undefined}isDismissable- defaultOpen- onOpenChange={isOpen => !isOpen && handleOnClose?.()}+ isOpen={isOpen}+ onOpenChange={nextIsOpen => {+ setIsOpen(nextIsOpen);+ if (!nextIsOpen) {+ handleOnClose();+ }+ }}style={{position: 'fixed',inset: 0,@@ -104,30 +204,35 @@ export const Modal = ({<Viewstyle={{display: 'flex',- alignItems: 'center',- justifyContent: 'center',+ ...(isSheet+ ? { alignItems: 'stretch', justifyContent: 'flex-end' }+ : { alignItems: 'center', justifyContent: 'center' }),height: 'var(--visual-viewport-height)',overflowY: 'auto',...wrapperProps?.style,}}>- <ReactAriaModal>+ <ReactAriaModal+ ref={sheetRef}+ className={isAnimatedSheet ? mobileSheetModalClassName : undefined}+ >{modalProps => (<Dialog- aria-label={t('Modal dialog')}+ aria-label={ariaLabelledBy ? undefined : t('Modal dialog')}+ aria-labelledby={ariaLabelledBy}className={css(styles.lightScrollbar)}style={{outline: 'none', // remove focus outline}}><ModalContentContainer- noAnimation={noAnimation}+ noAnimation={noAnimation || isSheet}isActive={isActive(name)}{...containerProps}style={{flex: 1,padding: 10,- willChange: 'opacity, transform',+ willChange: isSheet ? undefined : 'opacity, transform',maxWidth: '90vw',minWidth: '90vw',maxHeight: 'calc(var(--visual-viewport-height) * 0.9)',@@ -142,9 +247,11 @@ export const Modal = ({},overflowY: 'auto',...styles.shadowLarge,+ ...(isSheet && mobileSheetContainerStyle),...containerProps?.style,}}>+ {isSheet && <View style={mobileSheetHandleStyle} />}<View style={{ paddingTop: 0, flex: 1, flexShrink: 0 }}><ErrorBoundary FallbackComponent={FeatureErrorFallback}>{typeof children === 'function'@@ -222,7 +329,7 @@ const ModalContentContainer = ({if (!mounted.current) {if (noAnimation) {contentRef.current.style.opacity = '1';- contentRef.current.style.transform = 'translateY(0px) scale(1)';+ contentRef.current.style.transform = 'none';setTimeout(() => {if (contentRef.current) {diff --git a/packages/desktop-client/src/components/mobile/MobileSheet.tsx b/packages/desktop-client/src/components/mobile/MobileSheet.tsxnew file mode 100644index 0000000000..6495e46b33--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheet.tsx@@ -0,0 +1,194 @@+import { useId, useRef, useState } from 'react';+import type { KeyboardEvent, ReactNode } from 'react';+import { useTranslation } from 'react-i18next';++import { useResponsive } from '@actual-app/components/hooks/useResponsive';+import { Input } from '@actual-app/components/input';+import { styles } from '@actual-app/components/styles';+import type { CSSProperties } from '@actual-app/components/styles';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';++import {+ Modal,+ ModalCloseButton,+ ModalHeader,+ ModalTitle,+} from '#components/common/Modal';+import type { Modal as ModalType } from '#modals/modalsSlice';++const SHEET_MAX_HEIGHT =+ 'min(660px, calc(var(--visual-viewport-height) * 0.9))';++const titleStyle: CSSProperties = {+ fontSize: 18,+ fontWeight: 600,+ color: theme.pageTextDark,+ textAlign: 'center',+};++type MobileSheetChildArgs = {+ close: () => void;+ editTitle: () => void;+ isEditingTitle: boolean;+};++type MobileSheetProps = {+ name: ModalType['name'];+ title: string;+ onTitleUpdate?: (newTitle: string) => string | undefined;+ isLoading?: boolean;+ wrapperStyle?: CSSProperties;+ onClose?: () => void;+ children: ReactNode | ((args: MobileSheetChildArgs) => ReactNode);+};++export function MobileSheet({+ name,+ title,+ onTitleUpdate,+ isLoading,+ wrapperStyle,+ onClose,+ children,+}: MobileSheetProps) {+ const { t } = useTranslation();+ const { isNarrowWidth } = useResponsive();+ const [isEditingTitle, setIsEditingTitle] = useState(false);+ const [titleError, setTitleError] = useState<string | null>(null);+ const ignoreBlurRef = useRef(false);+ const titleId = useId();++ const editTitle = () => {+ ignoreBlurRef.current = false;+ setTitleError(null);+ setIsEditingTitle(true);+ };++ const stopEditing = () => {+ ignoreBlurRef.current = true;+ setTitleError(null);+ setIsEditingTitle(false);+ };++ const commitTitle = (newTitle: string, isBlur: boolean) => {+ if (ignoreBlurRef.current) {+ return;+ }+ const trimmed = newTitle.trim();+ if (!trimmed || trimmed === title) {+ stopEditing();+ return;+ }+ const error = onTitleUpdate?.(trimmed);+ if (error && !isBlur) {+ setTitleError(error);+ return;+ }+ stopEditing();+ };++ const onTitleKeyDown = (event: KeyboardEvent<HTMLInputElement>) => {+ if (event.key === 'Escape') {+ event.stopPropagation();+ event.preventDefault();+ stopEditing();+ }+ };++ const renderChildren = (close: () => void) =>+ typeof children === 'function'+ ? children({ close, editTitle, isEditingTitle })+ : children;++ if (!isNarrowWidth) {+ return (+ <Modal name={name} isLoading={isLoading} onClose={onClose}>+ {({ state }) => (+ <>+ <ModalHeader+ title={<ModalTitle title={title} shrinkOnOverflow />}+ rightContent={<ModalCloseButton onPress={() => state.close()} />}+ />+ {renderChildren(() => state.close())}+ </>+ )}+ </Modal>+ );+ }++ return (+ <Modal+ name={name}+ ariaLabelledBy={titleId}+ presentation="sheet"+ isLoading={isLoading}+ onClose={onClose}+ wrapperProps={{ style: wrapperStyle }}+ containerProps={{+ style: {+ padding: 0,+ paddingBottom: 'env(safe-area-inset-bottom)',+ maxHeight: SHEET_MAX_HEIGHT,+ },+ }}+ >+ {({ state }) => (+ <>+ <View+ style={{+ alignItems: 'center',+ padding: `${spacing.xs}px ${spacing.lg}px ${spacing.sm}px`,+ flexShrink: 0,+ }}+ >+ {isEditingTitle ? (+ <View style={{ width: '100%', alignItems: 'center' }}>+ <Input+ id={titleId}+ aria-label={t('Name')}+ defaultValue={title}+ autoFocus+ onEnter={value => commitTitle(value, false)}+ onBlur={event => commitTitle(event.currentTarget.value, true)}+ onKeyDown={onTitleKeyDown}+ style={{ ...titleStyle, width: '100%' }}+ />+ {titleError && (+ <Text+ style={{+ ...styles.verySmallText,+ color: theme.errorText,+ textAlign: 'center',+ marginTop: spacing.xs,+ }}+ >+ {titleError}+ </Text>+ )}+ </View>+ ) : (+ <h2+ id={titleId}+ style={{+ ...titleStyle,+ ...styles.lineClamp(2),+ overflowWrap: 'anywhere',+ maxWidth: '100%',+ margin: 0,+ }}+ >+ {title}+ </h2>+ )}+ </View>+ <View style={{ flex: 1, minHeight: 0, overflowY: 'auto' }}>+ {renderChildren(() => state.close())}+ </View>+ </>+ )}+ </Modal>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetActions.tsx b/packages/desktop-client/src/components/mobile/MobileSheetActions.tsxnew file mode 100644index 0000000000..40da941246--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetActions.tsx@@ -0,0 +1,58 @@+import type { ReactNode } from 'react';+import { Trans } from 'react-i18next';++import { Button } from '@actual-app/components/button';+import { useResponsive } from '@actual-app/components/hooks/useResponsive';+import { styles } from '@actual-app/components/styles';+import { theme } from '@actual-app/components/theme';+import { radius, spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';++type MobileSheetActionsProps = {+ onCancel: () => void;+ onConfirm: () => void;+ confirmLabel: ReactNode;+ isDestructive?: boolean;+};++export function MobileSheetActions({+ onCancel,+ onConfirm,+ confirmLabel,+ isDestructive = false,+}: MobileSheetActionsProps) {+ const { isNarrowWidth } = useResponsive();+ const touchButtonStyle = isNarrowWidth+ ? { flex: 1, height: styles.mobileMinHeight, borderRadius: radius.sm }+ : {};++ return (+ <View+ style={{+ flexDirection: 'row',+ justifyContent: isNarrowWidth ? 'stretch' : 'flex-end',+ gap: spacing.sm,+ padding: isNarrowWidth ? spacing.lg : `${spacing.lg}px 0 0`,+ flexShrink: 0,+ }}+ >+ <Button variant="normal" onPress={onCancel} style={touchButtonStyle}>+ <Trans>Cancel</Trans>+ </Button>+ <Button+ variant="primary"+ onPress={onConfirm}+ style={{+ ...touchButtonStyle,+ ...(isNarrowWidth && { flex: 1.4 }),+ ...(isDestructive && {+ backgroundColor: theme.errorText,+ borderColor: theme.errorText,+ }),+ }}+ >+ {confirmLabel}+ </Button>+ </View>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetBalanceHeader.tsx b/packages/desktop-client/src/components/mobile/MobileSheetBalanceHeader.tsxnew file mode 100644index 0000000000..c1f465e54c--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetBalanceHeader.tsx@@ -0,0 +1,57 @@+import type { ComponentPropsWithoutRef, ReactNode } from 'react';++import { styles } from '@actual-app/components/styles';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';++import { BalanceWithCarryover } from '#components/budget/BalanceWithCarryover';+import { CellValueText } from '#components/spreadsheet/CellValue';++import { MobileSheetCarryoverIndicator } from './MobileSheetCarryoverIndicator';++type MobileSheetBalanceHeaderProps = {+ label: ReactNode;+} & Pick<+ ComponentPropsWithoutRef<typeof BalanceWithCarryover>,+ 'carryover' | 'balance' | 'goal' | 'budgeted' | 'longGoal'+>;++export function MobileSheetBalanceHeader({+ label,+ ...bindings+}: MobileSheetBalanceHeaderProps) {+ return (+ <View+ style={{+ justifyContent: 'center',+ alignItems: 'center',+ padding: `${spacing.xs}px ${spacing.md}px ${spacing.md}px`,+ }}+ >+ <Text+ style={{+ ...styles.smallText,+ color: theme.pageTextLight,+ marginBottom: spacing.xxs,+ }}+ >+ {label}+ </Text>+ <BalanceWithCarryover+ isDisabled+ shouldInlineGoalStatus+ CarryoverIndicator={MobileSheetCarryoverIndicator}+ {...bindings}+ >+ {props => (+ <CellValueText+ {...props}+ style={{ textAlign: 'center', ...styles.veryLargeText }}+ />+ )}+ </BalanceWithCarryover>+ </View>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetCarryoverIndicator.tsx b/packages/desktop-client/src/components/mobile/MobileSheetCarryoverIndicator.tsxnew file mode 100644index 0000000000..b888b20fac--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetCarryoverIndicator.tsx@@ -0,0 +1,23 @@+import type { CSSProperties } from '@actual-app/components/styles';++import { CarryoverIndicator } from '#components/budget/BalanceWithCarryover';++type MobileSheetCarryoverIndicatorProps = {+ style?: CSSProperties;+};++export function MobileSheetCarryoverIndicator({+ style,+}: MobileSheetCarryoverIndicatorProps) {+ return (+ <CarryoverIndicator+ style={{+ width: 15,+ height: 15,+ display: 'inline-flex',+ position: 'relative',+ ...style,+ }}+ />+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetCategoryPicker.tsx b/packages/desktop-client/src/components/mobile/MobileSheetCategoryPicker.tsxnew file mode 100644index 0000000000..e7cec7dcfc--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetCategoryPicker.tsx@@ -0,0 +1,45 @@+import { useTranslation } from 'react-i18next';++import type { CategoryGroupEntity } from '@actual-app/core/types/models';++import { pushModal } from '#modals/modalsSlice';+import { useDispatch } from '#redux';++import { MobileSheetPickerField } from './MobileSheetPickerField';++type MobileSheetCategoryPickerProps = {+ categoryGroups: CategoryGroupEntity[];+ valueName?: string;+ onSelect: (categoryId: string | null) => void;+};++export function MobileSheetCategoryPicker({+ categoryGroups,+ valueName,+ onSelect,+}: MobileSheetCategoryPickerProps) {+ const { t } = useTranslation();+ const dispatch = useDispatch();++ return (+ <MobileSheetPickerField+ label={t('Category')}+ placeholder={t('Select category...')}+ valueName={valueName}+ onPress={() =>+ dispatch(+ pushModal({+ modal: {+ name: 'category-autocomplete',+ options: {+ categoryGroups,+ showHiddenCategories: true,+ onSelect: categoryId => onSelect(categoryId),+ },+ },+ }),+ )+ }+ />+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetConfirm.tsx b/packages/desktop-client/src/components/mobile/MobileSheetConfirm.tsxnew file mode 100644index 0000000000..8ec442b134--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetConfirm.tsx@@ -0,0 +1,70 @@+import type { ReactNode } from 'react';++import { styles } from '@actual-app/components/styles';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';++import { MobileSheetActions } from './MobileSheetActions';++type MobileSheetConfirmProps = {+ message: ReactNode;+ detail?: ReactNode;+ error?: ReactNode;+ confirmLabel: ReactNode;+ isDestructive?: boolean;+ onCancel: () => void;+ onConfirm: () => void;+ children?: ReactNode;+};++export function MobileSheetConfirm({+ message,+ detail,+ error,+ confirmLabel,+ isDestructive = false,+ onCancel,+ onConfirm,+ children,+}: MobileSheetConfirmProps) {+ return (+ <View>+ <View+ style={{+ padding: `${spacing.sm}px ${spacing.lg}px 0`,+ gap: spacing.sm,+ }}+ >+ <Text+ style={{+ ...styles.mediumText,+ fontWeight: 600,+ color: theme.pageTextDark,+ overflowWrap: 'anywhere',+ }}+ >+ {message}+ </Text>+ {detail && (+ <Text style={{ ...styles.smallText, color: theme.pageTextLight }}>+ {detail}+ </Text>+ )}+ {children}+ {error && (+ <Text style={{ ...styles.smallText, color: theme.errorText }}>+ {error}+ </Text>+ )}+ </View>+ <MobileSheetActions+ onCancel={onCancel}+ onConfirm={onConfirm}+ confirmLabel={confirmLabel}+ isDestructive={isDestructive}+ />+ </View>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetDeleteConfirm.tsx b/packages/desktop-client/src/components/mobile/MobileSheetDeleteConfirm.tsxnew file mode 100644index 0000000000..d8c4057ecd--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetDeleteConfirm.tsx@@ -0,0 +1,58 @@+import { useTranslation } from 'react-i18next';++import type {+ CategoryEntity,+ CategoryGroupEntity,+} from '@actual-app/core/types/models';++import { CategoryDeleteMessage } from '#components/budget/CategoryDeleteMessage';+import type { useDeleteCategoryFlow } from '#hooks/useDeleteCategoryFlow';++import { MobileSheetCategoryPicker } from './MobileSheetCategoryPicker';+import { MobileSheetConfirm } from './MobileSheetConfirm';++type MobileSheetDeleteConfirmProps = {+ flow: ReturnType<typeof useDeleteCategoryFlow>;+ category?: CategoryEntity;+ group?: CategoryGroupEntity;+ transferGroups: CategoryGroupEntity[];+ transferName?: string;+};++export function MobileSheetDeleteConfirm({+ flow,+ category,+ group,+ transferGroups,+ transferName,+}: MobileSheetDeleteConfirmProps) {+ const { t } = useTranslation();+ const needsTransfer = flow.step === 'confirm-transfer';+ const name = (category ?? group)?.name ?? '';++ return (+ <MobileSheetConfirm+ message={t('Delete {{name}}?', { name })}+ detail={+ needsTransfer && (+ <CategoryDeleteMessage category={category} group={group} />+ )+ }+ error={+ flow.hasTransferError ? t('You must select a category') : undefined+ }+ confirmLabel={t('Delete')}+ isDestructive+ onCancel={flow.cancel}+ onConfirm={flow.confirm}+ >+ {needsTransfer && (+ <MobileSheetCategoryPicker+ categoryGroups={transferGroups}+ valueName={transferName}+ onSelect={flow.selectTransfer}+ />+ )}+ </MobileSheetConfirm>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetMenuRows.tsx b/packages/desktop-client/src/components/mobile/MobileSheetMenuRows.tsxnew file mode 100644index 0000000000..e5ff125e40--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetMenuRows.tsx@@ -0,0 +1,42 @@+import type { MenuItemObject } from '@actual-app/components/menu';+import { styles } from '@actual-app/components/styles';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';++import { MobileSheetRow } from './MobileSheetRow';++type MobileSheetMenuRowsProps = {+ items: MenuItemObject<string>[];+ onSelect: (name: string) => void;+};++export function MobileSheetMenuRows({+ items,+ onSelect,+}: MobileSheetMenuRowsProps) {+ return (+ <>+ {items.map(item =>+ item.disabled ? (+ <Text+ key={item.name}+ style={{+ ...styles.mediumText,+ color: theme.pageTextLight,+ padding: `${spacing.sm}px ${spacing.lg}px ${spacing.lg}px`,+ }}+ >+ {item.text}+ </Text>+ ) : (+ <MobileSheetRow+ key={item.name}+ label={item.text}+ onPress={() => onSelect(item.name)}+ />+ ),+ )}+ </>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetNotes.tsx b/packages/desktop-client/src/components/mobile/MobileSheetNotes.tsxnew file mode 100644index 0000000000..8b098a1708--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetNotes.tsx@@ -0,0 +1,67 @@+import { useLayoutEffect, useRef, useState } from 'react';+import type { UIEvent } from 'react';++import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';++import { Notes } from '#components/Notes';++const NOTES_MAX_HEIGHT = 120;+const SCROLL_SHADOW_HEIGHT = spacing.xl;++type MobileSheetNotesProps = {+ notes: string;+};++function hasContentBelow(element: HTMLDivElement) {+ return element.scrollHeight - element.scrollTop - element.clientHeight > 1;+}++export function MobileSheetNotes({ notes }: MobileSheetNotesProps) {+ const scrollRef = useRef<HTMLDivElement>(null);+ const [hasMoreBelow, setHasMoreBelow] = useState(false);++ useLayoutEffect(() => {+ if (scrollRef.current) {+ setHasMoreBelow(hasContentBelow(scrollRef.current));+ }+ }, [notes]);++ return (+ <View style={{ position: 'relative', flexShrink: 0 }}>+ <View+ innerRef={scrollRef}+ onScroll={(event: UIEvent<HTMLDivElement>) =>+ setHasMoreBelow(hasContentBelow(event.currentTarget))+ }+ style={{+ maxHeight: NOTES_MAX_HEIGHT,+ overflowY: 'auto',+ padding: `0 ${spacing.sm}px`,+ }}+ >+ <Notes+ notes={notes}+ editable={false}+ focused={false}+ getStyle={() => ({ borderRadius: 6, color: theme.pageText })}+ />+ </View>+ <View+ aria-hidden+ style={{+ position: 'absolute',+ left: 0,+ right: 0,+ bottom: 0,+ height: SCROLL_SHADOW_HEIGHT,+ pointerEvents: 'none',+ background: `linear-gradient(to bottom, transparent, ${theme.modalBackground})`,+ opacity: hasMoreBelow ? 1 : 0,+ transition: 'opacity 150ms ease',+ }}+ />+ </View>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetPickerField.tsx b/packages/desktop-client/src/components/mobile/MobileSheetPickerField.tsxnew file mode 100644index 0000000000..82696464be--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetPickerField.tsx@@ -0,0 +1,37 @@+import { Button } from '@actual-app/components/button';+import { styles } from '@actual-app/components/styles';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';++type MobileSheetPickerFieldProps = {+ label: string;+ placeholder: string;+ valueName?: string;+ onPress: () => void;+};++export function MobileSheetPickerField({+ label,+ placeholder,+ valueName,+ onPress,+}: MobileSheetPickerFieldProps) {+ return (+ <Button+ variant="normal"+ aria-label={label}+ aria-haspopup="dialog"+ onPress={onPress}+ style={{+ ...styles.mediumText,+ width: '100%',+ height: styles.mobileMinHeight,+ justifyContent: 'flex-start',+ fontWeight: 400,+ color: valueName ? theme.formInputText : theme.formInputTextPlaceholder,+ }}+ >+ <Text style={styles.ellipsisText}>{valueName || placeholder}</Text>+ </Button>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetRow.tsx b/packages/desktop-client/src/components/mobile/MobileSheetRow.tsxnew file mode 100644index 0000000000..45d62513e3--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetRow.tsx@@ -0,0 +1,38 @@+import type { ReactNode } from 'react';++import { Button } from '@actual-app/components/button';+import { styles } from '@actual-app/components/styles';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';++type MobileSheetRowProps = {+ label: ReactNode;+ onPress: () => void;+ isDestructive?: boolean;+};++export function MobileSheetRow({+ label,+ onPress,+ isDestructive = false,+}: MobileSheetRowProps) {+ return (+ <Button+ variant="bare"+ onPress={onPress}+ style={{+ ...styles.mediumText,+ width: '100%',+ minHeight: styles.mobileMinHeight,+ justifyContent: 'flex-start',+ padding: `${spacing.sm}px ${spacing.lg}px`,+ borderRadius: 0,+ borderTop: `1px solid ${theme.tooltipBorder}`,+ color: isDestructive ? theme.errorText : theme.pageText,+ }}+ >+ <Text style={{ ...styles.ellipsisText, textAlign: 'left' }}>{label}</Text>+ </Button>+ );+}diff --git a/packages/desktop-client/src/components/mobile/MobileSheetSection.tsx b/packages/desktop-client/src/components/mobile/MobileSheetSection.tsxnew file mode 100644index 0000000000..98dd9691a0--- /dev/null+++ b/packages/desktop-client/src/components/mobile/MobileSheetSection.tsx@@ -0,0 +1,49 @@+import { useId } from 'react';+import type { ReactNode } from 'react';++import { styles } from '@actual-app/components/styles';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';++type MobileSheetSectionProps = {+ title?: ReactNode;+ children: ReactNode;+};++export function MobileSheetSection({+ title,+ children,+}: MobileSheetSectionProps) {+ const titleId = useId();+ return (+ <section+ aria-labelledby={title ? titleId : undefined}+ style={{+ paddingTop: title ? 0 : spacing.sm,+ paddingBottom: spacing.sm,+ }}+ >+ {title && (+ <View+ style={{+ padding: `${spacing.md}px ${spacing.lg}px ${spacing.xs}px`,+ }}+ >+ <Text+ id={titleId}+ style={{+ ...styles.smallText,+ fontWeight: 600,+ color: theme.pageTextLight,+ }}+ >+ {title}+ </Text>+ </View>+ )}+ {children}+ </section>+ );+}diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountPage.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountPage.tsxindex cc435e1821..2c4f5591c0 100644--- a/packages/desktop-client/src/components/mobile/accounts/AccountPage.tsx+++ b/packages/desktop-client/src/components/mobile/accounts/AccountPage.tsx@@ -165,31 +165,6 @@ function AccountHeader({ account }: { readonly account: AccountEntity }) {);}, [account.id, dispatch, setSearchParams]);- const [showRunningBalances, setShowRunningBalances] = useSyncedPref(- `show-balances-${account.id}`,- );- const [hideReconciled, setHideReconciled] = useSyncedPref(- `hide-reconciled-${account.id}`,- );-- const onToggleRunningBalance = useCallback(() => {- setShowRunningBalances(showRunningBalances === 'true' ? 'false' : 'true');- dispatch(- collapseModals({- rootModalName: 'account-menu',- }),- );- }, [showRunningBalances, setShowRunningBalances, dispatch]);-- const onToggleReconciled = useCallback(() => {- setHideReconciled(hideReconciled === 'true' ? 'false' : 'true');- dispatch(- collapseModals({- rootModalName: 'account-menu',- }),- );- }, [hideReconciled, setHideReconciled, dispatch]);-const onClick = useCallback(() => {dispatch(pushModal({@@ -202,8 +177,6 @@ function AccountHeader({ account }: { readonly account: AccountEntity }) {onCloseAccount,onReopenAccount,onReconcile,- onToggleRunningBalance,- onToggleReconciled,},},}),@@ -216,8 +189,6 @@ function AccountHeader({ account }: { readonly account: AccountEntity }) {onReconcile,onReopenAccount,onSave,- onToggleRunningBalance,- onToggleReconciled,]);return (diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetMenuSheet.tsx b/packages/desktop-client/src/components/mobile/budget/BudgetMenuSheet.tsxnew file mode 100644index 0000000000..3ee3f090a0--- /dev/null+++ b/packages/desktop-client/src/components/mobile/budget/BudgetMenuSheet.tsx@@ -0,0 +1,115 @@+import { useState } from 'react';+import { Trans, useTranslation } from 'react-i18next';++import type { MenuItemObject } from '@actual-app/components/menu';+import { styles } from '@actual-app/components/styles';+import { Text } from '@actual-app/components/text';+import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';+import { amountToInteger, integerToAmount } from '@actual-app/core/shared/util';+import type { CategoryEntity, NoteEntity } from '@actual-app/core/types/models';++import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetMenuRows } from '#components/mobile/MobileSheetMenuRows';+import { MobileSheetNotes } from '#components/mobile/MobileSheetNotes';+import { MobileSheetRow } from '#components/mobile/MobileSheetRow';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';+import { AmountInput } from '#components/mobile/transactions/AmountInput';+import { CALCULATOR_KEYBOARD_HEIGHT } from '#components/mobile/transactions/CalculatorKeyboard';+import { useCategory } from '#hooks/useCategory';+import { useFeatureFlag } from '#hooks/useFeatureFlag';+import { useNotes } from '#hooks/useNotes';+import type { Modal as ModalType } from '#modals/modalsSlice';++type BudgetMenuSheetProps = {+ name: Extract<+ ModalType['name'],+ 'envelope-budget-menu' | 'tracking-budget-menu'+ >;+ categoryId: CategoryEntity['id'];+ month: string;+ budgeted: number;+ items: MenuItemObject<string>[];+ onMenuSelect: (name: string) => void;+ onUpdateBudget: (amount: number) => void;+ onEditNotes: (id: NoteEntity['id'], month: string) => void;+};++export function BudgetMenuSheet({+ name,+ categoryId,+ month,+ budgeted,+ items,+ onMenuSelect,+ onUpdateBudget,+ onEditNotes,+}: BudgetMenuSheetProps) {+ const { t } = useTranslation();+ const { data: category } = useCategory(categoryId);+ const isMobileCalculatorEnabled = useFeatureFlag('mobileCalculator');+ const [isCalculatorOpen, setIsCalculatorOpen] = useState(false);+ const notesId = `${categoryId}-${month}`;+ const notes = useNotes(notesId);++ if (!category) {+ return null;+ }++ return (+ <MobileSheet+ name={name}+ title={category.name}+ wrapperStyle={{+ paddingBottom: isCalculatorOpen ? CALCULATOR_KEYBOARD_HEIGHT : 0,+ }}+ >+ {({ close }) => (+ <>+ <View+ style={{+ justifyContent: 'center',+ alignItems: 'center',+ padding: `${spacing.xs}px ${spacing.md}px ${spacing.md}px`,+ }}+ >+ <Text+ style={{+ ...styles.smallText,+ color: theme.pageTextLight,+ marginBottom: spacing.xxs,+ }}+ >+ <Trans>Budgeted</Trans>+ </Text>+ <AmountInput+ value={integerToAmount(budgeted)}+ onEnter={close}+ onChange={amount => onUpdateBudget(amountToInteger(amount))}+ onFocus={() => setIsCalculatorOpen(isMobileCalculatorEnabled)}+ onBlur={() => setIsCalculatorOpen(false)}+ data-testid="budget-amount"+ variant="large"+ />+ </View>+ {notes && <MobileSheetNotes notes={notes} />}++ <MobileSheetSection>+ <MobileSheetRow+ label={t('Edit notes')}+ onPress={() => onEditNotes(notesId, month)}+ />+ <MobileSheetMenuRows+ items={items}+ onSelect={itemName => {+ onMenuSelect(itemName);+ close();+ }}+ />+ </MobileSheetSection>+ </>+ )}+ </MobileSheet>+ );+}diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetMonthMenuSheet.tsx b/packages/desktop-client/src/components/mobile/budget/BudgetMonthMenuSheet.tsxnew file mode 100644index 0000000000..59e767f0f8--- /dev/null+++ b/packages/desktop-client/src/components/mobile/budget/BudgetMonthMenuSheet.tsx@@ -0,0 +1,75 @@+import { useTranslation } from 'react-i18next';++import type { MenuItemObject } from '@actual-app/components/menu';+import * as monthUtils from '@actual-app/core/shared/months';+import type { NoteEntity } from '@actual-app/core/types/models';++import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetMenuRows } from '#components/mobile/MobileSheetMenuRows';+import { MobileSheetNotes } from '#components/mobile/MobileSheetNotes';+import { MobileSheetRow } from '#components/mobile/MobileSheetRow';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';+import { useLocale } from '#hooks/useLocale';+import { useNotes } from '#hooks/useNotes';+import { useUndo } from '#hooks/useUndo';+import type { Modal as ModalType } from '#modals/modalsSlice';++type BudgetMonthMenuSheetProps = {+ name: Extract<+ ModalType['name'],+ 'envelope-budget-month-menu' | 'tracking-budget-month-menu'+ >;+ month: string;+ items: MenuItemObject<string>[];+ onMenuSelect: (name: string) => void;+ undoMessages: Record<string, string>;+ onEditNotes: (id: NoteEntity['id']) => void;+};++export function BudgetMonthMenuSheet({+ name,+ month,+ items,+ onMenuSelect,+ undoMessages,+ onEditNotes,+}: BudgetMonthMenuSheetProps) {+ const { t } = useTranslation();+ const locale = useLocale();+ const notes = useNotes(`budget-${month}`);+ const { showUndoNotification } = useUndo();++ return (+ <MobileSheet+ name={name}+ title={monthUtils.format(month, "MMMM ''yy", locale)}+ >+ {({ close }) => (+ <>+ {notes && <MobileSheetNotes notes={notes} />}++ <MobileSheetSection title={t('Month')}>+ <MobileSheetRow+ label={t('Edit notes')}+ onPress={() => onEditNotes(month)}+ />+ </MobileSheetSection>++ <MobileSheetSection title={t('Budget')}>+ <MobileSheetMenuRows+ items={items}+ onSelect={itemName => {+ onMenuSelect(itemName);+ close();+ const message = undoMessages[itemName];+ if (message) {+ showUndoNotification({ message });+ }+ }}+ />+ </MobileSheetSection>+ </>+ )}+ </MobileSheet>+ );+}diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetPage.tsx b/packages/desktop-client/src/components/mobile/budget/BudgetPage.tsxindex 1b3acd8b02..073c102dfb 100644--- a/packages/desktop-client/src/components/mobile/budget/BudgetPage.tsx+++ b/packages/desktop-client/src/components/mobile/budget/BudgetPage.tsx@@ -236,25 +236,13 @@ export function BudgetPage() {);const onDeleteGroup = useCallback(- groupId => {+ (groupId, transferId) => {dispatch(collapseModals({ rootModalName: 'category-group-menu' }));- deleteCategoryGroup.mutate({ id: groupId });+ deleteCategoryGroup.mutate({ id: groupId, transferId });},[deleteCategoryGroup, dispatch],);- const onToggleGroupVisibility = useCallback(- groupId => {- const group = categoryGroups.find(g => g.id === groupId);- onSaveGroup({- ...group,- hidden: group.hidden ? false : true,- });- dispatch(collapseModals({ rootModalName: 'category-group-menu' }));- },- [categoryGroups, dispatch, onSaveGroup],- );-const onSaveCategory = useCallback(category => {saveCategory.mutate({ category });@@ -263,25 +251,13 @@ export function BudgetPage() {);const onDeleteCategory = useCallback(- categoryId => {+ (categoryId, transferId) => {dispatch(collapseModals({ rootModalName: 'category-menu' }));- deleteCategory.mutate({ id: categoryId });+ deleteCategory.mutate({ id: categoryId, transferId });},[deleteCategory, dispatch],);- const onToggleCategoryVisibility = useCallback(- categoryId => {- const category = categories.find(c => c.id === categoryId);- onSaveCategory({- ...category,- hidden: category.hidden ? false : true,- });- dispatch(collapseModals({ rootModalName: 'category-menu' }));- },- [categories, dispatch, onSaveCategory],- );-const onPrevMonth = useCallback(async () => {const month = monthUtils.subMonths(startMonth, 1);await prewarmMonth(budgetType, spreadsheet, month);@@ -396,7 +372,6 @@ export function BudgetPage() {onAddCategory: onOpenNewCategoryModal,onEditNotes: onOpenCategoryGroupNotesModal,onDelete: onDeleteGroup,- onToggleVisibility: onToggleGroupVisibility,onApplyBudgetTemplatesInGroup,onSortCategories: (groupId, direction) => {sortCategories.mutate({ groupId, direction });@@ -413,7 +388,6 @@ export function BudgetPage() {onOpenCategoryGroupNotesModal,onOpenNewCategoryModal,onSaveGroup,- onToggleGroupVisibility,onApplyBudgetTemplatesInGroup,sortCategories,],@@ -435,7 +409,6 @@ export function BudgetPage() {onSave: onSaveCategory,onEditNotes: onOpenCategoryNotesModal,onDelete: onDeleteCategory,- onToggleVisibility: onToggleCategoryVisibility,...(canEditAutomations && {onEditAutomations: (categoryId: string) => {dispatch(collapseModals({ rootModalName: 'category-menu' }));@@ -463,7 +436,6 @@ export function BudgetPage() {onDeleteCategory,onOpenCategoryNotesModal,onSaveCategory,- onToggleCategoryVisibility,startMonth,],);@@ -474,8 +446,7 @@ export function BudgetPage() {const onToggleHiddenCategories = useCallback(() => {setShowHiddenCategoriesPref(!showHiddenCategories);- dispatch(collapseModals({ rootModalName: 'budget-page-menu' }));- }, [dispatch, setShowHiddenCategoriesPref, showHiddenCategories]);+ }, [setShowHiddenCategoriesPref, showHiddenCategories]);const onOpenBudgetMonthNotesModal = useCallback(month => {diff --git a/packages/desktop-client/src/components/mobile/budget/CategoryGroupActionMenu.tsx b/packages/desktop-client/src/components/mobile/budget/CategoryGroupActionMenu.tsxdeleted file mode 100644index 82bb893cdd..0000000000--- a/packages/desktop-client/src/components/mobile/budget/CategoryGroupActionMenu.tsx+++ /dev/null@@ -1,46 +0,0 @@-import React from 'react';-import type { ComponentPropsWithoutRef } from 'react';-import { useTranslation } from 'react-i18next';--import { Menu } from '@actual-app/components/menu';--import { useFeatureFlag } from '#hooks/useFeatureFlag';--type CategoryGroupActionMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {- onApplyBudgetTemplatesInGroup: () => void;-};-export function CategoryGroupActionMenu({- onApplyBudgetTemplatesInGroup,- ...props-}: CategoryGroupActionMenuProps) {- const { t } = useTranslation();-- const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');- return (- <Menu- {...props}- onMenuSelect={name => {- switch (name) {- case 'apply-budget-templates-in-group':- onApplyBudgetTemplatesInGroup();- break;- default:- throw new Error(`Unrecognized menu option: ${name}`);- }- }}- items={[- ...(isGoalTemplatesEnabled- ? [- {- name: 'apply-budget-templates-in-group',- text: t('Overwrite with templates'),- },- ]- : []),- ]}- />- );-}diff --git a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsxindex 696f2839b7..30ccbfa1bf 100644--- a/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx+++ b/packages/desktop-client/src/components/mobile/budget/ExpenseCategoryListItem.tsx@@ -248,9 +248,8 @@ export function ExpenseCategoryListItem({category: category.id,flag: carryover,});- dispatch(collapseModals({ rootModalName: balanceMenuModalName }));},- [category, onBudgetAction, month, dispatch, balanceMenuModalName],+ [category, onBudgetAction, month],);const catBalance = useSheetValue<diff --git a/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx b/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsxindex 578018bccc..77409f5c68 100644--- a/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx+++ b/packages/desktop-client/src/components/mobile/budget/IncomeCategoryListItem.tsx@@ -14,7 +14,7 @@ import type { CategoryEntity } from '@actual-app/core/types/models';import { useNavigate } from '#hooks/useNavigate';import { useSyncedPref } from '#hooks/useSyncedPref';-import { collapseModals, pushModal } from '#modals/modalsSlice';+import { pushModal } from '#modals/modalsSlice';import { useDispatch } from '#redux';import { envelopeBudget, trackingBudget } from '#spreadsheet/bindings';@@ -204,9 +204,8 @@ export function IncomeCategoryListItem({category: category.id,flag: carryover,});- dispatch(collapseModals({ rootModalName: balanceMenuModalName }));},- [category, onBudgetAction, month, dispatch, balanceMenuModalName],+ [category, onBudgetAction, month],);const onOpenBalanceMenu = useCallback(() => {diff --git a/packages/desktop-client/src/components/mobile/budget/ToBudgetSheetActions.tsx b/packages/desktop-client/src/components/mobile/budget/ToBudgetSheetActions.tsxnew file mode 100644index 0000000000..7e9c8a5017--- /dev/null+++ b/packages/desktop-client/src/components/mobile/budget/ToBudgetSheetActions.tsx@@ -0,0 +1,14 @@+import { useToBudgetMenu } from '#components/budget/envelope/budgetsummary/ToBudgetMenu';+import type { ToBudgetMenuActions } from '#components/budget/envelope/budgetsummary/ToBudgetMenu';+import { MobileSheetMenuRows } from '#components/mobile/MobileSheetMenuRows';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';++export function ToBudgetSheetActions(props: ToBudgetMenuActions) {+ const { items, onMenuSelect } = useToBudgetMenu(props);++ return (+ <MobileSheetSection>+ <MobileSheetMenuRows items={items} onSelect={onMenuSelect} />+ </MobileSheetSection>+ );+}diff --git a/packages/desktop-client/src/components/mobile/transactions/CalculatorKeyboard.tsx b/packages/desktop-client/src/components/mobile/transactions/CalculatorKeyboard.tsxindex 5b972f5be3..8cbd0e6032 100644--- a/packages/desktop-client/src/components/mobile/transactions/CalculatorKeyboard.tsx+++ b/packages/desktop-client/src/components/mobile/transactions/CalculatorKeyboard.tsx@@ -9,6 +9,8 @@ import { View } from '@actual-app/components/view';import { CalculatorButtons } from '#components/common/CalculatorButtons';+export const CALCULATOR_KEYBOARD_HEIGHT = 'min(400px, max(320px, 50dvh))';+export const CalculatorKeyboard = memo(function CalculatorAmountInput({inputRef,header,diff --git a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx b/packages/desktop-client/src/components/modals/AccountMenuModal.tsxindex 6a107f0828..cbd0453f7c 100644--- a/packages/desktop-client/src/components/modals/AccountMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/AccountMenuModal.tsx@@ -1,28 +1,9 @@-import { Fragment, useRef, useState } from 'react';-import type { ComponentProps, CSSProperties } from 'react';-import { Trans, useTranslation } from 'react-i18next';+import { useTranslation } from 'react-i18next';-import { Button } from '@actual-app/components/button';-import {- SvgClose,- SvgDotsHorizontalTriple,- SvgLockOpen,-} from '@actual-app/components/icons/v1';-import { SvgLockClosed, SvgNotesPaper } from '@actual-app/components/icons/v2';-import { Menu } from '@actual-app/components/menu';-import { Popover } from '@actual-app/components/popover';-import { styles } from '@actual-app/components/styles';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';-import type { AccountEntity } from '@actual-app/core/types/models';--import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';-import { Notes } from '#components/Notes';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetNotes } from '#components/mobile/MobileSheetNotes';+import { MobileSheetRow } from '#components/mobile/MobileSheetRow';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';import { validateAccountName } from '#components/util/accountValidation';import { useAccount } from '#hooks/useAccount';import { useAccounts } from '#hooks/useAccounts';@@ -43,276 +24,90 @@ export function AccountMenuModal({onEditNotes,onClose,onReconcile,- onToggleRunningBalance,- onToggleReconciled,}: AccountMenuModalProps) {const { t } = useTranslation();const account = useAccount(accountId);const { data: accounts = [] } = useAccounts();- const originalNotes = useNotes(`account-${accountId}`);- const [accountNameError, setAccountNameError] = useState('');- const [currentAccountName, setCurrentAccountName] = useState(- account?.name || t('New Account'),+ const notes = useNotes(`account-${accountId}`);+ const [showBalances, setShowBalances] = useSyncedPref(+ `show-balances-${accountId}`,+ );+ const [hideReconciled, setHideReconciled] = useSyncedPref(+ `hide-reconciled-${accountId}`,);-- const onRename = (newName: string) => {- newName = newName.trim();- if (!account) {- return;- }- if (!newName) {- setCurrentAccountName(t('Account'));- } else {- setCurrentAccountName(newName);- }-- if (newName !== account.name) {- const renameAccountError = validateAccountName(- newName,- accountId,- accounts,- );- if (renameAccountError) {- setAccountNameError(renameAccountError);- } else {- setAccountNameError('');- onSave?.({- ...account,- name: newName,- });- }- }- };-- const _onEditNotes = () => {- if (!account) {- return;- }-- onEditNotes?.(account.id);- };-- const canReconcile = !!onReconcile;-- const buttonStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- color: theme.formLabelText,- // Adjust based on desired number of buttons per row.- flexBasis: canReconcile ? '48%' : '100%',- };if (!account) {return null;}+ const onRename = (newName: string) => {+ const error = validateAccountName(newName, accountId, accounts);+ if (error) {+ return error;+ }+ onSave?.({ ...account, name: newName });+ };+return (- <Modal+ <MobileSheetname="account-menu"+ title={account.name}+ onTitleUpdate={onRename}onClose={onClose}- containerProps={{- style: {- height: '45vh',- },- }}>- {({ state }) => (+ {({ editTitle, isEditingTitle }) => (<>- <ModalHeader- leftContent={- <AdditionalAccountMenu- account={account}- onClose={onCloseAccount}- onReopen={onReopenAccount}- onToggleRunningBalance={onToggleRunningBalance}- onToggleReconciled={onToggleReconciled}+ {notes && <MobileSheetNotes notes={notes} />}++ <MobileSheetSection>+ {!isEditingTitle && (+ <MobileSheetRow label={t('Rename')} onPress={editTitle} />+ )}+ <MobileSheetRow+ label={t('Edit notes')}+ onPress={() => onEditNotes?.(account.id)}+ />+ {onReconcile && (+ <MobileSheetRow+ label={t('Reconcile')}+ onPress={() => onReconcile()}/>- }- title={- <Fragment>- <ModalTitle- isEditable- title={currentAccountName}- onTitleUpdate={onRename}- />- {accountNameError && (- <View style={{ color: theme.warningText }}>- {accountNameError}- </View>- )}- </Fragment>- }- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <View- style={{- flex: 1,- flexDirection: 'column',- }}- >- <View- style={{- overflowY: 'auto',- flex: 1,+ )}+ <MobileSheetRow+ label={+ showBalances === 'true'+ ? t('Hide running balance')+ : t('Show running balance')+ }+ onPress={() => {+ setShowBalances(showBalances === 'true' ? 'false' : 'true');}}- >- <Notes- notes={- originalNotes && originalNotes.length > 0- ? originalNotes- : t('No notes')- }- editable={false}- focused={false}- getStyle={() => ({- borderRadius: 6,- ...((!originalNotes || originalNotes.length === 0) && {- justifySelf: 'center',- alignSelf: 'center',- color: theme.pageTextSubdued,- }),- })}- />- </View>- <View- style={{- flexDirection: 'row',- flexWrap: 'wrap',- justifyContent: 'space-between',- alignContent: 'space-between',- paddingTop: 10,+ />+ <MobileSheetRow+ label={+ hideReconciled !== 'true'+ ? t('Hide reconciled transactions')+ : t('Show reconciled transactions')+ }+ onPress={() => {+ setHideReconciled(hideReconciled === 'true' ? 'false' : 'true');}}- >- <Button style={buttonStyle} onPress={_onEditNotes}>- <SvgNotesPaper- width={20}- height={20}- style={{ paddingRight: 5 }}- />- <Trans>Edit notes</Trans>- </Button>- {canReconcile && (- <Button style={buttonStyle} onPress={() => onReconcile?.()}>- <SvgLockClosed- width={20}- height={20}- style={{ paddingRight: 5 }}- />- <Trans>Reconcile</Trans>- </Button>- )}- </View>- </View>+ />+ {account.closed ? (+ <MobileSheetRow+ label={t('Reopen account')}+ onPress={() => onReopenAccount?.(account.id)}+ />+ ) : (+ <MobileSheetRow+ label={t('Close account')}+ isDestructive+ onPress={() => onCloseAccount?.(account.id)}+ />+ )}+ </MobileSheetSection></>)}- </Modal>- );-}--type AdditionalAccountMenuProps = {- account: AccountEntity;- onClose?: (accountId: string) => void;- onReopen?: (accountId: string) => void;- onToggleRunningBalance?: () => void;- onToggleReconciled?: () => void;-};--function AdditionalAccountMenu({- account,- onClose,- onReopen,- onToggleRunningBalance,- onToggleReconciled,-}: AdditionalAccountMenuProps) {- const { t } = useTranslation();- const triggerRef = useRef(null);- const [menuOpen, setMenuOpen] = useState(false);- const itemStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- };-- const getItemStyle: ComponentProps<typeof Menu>['getItemStyle'] = item => ({- ...itemStyle,- ...(item.name === 'close' && { color: theme.errorTextMenu }),- });- const [showBalances] = useSyncedPref(`show-balances-${account.id}`);- const [hideReconciled] = useSyncedPref(`hide-reconciled-${account.id}`);-- return (- <View>- <Button- ref={triggerRef}- variant="bare"- aria-label={t('Menu')}- onPress={() => {- setMenuOpen(true);- }}- >- <SvgDotsHorizontalTriple- width={17}- height={17}- style={{ color: 'currentColor' }}- />- <Popover- triggerRef={triggerRef}- isOpen={menuOpen}- placement="bottom start"- onOpenChange={() => setMenuOpen(false)}- >- <Menu- getItemStyle={getItemStyle}- items={[- {- name: 'balance',- text:- showBalances === 'true'- ? t('Hide running balance')- : t('Show running balance'),- },- {- name: 'toggle-reconciled',- text:- hideReconciled !== 'true'- ? t('Hide reconciled transactions')- : t('Show reconciled transactions'),- },- account.closed- ? {- name: 'reopen',- text: t('Reopen account'),- icon: SvgLockOpen,- iconSize: 15,- }- : {- name: 'close',- text: t('Close account'),- icon: SvgClose,- iconSize: 15,- },- ]}- onMenuSelect={name => {- setMenuOpen(false);- switch (name) {- case 'close':- onClose?.(account.id);- break;- case 'reopen':- onReopen?.(account.id);- break;- case 'balance':- onToggleRunningBalance?.();- break;- case 'toggle-reconciled':- onToggleReconciled?.();- break;- default:- throw new Error(`Unrecognized menu option: ${String(name)}`);- }- }}- />- </Popover>- </Button>- </View>+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/BudgetPageMenuModal.tsx b/packages/desktop-client/src/components/modals/BudgetPageMenuModal.tsxindex bb61419ecf..96308b0eec 100644--- a/packages/desktop-client/src/components/modals/BudgetPageMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/BudgetPageMenuModal.tsx@@ -1,12 +1,7 @@-import React from 'react';-import type { ComponentPropsWithoutRef, CSSProperties } from 'react';import { useTranslation } from 'react-i18next';-import { Menu } from '@actual-app/components/menu';-import { styles } from '@actual-app/components/styles';-import { theme } from '@actual-app/components/theme';--import { Modal, ModalCloseButton, ModalHeader } from '#components/common/Modal';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetRow } from '#components/mobile/MobileSheetRow';import { useLocalPref } from '#hooks/useLocalPref';import type { Modal as ModalType } from '#modals/modalsSlice';@@ -20,88 +15,34 @@ export function BudgetPageMenuModal({onToggleHiddenCategories,onSwitchBudgetFile,}: BudgetPageMenuModalProps) {- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };+ const { t } = useTranslation();+ const [showHiddenCategories] = useLocalPref('budget.showHiddenCategories');return (- <Modal name="budget-page-menu">- {({ state }) => (+ <MobileSheet name="budget-page-menu" title={t('Budget')}>+ {({ close }) => (<>- <ModalHeader- showLogo- rightContent={<ModalCloseButton onPress={() => state.close()} />}+ <MobileSheetRow+ label={t('Add category group')}+ onPress={onAddCategoryGroup}+ />+ <MobileSheetRow+ label={+ showHiddenCategories+ ? t('Hide hidden categories')+ : t('Show hidden categories')+ }+ onPress={onToggleHiddenCategories}/>- <BudgetPageMenu- getItemStyle={() => defaultMenuItemStyle}- onAddCategoryGroup={onAddCategoryGroup}- onToggleHiddenCategories={onToggleHiddenCategories}- onSwitchBudgetFile={onSwitchBudgetFile}+ <MobileSheetRow+ label={t('Switch budget file')}+ onPress={() => {+ close();+ onSwitchBudgetFile();+ }}/></>)}- </Modal>- );-}--type BudgetPageMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {- onAddCategoryGroup: () => void;- onToggleHiddenCategories: () => void;- onSwitchBudgetFile: () => void;-};--function BudgetPageMenu({- onAddCategoryGroup,- onToggleHiddenCategories,- onSwitchBudgetFile,- ...props-}: BudgetPageMenuProps) {- const [showHiddenCategories] = useLocalPref('budget.showHiddenCategories');-- const onMenuSelect = (name: string) => {- switch (name) {- case 'add-category-group':- onAddCategoryGroup?.();- break;- // case 'edit-mode':- // onEditMode?.(true);- // break;- case 'toggle-hidden-categories':- onToggleHiddenCategories?.();- break;- case 'switch-budget-file':- onSwitchBudgetFile?.();- break;- default:- throw new Error(`Unrecognized menu item: ${name}`);- }- };- const { t } = useTranslation();-- return (- <Menu- {...props}- onMenuSelect={onMenuSelect}- items={[- {- name: 'add-category-group',- text: t('Add category group'),- },- {- name: 'toggle-hidden-categories',- text: `${!showHiddenCategories ? t('Show hidden categories') : t('Hide hidden categories')}`,- },- {- name: 'switch-budget-file',- text: t('Switch budget file'),- },- ]}- />+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsxindex 9781407b70..322baa61e6 100644--- a/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/CategoryGroupMenuModal.tsx@@ -1,38 +1,13 @@-// @ts-strict-ignore-import React, { useRef, useState } from 'react';-import type { ComponentProps } from 'react';-import { Trans, useTranslation } from 'react-i18next';+import { useTranslation } from 'react-i18next';-import { Button } from '@actual-app/components/button';-import {- SvgAdd,- SvgCheveronDown,- SvgCheveronUp,- SvgDotsHorizontalTriple,- SvgTrash,-} from '@actual-app/components/icons/v1';-import {- SvgNotesPaper,- SvgViewHide,- SvgViewShow,-} from '@actual-app/components/icons/v2';-import { Menu } from '@actual-app/components/menu';-import { Popover } from '@actual-app/components/popover';-import { styles } from '@actual-app/components/styles';-import type { CSSProperties } from '@actual-app/components/styles';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';-import { css } from '@emotion/css';--import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';-import { CategoryGroupActionMenu } from '#components/mobile/budget/CategoryGroupActionMenu';-import { Notes } from '#components/Notes';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetDeleteConfirm } from '#components/mobile/MobileSheetDeleteConfirm';+import { MobileSheetNotes } from '#components/mobile/MobileSheetNotes';+import { MobileSheetRow } from '#components/mobile/MobileSheetRow';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';import { useCategories } from '#hooks/useCategories';+import { useCategoryGroup } from '#hooks/useCategoryGroup';+import { useDeleteCategoryFlow } from '#hooks/useDeleteCategoryFlow';import { useFeatureFlag } from '#hooks/useFeatureFlag';import { useNotes } from '#hooks/useNotes';import { useUndo } from '#hooks/useUndo';@@ -49,310 +24,131 @@ export function CategoryGroupMenuModal({onAddCategory,onEditNotes,onDelete,- onToggleVisibility,onClose,onApplyBudgetTemplatesInGroup,onSortCategories,}: CategoryGroupMenuModalProps) {- const [showMore, setShowMore] = useState(false);- const { data: { grouped: categoryGroups } = { grouped: [] } } =- useCategories();- const group = categoryGroups.find(g => g.id === groupId);- const notes = useNotes(group.id);+ const { t } = useTranslation();+ const { data: group } = useCategoryGroup(groupId);+ const {+ data: { grouped: categoryGroups, list: allCategories } = {+ grouped: [],+ list: [],+ },+ } = useCategories();+ const notes = useNotes(groupId);const { showUndoNotification } = useUndo();const isGoalTemplatesEnabled = useFeatureFlag('goalTemplatesEnabled');- const { t } = useTranslation();-- const onRename = newName => {- if (newName && newName !== group.name) {- onSave?.({- ...group,- name: newName,- });- }- };-- const onShowMore = () => {- setShowMore(!showMore);- };-- const _onAddCategory = () => {- onAddCategory?.(group.id, group.is_income);- };-- const _onEditNotes = () => {- onEditNotes?.(group.id);- };-- const _onDelete = () => {- onDelete?.(group.id);- };-- const _onToggleVisibility = () => {- onToggleVisibility?.(group.id);- };-- const _onApplyBudgetTemplatesInGroup = () => {- onApplyBudgetTemplatesInGroup?.(- group.categories.filter(c => !c.hidden).map(c => c.id),- );- };-- const hasMultipleCategories = (group.categories?.length ?? 0) > 1;-- const _onSortAsc = () => onSortCategories?.(group.id, 'asc');- const _onSortDesc = () => onSortCategories?.(group.id, 'desc');-- const buttonStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- color: theme.formLabelText,- // Adjust based on desired number of buttons per row.- flexBasis: '48%',- marginLeft: '1%',- marginRight: '1%',- };+ const categories = group?.categories ?? [];+ const deleteFlow = useDeleteCategoryFlow({+ categoryIds: categories.map(c => c.id),+ onDelete: transferCategoryId => onDelete(groupId, transferCategoryId),+ });- const actionButtonStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- color: theme.formLabelText,- // Adjust based on desired number of buttons per row.- flexBasis: '100%',- };+ if (!group) {+ return null;+ }- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- height: styles.mobileMinHeight,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };+ const hasMultipleCategories = categories.length > 1;+ const hasBudgetSection = isGoalTemplatesEnabled || hasMultipleCategories;+ const isIncome = Boolean(group.is_income);+ const transferGroups = categoryGroups.filter(+ g => g.id !== group.id && Boolean(g.is_income) === isIncome,+ );+ const transferName = allCategories.find(+ c => c.id === deleteFlow.transferId,+ )?.name;return (- <Modal+ <MobileSheetname="category-group-menu"- onClose={onClose}- containerProps={{- style: {- height: '45vh',- },+ title={group.name}+ onTitleUpdate={newName => {+ onSave({ ...group, name: newName });+ return undefined;}}+ onClose={onClose}>- {({ state }) => (- <>- <ModalHeader- leftContent={- <AdditionalCategoryGroupMenu- group={group}- onDelete={_onDelete}- onToggleVisibility={_onToggleVisibility}- onSortAsc={hasMultipleCategories ? _onSortAsc : undefined}- onSortDesc={hasMultipleCategories ? _onSortDesc : undefined}- onClose={() => state.close()}- />- }- title={- <ModalTitle- isEditable- title={group.name}- onTitleUpdate={onRename}- />- }- rightContent={<ModalCloseButton onPress={() => state.close()} />}+ {({ close, editTitle, isEditingTitle }) =>+ deleteFlow.step ? (+ <MobileSheetDeleteConfirm+ flow={deleteFlow}+ group={group}+ transferGroups={transferGroups}+ transferName={transferName}/>- <View- style={{- flex: 1,- flexDirection: 'column',- }}- >- <View- style={{- overflowY: 'auto',- flex: 1,- }}+ ) : (+ <>+ {notes && <MobileSheetNotes notes={notes} />}++ {hasBudgetSection && (+ <MobileSheetSection title={t('Budget')}>+ {isGoalTemplatesEnabled && (+ <MobileSheetRow+ label={t('Overwrite with templates')}+ onPress={() => {+ onApplyBudgetTemplatesInGroup?.(+ categories.filter(c => !c.hidden).map(c => c.id),+ );+ close();+ showUndoNotification({+ message: t('budget templates have been applied.'),+ });+ }}+ />+ )}+ {hasMultipleCategories && (+ <MobileSheetRow+ label={t('Sort A to Z')}+ onPress={() => {+ onSortCategories?.(group.id, 'asc');+ close();+ }}+ />+ )}+ {hasMultipleCategories && (+ <MobileSheetRow+ label={t('Sort Z to A')}+ onPress={() => {+ onSortCategories?.(group.id, 'desc');+ close();+ }}+ />+ )}+ </MobileSheetSection>+ )}++ <MobileSheetSection+ title={hasBudgetSection ? t('Group') : undefined}>- <Notes- notes={notes?.length > 0 ? notes : t('No notes')}- editable={false}- focused={false}- getStyle={() => ({- ...styles.mediumText,- borderRadius: 6,- ...((!notes || notes.length === 0) && {- justifySelf: 'center',- alignSelf: 'center',- color: theme.pageTextSubdued,- }),- })}+ {!isEditingTitle && (+ <MobileSheetRow label={t('Rename')} onPress={editTitle} />+ )}+ <MobileSheetRow+ label={t('Edit notes')}+ onPress={() => onEditNotes(group.id)}/>- </View>- <View- style={{- flexDirection: 'row',- flexWrap: 'wrap',- justifyContent: 'space-between',- alignContent: 'space-between',- paddingTop: 10,- }}- >- <Button style={buttonStyle} onPress={_onAddCategory}>- <SvgAdd width={17} height={17} style={{ paddingRight: 5 }} />- <Trans>Add category</Trans>- </Button>- <Button style={buttonStyle} onPress={_onEditNotes}>- <SvgNotesPaper- width={20}- height={20}- style={{ paddingRight: 5 }}+ <MobileSheetRow+ label={t('Add category')}+ onPress={() => onAddCategory(group.id, group.is_income)}+ />+ {!group.is_income && (+ <MobileSheetRow+ label={group.hidden ? t('Show') : t('Hide')}+ onPress={() => onSave({ ...group, hidden: !group.hidden })}/>- <Trans>Edit notes</Trans>- </Button>- {isGoalTemplatesEnabled && (- <Button- variant="bare"- className={css([- actionButtonStyle,- {- '&[data-pressed], &[data-hovered]': {- backgroundColor: 'transparent',- color: buttonStyle.color,- },- },- ])}- onPress={onShowMore}- >- {!showMore ? (- <SvgCheveronUp- width={30}- height={30}- style={{ paddingRight: 5 }}- />- ) : (- <SvgCheveronDown- width={30}- height={30}- style={{ paddingRight: 5 }}- />- )}- <Trans>Actions</Trans>- </Button>)}- </View>- {showMore && (- <CategoryGroupActionMenu- style={{ overflowY: 'auto', paddingTop: 10 }}- getItemStyle={() => defaultMenuItemStyle}- onApplyBudgetTemplatesInGroup={() => {- _onApplyBudgetTemplatesInGroup();- state.close();- showUndoNotification({- message: t('budget templates have been applied.'),- });- }}- />- )}- </View>- </>- )}- </Modal>- );-}--function AdditionalCategoryGroupMenu({- group,- onDelete,- onToggleVisibility,- onSortAsc,- onSortDesc,- onClose,-}) {- const { t } = useTranslation();- const triggerRef = useRef(null);- const [menuOpen, setMenuOpen] = useState(false);- const itemStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- };-- const getItemStyle = item => ({- ...itemStyle,- ...(item.name === 'delete' && { color: theme.errorTextMenu }),- });-- return (- <View>- {!group.is_income && (- <Button- ref={triggerRef}- variant="bare"- aria-label={t('Menu')}- onPress={() => {- setMenuOpen(true);- }}- >- <SvgDotsHorizontalTriple- width={17}- height={17}- style={{ color: 'currentColor' }}- />- <Popover- triggerRef={triggerRef}- isOpen={menuOpen}- placement="bottom start"- onOpenChange={() => setMenuOpen(false)}- >- <Menu- style={{- ...styles.mediumText,- color: theme.formLabelText,- }}- getItemStyle={getItemStyle}- items={- [- {- name: 'toggleVisibility',- text: group.hidden ? t('Show') : t('Hide'),- icon: group.hidden ? SvgViewShow : SvgViewHide,- iconSize: 16,- },- ...(!group.is_income && [- Menu.line,- {- name: 'delete',- text: t('Delete'),- icon: SvgTrash,- iconSize: 15,- },- ]),- ...(onSortAsc && onSortDesc- ? [- Menu.line,- { name: 'sort-asc', text: t('Sort A to Z') },- { name: 'sort-desc', text: t('Sort Z to A') },- ]- : []),- ].filter(i => i != null) as ComponentProps<typeof Menu>['items']- }- onMenuSelect={itemName => {- setMenuOpen(false);- if (itemName === 'delete') {- onDelete();- } else if (itemName === 'toggleVisibility') {- onToggleVisibility();- } else if (itemName === 'sort-asc') {- onSortAsc?.();- onClose?.();- } else if (itemName === 'sort-desc') {- onSortDesc?.();- onClose?.();- }- }}- />- </Popover>- </Button>- )}- </View>+ {!group.is_income && (+ <MobileSheetRow+ label={t('Delete')}+ isDestructive+ onPress={() => void deleteFlow.start()}+ />+ )}+ </MobileSheetSection>+ </>+ )+ }+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsxindex 65f8926c40..a8579e21b3 100644--- a/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/CategoryMenuModal.tsx@@ -1,34 +1,14 @@-// @ts-strict-ignore-import React, { useRef, useState } from 'react';-import type { CSSProperties } from 'react';-import { Trans, useTranslation } from 'react-i18next';+import { useTranslation } from 'react-i18next';-import { Button } from '@actual-app/components/button';-import {- SvgChartPie,- SvgDotsHorizontalTriple,- SvgTrash,-} from '@actual-app/components/icons/v1';-import {- SvgNotesPaper,- SvgViewHide,- SvgViewShow,-} from '@actual-app/components/icons/v2';-import { Menu } from '@actual-app/components/menu';-import { Popover } from '@actual-app/components/popover';-import { styles } from '@actual-app/components/styles';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';--import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';-import { Notes } from '#components/Notes';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetDeleteConfirm } from '#components/mobile/MobileSheetDeleteConfirm';+import { MobileSheetNotes } from '#components/mobile/MobileSheetNotes';+import { MobileSheetRow } from '#components/mobile/MobileSheetRow';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';+import { useCategories } from '#hooks/useCategories';import { useCategory } from '#hooks/useCategory';import { useCategoryGroup } from '#hooks/useCategoryGroup';+import { useDeleteCategoryFlow } from '#hooks/useDeleteCategoryFlow';import { useNotes } from '#hooks/useNotes';import type { Modal as ModalType } from '#modals/modalsSlice';@@ -42,208 +22,92 @@ export function CategoryMenuModal({onSave,onEditNotes,onDelete,- onToggleVisibility,onEditAutomations,onClose,}: CategoryMenuModalProps) {const { t } = useTranslation();const { data: category } = useCategory(categoryId);const { data: categoryGroup } = useCategoryGroup(category?.group);- const originalNotes = useNotes(category.id);-- const onRename = newName => {- if (newName && newName !== category.name) {- onSave?.({- ...category,- name: newName,- });- }- };-- const _onToggleVisibility = () => {- onToggleVisibility?.(category.id);- };-- const _onEditNotes = () => {- onEditNotes?.(category.id);- };-- const _onDelete = () => {- onDelete?.(category.id);- };+ const {+ data: { grouped: categoryGroups, list: categories } = {+ grouped: [],+ list: [],+ },+ } = useCategories();+ const notes = useNotes(categoryId);+ const deleteFlow = useDeleteCategoryFlow({+ categoryIds: [categoryId],+ onDelete: transferCategoryId => onDelete(categoryId, transferCategoryId),+ });- const _onEditAutomations = () => {- onEditAutomations?.(category.id);- };+ if (!category) {+ return null;+ }- const buttonStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- color: theme.formLabelText,- // Adjust based on desired number of buttons per row.- flexBasis: '100%',- };+ const isIncome = Boolean(category.is_income);+ const transferGroups = categoryGroups+ .filter(group => Boolean(group.is_income) === isIncome)+ .map(group => ({+ ...group,+ categories: (group.categories ?? []).filter(c => c.id !== categoryId),+ }));+ const transferName = categories.find(+ c => c.id === deleteFlow.transferId,+ )?.name;return (- <Modal+ <MobileSheetname="category-menu"- onClose={onClose}- containerProps={{- style: { height: '45vh' },+ title={category.name}+ onTitleUpdate={newName => {+ onSave({ ...category, name: newName });+ return undefined;}}+ onClose={onClose}>- {({ state }) => (- <>- <ModalHeader- leftContent={- <AdditionalCategoryMenu- category={category}- categoryGroup={categoryGroup}- onDelete={_onDelete}- onToggleVisibility={_onToggleVisibility}- />- }- title={- <ModalTitle- isEditable- title={category.name}- onTitleUpdate={onRename}- />- }- rightContent={<ModalCloseButton onPress={() => state.close()} />}+ {({ editTitle, isEditingTitle }) =>+ deleteFlow.step ? (+ <MobileSheetDeleteConfirm+ flow={deleteFlow}+ category={category}+ transferGroups={transferGroups}+ transferName={transferName}/>- <View- style={{- flex: 1,- flexDirection: 'column',- }}- >- <View- style={{- overflowY: 'auto',- flex: 1,- }}- >- <Notes- notes={- originalNotes?.length > 0 ? originalNotes : t('No notes')- }- editable={false}- focused={false}- getStyle={() => ({- borderRadius: 6,- ...((!originalNotes || originalNotes.length === 0) && {- justifySelf: 'center',- alignSelf: 'center',- color: theme.pageTextSubdued,- }),- })}+ ) : (+ <>+ {notes && <MobileSheetNotes notes={notes} />}++ <MobileSheetSection>+ {!isEditingTitle && (+ <MobileSheetRow label={t('Rename')} onPress={editTitle} />+ )}+ <MobileSheetRow+ label={t('Edit notes')}+ onPress={() => onEditNotes(category.id)}/>- </View>- <View- style={{- flexDirection: 'row',- flexWrap: 'wrap',- justifyContent: 'space-between',- alignContent: 'space-between',- gap: 8,- paddingTop: 10,- }}- >- <Button style={buttonStyle} onPress={_onEditNotes}>- <SvgNotesPaper- width={20}- height={20}- style={{ paddingRight: 5 }}- />- <Trans>Edit notes</Trans>- </Button>{onEditAutomations && (- <Button style={buttonStyle} onPress={_onEditAutomations}>- <SvgChartPie- width={20}- height={20}- style={{ paddingRight: 5 }}- />- <Trans>Budget automations</Trans>- </Button>+ <MobileSheetRow+ label={t('Budget automations')}+ onPress={() => onEditAutomations(category.id)}+ />)}- </View>- </View>- </>- )}- </Modal>- );-}--function AdditionalCategoryMenu({- category,- categoryGroup,- onDelete,- onToggleVisibility,-}) {- const { t } = useTranslation();- const triggerRef = useRef(null);- const [menuOpen, setMenuOpen] = useState(false);- const itemStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- };-- const getItemStyle = item => ({- ...itemStyle,- ...(item.name === 'delete' && { color: theme.errorTextMenu }),- });-- return (- <View>- <Button- ref={triggerRef}- variant="bare"- aria-label={t('Menu')}- onPress={() => {- setMenuOpen(true);- }}- >- <SvgDotsHorizontalTriple- width={17}- height={17}- style={{ color: 'currentColor' }}- />- <Popover- triggerRef={triggerRef}- isOpen={menuOpen}- placement="bottom start"- onOpenChange={() => setMenuOpen(false)}- >- <Menu- getItemStyle={getItemStyle}- items={[- !categoryGroup?.hidden && {- name: 'toggleVisibility',- text: category.hidden ? t('Show') : t('Hide'),- icon: category.hidden ? SvgViewShow : SvgViewHide,- iconSize: 16,- },- !categoryGroup?.hidden && Menu.line,- {- name: 'delete',- text: t('Delete'),- icon: SvgTrash,- iconSize: 15,- },- ]}- onMenuSelect={itemName => {- setMenuOpen(false);- if (itemName === 'delete') {- onDelete();- } else if (itemName === 'toggleVisibility') {- onToggleVisibility();- }- }}- />- </Popover>- </Button>- </View>+ {!categoryGroup?.hidden && (+ <MobileSheetRow+ label={category.hidden ? t('Show') : t('Hide')}+ onPress={() =>+ onSave({ ...category, hidden: !category.hidden })+ }+ />+ )}+ <MobileSheetRow+ label={t('Delete')}+ isDestructive+ onPress={() => void deleteFlow.start()}+ />+ </MobileSheetSection>+ </>+ )+ }+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/CloseAccountModal.tsx b/packages/desktop-client/src/components/modals/CloseAccountModal.tsxindex 29fc81d2ff..31be32aa9a 100644--- a/packages/desktop-client/src/components/modals/CloseAccountModal.tsx+++ b/packages/desktop-client/src/components/modals/CloseAccountModal.tsx@@ -1,6 +1,5 @@-// @ts-strict-ignore-import React, { useState } from 'react';-import type { CSSProperties, FormEvent } from 'react';+import { useState } from 'react';+import type { FormEvent } from 'react';import { Form } from 'react-aria-components';import { Trans, useTranslation } from 'react-i18next';@@ -8,9 +7,9 @@ import { Button } from '@actual-app/components/button';import { FormError } from '@actual-app/components/form-error';import { useResponsive } from '@actual-app/components/hooks/useResponsive';import { Paragraph } from '@actual-app/components/paragraph';-import { styles } from '@actual-app/components/styles';import { Text } from '@actual-app/components/text';import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';import { View } from '@actual-app/components/view';import { integerToCurrency } from '@actual-app/core/shared/util';import type { AccountEntity } from '@actual-app/core/types/models';@@ -21,6 +20,10 @@ import { AccountAutocomplete } from '#components/autocomplete/AccountAutocompletimport { CategoryAutocomplete } from '#components/autocomplete/CategoryAutocomplete';import { Link } from '#components/common/Link';import { Modal, ModalCloseButton, ModalHeader } from '#components/common/Modal';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetActions } from '#components/mobile/MobileSheetActions';+import { MobileSheetCategoryPicker } from '#components/mobile/MobileSheetCategoryPicker';+import { MobileSheetPickerField } from '#components/mobile/MobileSheetPickerField';import { useAccounts } from '#hooks/useAccounts';import { useCategories } from '#hooks/useCategories';import { pushModal } from '#modals/modalsSlice';@@ -32,12 +35,8 @@ function needsCategory(currentTransfer: string,accounts: AccountEntity[],) {- const acct = accounts.find(a => a.id === currentTransfer);- const isOffBudget = acct && acct.offbudget === 1;-- // The user must select a category if transferring from a budgeted- // account to an off budget account- return account.offbudget === 0 && isOffBudget;+ const transferTarget = accounts.find(a => a.id === currentTransfer);+ return account.offbudget === 0 && transferTarget?.offbudget === 1;}type CloseAccountModalProps = Extract<@@ -50,7 +49,7 @@ export function CloseAccountModal({balance,canDelete,}: CloseAccountModalProps) {- const { t } = useTranslation(); // Initialize translation hook+ const { t } = useTranslation();const { data: allAccounts = [] } = useAccounts();const accounts = allAccounts.filter(a => a.closed === 0);const {@@ -59,70 +58,201 @@ export function CloseAccountModal({list: [],},} = useCategories();- const [loading, setLoading] = useState(false);+ const [isClosing, setIsClosing] = useState(false);const [transferAccountId, setTransferAccountId] = useState('');const transferAccount = accounts.find(a => a.id === transferAccountId);const [categoryId, setCategoryId] = useState('');const category = categories.find(c => c.id === categoryId);-- const [transferError, setTransferError] = useState(false);- const [categoryError, setCategoryError] = useState(false);+ const [hasTransferError, setHasTransferError] = useState(false);+ const [hasCategoryError, setHasCategoryError] = useState(false);const dispatch = useDispatch();const { isNarrowWidth } = useResponsive();+ const closeAccount = useCloseAccountMutation();- const onSelectAccount = accId => {- setTransferAccountId(accId);- if (transferError && accId) {- setTransferError(false);+ const onSelectAccount = (accountId: string | null) => {+ setTransferAccountId(accountId ?? '');+ if (accountId) {+ setHasTransferError(false);}};- const onSelectCategory = catId => {- setCategoryId(catId);- if (categoryError && catId) {- setCategoryError(false);+ const onSelectCategory = (selectedCategoryId: string | null) => {+ setCategoryId(selectedCategoryId ?? '');+ if (selectedCategoryId) {+ setHasCategoryError(false);}};- const narrowStyle: CSSProperties = isNarrowWidth- ? {- userSelect: 'none',- height: styles.mobileMinHeight,- ...styles.mediumText,- }- : {};-- const closeAccount = useCloseAccountMutation();-- const onSubmit = (event: FormEvent<HTMLFormElement>) => {- event.preventDefault();-- const transferError = balance !== 0 && !transferAccountId;- setTransferError(transferError);-- const categoryError =+ const submit = () => {+ const transferMissing = balance !== 0 && !transferAccountId;+ const categoryMissing =needsCategory(account, transferAccountId, accounts) && !categoryId;- setCategoryError(categoryError);-- if (transferError || categoryError) {+ setHasTransferError(transferMissing);+ setHasCategoryError(categoryMissing);+ if (transferMissing || categoryMissing) {return false;}-- setLoading(true);-+ setIsClosing(true);closeAccount.mutate({id: account.id,- transferAccountId: transferAccountId || null,- categoryId: categoryId || null,+ transferAccountId: transferAccountId || undefined,+ categoryId: categoryId || undefined,});-return true;};+ const forceClose = (close: () => void) => {+ setIsClosing(true);+ closeAccount.mutate({ id: account.id, forced: true });+ close();+ };++ const intro = (+ <Paragraph>+ <Trans>+ Are you sure you want to close{' '}+ <strong>{{ accountName: account.name } as TransObjectLiteral}</strong>+ ?{' '}+ </Trans>+ {canDelete ? (+ <Trans>+ This account has no transactions so it will be permanently deleted.+ </Trans>+ ) : (+ <Trans>+ This account has transactions so we can't permanently delete it.+ </Trans>+ )}+ </Paragraph>+ );++ const balanceIntro = (+ <Paragraph>+ <Trans>+ This account has a balance of{' '}+ <strong>+ {{ balance: integerToCurrency(balance) } as TransObjectLiteral}+ </strong>+ . To close this account, select a different account to transfer this+ balance to:+ </Trans>+ </Paragraph>+ );++ const categoryIntro = (+ <Paragraph>+ <Trans>+ Since you are transferring the balance from an on budget account to an+ off budget account, this transaction must be categorized. Select a+ category:+ </Trans>+ </Paragraph>+ );++ const renderForceClose = (close: () => void) =>+ !canDelete && (+ <View style={{ marginBottom: spacing.lg }}>+ <Text size="small">+ <Trans>+ You can also{' '}+ <Link+ variant="text"+ onClick={() => forceClose(close)}+ style={{ color: theme.errorText }}+ >+ force close+ </Link>{' '}+ the account which will delete it and all its transactions+ permanently. Doing so may change your budget unexpectedly since+ money in it may vanish.+ </Trans>+ </Text>+ </View>+ );++ if (isNarrowWidth) {+ return (+ <MobileSheet+ name="close-account"+ title={t('Close Account')}+ isLoading={isClosing}+ >+ {({ close }) => (+ <View style={{ padding: `0 ${spacing.lg}px` }}>+ {intro}+ {balance !== 0 && (+ <View>+ {balanceIntro}+ <View style={{ marginBottom: spacing.lg }}>+ <MobileSheetPickerField+ label={t('Account')}+ placeholder={t('Select account...')}+ valueName={transferAccount?.name}+ onPress={() =>+ dispatch(+ pushModal({+ modal: {+ name: 'account-autocomplete',+ options: {+ includeClosedAccounts: false,+ hiddenAccounts: [account.id],+ onSelect: onSelectAccount,+ },+ },+ }),+ )+ }+ />+ </View>+ {hasTransferError && (+ <FormError style={{ marginBottom: spacing.lg }}>+ <Trans>Transfer is required</Trans>+ </FormError>+ )}+ {needsCategory(account, transferAccountId, accounts) && (+ <View style={{ marginBottom: spacing.lg }}>+ {categoryIntro}+ <MobileSheetCategoryPicker+ categoryGroups={categoryGroups}+ valueName={category?.name}+ onSelect={onSelectCategory}+ />+ {hasCategoryError && (+ <FormError>+ <Trans>Category is required</Trans>+ </FormError>+ )}+ </View>+ )}+ </View>+ )}+ {renderForceClose(close)}+ <MobileSheetActions+ onCancel={close}+ confirmLabel={t('Close Account')}+ onConfirm={() => {+ if (submit()) {+ close();+ }+ }}+ />+ </View>+ )}+ </MobileSheet>+ );+ }++ const onSubmit = (event: FormEvent<HTMLFormElement>, close: () => void) => {+ event.preventDefault();+ if (submit()) {+ close();+ }+ };+return (<Modalname="close-account"- isLoading={loading}+ isLoading={isClosing}containerProps={{ style: { width: '30vw' } }}>{({ state }) => (@@ -132,55 +262,12 @@ export function CloseAccountModal({rightContent={<ModalCloseButton onPress={() => state.close()} />}/><View>- <Paragraph>- <Trans>- Are you sure you want to close{' '}- <strong>- {{ accountName: account.name } as TransObjectLiteral}- </strong>- ?{' '}- </Trans>- {canDelete ? (- <span>- <Trans>- This account has no transactions so it will be permanently- deleted.- </Trans>- </span>- ) : (- <span>- <Trans>- This account has transactions so we can't permanently delete- it.- </Trans>- </span>- )}- </Paragraph>- <Form- onSubmit={e => {- if (onSubmit(e)) {- state.close();- }- }}- >+ {intro}+ <Form onSubmit={event => onSubmit(event, () => state.close())}>{balance !== 0 && (<View>- <Paragraph>- <Trans>- This account has a balance of{' '}- <strong>- {- {- balance: integerToCurrency(balance),- } as TransObjectLiteral- }- </strong>- . To close this account, select a different account to- transfer this balance to:- </Trans>- </Paragraph>-- <View style={{ marginBottom: 15 }}>+ {balanceIntro}+ <View style={{ marginBottom: spacing.lg }}><AccountAutocompleteincludeClosedAccounts={false}hiddenAccounts={[account.id]}@@ -188,77 +275,25 @@ export function CloseAccountModal({inputProps={{placeholder: t('Select account...'),autoFocus: true,- ...(isNarrowWidth && {- value: transferAccount?.name || '',- style: {- ...narrowStyle,- },- onClick: () => {- dispatch(- pushModal({- modal: {- name: 'account-autocomplete',- options: {- includeClosedAccounts: false,- hiddenAccounts: [account.id],- onSelect: onSelectAccount,- },- },- }),- );- },- }),}}onSelect={onSelectAccount}/></View>-- {transferError && (- <FormError style={{ marginBottom: 15 }}>+ {hasTransferError && (+ <FormError style={{ marginBottom: spacing.lg }}><Trans>Transfer is required</Trans></FormError>)}-{needsCategory(account, transferAccountId, accounts) && (- <View style={{ marginBottom: 15 }}>- <Paragraph>- <Trans>- Since you are transferring the balance from an on- budget account to an off budget account, this- transaction must be categorized. Select a category:- </Trans>- </Paragraph>-+ <View style={{ marginBottom: spacing.lg }}>+ {categoryIntro}<CategoryAutocompletecategoryGroups={categoryGroups}value={categoryId}- inputProps={{- placeholder: t('Select category...'),- ...(isNarrowWidth && {- value: category?.name || '',- style: {- ...narrowStyle,- },- onClick: () => {- dispatch(- pushModal({- modal: {- name: 'category-autocomplete',- options: {- categoryGroups,- showHiddenCategories: true,- onSelect: onSelectCategory,- },- },- }),- );- },- }),- }}+ inputProps={{ placeholder: t('Select category...') }}onSelect={onSelectCategory}/>-- {categoryError && (+ {hasCategoryError && (<FormError><Trans>Category is required</Trans></FormError>@@ -267,56 +302,17 @@ export function CloseAccountModal({)}</View>)}-- {!canDelete && (- <View style={{ marginBottom: 15 }}>- <Text size="small">- <Trans>- You can also{' '}- <Link- variant="text"- onClick={() => {- setLoading(true);- closeAccount.mutate({- id: account.id,- forced: true,- });- state.close();- }}- style={{ color: theme.errorText }}- >- force close- </Link>{' '}- the account which will delete it and all its transactions- permanently. Doing so may change your budget unexpectedly- since money in it may vanish.- </Trans>- </Text>- </View>- )}-+ {renderForceClose(() => state.close())}<View- style={{- flexDirection: 'row',- justifyContent: 'flex-end',- }}+ style={{ flexDirection: 'row', justifyContent: 'flex-end' }}><Button- style={{- marginRight: 10,- height: isNarrowWidth ? styles.mobileMinHeight : undefined,- }}+ style={{ marginRight: spacing.md }}onPress={() => state.close()}><Trans>Cancel</Trans></Button>- <Button- type="submit"- variant="primary"- style={{- height: isNarrowWidth ? styles.mobileMinHeight : undefined,- }}- >+ <Button type="submit" variant="primary"><Trans>Close Account</Trans></Button></View>diff --git a/packages/desktop-client/src/components/modals/ConfirmCategoryDeleteModal.tsx b/packages/desktop-client/src/components/modals/ConfirmCategoryDeleteModal.tsxindex b244e67dc6..94461d9770 100644--- a/packages/desktop-client/src/components/modals/ConfirmCategoryDeleteModal.tsx+++ b/packages/desktop-client/src/components/modals/ConfirmCategoryDeleteModal.tsx@@ -1,16 +1,21 @@-// @ts-strict-ignore-import React, { useState } from 'react';-import { Trans, useTranslation } from 'react-i18next'; // Import useTranslation+import { useState } from 'react';+import { Trans, useTranslation } from 'react-i18next';import { Block } from '@actual-app/components/block';import { Button } from '@actual-app/components/button';+import { useResponsive } from '@actual-app/components/hooks/useResponsive';+import { Paragraph } from '@actual-app/components/paragraph';import { Text } from '@actual-app/components/text';import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';import { View } from '@actual-app/components/view';-import type { TransObjectLiteral } from '@actual-app/core/types/util';import { CategoryAutocomplete } from '#components/autocomplete/CategoryAutocomplete';+import { CategoryDeleteMessage } from '#components/budget/CategoryDeleteMessage';import { Modal, ModalCloseButton, ModalHeader } from '#components/common/Modal';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetActions } from '#components/mobile/MobileSheetActions';+import { MobileSheetCategoryPicker } from '#components/mobile/MobileSheetCategoryPicker';import { useCategories } from '#hooks/useCategories';import type { Modal as ModalType } from '#modals/modalsSlice';@@ -24,9 +29,10 @@ export function ConfirmCategoryDeleteModal({category: categoryId,onDelete,}: ConfirmCategoryDeleteModalProps) {- const { t } = useTranslation(); // Initialize translation hook+ const { t } = useTranslation();+ const { isNarrowWidth } = useResponsive();const [transferCategory, setTransferCategory] = useState<string | null>(null);- const [error, setError] = useState<string | null>(null);+ const [hasError, setHasError] = useState(false);const {data: { grouped: categoryGroups, list: categories } = {grouped: [],@@ -35,31 +41,76 @@ export function ConfirmCategoryDeleteModal({} = useCategories();const group = categoryGroups.find(g => g.id === groupId);const category = categories.find(c => c.id === categoryId);+ const subject = category ?? group;- const renderError = (error: string) => {- let msg: string;+ if (!subject) {+ return null;+ }- switch (error) {- case 'required-transfer':- msg = 'You must select a category';- break;- default:- msg = 'Something bad happened, sorry!';+ const isIncome = Boolean(subject.is_income);+ const transferCategoryName =+ categories.find(c => c.id === transferCategory)?.name ?? '';+ const transferGroups = group+ ? categoryGroups.filter(+ g => g.id !== group.id && Boolean(g.is_income) === isIncome,+ )+ : categoryGroups+ .filter(g => Boolean(g.is_income) === isIncome)+ .map(g => ({+ ...g,+ categories: (g.categories ?? []).filter(c => c.id !== categoryId),+ }));++ const onSelectTransfer = (id: string | null) => {+ setTransferCategory(id);+ if (id) {+ setHasError(false);}+ };- return (- <Text- style={{- marginTop: 15,- color: theme.errorText,- }}- >- {msg}- </Text>- );+ const confirmDelete = (close: () => void) => {+ if (!transferCategory) {+ setHasError(true);+ return;+ }+ onDelete(transferCategory);+ close();};- const isIncome = !!(category || group).is_income;+ const message = <CategoryDeleteMessage category={category} group={group} />;++ const errorMessage = hasError && (+ <Text style={{ marginTop: spacing.md, color: theme.errorText }}>+ <Trans>You must select a category</Trans>+ </Text>+ );++ if (isNarrowWidth) {+ return (+ <MobileSheet name="confirm-category-delete" title={t('Confirm Delete')}>+ {({ close }) => (+ <View style={{ padding: `0 ${spacing.lg}px` }}>+ <Paragraph>{message}</Paragraph>+ <Text style={{ marginBottom: spacing.sm }}>+ <Trans>Transfer to:</Trans>+ </Text>+ <MobileSheetCategoryPicker+ categoryGroups={transferGroups}+ valueName={transferCategoryName}+ onSelect={onSelectTransfer}+ />+ {errorMessage}+ <MobileSheetActions+ onCancel={close}+ confirmLabel={t('Delete')}+ isDestructive+ onConfirm={() => confirmDelete(close)}+ />+ </View>+ )}+ </MobileSheet>+ );+ }return (<Modal@@ -69,67 +120,15 @@ export function ConfirmCategoryDeleteModal({{({ state }) => (<><ModalHeader- title={t('Confirm Delete')} // Use translation for title+ title={t('Confirm Delete')}rightContent={<ModalCloseButton onPress={() => state.close()} />}/><View style={{ lineHeight: 1.5 }}>- {group ? (- <Block>- {!isIncome ? (- <Trans>- Categories in the group{' '}- <strong>- {{ group: group.name } as TransObjectLiteral}- </strong>{' '}- are used by existing transactions.- </Trans>- ) : (- <Trans>- Categories in the group{' '}- <strong>- {{ group: group.name } as TransObjectLiteral}- </strong>{' '}- are used by existing transactions or it has a positive- leftover balance currently.- </Trans>- )}- <Trans>- <strong>Are you sure you want to delete it?</strong> If so,- you must select another category to transfer existing- transactions and balance to.- </Trans>- </Block>- ) : (- <Block>- {!isIncome ? (- <Trans>- <strong>- {{ category: category.name } as TransObjectLiteral}- </strong>{' '}- is used by existing transactions.- </Trans>- ) : (- <Trans>- <strong>- {{ category: category.name } as TransObjectLiteral}- </strong>{' '}- is used by existing transactions or it has a positive- leftover balance currently.- </Trans>- )}- <Trans>- <strong>Are you sure you want to delete it?</strong> If so,- you must select another category to transfer existing- transactions and balance to.- </Trans>- </Block>- )}-- {error && renderError(error)}-+ <Block>{message}</Block>+ {errorMessage}<Viewstyle={{- marginTop: 20,+ marginTop: spacing.xl,flexDirection: 'row',justifyContent: 'flex-start',alignItems: 'center',@@ -138,43 +137,25 @@ export function ConfirmCategoryDeleteModal({<Text><Trans>Transfer to:</Trans></Text>-- <View style={{ flex: 1, marginLeft: 10, marginRight: 30 }}>+ <View+ style={{+ flex: 1,+ marginLeft: spacing.md,+ marginRight: spacing.xl,+ }}+ ><CategoryAutocomplete- categoryGroups={- group- ? categoryGroups.filter(- g => g.id !== group.id && !!g.is_income === isIncome,- )- : categoryGroups- .filter(g => !!g.is_income === isIncome)- .map(g => ({- ...g,- categories: g.categories.filter(- c => c.id !== category.id,- ),- }))- }+ categoryGroups={transferGroups}value={transferCategory}focused- inputProps={{- placeholder: t('Select category...'),- }}- onSelect={category => setTransferCategory(category)}+ inputProps={{ placeholder: t('Select category...') }}+ onSelect={onSelectTransfer}showHiddenCategories/></View>-<Buttonvariant="primary"- onPress={() => {- if (!transferCategory) {- setError('required-transfer');- } else {- onDelete(transferCategory);- state.close();- }- }}+ onPress={() => confirmDelete(() => state.close())}><Trans>Delete</Trans></Button>diff --git a/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsxindex 8a5f720093..957b837e17 100644--- a/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/EnvelopeBalanceMenuModal.tsx@@ -1,24 +1,10 @@-import React from 'react';-import type { CSSProperties } from 'react';import { Trans } from 'react-i18next';-import { styles } from '@actual-app/components/styles';-import { Text } from '@actual-app/components/text';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';--import {- BalanceWithCarryover,- CarryoverIndicator,-} from '#components/budget/BalanceWithCarryover';-import { BalanceMenu } from '#components/budget/envelope/BalanceMenu';-import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';-import { CellValueText } from '#components/spreadsheet/CellValue';+import { useBalanceMenu } from '#components/budget/envelope/BalanceMenu';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetBalanceHeader } from '#components/mobile/MobileSheetBalanceHeader';+import { MobileSheetMenuRows } from '#components/mobile/MobileSheetMenuRows';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';import { useCategory } from '#hooks/useCategory';import type { Modal as ModalType } from '#modals/modalsSlice';import { envelopeBudget } from '#spreadsheet/bindings';@@ -34,77 +20,31 @@ export function EnvelopeBalanceMenuModal({onTransfer,onCover,}: EnvelopeBalanceMenuModalProps) {- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };-const { data: category } = useCategory(categoryId);+ const { items, onMenuSelect } = useBalanceMenu({+ categoryId,+ onCarryover,+ onTransfer,+ onCover,+ });if (!category) {return null;}return (- <Modal name="envelope-balance-menu">- {({ state }) => (- <>- <ModalHeader- title={<ModalTitle title={category.name} shrinkOnOverflow />}- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <View- style={{- justifyContent: 'center',- alignItems: 'center',- marginBottom: 20,- }}- >- <Text size="extra-large" style={{ fontWeight: 400 }}>- <Trans>Balance</Trans>- </Text>- <BalanceWithCarryover- isDisabled- shouldInlineGoalStatus- carryover={envelopeBudget.catCarryover(categoryId)}- balance={envelopeBudget.catBalance(categoryId)}- goal={envelopeBudget.catGoal(categoryId)}- budgeted={envelopeBudget.catBudgeted(categoryId)}- longGoal={envelopeBudget.catLongGoal(categoryId)}- CarryoverIndicator={({ style }) => (- <CarryoverIndicator- style={{- width: 15,- height: 15,- display: 'inline-flex',- position: 'relative',- ...style,- }}- />- )}- >- {props => (- <CellValueText- {...props}- style={{- textAlign: 'center',- ...styles.veryLargeText,- }}- />- )}- </BalanceWithCarryover>- </View>- <BalanceMenu- categoryId={categoryId}- getItemStyle={() => defaultMenuItemStyle}- onCarryover={onCarryover}- onTransfer={onTransfer}- onCover={onCover}- />- </>- )}- </Modal>+ <MobileSheet name="envelope-balance-menu" title={category.name}>+ <MobileSheetBalanceHeader+ label={<Trans>Balance</Trans>}+ carryover={envelopeBudget.catCarryover(categoryId)}+ balance={envelopeBudget.catBalance(categoryId)}+ goal={envelopeBudget.catGoal(categoryId)}+ budgeted={envelopeBudget.catBudgeted(categoryId)}+ longGoal={envelopeBudget.catLongGoal(categoryId)}+ />+ <MobileSheetSection>+ <MobileSheetMenuRows items={items} onSelect={onMenuSelect} />+ </MobileSheetSection>+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsxindex 07847fad5a..c936266897 100644--- a/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetMenuModal.tsx@@ -1,33 +1,6 @@-import React, { useState } from 'react';-import type { CSSProperties } from 'react';-import { Trans } from 'react-i18next';--import { Button } from '@actual-app/components/button';-import {- SvgCheveronDown,- SvgCheveronUp,-} from '@actual-app/components/icons/v1';-import { SvgNotesPaper } from '@actual-app/components/icons/v2';-import { styles } from '@actual-app/components/styles';-import { Text } from '@actual-app/components/text';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';-import { amountToInteger, integerToAmount } from '@actual-app/core/shared/util';-import { t } from 'i18next';--import { BudgetMenu } from '#components/budget/envelope/BudgetMenu';+import { useBudgetMenu } from '#components/budget/envelope/BudgetMenu';import { useEnvelopeSheetValue } from '#components/budget/envelope/EnvelopeBudgetComponents';-import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';-import { AmountInput } from '#components/mobile/transactions/AmountInput';-import { Notes } from '#components/Notes';-import { useCategory } from '#hooks/useCategory';-import { useFeatureFlag } from '#hooks/useFeatureFlag';-import { useNotes } from '#hooks/useNotes';+import { BudgetMenuSheet } from '#components/mobile/budget/BudgetMenuSheet';import type { Modal as ModalType } from '#modals/modalsSlice';import { envelopeBudget } from '#spreadsheet/bindings';@@ -38,155 +11,32 @@ type EnvelopeBudgetMenuModalProps = Extract<export function EnvelopeBudgetMenuModal({categoryId,+ month,onUpdateBudget,onCopyLastMonthAverage,onSetMonthsAverage,onApplyBudgetTemplate,onEditNotes,- month,}: EnvelopeBudgetMenuModalProps) {- const buttonStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- color: theme.formLabelText,- // Adjust based on desired number of buttons per row.- flexBasis: '100%',- };-- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };-const budgeted = useEnvelopeSheetValue(envelopeBudget.catBudgeted(categoryId),);- const { data: category } = useCategory(categoryId);- const mobileCalculatorEnabled = useFeatureFlag('mobileCalculator');-- const notesId = category ? `${category.id}-${month}` : '';- const originalNotes = useNotes(notesId) ?? '';- const _onUpdateBudget = (amount: number) => {- onUpdateBudget?.(amountToInteger(amount));- };-- const [showMore, setShowMore] = useState(false);-- const onShowMore = () => {- setShowMore(!showMore);- };-- const _onEditNotes = () => {- if (category && month) {- onEditNotes?.(`${category.id}-${month}`, month);- }- };-- if (!category) {- return null;- }+ const { items, onMenuSelect } = useBudgetMenu({+ onCopyLastMonthAverage,+ onSetMonthsAverage,+ onApplyBudgetTemplate,+ });return (- <Modal+ <BudgetMenuSheetname="envelope-budget-menu"- wrapperProps={{- style: mobileCalculatorEnabled ? { paddingBottom: '30vh' } : undefined,- }}- >- {({ state }) => (- <>- <ModalHeader- title={<ModalTitle title={category.name} shrinkOnOverflow />}- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <View- style={{- justifyContent: 'center',- alignItems: 'center',- }}- >- <Text size="extra-large" style={{ fontWeight: 400 }}>- <Trans>Budgeted</Trans>- </Text>- <AmountInput- value={integerToAmount(budgeted || 0)}- onEnter={() => state.close()}- onChange={_onUpdateBudget}- data-testid="budget-amount"- autoFocus- autoFocusDelay={150}- variant="large"- />- </View>- <View- style={{- display: showMore ? 'none' : undefined,- overflowY: 'auto',- flex: 1,- }}- >- <Notes- notes={originalNotes.length > 0 ? originalNotes : t('No notes')}- editable={false}- focused={false}- getStyle={() => ({- borderRadius: 6,- ...(originalNotes.length === 0 && {- justifySelf: 'center',- alignSelf: 'center',- color: theme.pageTextSubdued,- }),- })}- />- </View>- <View- style={{- display: showMore ? 'none' : undefined,- flexDirection: 'row',- flexWrap: 'wrap',- justifyContent: 'space-between',- alignContent: 'space-between',- }}- >- <Button style={buttonStyle} onPress={_onEditNotes}>- <SvgNotesPaper- width={20}- height={20}- style={{ paddingRight: 5 }}- />- <Trans>Edit notes</Trans>- </Button>- </View>- <View>- <Button variant="bare" style={buttonStyle} onPress={onShowMore}>- {!showMore ? (- <SvgCheveronUp- width={30}- height={30}- style={{ paddingRight: 5 }}- />- ) : (- <SvgCheveronDown- width={30}- height={30}- style={{ paddingRight: 5 }}- />- )}- <Trans>Actions</Trans>- </Button>- </View>- {showMore && (- <BudgetMenu- getItemStyle={() => defaultMenuItemStyle}- onCopyLastMonthAverage={onCopyLastMonthAverage}- onSetMonthsAverage={onSetMonthsAverage}- onApplyBudgetTemplate={onApplyBudgetTemplate}- />- )}- </>- )}- </Modal>+ categoryId={categoryId}+ month={month}+ budgeted={budgeted ?? 0}+ items={items}+ onMenuSelect={onMenuSelect}+ onUpdateBudget={onUpdateBudget}+ onEditNotes={onEditNotes}+ />);}diff --git a/packages/desktop-client/src/components/modals/EnvelopeBudgetMonthMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetMonthMenuModal.tsxindex acc1f1ad65..31e7c5adad 100644--- a/packages/desktop-client/src/components/modals/EnvelopeBudgetMonthMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetMonthMenuModal.tsx@@ -1,26 +1,10 @@-// @ts-strict-ignore-import React, { useState } from 'react';-import { Trans, useTranslation } from 'react-i18next';+import { useTranslation } from 'react-i18next';-import { Button } from '@actual-app/components/button';-import {- SvgCheveronDown,- SvgCheveronUp,-} from '@actual-app/components/icons/v1';-import { SvgNotesPaper } from '@actual-app/components/icons/v2';-import { styles } from '@actual-app/components/styles';-import type { CSSProperties } from '@actual-app/components/styles';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';import * as monthUtils from '@actual-app/core/shared/months';-import { css } from '@emotion/css';-import { BudgetMonthMenu } from '#components/budget/envelope/budgetsummary/BudgetMonthMenu';-import { Modal, ModalCloseButton, ModalHeader } from '#components/common/Modal';-import { Notes } from '#components/Notes';+import { useBudgetMonthMenu } from '#components/budget/envelope/budgetsummary/BudgetMonthMenu';+import { BudgetMonthMenuSheet } from '#components/mobile/budget/BudgetMonthMenuSheet';import { useLocale } from '#hooks/useLocale';-import { useNotes } from '#hooks/useNotes';-import { useUndo } from '#hooks/useUndo';import type { Modal as ModalType } from '#modals/modalsSlice';type EnvelopeBudgetMonthMenuModalProps = Extract<@@ -33,200 +17,64 @@ export function EnvelopeBudgetMonthMenuModal({onBudgetAction,onEditNotes,}: EnvelopeBudgetMonthMenuModalProps) {+ const { t } = useTranslation();const locale = useLocale();- const originalNotes = useNotes(`budget-${month}`);- const { showUndoNotification } = useUndo();-- const _onEditNotes = () => {- onEditNotes?.(month);- };-- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };-- const buttonStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- color: theme.formLabelText,- // Adjust based on desired number of buttons per row.- flexBasis: '100%',- };+ const displayMonth = monthUtils.format(month, "MMMM ''yy", locale);- const [showMore, setShowMore] = useState(false);+ const { items, onMenuSelect } = useBudgetMonthMenu({+ onCopyLastMonthBudget: () => onBudgetAction(month, 'copy-last'),+ onSetBudgetsToZero: () => onBudgetAction(month, 'set-zero'),+ onSetMonthsAverage: numberOfMonths =>+ onBudgetAction(month, `set-${numberOfMonths}-avg`),+ onCheckTemplates: () => onBudgetAction(month, 'check-templates'),+ onApplyBudgetTemplates: () => onBudgetAction(month, 'apply-goal-template'),+ onOverwriteWithBudgetTemplates: () =>+ onBudgetAction(month, 'overwrite-goal-template'),+ onEndOfMonthCleanup: () => onBudgetAction(month, 'cleanup-goal-template'),+ });- const onShowMore = () => {- setShowMore(!showMore);+ const undoMessages = {+ 'copy-last': t(+ "{{displayMonth}} budgets have all been set to last month's budgeted amounts.",+ { displayMonth },+ ),+ 'set-zero': t('{{displayMonth}} budgets have all been set to zero.', {+ displayMonth,+ }),+ 'set-3-avg': t(+ '{{displayMonth}} budgets have all been set to {{months}} month average.',+ { displayMonth, months: 3 },+ ),+ 'set-6-avg': t(+ '{{displayMonth}} budgets have all been set to {{months}} month average.',+ { displayMonth, months: 6 },+ ),+ 'set-12-avg': t(+ '{{displayMonth}} budgets have all been set to yearly average.',+ { displayMonth },+ ),+ 'apply-goal-template': t(+ '{{displayMonth}} budget templates have been applied.',+ { displayMonth },+ ),+ 'overwrite-goal-template': t(+ '{{displayMonth}} budget templates have been overwritten.',+ { displayMonth },+ ),+ 'cleanup-goal-template': t(+ '{{displayMonth}} end-of-month cleanup templates have been applied.',+ { displayMonth },+ ),};- const displayMonth = monthUtils.format(month, "MMMM ''yy", locale);- const { t } = useTranslation();-return (- <Modal+ <BudgetMonthMenuSheetname="envelope-budget-month-menu"- containerProps={{- style: { height: '50vh' },- }}- >- {({ state }) => (- <>- <ModalHeader- title={displayMonth}- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <View- style={{- flex: 1,- flexDirection: 'column',- }}- >- <View- style={{- display: showMore ? 'none' : undefined,- overflowY: 'auto',- flex: 1,- }}- >- <Notes- notes={- originalNotes?.length > 0 ? originalNotes : t('No notes')- }- editable={false}- focused={false}- getStyle={() => ({- borderRadius: 6,- ...((!originalNotes || originalNotes.length === 0) && {- justifySelf: 'center',- alignSelf: 'center',- color: theme.pageTextSubdued,- }),- })}- />- </View>- <View style={{ paddingTop: 10, gap: 5 }}>- <View- style={{- display: showMore ? 'none' : undefined,- flexDirection: 'row',- flexWrap: 'wrap',- justifyContent: 'space-between',- alignContent: 'space-between',- }}- >- <Button style={buttonStyle} onPress={_onEditNotes}>- <SvgNotesPaper- width={20}- height={20}- style={{ paddingRight: 5 }}- />- <Trans>Edit notes</Trans>- </Button>- </View>- <View>- <Button- variant="bare"- className={css([- buttonStyle,- {- '&[data-pressed], &[data-hovered]': {- backgroundColor: 'transparent',- color: buttonStyle.color,- },- },- ])}- onPress={onShowMore}- >- {!showMore ? (- <SvgCheveronUp- width={30}- height={30}- style={{ paddingRight: 5 }}- />- ) : (- <SvgCheveronDown- width={30}- height={30}- style={{ paddingRight: 5 }}- />- )}- <Trans>Actions</Trans>- </Button>- </View>- </View>- {showMore && (- <BudgetMonthMenu- style={{ overflowY: 'auto', paddingTop: 10 }}- getItemStyle={() => defaultMenuItemStyle}- onCopyLastMonthBudget={() => {- onBudgetAction(month, 'copy-last');- state.close();- showUndoNotification({- message: t(- "{{displayMonth}} budgets have all been set to last month's budgeted amounts.",- { displayMonth },- ),- });- }}- onSetBudgetsToZero={() => {- onBudgetAction(month, 'set-zero');- state.close();- showUndoNotification({- message: t(- '{{displayMonth}} budgets have all been set to zero.',- { displayMonth },- ),- });- }}- onSetMonthsAverage={numberOfMonths => {- onBudgetAction(month, `set-${numberOfMonths}-avg`);- state.close();- showUndoNotification({- message: `${displayMonth} budgets have all been set to ${numberOfMonths === 12 ? 'yearly' : `${numberOfMonths} month`} average.`,- });- }}- onCheckTemplates={() => {- onBudgetAction(month, 'check-templates');- state.close();- }}- onApplyBudgetTemplates={() => {- onBudgetAction(month, 'apply-goal-template');- state.close();- showUndoNotification({- message: t(- '{{displayMonth}} budget templates have been applied.',- { displayMonth },- ),- });- }}- onOverwriteWithBudgetTemplates={() => {- onBudgetAction(month, 'overwrite-goal-template');- state.close();- showUndoNotification({- message: t(- '{{displayMonth}} budget templates have been overwritten.',- { displayMonth },- ),- });- }}- onEndOfMonthCleanup={() => {- onBudgetAction(month, 'cleanup-goal-template');- state.close();- showUndoNotification({- message: t(- '{{displayMonth}} end-of-month cleanup templates have been applied.',- { displayMonth },- ),- });- }}- />- )}- </View>- </>- )}- </Modal>+ month={month}+ items={items}+ onMenuSelect={onMenuSelect}+ undoMessages={undoMessages}+ onEditNotes={onEditNotes}+ />);}diff --git a/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsxindex 8f9ed8a8e3..d442973d5b 100644--- a/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx+++ b/packages/desktop-client/src/components/modals/EnvelopeBudgetSummaryModal.tsx@@ -1,7 +1,8 @@-import React from 'react';import { useTranslation } from 'react-i18next';import { styles } from '@actual-app/components/styles';+import { spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';import {format as formatMonth,prevMonth,@@ -12,7 +13,8 @@ import type { CategoryEntity } from '@actual-app/core/types/models/category';import { ToBudgetAmount } from '#components/budget/envelope/budgetsummary/ToBudgetAmount';import { TotalsList } from '#components/budget/envelope/budgetsummary/TotalsList';import { useEnvelopeSheetValue } from '#components/budget/envelope/EnvelopeBudgetComponents';-import { Modal, ModalCloseButton, ModalHeader } from '#components/common/Modal';+import { ToBudgetSheetActions } from '#components/mobile/budget/ToBudgetSheetActions';+import { MobileSheet } from '#components/mobile/MobileSheet';import { useCategoriesById } from '#hooks/useCategories';import { useFormat } from '#hooks/useFormat';import { useLocale } from '#hooks/useLocale';@@ -34,7 +36,6 @@ export function EnvelopeBudgetSummaryModal({}: EnvelopeBudgetSummaryModalProps) {const { t } = useTranslation();const format = useFormat();-const locale = useLocale();const dispatch = useDispatch();const prevMonthName = formatMonth(prevMonth(month), 'MMM', locale);@@ -126,61 +127,38 @@ export function EnvelopeBudgetSummaryModal({);};- const onResetHoldBuffer = () => {- void onBudgetAction(month, 'reset-hold');- };-- const onClick = ({ close }: { close: () => void }) => {- dispatch(- pushModal({- modal: {- name: 'envelope-summary-to-budget-menu',- options: {- month,- onTransfer: openTransferAvailableModal,- onCover: openCoverOverbudgetedModal,- onResetHoldBuffer: () => {- onResetHoldBuffer();- close();- },- onHoldBuffer,- onBudgetAction,- },- },- }),- );- };-return (- <Modal name="envelope-budget-summary">- {({ state }) => (- <>- <ModalHeader- title={t('Budget Summary')}- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <SheetNameProvider name={sheetForMonth(month)}>+ <MobileSheet name="envelope-budget-summary" title={t('Budget Summary')}>+ {({ close }) => (+ <SheetNameProvider name={sheetForMonth(month)}>+ <View+ style={{+ padding: `${spacing.xs}px ${spacing.lg}px ${spacing.lg}px`,+ }}+ ><TotalsListprevMonthName={prevMonthName}- style={{- ...styles.mediumText,- }}+ style={styles.mediumText}/><ToBudgetAmountprevMonthName={prevMonthName}- style={{- ...styles.mediumText,- marginTop: 15,- }}- amountStyle={{- ...styles.underlinedText,- }}- onClick={() => onClick({ close: () => state.close() })}+ style={{ ...styles.mediumText, marginTop: spacing.lg }}isTotalsListTooltipDisabled/>- </SheetNameProvider>- </>+ </View>+ <ToBudgetSheetActions+ month={month}+ onTransfer={openTransferAvailableModal}+ onCover={openCoverOverbudgetedModal}+ onHoldBuffer={onHoldBuffer}+ onResetHoldBuffer={() => {+ void onBudgetAction(month, 'reset-hold');+ close();+ }}+ onBudgetAction={onBudgetAction}+ />+ </SheetNameProvider>)}- </Modal>+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/EnvelopeIncomeBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeIncomeBalanceMenuModal.tsxindex e38fb4d238..ec3069df46 100644--- a/packages/desktop-client/src/components/modals/EnvelopeIncomeBalanceMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/EnvelopeIncomeBalanceMenuModal.tsx@@ -1,25 +1,10 @@-import React from 'react';-import type { CSSProperties } from 'react';import { Trans, useTranslation } from 'react-i18next';-import { Menu } from '@actual-app/components/menu';-import { styles } from '@actual-app/components/styles';-import { Text } from '@actual-app/components/text';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';--import {- BalanceWithCarryover,- CarryoverIndicator,-} from '#components/budget/BalanceWithCarryover';import { useEnvelopeSheetValue } from '#components/budget/envelope/EnvelopeBudgetComponents';-import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';-import { CellValueText } from '#components/spreadsheet/CellValue';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetBalanceHeader } from '#components/mobile/MobileSheetBalanceHeader';+import { MobileSheetRow } from '#components/mobile/MobileSheetRow';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';import { useCategory } from '#hooks/useCategory';import type { Modal as ModalType } from '#modals/modalsSlice';import { envelopeBudget } from '#spreadsheet/bindings';@@ -34,16 +19,8 @@ export function EnvelopeIncomeBalanceMenuModal({onCarryover,onShowActivity,}: EnvelopeIncomeBalanceMenuModalProps) {- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };-const { t } = useTranslation();const { data: category } = useCategory(categoryId);-const carryover = useEnvelopeSheetValue(envelopeBudget.catCarryover(categoryId),);@@ -53,83 +30,25 @@ export function EnvelopeIncomeBalanceMenuModal({}return (- <Modal name="envelope-income-balance-menu">- {({ state }) => (- <>- <ModalHeader- title={<ModalTitle title={category.name} shrinkOnOverflow />}- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <View- style={{- justifyContent: 'center',- alignItems: 'center',- marginBottom: 20,- }}- >- <Text size="extra-large" style={{ fontWeight: 400 }}>- <Trans>Balance</Trans>- </Text>- <BalanceWithCarryover- isDisabled- shouldInlineGoalStatus- carryover={envelopeBudget.catCarryover(categoryId)}- balance={envelopeBudget.catSumAmount(categoryId)}- goal={envelopeBudget.catGoal(categoryId)}- budgeted={envelopeBudget.catBudgeted(categoryId)}- longGoal={envelopeBudget.catLongGoal(categoryId)}- CarryoverIndicator={({ style }) => (- <CarryoverIndicator- style={{- width: 15,- height: 15,- display: 'inline-flex',- position: 'relative',- ...style,- }}- />- )}- >- {props => (- <CellValueText- {...props}- style={{- textAlign: 'center',- ...styles.veryLargeText,- }}- />- )}- </BalanceWithCarryover>- </View>- <Menu- getItemStyle={() => defaultMenuItemStyle}- onMenuSelect={name => {- switch (name) {- case 'carryover':- onCarryover?.(!carryover);- break;- case 'view':- onShowActivity?.();- break;- default:- throw new Error(`Unrecognized menu option: ${String(name)}`);- }- }}- items={[- {- name: 'carryover',- text: carryover- ? t('Disable auto hold')- : t('Enable auto hold'),- },- {- name: 'view',- text: t('View transactions'),- },- ]}- />- </>- )}- </Modal>+ <MobileSheet name="envelope-income-balance-menu" title={category.name}>+ <MobileSheetBalanceHeader+ label={<Trans>Received</Trans>}+ carryover={envelopeBudget.catCarryover(categoryId)}+ balance={envelopeBudget.catSumAmount(categoryId)}+ goal={envelopeBudget.catGoal(categoryId)}+ budgeted={envelopeBudget.catBudgeted(categoryId)}+ longGoal={envelopeBudget.catLongGoal(categoryId)}+ />+ <MobileSheetSection>+ <MobileSheetRow+ label={carryover ? t('Disable auto hold') : t('Enable auto hold')}+ onPress={() => onCarryover(!carryover)}+ />+ <MobileSheetRow+ label={t('View transactions')}+ onPress={() => onShowActivity()}+ />+ </MobileSheetSection>+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/EnvelopeToBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/EnvelopeToBudgetMenuModal.tsxdeleted file mode 100644index 63fbe35e32..0000000000--- a/packages/desktop-client/src/components/modals/EnvelopeToBudgetMenuModal.tsx+++ /dev/null@@ -1,52 +0,0 @@-import React from 'react';-import type { CSSProperties } from 'react';--import { styles } from '@actual-app/components/styles';-import { theme } from '@actual-app/components/theme';--import { ToBudgetMenu } from '#components/budget/envelope/budgetsummary/ToBudgetMenu';-import { Modal, ModalCloseButton, ModalHeader } from '#components/common/Modal';-import type { Modal as ModalType } from '#modals/modalsSlice';--type EnvelopeToBudgetMenuModalProps = Extract<- ModalType,- { name: 'envelope-summary-to-budget-menu' }->['options'];--export function EnvelopeToBudgetMenuModal({- onTransfer,- onCover,- onHoldBuffer,- onResetHoldBuffer,- onBudgetAction,- month,-}: EnvelopeToBudgetMenuModalProps) {- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };-- return (- <Modal name="envelope-summary-to-budget-menu">- {({ state }) => (- <>- <ModalHeader- showLogo- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <ToBudgetMenu- getItemStyle={() => defaultMenuItemStyle}- onTransfer={onTransfer}- onCover={onCover}- onHoldBuffer={onHoldBuffer}- onResetHoldBuffer={onResetHoldBuffer}- onBudgetAction={onBudgetAction}- month={month}- />- </>- )}- </Modal>- );-}diff --git a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsxindex b38443b984..d592271a83 100644--- a/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/ScheduledTransactionMenuModal.tsx@@ -1,11 +1,10 @@import React, { useMemo } from 'react';-import type { ComponentPropsWithoutRef, CSSProperties } from 'react';import { Trans, useTranslation } from 'react-i18next';-import { Menu } from '@actual-app/components/menu';import { styles } from '@actual-app/components/styles';import { Text } from '@actual-app/components/text';import { theme } from '@actual-app/components/theme';+import { spacing } from '@actual-app/components/tokens';import { View } from '@actual-app/components/view';import { format } from '@actual-app/core/shared/months';import { q } from '@actual-app/core/shared/query';@@ -14,12 +13,9 @@ import {scheduleIsRecurring,} from '@actual-app/core/shared/schedules';-import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetRow } from '#components/mobile/MobileSheetRow';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';import { useLocale } from '#hooks/useLocale';import { useSchedules } from '#hooks/useSchedules';import type { Modal as ModalType } from '#modals/modalsSlice';@@ -35,13 +31,8 @@ export function ScheduledTransactionMenuModal({onPost,onComplete,}: ScheduledTransactionMenuModalProps) {+ const { t } = useTranslation();const locale = useLocale();- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };const scheduleId = transactionId?.split('/')?.[1];const schedulesQuery = useMemo(() => q('schedules').filter({ id: scheduleId }).select('*'),@@ -56,103 +47,62 @@ export function ScheduledTransactionMenuModal({}const schedule = schedules?.[0];+ if (!schedule) {+ return null;+ }+const { date: dateCond } = extractScheduleConds(schedule._conditions);const canBeSkipped = scheduleIsRecurring(dateCond);const canBeCompleted = !scheduleIsRecurring(dateCond);return (- <Modal name="scheduled-transaction-menu">- {({ state }) => (- <>- <ModalHeader- title={<ModalTitle title={schedule?.name || ''} shrinkOnOverflow />}- rightContent={<ModalCloseButton onPress={() => state.close()} />}+ <MobileSheet+ name="scheduled-transaction-menu"+ title={schedule.name || t('Schedule')}+ >+ <View+ style={{+ alignItems: 'center',+ padding: `${spacing.xs}px ${spacing.md}px ${spacing.md}px`,+ }}+ >+ <Text+ style={{+ ...styles.smallText,+ color: theme.pageTextLight,+ marginBottom: spacing.xxs,+ }}+ >+ <Trans>Scheduled date</Trans>+ </Text>+ <Text style={{ ...styles.mediumText, fontWeight: 600 }}>+ {format(schedule.next_date || '', 'MMMM dd, yyyy', locale)}+ </Text>+ </View>++ <MobileSheetSection>+ <MobileSheetRow+ label={t('Post transaction')}+ onPress={() => onPost(transactionId)}+ />+ <MobileSheetRow+ label={t('Post transaction today')}+ onPress={() => onPost(transactionId, true)}+ />+ {canBeSkipped && (+ <MobileSheetRow+ label={t('Skip next scheduled date')}+ onPress={() => onSkip(transactionId)}/>- <View- style={{- justifyContent: 'center',- alignItems: 'center',- marginBottom: 20,- }}- >- <Text size="extra-large" style={{ fontWeight: 400 }}>- <Trans>Scheduled date</Trans>- </Text>- <Text size="extra-large" style={{ fontWeight: 700 }}>- {format(schedule?.next_date || '', 'MMMM dd, yyyy', locale)}- </Text>- </View>- <ScheduledTransactionMenu- transactionId={transactionId}- onPost={onPost}- onSkip={onSkip}- onComplete={onComplete}- canBeSkipped={canBeSkipped}- canBeCompleted={canBeCompleted}- getItemStyle={() => defaultMenuItemStyle}+ )}+ {canBeCompleted && (+ <MobileSheetRow+ label={t('Mark as completed')}+ onPress={() => onComplete(transactionId)}/>- </>- )}- </Modal>- );-}--type ScheduledTransactionMenuProps = Omit<- ComponentPropsWithoutRef<typeof Menu>,- 'onMenuSelect' | 'items'-> & {- transactionId: string;- onSkip: (transactionId: string) => void;- onPost: (transactionId: string, today?: boolean) => void;- onComplete: (transactionId: string) => void;-};--function ScheduledTransactionMenu({- transactionId,- onSkip,- onPost,- onComplete,- canBeSkipped,- canBeCompleted,- ...props-}: ScheduledTransactionMenuProps & {- canBeCompleted: boolean;- canBeSkipped: boolean;-}) {- const { t } = useTranslation();-- return (- <Menu- {...props}- onMenuSelect={name => {- switch (name) {- case 'post':- onPost?.(transactionId);- break;- case 'post-today':- onPost?.(transactionId, true);- break;- case 'skip':- onSkip?.(transactionId);- break;- case 'complete':- onComplete?.(transactionId);- break;- default:- throw new Error(`Unrecognized menu option: ${name}`);- }- }}- items={[- { name: 'post', text: t('Post transaction') },- { name: 'post-today', text: t('Post transaction today') },- ...(canBeSkipped- ? [{ name: 'skip', text: t('Skip next scheduled date') }]- : []),- ...(canBeCompleted- ? [{ name: 'complete', text: t('Mark as completed') }]- : []),- ]}- />+ )}+ </MobileSheetSection>+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsxindex 39c1f526be..07359fe634 100644--- a/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/TrackingBalanceMenuModal.tsx@@ -1,24 +1,10 @@-import React from 'react';-import type { CSSProperties } from 'react';import { Trans } from 'react-i18next';-import { styles } from '@actual-app/components/styles';-import { Text } from '@actual-app/components/text';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';--import {- BalanceWithCarryover,- CarryoverIndicator,-} from '#components/budget/BalanceWithCarryover';-import { BalanceMenu } from '#components/budget/tracking/BalanceMenu';-import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';-import { CellValueText } from '#components/spreadsheet/CellValue';+import { useBalanceMenu } from '#components/budget/tracking/BalanceMenu';+import { MobileSheet } from '#components/mobile/MobileSheet';+import { MobileSheetBalanceHeader } from '#components/mobile/MobileSheetBalanceHeader';+import { MobileSheetMenuRows } from '#components/mobile/MobileSheetMenuRows';+import { MobileSheetSection } from '#components/mobile/MobileSheetSection';import { useCategory } from '#hooks/useCategory';import type { Modal as ModalType } from '#modals/modalsSlice';import { trackingBudget } from '#spreadsheet/bindings';@@ -32,74 +18,26 @@ export function TrackingBalanceMenuModal({categoryId,onCarryover,}: TrackingBalanceMenuModalProps) {- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };-const { data: category } = useCategory(categoryId);+ const { items, onMenuSelect } = useBalanceMenu({ categoryId, onCarryover });if (!category) {return null;}return (- <Modal name="tracking-balance-menu">- {({ state }) => (- <>- <ModalHeader- title={<ModalTitle title={category.name} shrinkOnOverflow />}- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <View- style={{- justifyContent: 'center',- alignItems: 'center',- marginBottom: 20,- }}- >- <Text size="extra-large" style={{ fontWeight: 400 }}>- <Trans>Balance</Trans>- </Text>- <BalanceWithCarryover- isDisabled- carryover={trackingBudget.catCarryover(categoryId)}- balance={trackingBudget.catBalance(categoryId)}- goal={trackingBudget.catGoal(categoryId)}- budgeted={trackingBudget.catBudgeted(categoryId)}- longGoal={trackingBudget.catLongGoal(categoryId)}- CarryoverIndicator={({ style }) => (- <CarryoverIndicator- style={{- width: 15,- height: 15,- display: 'inline-flex',- position: 'relative',- ...style,- }}- />- )}- >- {props => (- <CellValueText- {...props}- style={{- textAlign: 'center',- ...styles.veryLargeText,- }}- />- )}- </BalanceWithCarryover>- </View>- <BalanceMenu- categoryId={categoryId}- getItemStyle={() => defaultMenuItemStyle}- onCarryover={onCarryover}- />- </>- )}- </Modal>+ <MobileSheet name="tracking-balance-menu" title={category.name}>+ <MobileSheetBalanceHeader+ label={<Trans>Balance</Trans>}+ carryover={trackingBudget.catCarryover(categoryId)}+ balance={trackingBudget.catBalance(categoryId)}+ goal={trackingBudget.catGoal(categoryId)}+ budgeted={trackingBudget.catBudgeted(categoryId)}+ longGoal={trackingBudget.catLongGoal(categoryId)}+ />+ <MobileSheetSection>+ <MobileSheetMenuRows items={items} onSelect={onMenuSelect} />+ </MobileSheetSection>+ </MobileSheet>);}diff --git a/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsxindex f311f0056b..4e69465db1 100644--- a/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/TrackingBudgetMenuModal.tsx@@ -1,33 +1,6 @@-import React, { useState } from 'react';-import type { CSSProperties } from 'react';-import { Trans } from 'react-i18next';--import { Button } from '@actual-app/components/button';-import {- SvgCheveronDown,- SvgCheveronUp,-} from '@actual-app/components/icons/v1';-import { SvgNotesPaper } from '@actual-app/components/icons/v2';-import { styles } from '@actual-app/components/styles';-import { Text } from '@actual-app/components/text';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';-import { amountToInteger, integerToAmount } from '@actual-app/core/shared/util';-import { t } from 'i18next';--import { BudgetMenu } from '#components/budget/tracking/BudgetMenu';+import { useBudgetMenu } from '#components/budget/tracking/BudgetMenu';import { useTrackingSheetValue } from '#components/budget/tracking/TrackingBudgetComponents';-import {- Modal,- ModalCloseButton,- ModalHeader,- ModalTitle,-} from '#components/common/Modal';-import { AmountInput } from '#components/mobile/transactions/AmountInput';-import { Notes } from '#components/Notes';-import { useCategory } from '#hooks/useCategory';-import { useFeatureFlag } from '#hooks/useFeatureFlag';-import { useNotes } from '#hooks/useNotes';+import { BudgetMenuSheet } from '#components/mobile/budget/BudgetMenuSheet';import type { Modal as ModalType } from '#modals/modalsSlice';import { trackingBudget } from '#spreadsheet/bindings';@@ -38,156 +11,34 @@ type TrackingBudgetMenuModalProps = Extract<export function TrackingBudgetMenuModal({categoryId,+ month,onUpdateBudget,onCopyLastMonthAverage,onSetMonthsAverage,onApplyBudgetTemplate,onCopyUntilYearEnd,onEditNotes,- month,}: TrackingBudgetMenuModalProps) {- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };-- const buttonStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- color: theme.formLabelText,- // Adjust based on desired number of buttons per row.- flexBasis: '100%',- };const budgeted = useTrackingSheetValue(trackingBudget.catBudgeted(categoryId),);- const { data: category } = useCategory(categoryId);- const mobileCalculatorEnabled = useFeatureFlag('mobileCalculator');- const notesId = category ? `${category.id}-${month}` : '';- const originalNotes = useNotes(notesId) ?? '';-- const _onUpdateBudget = (amount: number) => {- onUpdateBudget?.(amountToInteger(amount));- };-- const _onEditNotes = () => {- if (category && month) {- onEditNotes?.(`${category.id}-${month}`, month);- }- };-- const [showMore, setShowMore] = useState(false);-- const onShowMore = () => {- setShowMore(!showMore);- };-- if (!category) {- return null;- }+ const { items, onMenuSelect } = useBudgetMenu({+ onCopyLastMonthAverage,+ onSetMonthsAverage,+ onApplyBudgetTemplate,+ onCopyUntilYearEnd,+ });return (- <Modal+ <BudgetMenuSheetname="tracking-budget-menu"- wrapperProps={{- style: mobileCalculatorEnabled ? { paddingBottom: '30vh' } : undefined,- }}- >- {({ state }) => (- <>- <ModalHeader- title={<ModalTitle title={category.name} shrinkOnOverflow />}- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <View- style={{- justifyContent: 'center',- alignItems: 'center',- }}- >- <Text size="extra-large" style={{ fontWeight: 400 }}>- <Trans>Budgeted</Trans>- </Text>- <AmountInput- value={integerToAmount(budgeted || 0)}- onEnter={() => state.close()}- onChange={_onUpdateBudget}- data-testid="budget-amount"- autoFocus- autoFocusDelay={150}- variant="large"- />- </View>- <View- style={{- display: showMore ? 'none' : undefined,- overflowY: 'auto',- flex: 1,- }}- >- <Notes- notes={originalNotes.length > 0 ? originalNotes : t('No notes')}- editable={false}- focused={false}- getStyle={() => ({- borderRadius: 6,- ...(originalNotes.length === 0 && {- justifySelf: 'center',- alignSelf: 'center',- color: theme.pageTextSubdued,- }),- })}- />- </View>- <View- style={{- display: showMore ? 'none' : undefined,- flexDirection: 'row',- flexWrap: 'wrap',- justifyContent: 'space-between',- alignContent: 'space-between',- }}- >- <Button style={buttonStyle} onPress={_onEditNotes}>- <SvgNotesPaper- width={20}- height={20}- style={{ paddingRight: 5 }}- />- <Trans>Edit notes</Trans>- </Button>- </View>- <View>- <Button variant="bare" style={buttonStyle} onPress={onShowMore}>- {!showMore ? (- <SvgCheveronUp- width={30}- height={30}- style={{ paddingRight: 5 }}- />- ) : (- <SvgCheveronDown- width={30}- height={30}- style={{ paddingRight: 5 }}- />- )}- <Trans>Actions</Trans>- </Button>- </View>- {showMore && (- <BudgetMenu- getItemStyle={() => defaultMenuItemStyle}- onCopyLastMonthAverage={onCopyLastMonthAverage}- onSetMonthsAverage={onSetMonthsAverage}- onApplyBudgetTemplate={onApplyBudgetTemplate}- onCopyUntilYearEnd={onCopyUntilYearEnd}- />- )}- </>- )}- </Modal>+ categoryId={categoryId}+ month={month}+ budgeted={budgeted ?? 0}+ items={items}+ onMenuSelect={onMenuSelect}+ onUpdateBudget={onUpdateBudget}+ onEditNotes={onEditNotes}+ />);}diff --git a/packages/desktop-client/src/components/modals/TrackingBudgetMonthMenuModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetMonthMenuModal.tsxindex d49deecdff..fc1ca138c2 100644--- a/packages/desktop-client/src/components/modals/TrackingBudgetMonthMenuModal.tsx+++ b/packages/desktop-client/src/components/modals/TrackingBudgetMonthMenuModal.tsx@@ -1,26 +1,10 @@-// @ts-strict-ignore-import React, { useState } from 'react';-import { Trans, useTranslation } from 'react-i18next';+import { useTranslation } from 'react-i18next';-import { Button } from '@actual-app/components/button';-import {- SvgCheveronDown,- SvgCheveronUp,-} from '@actual-app/components/icons/v1';-import { SvgNotesPaper } from '@actual-app/components/icons/v2';-import { styles } from '@actual-app/components/styles';-import type { CSSProperties } from '@actual-app/components/styles';-import { theme } from '@actual-app/components/theme';-import { View } from '@actual-app/components/view';import * as monthUtils from '@actual-app/core/shared/months';-import { css } from '@emotion/css';-import { BudgetMonthMenu } from '#components/budget/tracking/budgetsummary/BudgetMonthMenu';-import { Modal, ModalCloseButton, ModalHeader } from '#components/common/Modal';-import { Notes } from '#components/Notes';+import { useBudgetMonthMenu } from '#components/budget/tracking/budgetsummary/BudgetMonthMenu';+import { BudgetMonthMenuSheet } from '#components/mobile/budget/BudgetMonthMenuSheet';import { useLocale } from '#hooks/useLocale';-import { useNotes } from '#hooks/useNotes';-import { useUndo } from '#hooks/useUndo';import type { Modal as ModalType } from '#modals/modalsSlice';type TrackingBudgetMonthMenuModalProps = Extract<@@ -33,190 +17,59 @@ export function TrackingBudgetMonthMenuModal({onBudgetAction,onEditNotes,}: TrackingBudgetMonthMenuModalProps) {- const locale = useLocale();const { t } = useTranslation();- const originalNotes = useNotes(`budget-${month}`);- const { showUndoNotification } = useUndo();-- const _onEditNotes = () => {- onEditNotes?.(month);- };-- const defaultMenuItemStyle: CSSProperties = {- ...styles.mobileMenuItem,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- };-- const buttonStyle: CSSProperties = {- ...styles.mediumText,- height: styles.mobileMinHeight,- color: theme.formLabelText,- // Adjust based on desired number of buttons per row.- flexBasis: '100%',- };+ const locale = useLocale();+ const displayMonth = monthUtils.format(month, "MMMM ''yy", locale);- const [showMore, setShowMore] = useState(false);+ const { items, onMenuSelect } = useBudgetMonthMenu({+ onCopyLastMonthBudget: () => onBudgetAction(month, 'copy-last'),+ onSetBudgetsToZero: () => onBudgetAction(month, 'set-zero'),+ onSetMonthsAverage: numberOfMonths =>+ onBudgetAction(month, `set-${numberOfMonths}-avg`),+ onCheckTemplates: () => onBudgetAction(month, 'check-templates'),+ onApplyBudgetTemplates: () => onBudgetAction(month, 'apply-goal-template'),+ onOverwriteWithBudgetTemplates: () =>+ onBudgetAction(month, 'overwrite-goal-template'),+ });- const onShowMore = () => {- setShowMore(!showMore);+ const undoMessages = {+ 'copy-last': t(+ "{{displayMonth}} budgets have all been set to last month's budgeted amounts.",+ { displayMonth },+ ),+ 'set-zero': t('{{displayMonth}} budgets have all been set to zero.', {+ displayMonth,+ }),+ 'set-3-avg': t(+ '{{displayMonth}} budgets have all been set to {{months}} month average.',+ { displayMonth, months: 3 },+ ),+ 'set-6-avg': t(+ '{{displayMonth}} budgets have all been set to {{months}} month average.',+ { displayMonth, months: 6 },+ ),+ 'set-12-avg': t(+ '{{displayMonth}} budgets have all been set to yearly average.',+ { displayMonth },+ ),+ 'apply-goal-template': t(+ '{{displayMonth}} budget templates have been applied.',+ { displayMonth },+ ),+ 'overwrite-goal-template': t(+ '{{displayMonth}} budget templates have been overwritten.',+ { displayMonth },+ ),};- const displayMonth = monthUtils.format(month, "MMMM ''yy", locale);-return (- <Modal+ <BudgetMonthMenuSheetname="tracking-budget-month-menu"- containerProps={{- style: { height: '50vh' },- }}- >- {({ state }) => (- <>- <ModalHeader- title={displayMonth}- rightContent={<ModalCloseButton onPress={() => state.close()} />}- />- <View- style={{- flex: 1,- flexDirection: 'column',- }}- >- <View- style={{- display: showMore ? 'none' : undefined,- overflowY: 'auto',- flex: 1,- }}- >- <Notes- notes={- originalNotes?.length > 0 ? originalNotes : t('No notes')- }- editable={false}- focused={false}- getStyle={() => ({- borderRadius: 6,- ...((!originalNotes || originalNotes.length === 0) && {- justifySelf: 'center',- alignSelf: 'center',- color: theme.pageTextSubdued,- }),- })}- />- </View>- <View style={{ paddingTop: 10, gap: 5 }}>- <View- style={{- display: showMore ? 'none' : undefined,- flexDirection: 'row',- flexWrap: 'wrap',- justifyContent: 'space-between',- alignContent: 'space-between',- }}- >- <Button style={buttonStyle} onPress={_onEditNotes}>- <SvgNotesPaper- width={20}- height={20}- style={{ paddingRight: 5 }}- />- <Trans>Edit notes</Trans>- </Button>- </View>- <View>- <Button- variant="bare"- className={css([- buttonStyle,- {- '&[data-pressed], &[data-hovered]': {- backgroundColor: 'transparent',- color: buttonStyle.color,- },- },- ])}- onPress={onShowMore}- >- {!showMore ? (- <SvgCheveronUp- width={30}- height={30}- style={{ paddingRight: 5 }}- />- ) : (- <SvgCheveronDown- width={30}- height={30}- style={{ paddingRight: 5 }}- />- )}- <Trans>Actions</Trans>- </Button>- </View>- </View>- {showMore && (- <BudgetMonthMenu- style={{ overflowY: 'auto', paddingTop: 10 }}- getItemStyle={() => defaultMenuItemStyle}- onCopyLastMonthBudget={() => {- onBudgetAction(month, 'copy-last');- state.close();- showUndoNotification({- message: t(- "{{displayMonth}} budgets have all been set to last month's budgeted amounts.",- { displayMonth },- ),- });- }}- onSetBudgetsToZero={() => {- onBudgetAction(month, 'set-zero');- state.close();- showUndoNotification({- message: t(- '{{displayMonth}} budgets have all been set to zero.',- { displayMonth },- ),- });- }}- onSetMonthsAverage={numberOfMonths => {- onBudgetAction(month, `set-${numberOfMonths}-avg`);- state.close();- showUndoNotification({- message: `${displayMonth} budgets have all been set to ${numberOfMonths === 12 ? 'yearly' : `${numberOfMonths} month`} average.`,- });- }}- onCheckTemplates={() => {- onBudgetAction(month, 'check-templates');- state.close();- }}- onApplyBudgetTemplates={() => {- onBudgetAction(month, 'apply-goal-template');- state.close();- showUndoNotification({- message: t(- '{{displayMonth}} budget templates have been applied.',- { displayMonth },- ),- });- }}- onOverwriteWithBudgetTemplates={() => {- onBudgetAction(month, 'overwrite-goal-template');- state.close();- showUndoNotification({- message: t(- '{{displayMonth}} budget templates have been overwritten.',- { displayMonth },- ),- });- }}- />- )}- </View>- </>- )}- </Modal>+ month={month}+ items={items}+ onMenuSelect={onMenuSelect}+ undoMessages={undoMessages}+ onEditNotes={onEditNotes}+ />);}diff --git a/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx b/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsxindex 8a2e79d7da..e41b39567e 100644--- a/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx+++ b/packages/desktop-client/src/components/modals/TrackingBudgetSummaryModal.tsx@@ -3,13 +3,15 @@ import { useTranslation } from 'react-i18next';import { SpaceBetween } from '@actual-app/components/space-between';import { styles } from '@actual-app/components/styles';+import { radius, spacing } from '@actual-app/components/tokens';+import { View } from '@actual-app/components/view';import { sheetForMonth } from '@actual-app/core/shared/months';import * as monthUtils from '@actual-app/core/shared/months';import { ExpenseTotal } from '#components/budget/tracking/budgetsummary/ExpenseTotal';import { IncomeTotal } from '#components/budget/tracking/budgetsummary/IncomeTotal';import { Saved } from '#components/budget/tracking/budgetsummary/Saved';-import { Modal, ModalCloseButton, ModalHeader } from '#components/common/Modal';+import { MobileSheet } from '#components/mobile/MobileSheet';import { SheetNameProvider } from '#hooks/useSheetName';import type { Modal as ModalType } from '#modals/modalsSlice';@@ -24,34 +26,30 @@ export function TrackingBudgetSummaryModal({const { t } = useTranslation();const currentMonth = monthUtils.currentMonth();return (- <Modal name="tracking-budget-summary">- {({ state }) => (- <>- <ModalHeader- title={t('Budget Summary')}- rightContent={<ModalCloseButton onPress={() => state.close()} />}+ <MobileSheet name="tracking-budget-summary" title={t('Budget Summary')}>+ <View+ style={{ padding: `${spacing.xs}px ${spacing.lg}px ${spacing.lg}px` }}+ >+ <SheetNameProvider name={sheetForMonth(month)}>+ <SpaceBetween+ direction="vertical"+ gap={spacing.sm}+ style={{+ alignSelf: 'center',+ alignItems: 'flex-start',+ backgroundColor: 'transparent',+ borderRadius: radius.sm,+ }}+ >+ <IncomeTotal style={{ ...styles.mediumText }} />+ <ExpenseTotal style={{ ...styles.mediumText }} />+ </SpaceBetween>+ <Saved+ projected={month >= currentMonth}+ style={{ ...styles.mediumText, marginTop: spacing.xl }}/>- <SheetNameProvider name={sheetForMonth(month)}>- <SpaceBetween- direction="vertical"- gap={10}- style={{- alignSelf: 'center',- alignItems: 'flex-start',- backgroundColor: 'transparent',- borderRadius: 4,- }}- >- <IncomeTotal style={{ ...styles.mediumText }} />- <ExpenseTotal style={{ ...styles.mediumText }} />- </SpaceBetween>- <Saved- projected={month >= currentMonth}- style={{ ...styles.mediumText, marginTop: 20 }}- />- </SheetNameProvider>- </>- )}- </Modal>+ </SheetNameProvider>+ </View>+ </MobileSheet>);}diff --git a/packages/desktop-client/src/hooks/useDeleteCategoryFlow.ts b/packages/desktop-client/src/hooks/useDeleteCategoryFlow.tsnew file mode 100644index 0000000000..1904dbfeaf--- /dev/null+++ b/packages/desktop-client/src/hooks/useDeleteCategoryFlow.ts@@ -0,0 +1,66 @@+import { useState } from 'react';++import { send } from '@actual-app/core/platform/client/connection';++type DeleteStep = 'confirm' | 'confirm-transfer';++type UseDeleteCategoryFlowOptions = {+ categoryIds: string[];+ onDelete: (transferCategoryId?: string) => void;+};++export function useDeleteCategoryFlow({+ categoryIds,+ onDelete,+}: UseDeleteCategoryFlowOptions) {+ const [step, setStep] = useState<DeleteStep | null>(null);+ const [isChecking, setIsChecking] = useState(false);+ const [transferId, setTransferId] = useState<string | null>(null);+ const [hasTransferError, setHasTransferError] = useState(false);++ const start = async () => {+ if (isChecking) {+ return;+ }+ setIsChecking(true);+ try {+ const results = await Promise.all(+ categoryIds.map(id => send('must-category-transfer', { id })),+ );+ setStep(results.some(Boolean) ? 'confirm-transfer' : 'confirm');+ } catch {+ setStep('confirm');+ } finally {+ setIsChecking(false);+ }+ };++ const cancel = () => {+ setStep(null);+ setTransferId(null);+ setHasTransferError(false);+ };++ const selectTransfer = (categoryId: string | null) => {+ setTransferId(categoryId);+ setHasTransferError(false);+ };++ const confirm = () => {+ if (step === 'confirm-transfer' && !transferId) {+ setHasTransferError(true);+ return;+ }+ onDelete(transferId ?? undefined);+ };++ return {+ step,+ transferId,+ hasTransferError,+ start,+ cancel,+ confirm,+ selectTransfer,+ };+}diff --git a/packages/desktop-client/src/hooks/useReducedMotion.ts b/packages/desktop-client/src/hooks/useReducedMotion.tsindex 464d108859..d6df42d7b2 100644--- a/packages/desktop-client/src/hooks/useReducedMotion.ts+++ b/packages/desktop-client/src/hooks/useReducedMotion.ts@@ -4,14 +4,23 @@ import { useIsTestEnv } from './useIsTestEnv';const QUERY = '(prefers-reduced-motion: reduce)';+function canMatchMedia() {+ return (+ typeof window !== 'undefined' && typeof window.matchMedia === 'function'+ );+}+function subscribe(callback: () => void) {+ if (!canMatchMedia()) {+ return () => undefined;+ }const mq = window.matchMedia(QUERY);mq.addEventListener('change', callback);return () => mq.removeEventListener('change', callback);}function getSnapshot() {- return window.matchMedia(QUERY).matches;+ return canMatchMedia() && window.matchMedia(QUERY).matches;}export function useReducedMotion(): boolean {diff --git a/packages/desktop-client/src/hooks/useSwipeToDismiss.ts b/packages/desktop-client/src/hooks/useSwipeToDismiss.tsnew file mode 100644index 0000000000..d6ac2675a3--- /dev/null+++ b/packages/desktop-client/src/hooks/useSwipeToDismiss.ts@@ -0,0 +1,143 @@+import { useEffect, useRef } from 'react';++const DRAG_START_PX = 8;+const DISMISS_DISTANCE_PX = 80;+const DISMISS_RELEASE_VELOCITY_PX_PER_MS = 0.5;++type UseSwipeToDismissOptions = {+ isEnabled: boolean;+ onDismiss: () => void;+};++function isScrolledDown(target: EventTarget | null, root: HTMLElement) {+ let element = target instanceof HTMLElement ? target : null;+ while (element && element !== root) {+ if (element.scrollTop > 0 && element.scrollHeight > element.clientHeight) {+ return true;+ }+ element = element.parentElement;+ }+ return false;+}++export function useSwipeToDismiss({+ isEnabled,+ onDismiss,+}: UseSwipeToDismissOptions) {+ const ref = useRef<HTMLDivElement>(null);+ const onDismissRef = useRef(onDismiss);++ useEffect(() => {+ onDismissRef.current = onDismiss;+ }, [onDismiss]);++ useEffect(() => {+ const element = ref.current;+ if (!isEnabled || !element) {+ return;+ }++ let startY = 0;+ let offset = 0;+ let lastY = 0;+ let lastTime = 0;+ let previousY = 0;+ let previousTime = 0;+ let isDragging = false;+ let isBlocked = false;++ const snapBack = () => {+ isDragging = false;+ isBlocked = true;+ offset = 0;+ element.style.transition = 'transform 200ms ease-out';+ element.style.transform = '';+ };++ const onTouchStart = (event: TouchEvent) => {+ if (event.touches.length !== 1) {+ if (isDragging) {+ snapBack();+ }+ isBlocked = true;+ return;+ }+ isBlocked = isScrolledDown(event.target, element);+ isDragging = false;+ offset = 0;+ startY = event.touches[0].clientY;+ lastY = startY;+ previousY = startY;+ lastTime = event.timeStamp;+ previousTime = event.timeStamp;+ };++ const onTouchMove = (event: TouchEvent) => {+ if (isBlocked || event.touches.length !== 1) {+ return;+ }+ const y = event.touches[0].clientY;+ const dy = y - startY;+ if (!isDragging) {+ if (dy < -DRAG_START_PX) {+ isBlocked = true;+ return;+ }+ if (dy < DRAG_START_PX) {+ return;+ }+ isDragging = true;+ element.style.transition = 'none';+ }+ event.preventDefault();+ previousY = lastY;+ previousTime = lastTime;+ lastY = y;+ lastTime = event.timeStamp;+ offset = Math.max(0, dy);+ element.style.transform = `translateY(${offset}px)`;+ };++ const onTouchEnd = (event: TouchEvent) => {+ if (!isDragging) {+ return;+ }+ if (event.touches.length > 0) {+ snapBack();+ return;+ }+ isDragging = false;+ const releaseVelocity =+ (lastY - previousY) / Math.max(1, lastTime - previousTime);+ if (+ offset > DISMISS_DISTANCE_PX ||+ releaseVelocity > DISMISS_RELEASE_VELOCITY_PX_PER_MS+ ) {+ onDismissRef.current();+ return;+ }+ snapBack();+ };++ const onInterrupted = () => {+ if (isDragging) {+ snapBack();+ }+ };++ element.addEventListener('touchstart', onTouchStart, { passive: true });+ element.addEventListener('touchmove', onTouchMove, { passive: false });+ element.addEventListener('touchend', onTouchEnd);+ element.addEventListener('touchcancel', onInterrupted);+ window.addEventListener('blur', onInterrupted);+ return () => {+ element.removeEventListener('touchstart', onTouchStart);+ element.removeEventListener('touchmove', onTouchMove);+ element.removeEventListener('touchend', onTouchEnd);+ element.removeEventListener('touchcancel', onInterrupted);+ window.removeEventListener('blur', onInterrupted);+ };+ }, [isEnabled]);++ return ref;+}diff --git a/packages/desktop-client/src/modals/modalsSlice.ts b/packages/desktop-client/src/modals/modalsSlice.tsindex 13c888b53f..26321aee7c 100644--- a/packages/desktop-client/src/modals/modalsSlice.ts+++ b/packages/desktop-client/src/modals/modalsSlice.ts@@ -364,8 +364,6 @@ export type Modal =onEditNotes: (id: NoteEntity['id']) => void;onClose?: () => void;onReconcile?: () => void;- onToggleRunningBalance?: () => void;- onToggleReconciled?: () => void;};}| {@@ -381,8 +379,10 @@ export type Modal =categoryId: CategoryEntity['id'];onSave: (category: CategoryEntity) => void;onEditNotes: (id: NoteEntity['id']) => void;- onDelete: (categoryId: CategoryEntity['id']) => void;- onToggleVisibility: (categoryId: CategoryEntity['id']) => void;+ onDelete: (+ categoryId: CategoryEntity['id'],+ transferCategoryId?: CategoryEntity['id'],+ ) => void;onEditAutomations?: (categoryId: CategoryEntity['id']) => void;onClose?: () => void;};@@ -422,8 +422,10 @@ export type Modal =isIncome: CategoryGroupEntity['is_income'],) => void;onEditNotes: (id: NoteEntity['id']) => void;- onDelete: (groupId: CategoryGroupEntity['id']) => void;- onToggleVisibility: (groupId: CategoryGroupEntity['id']) => void;+ onDelete: (+ groupId: CategoryGroupEntity['id'],+ transferCategoryId?: CategoryEntity['id'],+ ) => void;onClose?: () => void;onApplyBudgetTemplatesInGroup?: (categories: Array<CategoryEntity['id']>,@@ -490,17 +492,6 @@ export type Modal =onShowActivity: () => void;};}- | {- name: 'envelope-summary-to-budget-menu';- options: {- month: string;- onTransfer: () => void;- onCover: () => void;- onHoldBuffer: () => void;- onResetHoldBuffer: () => void;- onBudgetAction: (month: string, action: string, arg?: unknown) => void;- };- }| {name: 'tracking-balance-menu';options: {@@ -746,7 +737,7 @@ type ReplaceModalPayload = {};type CollapseModalPayload = {- rootModalName: Modal['name'];+ rootModalName: string;};const modalsSlice = createSlice({diff --git a/upcoming-release-notes/mobile-bottom-sheets.md b/upcoming-release-notes/mobile-bottom-sheets.mdnew file mode 100644index 0000000000..e26177d8ad--- /dev/null+++ b/upcoming-release-notes/mobile-bottom-sheets.md@@ -0,0 +1,6 @@+---+category: Enhancements+authors: [matt-fidd]+---++Show menus on mobile as bottom sheets