Merge branch 'master' into issue-3331

actualbudget · Sep 20, 2024 · 34e9bf4 · 34e9bf4
2 parents 3d4f83f + e6bf6da
commit 34e9bf4
Show file tree

Hide file tree

Showing 422 changed files with 8,051 additions and 6,913 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -14,6 +14,7 @@ packages/desktop-client/**/node_modules/*
 packages/desktop-client/node_modules/
 packages/desktop-client/src/icons/**/*
 packages/desktop-client/test-results/
+packages/desktop-client/playwright-report/
 
 packages/desktop-electron/client-build/
 packages/desktop-electron/dist/

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "6.9.0",
+  "version": "6.10.0",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {

diff --git a/packages/desktop-client/.gitignore b/packages/desktop-client/.gitignore
@@ -6,6 +6,7 @@ node_modules
 # testing
 coverage
 test-results
+playwright-report
 
 # production
 build

diff --git a/packages/desktop-client/e2e/accounts.test.js b/packages/desktop-client/e2e/accounts.test.js
@@ -1,3 +1,5 @@
+import { join } from 'path';
+
 import { test, expect } from '@playwright/test';
 
 import { ConfigurationPage } from './page-models/configuration-page';
@@ -99,4 +101,44 @@ test.describe('Accounts', () => {
       await expect(transaction.account).toHaveText('Ally Savings');
     });
   });
+
+  test.describe('Import Transactions', () => {
+    test.beforeEach(async () => {
+      accountPage = await navigation.createAccount({
+        name: 'CSV import',
+        offBudget: false,
+        balance: 0,
+      });
+    });
+
+    test.afterEach(async () => {
+      const close = await accountPage.clickCloseAccount();
+      await close.selectTransferAccount('Vanguard 401k');
+      await close.forceCloseAccount();
+    });
+
+    async function importCsv(screenshot = false) {
+      const fileChooserPromise = page.waitForEvent('filechooser');
+      await accountPage.page.getByRole('button', { name: 'Import' }).click();
+
+      const fileChooser = await fileChooserPromise;
+      await fileChooser.setFiles(join(__dirname, 'data/test.csv'));
+
+      if (screenshot) await expect(page).toMatchThemeScreenshots();
+
+      await accountPage.page
+        .getByRole('button', { name: /Import \d+ transactions/ })
+        .click();
+    }
+
+    test('imports transactions from a CSV file', async () => {
+      await importCsv(true);
+    });
+
+    test('import csv file twice', async () => {
+      await importCsv(false);
+      await page.waitForTimeout(1000);
+      await importCsv(true);
+    });
+  });
 });
