Notes tag autocomplete

.eslintignore

@@ -14,7 +14,6 @@ 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/

.eslintrc.js

@@ -1,3 +1,4 @@
+/* eslint-disable rulesdir/typography */
 const path = require('path');
 
 const rulesDirPlugin = require('eslint-plugin-rulesdir');
@@ -33,23 +34,9 @@ const restrictedImportColors = [
 ];
 
 module.exports = {
-  root: true,
-  env: {
-    browser: true,
-    commonjs: true,
-    es6: true,
-    jest: true,
-    node: true,
-  },
-  plugins: [
-    'prettier',
-    'import',
-    'rulesdir',
-    '@typescript-eslint',
-    'jsx-a11y',
-    'react-hooks',
-  ],
+  plugins: ['prettier', 'import', 'rulesdir', '@typescript-eslint'],
   extends: [
+    'react-app',
     'plugin:react/recommended',
     'plugin:react/jsx-runtime',
     'plugin:prettier/recommended',
@@ -64,184 +51,6 @@ module.exports = {
     vi: true,
   },
   rules: {
-    // http://eslint.org/docs/rules/
-    'array-callback-return': 'warn',
-    'default-case': ['warn', { commentPattern: '^no default$' }],
-    'dot-location': ['warn', 'property'],
-    eqeqeq: ['warn', 'smart'],
-    'new-parens': 'warn',
-    'no-array-constructor': 'warn',
-    'no-caller': 'warn',
-    'no-cond-assign': ['warn', 'except-parens'],
-    'no-const-assign': 'warn',
-    'no-control-regex': 'warn',
-    'no-delete-var': 'warn',
-    'no-dupe-args': 'warn',
-    'no-dupe-class-members': 'warn',
-    'no-dupe-keys': 'warn',
-    'no-duplicate-case': 'warn',
-    'no-empty-character-class': 'warn',
-    'no-empty-pattern': 'warn',
-    'no-eval': 'warn',
-    'no-ex-assign': 'warn',
-    'no-extend-native': 'warn',
-    'no-extra-bind': 'warn',
-    'no-extra-label': 'warn',
-    'no-fallthrough': 'warn',
-    'no-func-assign': 'warn',
-    'no-implied-eval': 'warn',
-    'no-invalid-regexp': 'warn',
-    'no-iterator': 'warn',
-    'no-label-var': 'warn',
-    'no-labels': ['warn', { allowLoop: true, allowSwitch: false }],
-    'no-lone-blocks': 'warn',
-    'no-mixed-operators': [
-      'warn',
-      {
-        groups: [
-          ['&', '|', '^', '~', '<<', '>>', '>>>'],
-          ['==', '!=', '===', '!==', '>', '>=', '<', '<='],
-          ['&&', '||'],
-          ['in', 'instanceof'],
-        ],
-        allowSamePrecedence: false,
-      },
-    ],
-    'no-multi-str': 'warn',
-    'no-global-assign': 'warn',
-    'no-unsafe-negation': 'warn',
-    'no-new-func': 'warn',
-    'no-new-object': 'warn',
-    'no-new-symbol': 'warn',
-    'no-new-wrappers': 'warn',
-    'no-obj-calls': 'warn',
-    'no-octal': 'warn',
-    'no-octal-escape': 'warn',
-    'no-redeclare': 'warn',
-    'no-regex-spaces': 'warn',
-    'no-script-url': 'warn',
-    'no-self-assign': 'warn',
-    'no-self-compare': 'warn',
-    'no-sequences': 'warn',
-    'no-shadow-restricted-names': 'warn',
-    'no-sparse-arrays': 'warn',
-    'no-template-curly-in-string': 'warn',
-    'no-this-before-super': 'warn',
-    'no-throw-literal': 'warn',
-    'no-undef': 'error',
-    'no-unreachable': 'warn',
-    'no-unused-expressions': [
-      'error',
-      {
-        allowShortCircuit: true,
-        allowTernary: true,
-        allowTaggedTemplates: true,
-      },
-    ],
-    'no-unused-labels': 'warn',
-    'no-use-before-define': [
-      'warn',
-      {
-        functions: false,
-        classes: false,
-        variables: false,
-      },
-    ],
-    'no-useless-computed-key': 'warn',
-    'no-useless-concat': 'warn',
-    'no-useless-constructor': 'warn',
-    'no-useless-escape': 'warn',
-    'no-useless-rename': [
-      'warn',
-      {
-        ignoreDestructuring: false,
-        ignoreImport: false,
-        ignoreExport: false,
-      },
-    ],
-    'no-with': 'warn',
-    'no-whitespace-before-property': 'warn',
-    'react-hooks/exhaustive-deps': 'warn',
-    'require-yield': 'warn',
-    'rest-spread-spacing': ['warn', 'never'],
-    strict: ['warn', 'never'],
-    'unicode-bom': ['warn', 'never'],
-    'use-isnan': 'warn',
-    'valid-typeof': 'warn',
-    'no-restricted-properties': [
-      'error',
-      {
-        object: 'require',
-        property: 'ensure',
-        message:
-          'Please use import() instead. More info: https://facebook.github.io/create-react-app/docs/code-splitting',
-      },
-      {
-        object: 'System',
-        property: 'import',
-        message:
-          'Please use import() instead. More info: https://facebook.github.io/create-react-app/docs/code-splitting',
-      },
-    ],
-    'getter-return': 'warn',
-
-    // https://github.com/benmosher/eslint-plugin-import/tree/master/docs/rules
-    'import/first': 'error',
-    'import/no-amd': 'error',
-    'import/no-anonymous-default-export': 'warn',
-    'import/no-webpack-loader-syntax': 'error',
-
-    // https://github.com/yannickcr/eslint-plugin-react/tree/master/docs/rules
-    'react/forbid-foreign-prop-types': ['warn', { allowInPropTypes: true }],
-    'react/jsx-no-comment-textnodes': 'warn',
-    'react/jsx-no-duplicate-props': 'warn',
-    'react/jsx-no-target-blank': 'warn',
-    'react/jsx-no-undef': 'error',
-    'react/jsx-pascal-case': [
-      'warn',
-      {
-        allowAllCaps: true,
-        ignore: [],
-      },
-    ],
-    'react/no-danger-with-children': 'warn',
-    // Disabled because of undesirable warnings
-    // See https://github.com/facebook/create-react-app/issues/5204 for
-    // blockers until its re-enabled
-    // 'react/no-deprecated': 'warn',
-    'react/no-direct-mutation-state': 'warn',
-    'react/no-is-mounted': 'warn',
-    'react/no-typos': 'error',
-    'react/require-render-return': 'error',
-    'react/style-prop-object': 'warn',
-
-    // https://github.com/evcohen/eslint-plugin-jsx-a11y/tree/master/docs/rules
-    'jsx-a11y/alt-text': 'warn',
-    'jsx-a11y/anchor-has-content': 'warn',
-    'jsx-a11y/anchor-is-valid': [
-      'warn',
-      {
-        aspects: ['noHref', 'invalidHref'],
-      },
-    ],
-    'jsx-a11y/aria-activedescendant-has-tabindex': 'warn',
-    'jsx-a11y/aria-props': 'warn',
-    'jsx-a11y/aria-proptypes': 'warn',
-    'jsx-a11y/aria-role': ['warn', { ignoreNonDOM: true }],
-    'jsx-a11y/aria-unsupported-elements': 'warn',
-    'jsx-a11y/heading-has-content': 'warn',
-    'jsx-a11y/iframe-has-title': 'warn',
-    'jsx-a11y/img-redundant-alt': 'warn',
-    'jsx-a11y/no-access-key': 'warn',
-    'jsx-a11y/no-distracting-elements': 'warn',
-    'jsx-a11y/no-redundant-roles': 'warn',
-    'jsx-a11y/role-has-required-aria-props': 'warn',
-    'jsx-a11y/role-supports-aria-props': 'warn',
-    'jsx-a11y/scope': 'warn',
-
-    // https://github.com/facebook/react/tree/main/packages/eslint-plugin-react-hooks
-    'react-hooks/rules-of-hooks': 'error',
-
     'prettier/prettier': 'warn',
 
     // Note: base rule explicitly disabled in favor of the TS one
@@ -251,7 +60,6 @@ module.exports = {
       {
         varsIgnorePattern: '^(_|React)',
         ignoreRestSiblings: true,
-        caughtErrors: 'none',
       },
     ],
 
@@ -358,63 +166,9 @@ module.exports = {
     'prefer-const': 'warn',
     'prefer-spread': 'off',
     '@typescript-eslint/no-empty-function': 'off',
-    '@typescript-eslint/no-require-imports': 'off',
     'import/no-default-export': 'warn',
   },
   overrides: [
-    {
-      files: ['**/*.ts?(x)'],
-      parser: '@typescript-eslint/parser',
-      parserOptions: {
-        ecmaVersion: 2018,
-        sourceType: 'module',
-        ecmaFeatures: {
-          jsx: true,
-        },
-
-        // typescript-eslint specific options
-        warnOnUnsupportedTypeScriptVersion: true,
-      },
-      plugins: ['@typescript-eslint'],
-      // If adding a typescript-eslint version of an existing ESLint rule,
-      // make sure to disable the ESLint rule here.
-      rules: {
-        // TypeScript's `noFallthroughCasesInSwitch` option is more robust (#6906)
-        'default-case': 'off',
-        // 'tsc' already handles this (https://github.com/typescript-eslint/typescript-eslint/issues/291)
-        'no-dupe-class-members': 'off',
-        // 'tsc' already handles this (https://github.com/typescript-eslint/typescript-eslint/issues/477)
-        'no-undef': 'off',
-
-        // Add TypeScript specific rules (and turn off ESLint equivalents)
-        '@typescript-eslint/consistent-type-assertions': 'warn',
-        'no-array-constructor': 'off',
-        '@typescript-eslint/no-array-constructor': 'warn',
-        'no-redeclare': 'off',
-        '@typescript-eslint/no-redeclare': 'warn',
-        'no-use-before-define': 'off',
-        '@typescript-eslint/no-use-before-define': [
-          'warn',
-          {
-            functions: false,
-            classes: false,
-            variables: false,
-            typedefs: false,
-          },
-        ],
-        'no-unused-expressions': 'off',
-        '@typescript-eslint/no-unused-expressions': [
-          'error',
-          {
-            allowShortCircuit: true,
-            allowTernary: true,
-            allowTaggedTemplates: true,
-          },
-        ],
-        'no-useless-constructor': 'off',
-        '@typescript-eslint/no-useless-constructor': 'warn',
-      },
-    },
     {
       files: ['.eslintrc.js', './**/.eslintrc.js'],
       parserOptions: { project: null },
@@ -435,7 +189,7 @@ module.exports = {
           'warn',
           { prefer: 'type-imports', fixStyle: 'inline-type-imports' },
         ],
-        '@typescript-eslint/no-restricted-types': [
+        '@typescript-eslint/ban-types': [
           'warn',
           {
             types: {
@@ -443,6 +197,7 @@ module.exports = {
               FunctionComponent: { message: ruleFCMsg },
               FC: { message: ruleFCMsg },
             },
+            extendDefaults: true,
           },
         ],
       },
@@ -526,8 +281,8 @@ module.exports = {
         './packages/desktop-client/src/components/budget/DynamicBudgetTable.tsx',
         './packages/desktop-client/src/components/budget/index.tsx',
         './packages/desktop-client/src/components/budget/MobileBudget.tsx',
-        './packages/desktop-client/src/components/budget/envelope/HoldMenu.tsx',
-        './packages/desktop-client/src/components/budget/envelope/TransferMenu.tsx',
+        './packages/desktop-client/src/components/budget/rollover/HoldTooltip.tsx',
+        './packages/desktop-client/src/components/budget/rollover/TransferTooltip.tsx',
         './packages/desktop-client/src/components/common/Menu.tsx',
         './packages/desktop-client/src/components/FinancesApp.tsx',
         './packages/desktop-client/src/components/GlobalKeys.ts',
@@ -577,23 +332,8 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'off',
       },
     },
-    {
-      files: [
-        '.eslintrc.js',
-        '*.test.js',
-        '*.test.ts',
-        '*.test.jsx',
-        '*.test.tsx',
-      ],
-      rules: {
-        'rulesdir/typography': 'off',
-      },
-    },
   ],
   settings: {
-    react: {
-      version: 'detect',
-    },
     'import/resolver': {
       typescript: {
         alwaysTryTypes: true,

.github/workflows/electron-master.yml

@@ -48,17 +48,13 @@ jobs:
           sudo flatpak install org.electronjs.Electron2.BaseApp/x86_64/23.08 -y
       - name: Set up environment
         uses: ./.github/actions/setup
-      - name: Build Electron for Mac
-        if: ${{ startsWith(matrix.os, 'macos') }}
+      - name: Build Electron
         run: ./bin/package-electron
         env:
           CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
           CSC_LINK: ${{ secrets.CSC_LINK }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
-      - name: Build Electron
-        if: ${{ ! startsWith(matrix.os, 'macos') }}
-        run: ./bin/package-electron
       - name: Upload Build
         uses: actions/upload-artifact@v4
         with:
@@ -66,22 +62,13 @@ jobs:
           path: |
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.exe
-            !packages/desktop-electron/dist/Actual-windows.exe
             packages/desktop-electron/dist/*.AppImage
             packages/desktop-electron/dist/*.flatpak
-      - name: Upload Windows Store Build
-        if: ${{ startsWith(matrix.os, 'windows') }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: actual-electron-${{ matrix.os }}-appx
-          path: |
-            packages/desktop-electron/dist/*.appx
       - name: Add to Release
         uses: softprops/action-gh-release@v2
         with:
           files: |
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.exe
-            !packages/desktop-electron/dist/Actual-windows.exe
             packages/desktop-electron/dist/*.AppImage
             packages/desktop-electron/dist/*.flatpak

.github/workflows/electron-pr.yml

@@ -52,13 +52,5 @@ jobs:
           path: |
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.exe
-            !packages/desktop-electron/dist/Actual-windows.exe
             packages/desktop-electron/dist/*.AppImage
             packages/desktop-electron/dist/*.flatpak
-      - name: Upload Windows Store Build
-        if: ${{ startsWith(matrix.os, 'windows') }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: actual-electron-${{ matrix.os }}-appx
-          path: |
-            packages/desktop-electron/dist/*.appx

.github/workflows/netlify-release.yml

@@ -1,43 +0,0 @@
-name: Deploy Netlify Release
-
-defaults:
-  run:
-    shell: bash
-
-env:
-  CI: true
-
-on:
-  push:
-    tags:
-      - v**
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: false
-
-jobs:
-  build-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Checkout
-        uses: actions/checkout@v4
-    
-      - name: Set up environment
-        uses: ./.github/actions/setup
-    
-      - name: Install Netlify
-        run: npm install netlify-cli@17.10.1 -g
-    
-      - name: Build Actual
-        run: ./bin/package-browser
-
-      - name: Deploy to Netlify
-        id: netlify_deploy
-        run: |
-          netlify deploy \
-            --dir packages/desktop-client/build \
-            --site ${{ secrets.NETLIFY_SITE_ID }} \
-            --auth ${{ secrets.NETLIFY_API_TOKEN }} \
-            --filter @actual-app/web \
-            --prod

.github/workflows/stale.yml

@@ -7,20 +7,10 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v9
+      - uses: actions/stale@v8
         with:
           stale-pr-message: 'This PR is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
           close-pr-message: 'This PR was closed because it has been stalled for 5 days with no activity.'
           days-before-stale: 30
           days-before-close: 5
           days-before-issue-stale: -1
-  stale-wip:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/stale@v9
-        with:
-          stale-pr-message: ':wave: Hi! It looks like this PR has not had any changes for a week now. Would you like someone to review this PR? If so - please remove the "[WIP]" prefix from the PR title. That will let the community know that this PR is open for a review.'
-          days-before-stale: 7
-          any-of-labels: ':construction: WIP'
-          days-before-close: -1
-          days-before-issue-stale: -1

.github/workflows/wip.yml

@@ -0,0 +1,27 @@
+name: Add WIP
+
+on:
+  pull_request_target:
+    types:
+      - opened
+
+jobs:
+  add_wip_prefix:
+    if: |
+      join(github.event.pull_request.requested_reviewers) == ''
+        && !contains(github.event.pull_request.title, 'WIP')
+        && !contains(github.event.pull_request.labels.*.name, 'WIP')
+        && github.event.pull_request.draft != true
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: write
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+    - name: Add WIP
+      env:
+          TITLE: ${{ github.event.pull_request.title }}
+      shell: bash
+      run: |
+        echo ${{ secrets.GITHUB_TOKEN }} | gh auth login --with-token
+        gh pr edit ${{ github.event.pull_request.number }} -t "[WIP] ${TITLE}"

.gitignore

@@ -21,7 +21,6 @@ packages/api/dist
 packages/api/@types
 packages/crdt/dist
 packages/desktop-electron/client-build
-packages/desktop-electron/build
 packages/desktop-electron/.electron-symbols
 packages/desktop-electron/dist
 packages/desktop-electron/loot-core
@@ -47,6 +46,3 @@ bundle.mobile.js.map
 
 # Misc
 .#*
-
-# Local Netlify folder
-.netlify

.husky/pre-commit

@@ -1 +0,0 @@
-yarn lint-staged

.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.3.1.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs

README.md

@@ -14,40 +14,22 @@ Want to say thanks? Click the ⭐ at the top of the page.
 
 - Actual [discord](https://discord.gg/pRYNYr4W5A) community.
 - Actual [Community Documentation](https://actualbudget.org/docs)
-- [Frequently asked questions](https://actualbudget.org/docs/faq)
 
 ## Installation
 
-There are four ways to deploy Actual:
+If you are only interested in running the latest version and not contributing to the source code, you don't need to clone this repo. You can get the latest version through npm.
 
-1. One-click deployment [via PikaPods](https://www.pikapods.com/pods?run=actual) (~1.40 $/month) - recommended for non-technical users
-1. Managed hosting [via Fly.io](https://actualbudget.org/docs/install/fly) (~1.50 $/month)
-1. Self-hosted by using [a Docker image](https://actualbudget.org/docs/install/docker)
-1. Local-only apps - [downloadable Windows, Mac and Linux apps](https://actualbudget.org/download/) you can run on your device
+### The easy way: using a server (recommended)
 
-Learn more in the [installation instructions docs](https://actualbudget.org/docs/install/).
+The easiest way to get Actual running is to use the [actual-server](https://github.com/actualbudget/actual-server) project. That is the server for syncing changes across devices, and it comes with the latest version of Actual. The server will provide both the web project and a server for syncing.
 
-## Ready to Start Budgeting?
-
-Read about [Envelope budgeting](https://actualbudget.org/docs/getting-started/envelope-budgeting) to know more about the idea behind Actual Budget.
-
-### Are you new to budgeting or want to start fresh?
-
-Check out the community's [Starting Fresh](https://actualbudget.org/docs/getting-started/starting-fresh) guide so you can quickly get up and running!
-
-### Are you migrating from other budgeting apps?
-
-Check out the community's [Migration](https://actualbudget.org/docs/migration/) guide to start jumping on the Actual Budget train!
+You can get up and running quickly and easily by following our [Running Actual Locally Guide](https://actualbudget.org/docs/install/local)
 
 ## Documentation
 
 We have a wide range of documentation on how to use Actual, this is all available in our [Community Documentation](https://actualbudget.org/docs), this includes topics on Budgeting, Account Management, Tips & Tricks and some documentation for developers.
 
-## Contributing
-
-Actual is a community driven product. Learn more about [contributing to Actual](https://actualbudget.org/docs/contributing/).
-
-### Code structure
+## Code structure
 
 The Actual app is split up into a few packages:
 
@@ -57,23 +39,15 @@ The Actual app is split up into a few packages:
 
 More information on the project structure is available in our [community documentation](https://actualbudget.org/docs/contributing/project-details).
 
-### Feature Requests
+## Feature Requests
 
 Current feature requests can be seen [here](https://github.com/actualbudget/actual/issues?q=is%3Aissue+label%3A%22needs+votes%22+sort%3Areactions-%2B1-desc).
 Vote for your favorite requests by reacting :+1: to the top comment of the request.
 
 To add new feature requests, open a new Issue of the "Feature Request" type.
 
-### Translation
-
-Make Actual Budget accessible to more people by helping with the [Internationalization](https://actualbudget.org/docs/contributing/i18n/) of Actual. We are using a crowd sourcing tool to manage the translations, see our [Weblate Project](https://hosted.weblate.org/projects/actualbudget/). Weblate proudly supports open-source software projects through their [Libre plan](https://weblate.org/en/hosting/#libre). 
-
-## Repo Activity
-
-![Alt](https://repobeats.axiom.co/api/embed/e20537dd8b74956f86736726ccfbc6f0565bec22.svg 'Repobeats analytics image')
-
 ## Sponsors
 
-Thanks to our wonderful sponsors who make Actual Budget possible!
+Thanks to our wonderful sponsors who make Actual budget possible!
 
 <a href="https://www.netlify.com"> <img src="https://www.netlify.com/v3/img/components/netlify-color-accent.svg" alt="Deploys by Netlify" /> </a>

bin/package-electron

@@ -34,9 +34,11 @@ if [ "$OSTYPE" == "msys" ]; then
     fi
 fi
 
+yarn rebuild-electron
+
 yarn workspace loot-core build:node
 
-yarn workspace @actual-app/web build --mode=desktop
+yarn workspace @actual-app/web build
 
 yarn workspace desktop-electron update-client
 
@@ -48,10 +50,10 @@ yarn workspace desktop-electron update-client
         if [ -f ../../.secret-tokens ]; then
             source ../../.secret-tokens
         fi
-        yarn build
+        yarn build --publish never --arm64 --x64
 
         echo "\nCreated release"
     else
-        SKIP_NOTARIZATION=true yarn build
+        SKIP_NOTARIZATION=true yarn build --publish never --x64
     fi
 )

bin/run-vrt

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# See here for more information: https://github.com/actualbudget/actual/tree/master/packages/desktop-client#visual-regression
-
-if [ ! -d "node_modules" ] || [ "$(ls -A node_modules)" = "" ]; then
-    yarn
-fi
-
-E2E_START_URL="${E2E_START_URL:-https://localhost:3001}"
-VRT_ARGS=""
-
-# Loop through all arguments
-while [ $# -gt 0 ]; do
-    key="$1"
-    case $key in
-        --e2e-start-url)
-            E2E_START_URL="$2"
-            shift
-            ;;
-        *)
-            VRT_ARGS="$VRT_ARGS $1"
-            ;;
-    esac
-    shift
-done
-
-echo "Running VRT tests with the following parameters:"
-echo "E2E_START_URL: $E2E_START_URL"
-echo "VRT_ARGS: $VRT_ARGS"
-
-MSYS_NO_PATHCONV=1 docker run --rm --network host -v "$(pwd)":/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.41.1-jammy /bin/bash \
-  -c "E2E_START_URL=$E2E_START_URL yarn vrt $VRT_ARGS"

package.json

@@ -30,42 +30,33 @@
     "build:browser": "./bin/package-browser",
     "build:desktop": "./bin/package-electron",
     "build:api": "yarn workspace @actual-app/api build",
-    "generate:i18n": "yarn workspace @actual-app/web generate:i18n",
     "test": "yarn workspaces foreach --all --parallel --verbose run test",
     "test:debug": "yarn workspaces foreach --all --verbose run test",
     "e2e": "yarn workspaces foreach --all --parallel --verbose run e2e",
     "vrt": "yarn workspaces foreach --all --parallel --verbose run vrt",
-    "vrt:docker": "./bin/run-vrt",
     "rebuild-electron": "./node_modules/.bin/electron-rebuild -f -m ./packages/loot-core",
     "rebuild-node": "yarn workspace loot-core rebuild",
     "lint": "eslint . --max-warnings 0 --ext .js,.jsx,.ts,.tsx",
     "lint:verbose": "DEBUG=eslint:cli-engine eslint . --max-warnings 0",
     "typecheck": "yarn tsc && tsc-strict",
-    "jq": "./node_modules/node-jq/bin/jq",
-    "prepare": "husky"
+    "jq": "./node_modules/node-jq/bin/jq"
   },
   "devDependencies": {
-    "@typescript-eslint/eslint-plugin": "^8.1.0",
-    "@typescript-eslint/parser": "^8.1.0",
-    "confusing-browser-globals": "^1.0.11",
     "cross-env": "^7.0.3",
-    "eslint": "^8.57.0",
+    "eslint": "^8.37.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "3.6.1",
-    "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-jsx-a11y": "^6.9.0",
-    "eslint-plugin-prettier": "5.2.1",
-    "eslint-plugin-react": "7.35.0",
-    "eslint-plugin-react-hooks": "^4.6.2",
+    "eslint-config-react-app": "7.0.1",
+    "eslint-import-resolver-typescript": "3.5.5",
+    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-prettier": "5.1.3",
+    "eslint-plugin-react": "7.32.2",
     "eslint-plugin-rulesdir": "^0.2.2",
-    "husky": "^9.0.11",
-    "lint-staged": "^15.2.9",
     "node-jq": "^4.0.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "3.3.3",
+    "prettier": "3.2.4",
     "source-map-support": "^0.5.21",
-    "typescript": "^5.5.4",
-    "typescript-strict-plugin": "^2.4.4"
+    "typescript": "^5.0.2",
+    "typescript-strict-plugin": "^2.2.2-beta.2"
   },
   "resolutions": {
     "rollup": "4.9.4"
@@ -73,10 +64,7 @@
   "engines": {
     "node": ">=18.0.0"
   },
-  "lint-staged": {
-    "*.{js,jsx,ts,tsx,md,json}": "prettier --write"
-  },
-  "packageManager": "yarn@4.3.1",
+  "packageManager": "yarn@4.0.2",
   "browserslist": [
     "electron 24.0",
     "defaults"

packages/api/methods.test.ts

@@ -58,19 +58,6 @@ describe('API CRUD operations', () => {
     await api.loadBudget(budgetName);
   });
 
-  // api: getBudgets
-  test('getBudgets', async () => {
-    const budgets = await api.getBudgets();
-    expect(budgets).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          id: 'test-budget',
-          name: 'Default Test Db',
-        }),
-      ]),
-    );
-  });
-
   // apis: getCategoryGroups, createCategoryGroup, updateCategoryGroup, deleteCategoryGroup
   test('CategoryGroups: successfully update category groups', async () => {
     const month = '2023-10';
@@ -81,22 +68,28 @@ describe('API CRUD operations', () => {
     expect(groups).toEqual(
       expect.arrayContaining([
         expect.objectContaining({
-          hidden: false,
+          hidden: 0,
           id: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-          is_income: false,
+          is_income: 0,
           name: 'Usual Expenses',
+          sort_order: 16384,
+          tombstone: 0,
         }),
         expect.objectContaining({
-          hidden: false,
+          hidden: 0,
           id: 'a137772f-cf2f-4089-9432-822d2ddc1466',
-          is_income: false,
+          is_income: 0,
           name: 'Investments and Savings',
+          sort_order: 32768,
+          tombstone: 0,
         }),
         expect.objectContaining({
-          hidden: false,
+          hidden: 0,
           id: '2E1F5BDB-209B-43F9-AF2C-3CE28E380C00',
-          is_income: true,
+          is_income: 1,
           name: 'Income',
+          sort_order: 32768,
+          tombstone: 0,
         }),
       ]),
     );
@@ -258,7 +251,7 @@ describe('API CRUD operations', () => {
     );
   });
 
-  //apis: createAccount, getAccounts, updateAccount, closeAccount, deleteAccount, reopenAccount, getAccountBalance
+  //apis: createAccount, getAccounts, updateAccount, closeAccount, deleteAccount, reopenAccount
   test('Accounts: successfully complete account operators', async () => {
     const accountId1 = await api.createAccount(
       { name: 'test-account1', offbudget: true },
@@ -279,9 +272,6 @@ describe('API CRUD operations', () => {
       ]),
     );
 
-    expect(await api.getAccountBalance(accountId1)).toEqual(1000);
-    expect(await api.getAccountBalance(accountId2)).toEqual(0);
-
     await api.updateAccount(accountId1, { offbudget: false });
     await api.closeAccount(accountId1, accountId2, null);
     await api.deleteAccount(accountId2);
@@ -356,221 +346,13 @@ describe('API CRUD operations', () => {
     );
   });
 
-  // apis: getRules, getPayeeRules, createRule, updateRule, deleteRule
-  test('Rules: successfully update rules', async () => {
-    await api.createPayee({ name: 'test-payee' });
-    await api.createPayee({ name: 'test-payee2' });
-
-    // create our test rules
-    const rule = await api.createRule({
-      stage: 'pre',
-      conditionsOp: 'and',
-      conditions: [
-        {
-          field: 'payee',
-          op: 'is',
-          value: 'test-payee',
-        },
-      ],
-      actions: [
-        {
-          op: 'set',
-          field: 'category',
-          value: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-        },
-      ],
-    });
-    const rule2 = await api.createRule({
-      stage: 'pre',
-      conditionsOp: 'and',
-      conditions: [
-        {
-          field: 'payee',
-          op: 'is',
-          value: 'test-payee2',
-        },
-      ],
-      actions: [
-        {
-          op: 'set',
-          field: 'category',
-          value: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-        },
-      ],
-    });
-
-    // get existing rules
-    const rules = await api.getRules();
-    expect(rules).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          actions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'category',
-              op: 'set',
-              type: 'id',
-              value: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-            }),
-          ]),
-          conditions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'payee',
-              op: 'is',
-              type: 'id',
-              value: 'test-payee2',
-            }),
-          ]),
-          conditionsOp: 'and',
-          id: rule2.id,
-          stage: 'pre',
-        }),
-        expect.objectContaining({
-          actions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'category',
-              op: 'set',
-              type: 'id',
-              value: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-            }),
-          ]),
-          conditions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'payee',
-              op: 'is',
-              type: 'id',
-              value: 'test-payee',
-            }),
-          ]),
-          conditionsOp: 'and',
-          id: rule.id,
-          stage: 'pre',
-        }),
-      ]),
-    );
-
-    // get by payee
-    expect(await api.getPayeeRules('test-payee')).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          actions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'category',
-              op: 'set',
-              type: 'id',
-              value: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-            }),
-          ]),
-          conditions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'payee',
-              op: 'is',
-              type: 'id',
-              value: 'test-payee',
-            }),
-          ]),
-          conditionsOp: 'and',
-          id: rule.id,
-          stage: 'pre',
-        }),
-      ]),
-    );
-
-    expect(await api.getPayeeRules('test-payee2')).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          actions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'category',
-              op: 'set',
-              type: 'id',
-              value: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-            }),
-          ]),
-          conditions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'payee',
-              op: 'is',
-              type: 'id',
-              value: 'test-payee2',
-            }),
-          ]),
-          conditionsOp: 'and',
-          id: rule2.id,
-          stage: 'pre',
-        }),
-      ]),
-    );
-
-    // update one rule
-    const updatedRule = {
-      ...rule,
-      stage: 'post',
-      conditionsOp: 'or',
-    };
-    expect(await api.updateRule(updatedRule)).toEqual(updatedRule);
-
-    expect(await api.getRules()).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({
-          actions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'category',
-              op: 'set',
-              type: 'id',
-              value: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-            }),
-          ]),
-          conditions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'payee',
-              op: 'is',
-              type: 'id',
-              value: 'test-payee',
-            }),
-          ]),
-          conditionsOp: 'or',
-          id: rule.id,
-          stage: 'post',
-        }),
-        expect.objectContaining({
-          actions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'category',
-              op: 'set',
-              type: 'id',
-              value: 'fc3825fd-b982-4b72-b768-5b30844cf832',
-            }),
-          ]),
-          conditions: expect.arrayContaining([
-            expect.objectContaining({
-              field: 'payee',
-              op: 'is',
-              type: 'id',
-              value: 'test-payee2',
-            }),
-          ]),
-          conditionsOp: 'and',
-          id: rule2.id,
-          stage: 'pre',
-        }),
-      ]),
-    );
-
-    // delete rules
-    await api.deleteRule(rules[1].id);
-    expect(await api.getRules()).toHaveLength(1);
-
-    await api.deleteRule(rules[0].id);
-    expect(await api.getRules()).toHaveLength(0);
-  });
-
   // apis: addTransactions, getTransactions, importTransactions, updateTransaction, deleteTransaction
   test('Transactions: successfully update transactions', async () => {
     const accountId = await api.createAccount({ name: 'test-account' }, 0);
 
     let newTransaction = [
-      { date: '2023-11-03', imported_id: '11', amount: 100, notes: 'notes' },
-      { date: '2023-11-03', imported_id: '12', amount: 100, notes: '' },
+      { date: '2023-11-03', imported_id: '11', amount: 100 },
+      { date: '2023-11-03', imported_id: '11', amount: 100 },
     ];
 
     const addResult = await api.addTransactions(accountId, newTransaction, {
@@ -579,11 +361,6 @@ describe('API CRUD operations', () => {
     });
     expect(addResult).toBe('ok');
 
-    expect(await api.getAccountBalance(accountId)).toEqual(200);
-    expect(
-      await api.getAccountBalance(accountId, new Date(2023, 10, 2)),
-    ).toEqual(0);
-
     // confirm added transactions exist
     let transactions = await api.getTransactions(
       accountId,
@@ -598,9 +375,8 @@ describe('API CRUD operations', () => {
     expect(transactions).toHaveLength(2);
 
     newTransaction = [
-      { date: '2023-12-03', imported_id: '11', amount: 100, notes: 'notes' },
-      { date: '2023-12-03', imported_id: '12', amount: 100, notes: 'notes' },
-      { date: '2023-12-03', imported_id: '22', amount: 200, notes: '' },
+      { date: '2023-12-03', imported_id: '11', amount: 100 },
+      { date: '2023-12-03', imported_id: '22', amount: 200 },
     ];
 
     const reconciled = await api.importTransactions(accountId, newTransaction);
@@ -616,22 +392,9 @@ describe('API CRUD operations', () => {
       '2023-12-31',
     );
     expect(transactions).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({ imported_id: '22', amount: 200 }),
-      ]),
-    );
-    expect(transactions).toHaveLength(1);
-
-    // confirm imported transactions update perfomed
-    transactions = await api.getTransactions(
-      accountId,
-      '2023-11-01',
-      '2023-11-30',
-    );
-    expect(transactions).toEqual(
-      expect.arrayContaining([
-        expect.objectContaining({ notes: 'notes', amount: 100 }),
-      ]),
+      expect.arrayContaining(
+        newTransaction.map(trans => expect.objectContaining(trans)),
+      ),
     );
     expect(transactions).toHaveLength(2);
 

packages/api/methods.ts

@@ -31,18 +31,10 @@ export async function downloadBudget(syncId, { password }: { password? } = {}) {
   return send('api/download-budget', { syncId, password });
 }
 
-export async function getBudgets() {
-  return send('api/get-budgets');
-}
-
 export async function sync() {
   return send('api/sync');
 }
 
-export async function runBankSync(args?: { accountId: string }) {
-  return send('api/bank-sync', args);
-}
-
 export async function batchBudgetUpdates(func) {
   await send('api/batch-budget-start');
   try {
@@ -129,10 +121,6 @@ export function deleteAccount(id) {
   return send('api/account-delete', { id });
 }
 
-export function getAccountBalance(id, cutoff?) {
-  return send('api/account-balance', { id, cutoff });
-}
-
 export function getCategoryGroups() {
   return send('api/category-groups-get');
 }
@@ -165,10 +153,6 @@ export function deleteCategory(id, transferCategoryId?) {
   return send('api/category-delete', { id, transferCategoryId });
 }
 
-export function getCommonPayees() {
-  return send('api/common-payees-get');
-}
-
 export function getPayees() {
   return send('api/payees-get');
 }
@@ -184,35 +168,3 @@ export function updatePayee(id, fields) {
 export function deletePayee(id) {
   return send('api/payee-delete', { id });
 }
-
-export function mergePayees(targetId, mergeIds) {
-  return send('api/payees-merge', { targetId, mergeIds });
-}
-
-export function getRules() {
-  return send('api/rules-get');
-}
-
-export function getPayeeRules(id) {
-  return send('api/payee-rules-get', { id });
-}
-
-export function createRule(rule) {
-  return send('api/rule-create', { rule });
-}
-
-export function updateRule(rule) {
-  return send('api/rule-update', { rule });
-}
-
-export function deleteRule(id: string) {
-  return send('api/rule-delete', id);
-}
-
-export function holdBudgetForNextMonth(month, amount) {
-  return send('api/budget-hold-for-next-month', { month, amount });
-}
-
-export function resetBudgetHold(month) {
-  return send('api/budget-reset-hold', { month });
-}

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "6.10.0",
+  "version": "6.7.0",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {
@@ -9,8 +9,7 @@
   "main": "dist/index.js",
   "types": "@types/index.d.ts",
   "files": [
-    "dist",
-    "@types"
+    "dist"
   ],
   "scripts": {
     "build:app": "yarn workspace loot-core build:api",
@@ -22,19 +21,18 @@
     "clean": "rm -rf dist @types"
   },
   "dependencies": {
-    "@actual-app/crdt": "workspace:^",
-    "better-sqlite3": "^9.6.0",
+    "better-sqlite3": "^9.3.0",
     "compare-versions": "^6.1.0",
     "node-fetch": "^3.3.2",
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@swc/core": "^1.5.3",
-    "@swc/jest": "^0.2.36",
+    "@swc/core": "^1.3.105",
+    "@swc/jest": "^0.2.31",
     "@types/jest": "^27.5.2",
     "@types/uuid": "^9.0.2",
     "jest": "^27.5.1",
     "tsc-alias": "^1.8.8",
-    "typescript": "^5.5.4"
+    "typescript": "^5.0.2"
   }
 }

packages/crdt/package.json

@@ -20,12 +20,12 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@swc/core": "^1.5.3",
-    "@swc/jest": "^0.2.36",
+    "@swc/core": "^1.3.105",
+    "@swc/jest": "^0.2.31",
     "@types/jest": "^27.5.2",
     "@types/uuid": "^9.0.2",
     "jest": "^27.5.1",
     "ts-protoc-gen": "^0.15.0",
-    "typescript": "^5.5.4"
+    "typescript": "^5.0.2"
   }
 }

packages/crdt/src/crdt/merkle.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import * as merkle from './merkle';
 import { Timestamp } from './timestamp';
 

packages/crdt/src/crdt/merkle.ts

@@ -134,7 +134,6 @@ export function diff(trie1: TrieNode, trie2: TrieNode): number | null {
     node2 = node2[diffkey] || emptyTrie();
   }
 
-  // eslint-disable-next-line no-unreachable
   return null;
 }
 

packages/crdt/src/crdt/timestamp.test.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Timestamp } from './timestamp';
 
 describe('Timestamp', function () {

packages/crdt/src/crdt/timestamp.ts

@@ -154,7 +154,7 @@ export class Timestamp {
   /**
    * maximum timestamp
    */
-
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   static max = Timestamp.parse(
     '9999-12-31T23:59:59.999Z-FFFF-FFFFFFFFFFFFFFFF',
   )!;
@@ -294,7 +294,7 @@ export class Timestamp {
   /**
    * zero/minimum timestamp
    */
-
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   static zero = Timestamp.parse(
     '1970-01-01T00:00:00.000Z-0000-0000000000000000',
   )!;

packages/desktop-client/.gitignore

@@ -6,7 +6,6 @@ node_modules
 # testing
 coverage
 test-results
-playwright-report
 
 # production
 build

packages/desktop-client/README.md

@@ -45,22 +45,7 @@ HTTPS=true docker compose up --build
 
 Note the network IP address and port the dev instance is listening on.
 
-Next, navigate to the root of your project folder, run the standardized docker container, and launch the visual regression tests from within it.
-
-Run via yarn:
-
-```sh
-# By default, this connects to https://localhost:3001
-yarn vrt:docker
-
-    # To use a different ip and port:
-    yarn vrt:docker --e2e-start-url https://ip:port
-
-    # To update snapshots, use the following command:
-    yarn vrt:docker --e2e-start-url https://ip:port --update-snapshots
-```
-
-Run manually:
+Next, navigate to the root of your project folder, run the standartised docker container, and launch the visual regression tests from within it.
 
 ```sh
 # Run docker container
@@ -69,8 +54,7 @@ docker run --rm --network host -v $(pwd):/work/ -w /work/ -it mcr.microsoft.com/
     # If you receive an error such as "docker: invalid reference format", please instead use the following command:
     docker run --rm --network host -v ${pwd}:/work/ -w /work/ -it mcr.microsoft.com/playwright:v1.41.1-jammy /bin/bash
 
-# Once inside the docker container, run the VRT tests: important - they MUST be ran against a HTTPS server.
-# Use the ip and port noted earlier
+# Run the VRT tests: important - they MUST be ran against a HTTPS server.  Use the ip and port noted earlier
 E2E_START_URL=https://ip:port yarn vrt
 
     # To update snapshots, use the following command:
@@ -81,15 +65,6 @@ E2E_START_URL=https://ip:port yarn vrt
 
 You can also run the tests against a remote server by passing the URL:
 
-Run in standardized docker container:
-```sh
-E2E_START_URL=https://my-remote-server.com yarn vrt:docker
-
-    # Or pass in server URL as argument
-    yarn vrt:docker --e2e-start-url https://my-remote-server.com
-```
-
-Run locally:
 ```sh
 E2E_START_URL=https://my-remote-server.com yarn vrt
 ```

packages/desktop-client/e2e/data/ynab5-demo-budget.json

@@ -102,22 +102,10 @@
         "name": "Store",
         "transfer_account_id": null,
         "deleted": false
-      },
-      {
-        "id": "620e85b1-2ae7-45b1-bb3e-b875ea5c553a",
-        "name": "Work",
-        "transfer_account_id": null,
-        "deleted": false
       }
     ],
     "payee_locations": [],
     "category_groups": [
-      {
-        "id": "a5c355c2-3b77-4a7f-b8b3-c832b10cfec8",
-        "name": "Income",
-        "hidden": false,
-        "deleted": false
-      },
       {
         "id": "d5c355c2-3b77-4a7f-b8b3-c832b10cfec9",
         "name": "Internal Master Category",
@@ -623,30 +611,6 @@
         "goal_overall_funded": null,
         "goal_overall_left": null,
         "deleted": false
-      },
-      {
-        "id": "1429f287-50aa-49d8-a89c-752cbd167d6c",
-        "category_group_id": "a5c355c2-3b77-4a7f-b8b3-c832b10cfec8",
-        "name": "Income",
-        "hidden": false,
-        "original_category_group_id": null,
-        "note": null,
-        "budgeted": 0,
-        "activity": 0,
-        "balance": 0,
-        "goal_type": "NEED",
-        "goal_day": null,
-        "goal_cadence": 1,
-        "goal_cadence_frequency": 1,
-        "goal_creation_month": null,
-        "goal_target": 0,
-        "goal_target_month": null,
-        "goal_percentage_complete": null,
-        "goal_months_to_budget": null,
-        "goal_under_funded": null,
-        "goal_overall_funded": null,
-        "goal_overall_left": null,
-        "deleted": false
       }
     ],
     "months": [
@@ -1747,26 +1711,6 @@
         "import_payee_name_original": null,
         "debt_transaction_type": null,
         "deleted": false
-      },
-      {
-        "id": "9a22f287-f1e0-4667-9fc0-91e4a4262193",
-        "date": "2024-02-02",
-        "amount": 2000000,
-        "memo": "Paycheck",
-        "cleared": "cleared",
-        "approved": true,
-        "flag_color": null,
-        "account_id": "bc1d862f-bab0-41c3-bd1e-6cee8c688e32",
-        "payee_id": "620e85b1-2ae7-45b1-bb3e-b875ea5c553a",
-        "category_id": "1429f287-50aa-49d8-a89c-752cbd167d6c",
-        "transfer_account_id": null,
-        "transfer_transaction_id": null,
-        "matched_transaction_id": null,
-        "import_id": null,
-        "import_payee_name": null,
-        "import_payee_name_original": null,
-        "debt_transaction_type": null,
-        "deleted": false
       }
     ],
     "subtransactions": [

packages/desktop-client/e2e/mobile.test.js

@@ -42,9 +42,6 @@ test.describe('Mobile', () => {
       'Mortgage',
       'Water',
       'Power',
-      'Starting Balances',
-      'Misc',
-      'Income',
     ]);
     await expect(page).toMatchThemeScreenshots();
   });

packages/desktop-client/e2e/onboarding.test.js

@@ -59,7 +59,7 @@ test.describe('Onboarding', () => {
     await expect(budgetPage.budgetTable).toBeVisible({ timeout: 30000 });
 
     const accountPage = await navigation.goToAccountPage('Checking');
-    await expect(accountPage.accountBalance).toHaveText('2,600.00');
+    await expect(accountPage.accountBalance).toHaveText('600.00');
 
     await navigation.goToAccountPage('Saving');
     await expect(accountPage.accountBalance).toHaveText('250.00');

packages/desktop-client/e2e/page-models/account-page.js

@@ -16,8 +16,8 @@ export class AccountPage {
     this.cancelTransactionButton = this.page.getByRole('button', {
       name: 'Cancel',
     });
-    this.accountMenuButton = this.page.getByRole('button', {
-      name: 'Account menu',
+    this.menuButton = this.page.getByRole('button', {
+      name: 'Menu',
     });
 
     this.transactionTable = this.page.getByTestId('transaction-table');
@@ -30,28 +30,16 @@ export class AccountPage {
     this.selectTooltip = this.page.getByTestId('transactions-select-tooltip');
   }
 
-  /**
-   * Enter details of a transaction
-   */
-  async enterSingleTransaction(transaction) {
-    await this.addNewTransactionButton.click();
-    await this._fillTransactionFields(this.newTransactionRow, transaction);
-  }
-
-  /**
-   * Finish adding a transaction
-   */
-  async addEnteredTransaction() {
-    await this.addTransactionButton.click();
-    await this.cancelTransactionButton.click();
-  }
-
   /**
    * Create a single transaction
    */
   async createSingleTransaction(transaction) {
-    await this.enterSingleTransaction(transaction);
-    await this.addEnteredTransaction();
+    await this.addNewTransactionButton.click();
+
+    await this._fillTransactionFields(this.newTransactionRow, transaction);
+
+    await this.addTransactionButton.click();
+    await this.cancelTransactionButton.click();
   }
 
   /**
@@ -94,15 +82,6 @@ export class AccountPage {
    */
   getNthTransaction(index) {
     const row = this.transactionTableRow.nth(index);
-
-    return this._getTransactionDetails(row);
-  }
-
-  getEnteredTransaction() {
-    return this._getTransactionDetails(this.newTransactionRow);
-  }
-
-  _getTransactionDetails(row) {
     const account = row.getByTestId('account');
 
     return {
@@ -124,10 +103,10 @@ export class AccountPage {
    * Open the modal for closing the account.
    */
   async clickCloseAccount() {
-    await this.accountMenuButton.click();
+    await this.menuButton.click();
     await this.page.getByRole('button', { name: 'Close Account' }).click();
     return new CloseAccountModal(
-      this.page.getByTestId('close-account-modal'),
+      this.page.locator('css=[aria-modal]'),
       this.page,
     );
   }

packages/desktop-client/e2e/page-models/custom-report-page.js

@@ -1,33 +0,0 @@
-export class CustomReportPage {
-  constructor(page) {
-    this.page = page;
-    this.pageContent = page.getByTestId('reports-page');
-
-    this.showLegendButton = this.pageContent.getByRole('button', {
-      name: 'Show Legend',
-    });
-    this.showSummaryButton = this.pageContent.getByRole('button', {
-      name: 'Show Summary',
-    });
-    this.showLabelsButton = this.pageContent.getByRole('button', {
-      name: 'Show Labels',
-    });
-  }
-
-  async selectViz(vizName) {
-    await this.pageContent.getByRole('button', { name: vizName }).click();
-  }
-
-  async selectMode(mode) {
-    switch (mode) {
-      case 'total':
-        await this.pageContent.getByRole('button', { name: 'Total' }).click();
-        break;
-      case 'time':
-        await this.pageContent.getByRole('button', { name: 'Time' }).click();
-        break;
-      default:
-        throw new Error(`Unrecognized mode: ${mode}`);
-    }
-  }
-}

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).click();
+    await this.accounts.nth(idx).getByRole('button').click();
 
     return new MobileAccountPage(this.page);
   }

packages/desktop-client/e2e/page-models/reports-page.js

@@ -1,5 +1,3 @@
-import { CustomReportPage } from './custom-report-page';
-
 export class ReportsPage {
   constructor(page) {
     this.page = page;
@@ -7,29 +5,22 @@ export class ReportsPage {
   }
 
   async waitToLoad() {
-    return this.pageContent.getByRole('button', { name: /^Net/ }).waitFor();
+    return this.pageContent.getByRole('link', { name: /^Net/ }).waitFor();
   }
 
   async goToNetWorthPage() {
-    await this.pageContent.getByRole('button', { name: /^Net/ }).click();
+    await this.pageContent.getByRole('link', { name: /^Net/ }).click();
     return new ReportsPage(this.page);
   }
 
   async goToCashFlowPage() {
-    await this.pageContent.getByRole('button', { name: /^Cash/ }).click();
+    await this.pageContent.getByRole('link', { name: /^Cash/ }).click();
     return new ReportsPage(this.page);
   }
 
-  async goToCustomReportPage() {
-    await this.pageContent
-      .getByRole('button', { name: 'Create new custom report' })
-      .click();
-    return new CustomReportPage(this.page);
-  }
-
   async getAvailableReportList() {
     return this.pageContent
-      .getByRole('button')
+      .getByRole('link')
       .getByRole('heading')
       .allTextContents();
   }

packages/desktop-client/e2e/page-models/rules-page.js

@@ -44,7 +44,7 @@ export class RulesPage {
         .first()
         .click();
       await this.page
-        .getByRole('button', { exact: true, name: data.conditionsOp })
+        .getByRole('option', { exact: true, name: data.conditionsOp })
         .click();
     }
 
@@ -52,7 +52,6 @@ export class RulesPage {
       await this._fillEditorFields(
         data.conditions,
         this.page.getByTestId('condition-list'),
-        true,
       );
     }
 
@@ -64,19 +63,28 @@ export class RulesPage {
     }
 
     if (data.splits) {
-      let idx = data.actions?.length ?? 0;
-      for (const splitActions of data.splits) {
-        await this.page.getByTestId('add-split-transactions').click();
+      if (data.splits.beforeSplitActions) {
         await this._fillEditorFields(
-          splitActions,
-          this.page.getByTestId('action-list').nth(idx),
+          data.splits.beforeSplitActions,
+          this.page.getByTestId('action-list'),
         );
-        idx++;
+      }
+
+      if (data.splits.splitActions) {
+        let idx = data.splits?.beforeSplitActions.length ?? 0;
+        for (const splitActions of data.splits.splitActions) {
+          await this.page.getByTestId('add-split-transactions').click();
+          await this._fillEditorFields(
+            splitActions,
+            this.page.getByTestId('action-list').nth(idx),
+          );
+          idx++;
+        }
       }
     }
   }
 
-  async _fillEditorFields(data, rootElement, fieldFirst = false) {
+  async _fillEditorFields(data, rootElement) {
     for (const idx in data) {
       const { field, op, value } = data[idx];
 
@@ -86,25 +94,16 @@ export class RulesPage {
         await rootElement.getByRole('button', { name: 'Add entry' }).click();
       }
 
-      if (op && !fieldFirst) {
-        await row.getByTestId('op-select').getByRole('button').first().click();
-        await this.page.getByRole('button', { name: op, exact: true }).click();
-      }
-
       if (field) {
-        await row
-          .getByTestId('field-select')
-          .getByRole('button')
-          .first()
-          .click();
+        await row.getByRole('button').first().click();
         await this.page
-          .getByRole('button', { name: field, exact: true })
+          .getByRole('option', { exact: true, name: field })
           .click();
       }
 
-      if (op && fieldFirst) {
-        await row.getByTestId('op-select').getByRole('button').first().click();
-        await this.page.getByRole('button', { name: op, exact: true }).click();
+      if (op) {
+        await row.getByRole('button', { name: 'is' }).click();
+        await this.page.getByRole('option', { name: op, exact: true }).click();
       }
 
       if (value) {

packages/desktop-client/e2e/page-models/schedules-page.js

@@ -84,10 +84,6 @@ export class SchedulesPage {
 
     if (data.amount) {
       await this.page.getByLabel('Amount').fill(String(data.amount));
-      // For some readon, the input field does not trigger the change event on tests
-      // but it works on the browser. We can revisit this once migration to
-      // react aria components is complete.
-      await this.page.keyboard.press('Enter');
     }
   }
 }

packages/desktop-client/e2e/reports.test.js

@@ -3,7 +3,7 @@ import { test, expect } from '@playwright/test';
 import { ConfigurationPage } from './page-models/configuration-page';
 import { Navigation } from './page-models/navigation';
 
-test.describe.parallel('Reports', () => {
+test.describe('Reports', () => {
   let page;
   let navigation;
   let reportsPage;
@@ -43,66 +43,4 @@ test.describe.parallel('Reports', () => {
     await reportsPage.goToCashFlowPage();
     await expect(page).toMatchThemeScreenshots();
   });
-
-  test.describe.parallel('custom reports', () => {
-    let customReportPage;
-
-    test.beforeEach(async () => {
-      customReportPage = await reportsPage.goToCustomReportPage();
-    });
-
-    test('Switches to Data Table and checks the visuals', async () => {
-      await customReportPage.selectMode('time');
-      await customReportPage.selectViz('Data Table');
-      await expect(page).toMatchThemeScreenshots();
-    });
-
-    test('Switches to Bar Graph and checks the visuals', async () => {
-      await customReportPage.selectMode('time');
-      await customReportPage.selectViz('Bar Graph');
-      await expect(page).toMatchThemeScreenshots();
-    });
-
-    test('Switches to Line Graph and checks the visuals', async () => {
-      await customReportPage.selectMode('time');
-      await customReportPage.selectViz('Line Graph');
-      await expect(page).toMatchThemeScreenshots();
-    });
-
-    test('Switches to Area Graph and checks the visuals', async () => {
-      await customReportPage.selectMode('total');
-      await customReportPage.selectViz('Area Graph');
-      await expect(page).toMatchThemeScreenshots();
-    });
-
-    test('Switches to Donut Graph and checks the visuals', async () => {
-      await customReportPage.selectMode('total');
-      await customReportPage.selectViz('Donut Graph');
-      await expect(page).toMatchThemeScreenshots();
-    });
-
-    test('Validates that "show legend" button shows the legend side-bar', async () => {
-      await customReportPage.selectViz('Bar Graph');
-      await customReportPage.showLegendButton.click();
-      await expect(page).toMatchThemeScreenshots();
-
-      await customReportPage.showLegendButton.click();
-    });
-
-    test('Validates that "show summary" button shows the summary', async () => {
-      await customReportPage.selectViz('Bar Graph');
-      await customReportPage.showSummaryButton.click();
-      await expect(page).toMatchThemeScreenshots();
-
-      await customReportPage.showSummaryButton.click();
-    });
-
-    test('Validates that "show labels" button shows the labels', async () => {
-      await customReportPage.selectViz('Bar Graph');
-      await customReportPage.showLabelsButton.click();
-      await expect(page).toMatchThemeScreenshots();
-
-      await customReportPage.showLabelsButton.click();
-    });
-  });
 });