A local-first personal finance app
Fix mobile category delete confirmation (#8301)
edwei068c0e8ea8afe6
diff --git a/packages/desktop-client/e2e/budget.mobile.test.ts b/packages/desktop-client/e2e/budget.mobile.test.tsindex ea5c23dfbc..4859bbd8b8 100644--- a/packages/desktop-client/e2e/budget.mobile.test.ts+++ b/packages/desktop-client/e2e/budget.mobile.test.ts@@ -278,13 +278,12 @@ budgetTypes.forEach(budgetType => {const budgetPage = await navigation.goToBudgetPage();const categoryGroupName = await budgetPage.getCategoryGroupNameForRow(0);- await budgetPage.openCategoryGroupMenu(categoryGroupName);+ const categoryGroupMenuModal =+ await budgetPage.openCategoryGroupMenu(categoryGroupName);- const categoryMenuModalHeading = page- .getByRole('dialog')- .getByRole('heading');-- await expect(categoryMenuModalHeading).toHaveText(categoryGroupName);+ await expect(categoryGroupMenuModal.heading).toHaveText(+ categoryGroupName,+ );await expect(page).toMatchThemeScreenshots();});@@ -298,6 +297,41 @@ budgetTypes.forEach(budgetType => {await expect(page).toMatchThemeScreenshots();});+ test('opens the transfer confirmation when deleting a category group with transactions', async () => {+ const budgetPage = await navigation.goToBudgetPage();++ const categoryGroupName = await budgetPage.getCategoryGroupNameForRow(0);+ const categoryGroupMenuModal =+ await budgetPage.openCategoryGroupMenu(categoryGroupName);++ await categoryGroupMenuModal.delete();++ const confirmDeleteModal = page.getByTestId(+ 'confirm-category-delete-modal',+ );+ await expect(confirmDeleteModal.getByRole('heading')).toHaveText(+ 'Confirm Delete',+ );+ await expect(confirmDeleteModal).toContainText('Transfer to:');+ });++ test('opens the transfer confirmation when deleting a category with transactions', async () => {+ const budgetPage = await navigation.goToBudgetPage();++ const categoryName = await budgetPage.getCategoryNameForRow(0);+ const categoryMenuModal = await budgetPage.openCategoryMenu(categoryName);++ await categoryMenuModal.delete();++ const confirmDeleteModal = page.getByTestId(+ 'confirm-category-delete-modal',+ );+ await expect(confirmDeleteModal.getByRole('heading')).toHaveText(+ 'Confirm Delete',+ );+ await expect(confirmDeleteModal).toContainText('Transfer to:');+ });+// Budgeted Cell Teststest('checks that clicking the budgeted cell opens the budget menu modal', async () => {diff --git a/packages/desktop-client/e2e/page-models/mobile-budget-page.ts b/packages/desktop-client/e2e/page-models/mobile-budget-page.tsindex a05d7b9348..bff895f3cb 100644--- a/packages/desktop-client/e2e/page-models/mobile-budget-page.ts+++ b/packages/desktop-client/e2e/page-models/mobile-budget-page.ts@@ -4,6 +4,7 @@ import type { Locator, Page } from '@playwright/test';import { MobileAccountPage } from './mobile-account-page';import { BalanceMenuModal } from './mobile-balance-menu-modal';import { BudgetMenuModal } from './mobile-budget-menu-modal';+import { CategoryGroupMenuModal } from './mobile-category-group-menu-modal';import { CategoryMenuModal } from './mobile-category-menu-modal';import { EnvelopeBudgetSummaryModal } from './mobile-envelope-budget-summary-modal';import { TrackingBudgetSummaryModal } from './mobile-tracking-budget-summary-modal';@@ -160,6 +161,12 @@ export class MobileBudgetPage {const categoryGroupButton =await this.#getButtonForCategoryGroup(categoryGroupName);await categoryGroupButton.click();++ return new CategoryGroupMenuModal(+ this.page.getByRole('dialog', {+ name: 'Modal dialog',+ }),+ );}async getCategoryNameForRow(idx: number) {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.tsnew file mode 100644index 0000000000..7af530ad6f--- /dev/null+++ b/packages/desktop-client/e2e/page-models/mobile-category-group-menu-modal.ts@@ -0,0 +1,24 @@+import type { Locator, Page } from '@playwright/test';++export class CategoryGroupMenuModal {+ readonly page: Page;+ readonly locator: Locator;+ readonly heading: Locator;+ readonly menuButton: Locator;++ constructor(locator: Locator) {+ this.locator = locator;+ this.page = locator.page();++ this.heading = locator.getByRole('heading');+ this.menuButton = this.heading.getByRole('button', { name: 'Menu' });+ }++ async delete() {+ await this.menuButton.click();+ await this.page+ .locator('[data-popover]')+ .getByRole('button', { name: 'Delete' })+ .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 79bc4c46d1..e78635a470 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,6 +6,7 @@ export class CategoryMenuModal {readonly page: Page;readonly locator: Locator;readonly heading: Locator;+ readonly menuButton: Locator;readonly budgetAmountInput: Locator;readonly editNotesButton: Locator;readonly budgetAutomationsButton: Locator;@@ -15,6 +16,7 @@ export class CategoryMenuModal {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', {@@ -41,4 +43,12 @@ export class CategoryMenuModal {return this.page.getByRole('dialog', { name: 'Modal dialog' });}++ async delete() {+ await this.menuButton.click();+ await this.page+ .locator('[data-popover]')+ .getByRole('button', { name: 'Delete' })+ .click();+ }}diff --git a/packages/desktop-client/src/components/mobile/budget/BudgetPage.tsx b/packages/desktop-client/src/components/mobile/budget/BudgetPage.tsxindex 8c376409f6..1b3acd8b02 100644--- a/packages/desktop-client/src/components/mobile/budget/BudgetPage.tsx+++ b/packages/desktop-client/src/components/mobile/budget/BudgetPage.tsx@@ -237,14 +237,8 @@ export function BudgetPage() {const onDeleteGroup = useCallback(groupId => {- deleteCategoryGroup.mutate(- { id: groupId },- {- onSettled: () => {- dispatch(collapseModals({ rootModalName: 'category-group-menu' }));- },- },- );+ dispatch(collapseModals({ rootModalName: 'category-group-menu' }));+ deleteCategoryGroup.mutate({ id: groupId });},[deleteCategoryGroup, dispatch],);@@ -270,14 +264,8 @@ export function BudgetPage() {const onDeleteCategory = useCallback(categoryId => {- deleteCategory.mutate(- { id: categoryId },- {- onSettled: () => {- dispatch(collapseModals({ rootModalName: 'category-menu' }));- },- },- );+ dispatch(collapseModals({ rootModalName: 'category-menu' }));+ deleteCategory.mutate({ id: categoryId });},[deleteCategory, dispatch],);diff --git a/upcoming-release-notes/fix-mobile-category-delete-confirmation.md b/upcoming-release-notes/fix-mobile-category-delete-confirmation.mdnew file mode 100644index 0000000000..429513cff1--- /dev/null+++ b/upcoming-release-notes/fix-mobile-category-delete-confirmation.md@@ -0,0 +1,6 @@+---+category: Bugfixes+authors: [edwei06]+---++Fix deleting categories and category groups with transactions on mobile