diff --git a/...apshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png b/...apshots/Accounts-Import-Transactions-import-csv-file-twice-1-chromium-linux.png
diff --git a/...apshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png b/...apshots/Accounts-Import-Transactions-import-csv-file-twice-2-chromium-linux.png
diff --git a/...apshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png b/...apshots/Accounts-Import-Transactions-import-csv-file-twice-3-chromium-linux.png
diff --git a/...s-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png b/...s-Import-Transactions-imports-transactions-from-a-CSV-file-1-chromium-linux.png
diff --git a/...s-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png b/...s-Import-Transactions-imports-transactions-from-a-CSV-file-2-chromium-linux.png
diff --git a/...s-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png b/...s-Import-Transactions-imports-transactions-from-a-CSV-file-3-chromium-linux.png
diff --git a/...est.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png b/...est.js-snapshots/Budget-transfer-funds-to-another-category-1-chromium-linux.png
diff --git a/...est.js-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png b/...est.js-snapshots/Budget-transfer-funds-to-another-category-2-chromium-linux.png
diff --git a/...est.js-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png b/...est.js-snapshots/Budget-transfer-funds-to-another-category-3-chromium-linux.png
diff --git a/packages/desktop-client/e2e/data/test.csv b/packages/desktop-client/e2e/data/test.csv
@@ -0,0 +1,9 @@
+Date,Payee,Notes,Category,Amount
+2024-08-02,Deposit,test 1,Income,1787.76
+2024-07-02,Deposit,test 2,Income,1787.76
+2024-06-02,Deposit,test 3,Income,1787.76
+2024-05-02,Deposit,test 4,Income,1787.76
+2024-04-02,Deposit,test 5,Income,1787.76
+2024-03-02,Deposit,test 6,Income,1787.76
+2024-02-02,Deposit,test 7,Income,1787.76
+2024-01-02,Starting Balance,test 8,Starting Balances,-330000
diff --git a/...s-snapshots/Mobile-checks-that-settings-page-can-be-opened-4-chromium-linux.png b/...s-snapshots/Mobile-checks-that-settings-page-can-be-opened-4-chromium-linux.png
diff --git a/...s-snapshots/Mobile-checks-that-settings-page-can-be-opened-5-chromium-linux.png b/...s-snapshots/Mobile-checks-that-settings-page-can-be-opened-5-chromium-linux.png
diff --git a/...s-snapshots/Mobile-checks-that-settings-page-can-be-opened-6-chromium-linux.png b/...s-snapshots/Mobile-checks-that-settings-page-can-be-opened-6-chromium-linux.png
diff --git a/...s-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png b/...s-snapshots/Mobile-creates-a-transaction-via-footer-button-7-chromium-linux.png
diff --git a/...s-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png b/...s-snapshots/Mobile-creates-a-transaction-via-footer-button-8-chromium-linux.png
diff --git a/...s-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png b/...s-snapshots/Mobile-creates-a-transaction-via-footer-button-9-chromium-linux.png
diff --git a/...apshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png b/...apshots/Mobile-loads-the-budget-page-with-budgeted-amounts-1-chromium-linux.png
diff --git a/...apshots/Mobile-loads-the-budget-page-with-budgeted-amounts-2-chromium-linux.png b/...apshots/Mobile-loads-the-budget-page-with-budgeted-amounts-2-chromium-linux.png
diff --git a/...apshots/Mobile-loads-the-budget-page-with-budgeted-amounts-3-chromium-linux.png b/...apshots/Mobile-loads-the-budget-page-with-budgeted-amounts-3-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-1-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-2-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-3-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-4-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-4-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-5-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-5-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-6-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-6-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-7-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-8-chromium-linux.png
diff --git a/...dividual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png b/...dividual-account-page-and-checks-that-filtering-is-working-9-chromium-linux.png
diff --git a/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-1-chromium-linux.png b/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-1-chromium-linux.png
diff --git a/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-2-chromium-linux.png b/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-2-chromium-linux.png
diff --git a/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-3-chromium-linux.png b/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-3-chromium-linux.png
diff --git a/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-4-chromium-linux.png b/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-4-chromium-linux.png
diff --git a/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-5-chromium-linux.png b/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-5-chromium-linux.png
diff --git a/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-6-chromium-linux.png b/...rding.test.js-snapshots/Onboarding-checks-the-page-visuals-6-chromium-linux.png
diff --git a/packages/desktop-client/e2e/page-models/close-account-modal.js b/packages/desktop-client/e2e/page-models/close-account-modal.js
@@ -12,4 +12,8 @@ export class CloseAccountModal {
   async closeAccount() {
     await this.page.getByRole('button', { name: 'Close account' }).click();
   }
+
+  async forceCloseAccount() {
+    await this.page.getByLabel('Force close').click();
+  }
 }
