Skip to content

A local-first personal finance app

Fix a navigation bug and a crash from the account pages (#3932)

Julian Dominguez-Schatzdf7bc5d2f0ce
diff --git a/packages/desktop-client/e2e/page-models/mobile-navigation.js b/packages/desktop-client/e2e/page-models/mobile-navigation.js
index ebda4cbb77..6881b4d399 100644
--- a/packages/desktop-client/e2e/page-models/mobile-navigation.js
+++ b/packages/desktop-client/e2e/page-models/mobile-navigation.js
@@ -1,3 +1,4 @@
+import { MobileAccountPage } from './mobile-account-page';
import { MobileAccountsPage } from './mobile-accounts-page';
import { MobileBudgetPage } from './mobile-budget-page';
import { MobileTransactionEntryPage } from './mobile-transaction-entry-page';
@@ -22,6 +23,13 @@ export class MobileNavigation {
return new MobileAccountsPage(this.page);
}
+ async goToUncategorizedPage() {
+ const button = this.page.getByRole('button', { name: /uncategorized/ });
+ await button.click();
+
+ return new MobileAccountPage(this.page);
+ }
+
async goToTransactionEntryPage() {
const link = this.page.getByRole('link', { name: 'Transaction' });
await link.click();
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js b/packages/desktop-client/e2e/transactions.mobile.test.js
index 0327dc2b58..822b3b4c2a 100644
--- a/packages/desktop-client/e2e/transactions.mobile.test.js
+++ b/packages/desktop-client/e2e/transactions.mobile.test.js
@@ -48,11 +48,8 @@ test.describe('Mobile Transactions', () => {
);
await expect(page).toMatchThemeScreenshots();
- const accountPage = await transactionEntryPage.createTransaction();
-
- await expect(accountPage.transactions.nth(0)).toHaveText(
- 'KrogerClothing-12.34',
- );
+ await transactionEntryPage.createTransaction();
+ await expect(page.getByLabel('Transaction list')).toHaveCount(0);
await expect(page).toMatchThemeScreenshots();
});
@@ -82,4 +79,74 @@ test.describe('Mobile Transactions', () => {
'KrogerClothing-12.34',
);
});
+
+ test('creates an uncategorized transaction from `/accounts/uncategorized` page', async () => {
+ // Create uncategorized transaction
+ let transactionEntryPage = await navigation.goToTransactionEntryPage();
+ await transactionEntryPage.amountField.fill('12.35');
+ // Click anywhere to cancel active edit.
+ await transactionEntryPage.header.click();
+ await transactionEntryPage.fillField(
+ page.getByTestId('account-field'),
+ 'Ally Savings',
+ );
+ await transactionEntryPage.createTransaction();
+
+ const uncategorizedPage = await navigation.goToUncategorizedPage();
+ transactionEntryPage = await uncategorizedPage.clickCreateTransaction();
+
+ await expect(transactionEntryPage.header).toHaveText('New Transaction');
+
+ await transactionEntryPage.amountField.fill('12.34');
+ // Click anywhere to cancel active edit.
+ await transactionEntryPage.header.click();
+ await transactionEntryPage.fillField(
+ page.getByTestId('payee-field'),
+ 'Kroger',
+ );
+
+ await transactionEntryPage.createTransaction();
+
+ await expect(uncategorizedPage.transactions.nth(0)).toHaveText(
+ 'KrogerUncategorized-12.34',
+ );
+ await expect(page).toMatchThemeScreenshots();
+ });
+
+ test('creates a categorized transaction from `/accounts/uncategorized` page', async () => {
+ // Create uncategorized transaction
+ let transactionEntryPage = await navigation.goToTransactionEntryPage();
+ await transactionEntryPage.amountField.fill('12.35');
+ // Click anywhere to cancel active edit.
+ await transactionEntryPage.header.click();
+ await transactionEntryPage.fillField(
+ page.getByTestId('account-field'),
+ 'Ally Savings',
+ );
+ await transactionEntryPage.createTransaction();
+
+ const uncategorizedPage = await navigation.goToUncategorizedPage();
+ transactionEntryPage = await uncategorizedPage.clickCreateTransaction();
+
+ await expect(transactionEntryPage.header).toHaveText('New Transaction');
+
+ await transactionEntryPage.amountField.fill('12.34');
+ // Click anywhere to cancel active edit.
+ await transactionEntryPage.header.click();
+ await transactionEntryPage.fillField(
+ page.getByTestId('payee-field'),
+ 'Kroger',
+ );
+ await transactionEntryPage.fillField(
+ page.getByTestId('category-field'),
+ 'Clothing',
+ );
+
+ await transactionEntryPage.createTransaction();
+
+ await expect(uncategorizedPage.transactions.nth(0)).toHaveText(
+ '(No payee)Uncategorized-12.35',
+ );
+ await expect(page).toMatchThemeScreenshots();
+ });
});
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png
new file mode 100644
index 0000000000..ad64d91030
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png
new file mode 100644
index 0000000000..c7cd31e05e
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png
new file mode 100644
index 0000000000..bdcad535d4
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-categorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png
index 09c4a4473d..5d6a84f5a7 100644
Binary files a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-7-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png
index 02118f4e42..c8ed30e1d6 100644
Binary files a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-8-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png
index 58a53f0cd3..d10b3d513d 100644
Binary files a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-a-transaction-via-footer-button-9-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png
new file mode 100644
index 0000000000..72f9836137
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-1-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png
new file mode 100644
index 0000000000..1a2ebaae04
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-2-chromium-linux.png differ
diff --git a/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png
new file mode 100644
index 0000000000..533989cdf5
Binary files /dev/null and b/packages/desktop-client/e2e/transactions.mobile.test.js-snapshots/Mobile-Transactions-creates-an-uncategorized-transaction-from-accounts-uncategorized-page-3-chromium-linux.png differ
diff --git a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
index 1d72fea856..d746aee4de 100644
--- a/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
+++ b/packages/desktop-client/src/components/mobile/accounts/AccountTransactions.tsx
@@ -73,7 +73,9 @@ export function AccountTransactions({
)
}
leftContent={<MobileBackButton />}
- rightContent={<AddTransactionButton accountId={accountId} />}
+ rightContent={
+ <AddTransactionButton accountId={account ? accountId : undefined} />
+ }
/>
}
padding={0}
diff --git a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
index b7f7140e2e..8005375a41 100644
--- a/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
+++ b/packages/desktop-client/src/components/mobile/transactions/TransactionEdit.jsx
@@ -457,7 +457,6 @@ const TransactionEditInner = memo(function TransactionEditInner({
[unserializedTransactions, dateFormat],
);
const { grouped: categoryGroups } = useCategories();
- const { state: locationState } = useLocation();
const [transaction, ...childTransactions] = transactions;
@@ -538,20 +537,7 @@ const TransactionEditInner = memo(function TransactionEditInner({
}
onSave(transactionsToSave);
-
- const isAddingFromAccountPage = isAdding && locationState?.accountId;
- if (!isAddingFromAccountPage || hasAccountChanged.current) {
- const { account: accountId } = unserializedTransaction;
- const account = accountsById?.[accountId];
- if (account) {
- navigate(`/accounts/${account.id}`, { replace: true });
- } else {
- // Handle the case where account is undefined
- navigate('/accounts');
- }
- } else {
- navigate(-1);
- }
+ navigate(-1);
};
if (unserializedTransaction.reconciled) {
@@ -568,15 +554,7 @@ const TransactionEditInner = memo(function TransactionEditInner({
} else {
onConfirmSave();
}
- }, [
- accountsById,
- isAdding,
- dispatch,
- locationState?.accountId,
- navigate,
- onSave,
- unserializedTransactions,
- ]);
+ }, [isAdding, dispatch, navigate, onSave, unserializedTransactions]);
const onUpdateInner = useCallback(
async (serializedTransaction, name, value) => {
diff --git a/upcoming-release-notes/3932.md b/upcoming-release-notes/3932.md
new file mode 100644
index 0000000000..23754b68dc
--- /dev/null
+++ b/upcoming-release-notes/3932.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [jfdoming]
+---
+
+Fix a navigation bug and a crash from the account pages