diff --git a/packages/desktop-client/e2e/page-models/mobile-accounts-page.js b/packages/desktop-client/e2e/page-models/mobile-accounts-page.js
@@ -23,7 +23,7 @@ export class MobileAccountsPage {
    * Click on the n-th account to open it up
    */
   async openNthAccount(idx) {
-    await this.accounts.nth(idx).getByRole('button').click();
+    await this.accounts.nth(idx).click();
 
     return new MobileAccountPage(this.page);
   }

diff --git a/...snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png b/...snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png
diff --git a/...snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png b/...snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png
diff --git a/...snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png b/...snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png
diff --git a/...snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png b/...snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png
diff --git a/...snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png b/...snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png
diff --git a/...snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png b/...snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png
diff --git a/...ettings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png b/...ettings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png
diff --git a/...ettings.test.js-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png b/...ettings.test.js-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png
diff --git a/...ettings.test.js-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png b/...ettings.test.js-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png
diff --git a/packages/desktop-client/index.html b/packages/desktop-client/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />
@@ -9,26 +9,16 @@
     <title>Actual</title>
     <link rel="canonical" href="/" />
     <link rel="shortcut icon" href="/favicon.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
     <link
-      rel="apple-touch-icon"
-      sizes="180x180"
-      href="/apple-touch-icon.png"
+      rel="manifest"
+      href="/site.webmanifest"
+      crossorigin="use-credentials"
     />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="32x32"
-      href="/favicon-32x32.png"
-    />
-    <link
-      rel="icon"
-      type="image/png"
-      sizes="16x16"
-      href="/favicon-16x16.png"
-    />
-    <link rel="manifest" href="/site.webmanifest" crossorigin="use-credentials"/>
-    <meta name="msapplication-TileColor" content="#da532c" />
-    <meta name="theme-color" content="#ffffff" />
+    <meta name="msapplication-TileColor" content="#8812E1" />
+    <meta name="theme-color" content="#8812E1" />
 
     <style type="text/css">
       html,
@@ -42,9 +32,21 @@
       body,
       button,
       input {
-        font-family: 'Inter var', -apple-system, BlinkMacSystemFont, 'Segoe UI',
-          'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
-          'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+        font-family:
+          'Inter var',
+          -apple-system,
+          BlinkMacSystemFont,
+          'Segoe UI',
+          'Roboto',
+          'Oxygen',
+          'Ubuntu',
+          'Cantarell',
+          'Fira Sans',
+          'Droid Sans',
+          'Helvetica Neue',
+          'Helvetica',
+          'Arial',
+          sans-serif;
       }
 
       a {
@@ -66,9 +68,21 @@
       input,
       textarea {
         font-size: 1em;
-        font-family: 'Inter var', -apple-system, BlinkMacSystemFont, 'Segoe UI',
-          'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans',
-          'Helvetica Neue', 'Helvetica', 'Arial', sans-serif;
+        font-family:
+          'Inter var',
+          -apple-system,
+          BlinkMacSystemFont,
+          'Segoe UI',
+          'Roboto',
+          'Oxygen',
+          'Ubuntu',
+          'Cantarell',
+          'Fira Sans',
+          'Droid Sans',
+          'Helvetica Neue',
+          'Helvetica',
+          'Arial',
+          sans-serif;
       }
 
       html,

diff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.json
@@ -1,25 +1,21 @@
 {
   "name": "@actual-app/web",
-  "version": "24.8.0",
+  "version": "24.9.0",
   "license": "MIT",
   "files": [
     "build"
   ],
   "devDependencies": {
     "@juggle/resize-observer": "^3.4.0",
     "@playwright/test": "1.41.1",
-    "@react-aria/focus": "^3.16.0",
-    "@react-aria/listbox": "^3.11.3",
-    "@react-aria/utils": "^3.23.0",
-    "@react-stately/collections": "^3.10.4",
-    "@react-stately/list": "^3.10.2",
     "@rollup/plugin-inject": "^5.0.5",
     "@svgr/cli": "^8.1.0",
     "@swc/core": "^1.5.3",
     "@swc/helpers": "^0.5.11",
     "@swc/plugin-react-remove-properties": "^1.5.121",
     "@testing-library/react": "14.1.2",
     "@testing-library/user-event": "14.5.2",
+    "@types/debounce": "^1.2.4",
     "@types/lodash": "^4",
     "@types/promise-retry": "^1.1.6",
     "@types/react": "^18.2.0",
@@ -53,8 +49,8 @@
     "promise-retry": "^2.0.1",
     "re-resizable": "^6.9.17",
     "react": "18.2.0",
-    "react-aria": "^3.33.1",
-    "react-aria-components": "^1.2.1",
+    "react-aria": "^3.34.3",
+    "react-aria-components": "^1.3.3",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-dom": "18.2.0",
@@ -68,6 +64,7 @@
     "react-router-dom": "6.21.3",
     "react-simple-pull-to-refresh": "^1.3.3",
     "react-spring": "^9.7.3",
+    "react-stately": "^3.10.9",
     "react-virtualized-auto-sizer": "^1.0.21",
     "recharts": "^2.10.4",
     "redux": "^4.2.1",

diff --git a/packages/desktop-client/playwright.config.js b/packages/desktop-client/playwright.config.js
@@ -57,9 +57,7 @@ export default defineConfig({
   timeout: 20000, // 20 seconds
   retries: 1,
   testDir: 'e2e/',
-  reporter: !process.env.CI
-    ? [['html', { open: 'never', outputFolder: 'test-results/html' }]]
-    : undefined,
+  reporter: !process.env.CI ? [['html', { open: 'never' }]] : undefined,
   use: {
     userAgent: 'playwright',
     screenshot: 'on',