Release notes

.eslintignore

@@ -0,0 +1,28 @@
+packages/api/app/bundle.api.js
+packages/api/dist
+packages/api/@types
+packages/api/migrations
+
+packages/crdt/dist
+
+packages/desktop-client/bundle.browser.js
+packages/desktop-client/build/
+packages/desktop-client/build-stats/
+packages/desktop-client/public/kcab/
+packages/desktop-client/public/data/
+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/
+
+packages/import-ynab4/**/node_modules/*
+
+packages/import-ynab5/**/node_modules/*
+
+packages/loot-core/**/node_modules/*
+packages/loot-core/**/lib-dist/*
+packages/loot-core/**/proto/*

.eslintrc.js

@@ -0,0 +1,608 @@
+const path = require('path');
+
+const rulesDirPlugin = require('eslint-plugin-rulesdir');
+rulesDirPlugin.RULES_DIR = path.join(
+  __dirname,
+  'packages',
+  'eslint-plugin-actual',
+  'lib',
+  'rules',
+);
+
+const ruleFCMsg =
+  'Type the props argument and let TS infer or use ComponentType for a component prop';
+
+const restrictedImportPatterns = [
+  {
+    group: ['*.api', '*.web', '*.electron'],
+    message: 'Don’t directly reference imports from other platforms',
+  },
+  {
+    group: ['uuid'],
+    importNames: ['*'],
+    message: "Use `import { v4 as uuidv4 } from 'uuid'` instead",
+  },
+];
+
+const restrictedImportColors = [
+  {
+    group: ['**/style', '**/colors'],
+    importNames: ['colors'],
+    message: 'Please use themes instead of colors',
+  },
+];
+
+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',
+  ],
+  extends: [
+    'plugin:react/recommended',
+    'plugin:react/jsx-runtime',
+    'plugin:prettier/recommended',
+    'plugin:@typescript-eslint/recommended',
+    'plugin:import/typescript',
+  ],
+  parser: '@typescript-eslint/parser',
+  parserOptions: { project: [path.join(__dirname, './tsconfig.json')] },
+  reportUnusedDisableDirectives: true,
+  globals: {
+    globalThis: false,
+    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',
+      {
+        additionalHooks: '(useQuery)',
+      },
+    ],
+    '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
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': [
+      'warn',
+      {
+        varsIgnorePattern: '^(_|React)',
+        ignoreRestSiblings: true,
+        caughtErrors: 'none',
+      },
+    ],
+
+    curly: ['warn', 'multi-line', 'consistent'],
+
+    'no-restricted-globals': ['warn'].concat(
+      require('confusing-browser-globals').filter(g => g !== 'self'),
+    ),
+
+    'react/jsx-filename-extension': [
+      'warn',
+      { extensions: ['.jsx', '.tsx'], allow: 'as-needed' },
+    ],
+    'react/jsx-no-useless-fragment': 'warn',
+    'react/self-closing-comp': 'warn',
+    'react/no-unstable-nested-components': [
+      'warn',
+      { allowAsProps: true, customValidators: ['formatter'] },
+    ],
+
+    'rulesdir/typography': 'warn',
+    'rulesdir/prefer-if-statement': 'warn',
+
+    // https://github.com/eslint/eslint/issues/16954
+    // https://github.com/eslint/eslint/issues/16953
+    'no-loop-func': 'off',
+
+    // Do don't need this as we're using TypeScript
+    'react/prop-types': 'off',
+
+    // TODO: re-enable these rules
+    'react/react-in-jsx-scope': 'off',
+
+    'no-var': 'warn',
+    'react/jsx-curly-brace-presence': 'warn',
+    'object-shorthand': ['warn', 'properties'],
+
+    'import/extensions': [
+      'warn',
+      'never',
+      {
+        json: 'always',
+      },
+    ],
+    'import/no-useless-path-segments': 'warn',
+    'import/no-duplicates': ['warn', { 'prefer-inline': true }],
+    'import/no-unused-modules': ['warn', { unusedExports: true }],
+    'import/order': [
+      'warn',
+      {
+        alphabetize: {
+          caseInsensitive: true,
+          order: 'asc',
+        },
+        groups: [
+          'builtin', // Built-in types are first
+          'external',
+          'parent',
+          'sibling',
+          'index', // Then the index file
+        ],
+        'newlines-between': 'always',
+        pathGroups: [
+          // Enforce that React (and react-related packages) is the first import
+          { group: 'builtin', pattern: 'react?(-*)', position: 'before' },
+          // Separate imports from Actual from "real" external imports
+          {
+            group: 'external',
+            pattern: 'loot-{core,design}/**/*',
+            position: 'after',
+          },
+        ],
+        pathGroupsExcludedImportTypes: ['react'],
+      },
+    ],
+
+    'no-restricted-syntax': [
+      'warn',
+      {
+        // forbid React.* as they are legacy https://twitter.com/dan_abramov/status/1308739731551858689
+        selector:
+          ":matches(MemberExpression[object.name='React'], TSQualifiedName[left.name='React'])",
+        message:
+          'Using default React import is discouraged, please use named exports directly instead.',
+      },
+      {
+        // forbid <a> in favor of <Link>
+        selector: 'JSXOpeningElement[name.name="a"]',
+        message: 'Using <a> is discouraged, please use <Link> instead.',
+      },
+    ],
+    'no-restricted-imports': [
+      'warn',
+      { patterns: [...restrictedImportPatterns, ...restrictedImportColors] },
+    ],
+
+    '@typescript-eslint/ban-ts-comment': [
+      'error',
+      { 'ts-ignore': 'allow-with-description' },
+    ],
+
+    // Rules disable during TS migration
+    '@typescript-eslint/no-var-requires': 'off',
+    '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 },
+      rules: {
+        '@typescript-eslint/consistent-type-exports': 'off',
+      },
+    },
+    {
+      files: [
+        './packages/desktop-client/**/*.{ts,tsx}',
+        './packages/loot-core/src/client/**/*.{ts,tsx}',
+      ],
+      rules: {
+        // enforce type over interface
+        '@typescript-eslint/consistent-type-definitions': ['warn', 'type'],
+        // enforce import type
+        '@typescript-eslint/consistent-type-imports': [
+          'warn',
+          { prefer: 'type-imports', fixStyle: 'inline-type-imports' },
+        ],
+        '@typescript-eslint/no-restricted-types': [
+          'warn',
+          {
+            types: {
+              // forbid FC as superflous
+              FunctionComponent: { message: ruleFCMsg },
+              FC: { message: ruleFCMsg },
+            },
+          },
+        ],
+      },
+    },
+    {
+      files: ['./packages/desktop-client/**/*'],
+      excludedFiles: [
+        './packages/desktop-client/src/hooks/useNavigate.{ts,tsx}',
+      ],
+      rules: {
+        'no-restricted-imports': [
+          'warn',
+          {
+            patterns: [
+              {
+                group: ['react-router-dom'],
+                importNames: ['useNavigate'],
+                message: 'Please use Actual’s useNavigate() hook instead.',
+              },
+            ],
+          },
+        ],
+      },
+    },
+    {
+      files: ['./packages/loot-core/src/**/*'],
+      rules: {
+        'no-restricted-imports': [
+          'warn',
+          {
+            patterns: [
+              ...restrictedImportPatterns,
+              {
+                group: ['loot-core/**'],
+                message:
+                  'Please use relative imports in loot-core instead of importing from `loot-core/*`',
+              },
+            ],
+          },
+        ],
+      },
+    },
+    {
+      files: [
+        'packages/loot-core/src/types/**/*',
+        'packages/loot-core/src/client/state-types/**/*',
+        '**/icons/**/*',
+        '**/{mocks,__mocks__}/**/*',
+        // can't correctly resolve usages
+        '**/*.{testing,electron,browser,web,api}.ts',
+      ],
+      rules: { 'import/no-unused-modules': 'off' },
+    },
+    {
+      files: [
+        './packages/desktop-client/src/style/index.*',
+        './packages/desktop-client/src/style/palette.*',
+      ],
+      rules: {
+        'no-restricted-imports': ['off', { patterns: restrictedImportColors }],
+      },
+    },
+    {
+      files: [
+        './packages/api/migrations/*',
+        './packages/loot-core/migrations/*',
+      ],
+      rules: {
+        'import/no-default-export': 'off',
+      },
+    },
+    {
+      // TODO: fix the issues in these files
+      files: [
+        './packages/desktop-client/src/components/accounts/Account.jsx',
+        './packages/desktop-client/src/components/accounts/MobileAccount.jsx',
+        './packages/desktop-client/src/components/accounts/MobileAccounts.jsx',
+        './packages/desktop-client/src/components/App.tsx',
+        './packages/desktop-client/src/components/budget/BudgetCategories.jsx',
+        './packages/desktop-client/src/components/budget/BudgetSummaries.tsx',
+        './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/common/Menu.tsx',
+        './packages/desktop-client/src/components/FinancesApp.tsx',
+        './packages/desktop-client/src/components/GlobalKeys.ts',
+        './packages/desktop-client/src/components/LoggedInUser.tsx',
+        './packages/desktop-client/src/components/manager/ManagementApp.jsx',
+        './packages/desktop-client/src/components/manager/subscribe/common.tsx',
+        './packages/desktop-client/src/components/ManageRules.tsx',
+        './packages/desktop-client/src/components/mobile/MobileAmountInput.jsx',
+        './packages/desktop-client/src/components/mobile/MobileNavTabs.tsx',
+        './packages/desktop-client/src/components/Modals.tsx',
+        './packages/desktop-client/src/components/modals/EditRule.jsx',
+        './packages/desktop-client/src/components/modals/ImportTransactions.jsx',
+        './packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx',
+        './packages/desktop-client/src/components/Notifications.tsx',
+        './packages/desktop-client/src/components/payees/ManagePayees.jsx',
+        './packages/desktop-client/src/components/payees/ManagePayeesWithData.jsx',
+        './packages/desktop-client/src/components/payees/PayeeTable.tsx',
+        './packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTable.tsx',
+        './packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableTotals.tsx',
+        './packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx',
+        './packages/desktop-client/src/components/reports/reports/CustomReport.jsx',
+        './packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx',
+        './packages/desktop-client/src/components/reports/SaveReportName.tsx',
+        './packages/desktop-client/src/components/reports/useReport.ts',
+        './packages/desktop-client/src/components/schedules/ScheduleDetails.jsx',
+        './packages/desktop-client/src/components/schedules/SchedulesTable.tsx',
+        './packages/desktop-client/src/components/select/DateSelect.tsx',
+        './packages/desktop-client/src/components/sidebar/Tools.tsx',
+        './packages/desktop-client/src/components/sort.tsx',
+        './packages/desktop-client/src/components/spreadsheet/useSheetValue.ts',
+        './packages/desktop-client/src/components/table.tsx',
+        './packages/desktop-client/src/components/Titlebar.tsx',
+        './packages/desktop-client/src/components/transactions/MobileTransaction.jsx',
+        './packages/desktop-client/src/components/transactions/SelectedTransactions.jsx',
+        './packages/desktop-client/src/components/transactions/SimpleTransactionsTable.jsx',
+        './packages/desktop-client/src/components/transactions/TransactionList.jsx',
+        './packages/desktop-client/src/components/transactions/TransactionsTable.jsx',
+        './packages/desktop-client/src/components/transactions/TransactionsTable.test.jsx',
+        './packages/desktop-client/src/hooks/useAccounts.ts',
+        './packages/desktop-client/src/hooks/useCategories.ts',
+        './packages/desktop-client/src/hooks/usePayees.ts',
+        './packages/desktop-client/src/hooks/useProperFocus.tsx',
+        './packages/desktop-client/src/hooks/useSelected.tsx',
+        './packages/loot-core/src/client/query-hooks.tsx',
+      ],
+      rules: {
+        '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/ISSUE_TEMPLATE/bug-report.yml

@@ -12,7 +12,7 @@ body:
     id: intro-md
     attributes:
       value: |
-        **IMPORTANT:** we use GitHub Issues only for BUG REPORTS and FEATURE REQUESTS. If you are looking for help/support - please reach out to the [community on Discord](https://discord.gg/pRYNYr4W5A). All non-bug and non-feature-request issues will be closed.
+        **IMPORTANT:** we use Github Issues only for BUG REPORTS and FEATURE REQUESTS. If you are looking for help/support - please reach out to the [community on Discord](https://discord.gg/pRYNYr4W5A). All non-bug and non-feature-request issues will be closed.
 
         **Bank-sync problems (SimpleFin / GoCardless)?** Reach out via the [community Discord](https://discord.gg/pRYNYr4W5A) first and open an issue only if the community deems the issue to be a legitimate bug in Actual.
   - type: checkboxes
@@ -23,6 +23,8 @@ body:
       options:
         - label: 'I have searched and found no existing issue'
           required: true
+        - label: 'I will be providing steps how to reproduce the bug (in most cases this will also mean uploading a demo budget file)'
+          required: true
     validations:
       required: true
   - type: textarea
@@ -34,14 +36,6 @@ body:
       value: 'A bug happened!'
     validations:
       required: true
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: How can we reproduce the issue?
-      description: Please give step-by-step instructions on how to reproduce the issue. In most cases this might also require uploading a sample budget/import file.
-      value: 'How can we reproduce the issue?'
-    validations:
-      required: true
   - type: markdown
     id: env-info
     attributes:

.github/ISSUE_TEMPLATE/config.yml

@@ -6,6 +6,3 @@ contact_links:
   - name: Support
     url: https://discord.gg/pRYNYr4W5A
     about: Need help with something? Having troubles setting up? Or perhaps issues using the API? Reach out to the community on Discord.
-  - name: Translations
-    url: https://hosted.weblate.org/projects/actualbudget/actual/
-    about: Found a string that needs a better translation? Add your suggestion or upvote an existing one in Weblate.

.github/actions/bump-package-versions

@@ -1,26 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-version="${1#v}"
-
-files_to_bump=(
-    packages/api/package.json
-    packages/desktop-client/package.json
-    packages/desktop-electron/package.json
-)
-
-for file in "${files_to_bump[@]}"; do
-    if [ -z "$version" ]; then
-        # version format: YY.MM.patch
-        # logic: if before the 25th, bump patch, else set minor/major to next month
-        version="$(jq -r .version "$file" | perl -e '($y,$m,$p)=split/\./,<>;$d=(localtime)[3];$d>25?($p=0,++$m,$m>12&&($m=1,++$y)):$p++;print"$y.$m.$p\n"')"
-        if [ -z "$version" ]; then
-            echo "Error: Failed to calculate new version" >&2
-            exit 1
-        fi
-    fi
-
-    echo "Bumping $file to version $version"
-    jq '.version = "'"$version"'"' "$file" > "$file.tmp"
-    mv "$file.tmp" "$file"
-done

.github/actions/setup/action.yml

@@ -1,15 +1,5 @@
 name: Setup
 
-inputs:
-  working-directory:
-    description: 'Working directory to run in, default .'
-    required: false
-    default: '.'
-  download-translations:
-    description: 'Whether to download translations as part of setup, default true'
-    required: false
-    default: 'true'
-
 runs:
   using: composite
   steps:
@@ -17,28 +7,13 @@ runs:
       uses: actions/setup-node@v4
       with:
         node-version: 18.16.0
-    - name: Install yarn
-      run: npm install -g yarn
-      shell: bash
-      if: ${{ env.ACT }}
     - name: Cache
       uses: actions/cache@v4
       id: cache
       with:
-        path: ${{ format('{0}/**/node_modules', inputs.working-directory) }}
-        key: yarn-v1-${{ runner.os }}-${{ hashFiles(format('{0}/.nvmrc', inputs.working-directory)) }}-${{ hashFiles(format('{0}/**/yarn.lock', inputs.working-directory)) }}
+        path: '**/node_modules'
+        key: yarn-v1-${{ runner.os }}-${{ hashFiles('.nvmrc') }}-${{ hashFiles('**/yarn.lock') }}
     - name: Install
-      working-directory: ${{ inputs.working-directory }}
       run: yarn --immutable
       shell: bash
       if: steps.cache.outputs.cache-hit != 'true'
-    - name: Download translations
-      uses: actions/checkout@v4
-      with:
-        repository: actualbudget/translations
-        path: ${{ inputs.working-directory }}/packages/desktop-client/locale
-      if: ${{ inputs.download-translations == 'true' }}
-    - name: Remove untranslated languages
-      run: packages/desktop-client/bin/remove-untranslated-languages
-      shell: bash
-      if: ${{ inputs.download-translations == 'true' }}

.github/workflows/electron-master.yml

@@ -80,7 +80,6 @@ jobs:
       - name: Add to Release
         uses: softprops/action-gh-release@v2
         with:
-          draft: true
           files: |
             packages/desktop-electron/dist/*.dmg
             packages/desktop-electron/dist/*.exe

.github/workflows/generate-release-pr.yml

@@ -1,35 +0,0 @@
-name: Generate release PR
-
-on:
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: 'Commit or branch to release'
-        required: true
-        default: 'master'
-      version:
-        description: 'Version number for the release (optional)'
-        required: false
-        default: ''
-
-jobs:
-  generate-release-pr:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.inputs.ref }}
-      - name: Bump package versions
-        id: bump_package_versions
-        shell: bash
-        run: |
-          .github/actions/bump-package-versions ${{ github.event.inputs.version }}
-          echo "version=$(jq -r .version packages/desktop-client/package.json)" > $GITHUB_OUTPUT
-      - name: Create PR
-        uses: peter-evans/create-pull-request@v7
-        with:
-          commit-message: '🔖 (${{ steps.bump_package_versions.outputs.version }})'
-          title: '🔖 (${{ steps.bump_package_versions.outputs.version }})'
-          body: 'Generated by [generate-release-pr.yml](../tree/master/.github/workflows/generate-release-pr.yml)'
-          branch: 'release/v${{ steps.bump_package_versions.outputs.version }}'

.github/workflows/i18n-string-extract-master.yml

@@ -1,87 +0,0 @@
-name: Extract and upload i18n strings
-
-on:
-  schedule:
-    # 4am UTC
-    - cron: "0 4 * * *"
-  workflow_dispatch:
-
-jobs:
-  extract-and-upload-i18n-strings:
-    runs-on: ubuntu-latest
-    if: github.repository == 'actualbudget/actual'
-    steps:
-      - name: Check out main repository
-        uses: actions/checkout@v4
-        with:
-          path: actual
-      - name: Set up environment
-        uses: ./actual/.github/actions/setup
-        with:
-          working-directory: actual
-          download-translations: false  # As we'll manually clone instead
-      - name: Configure Git config
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
-      - name: Configure i18n client
-        run: |
-          pip install wlc
-
-      - name: Lock translations
-        run: |
-          wlc \
-            --url https://hosted.weblate.org/api/ \
-            --key "${{ secrets.WEBLATE_API_KEY_CI_STRINGS }}" \
-            lock \
-            actualbudget/actual
-
-      - name: Update VCS with latest translations
-        run: |
-          wlc \
-            --url https://hosted.weblate.org/api/ \
-            --key "${{ secrets.WEBLATE_API_KEY_CI_STRINGS }}" \
-            push \
-            actualbudget/actual
-      - name: Check out updated translations
-        uses: actions/checkout@v4
-        with:
-          ssh-key: ${{ secrets.STRING_IMPORT_DEPLOY_KEY }}
-          repository: actualbudget/translations
-          path: translations
-      - name: Generate i18n strings
-        working-directory: actual
-        run: |
-          mkdir -p packages/desktop-client/locale/
-          cp ../translations/en.json packages/desktop-client/locale/
-          yarn generate:i18n
-          if [[ ! -f packages/desktop-client/locale/en.json ]]; then
-            echo "File packages/desktop-client/locale/en.json not found. Ensure the file was generated correctly."
-            exit 1
-          fi
-      - name: Check in new i18n strings
-        working-directory: translations
-        run: |
-          cp ../actual/packages/desktop-client/locale/en.json .
-          git add .
-          if git commit -m "Update source strings"; then
-            git push
-          else
-            echo "No changes to commit"
-          fi
-      - name: Update Weblate with latest translations
-        run: |
-          wlc \
-            --url https://hosted.weblate.org/api/ \
-            --key "${{ secrets.WEBLATE_API_KEY_CI_STRINGS }}" \
-            pull \
-            actualbudget/actual
-
-      - name: Unlock translations
-        if: always()  # Clean up even on failure
-        run: |
-          wlc \
-            --url https://hosted.weblate.org/api/ \
-            --key "${{ secrets.WEBLATE_API_KEY_CI_STRINGS }}" \
-            unlock \
-            actualbudget/actual

.github/workflows/update-vrt.yml

@@ -79,8 +79,6 @@ jobs:
         with:
           name: patch
       - name: Apply patch and push
-        env:
-          BRANCH_NAME: ${{ steps.comment-branch.outputs.head_ref }}
         run: |
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
@@ -91,7 +89,7 @@ jobs:
             exit 0
           fi
           git commit -m "Update VRT"
-          git push origin HEAD:${BRANCH_NAME}
+          git push origin HEAD:${{ steps.comment-branch.outputs.head_ref }}
       - name: Add finished reaction
         uses: dkershner6/reaction-action@v2
         with:

.yarnrc.yml

@@ -2,8 +2,6 @@ compressionLevel: mixed
 
 enableGlobalCache: false
 
-enableTransparentWorkspaces: false
-
 nodeLinker: node-modules
 
 yarnPath: .yarn/releases/yarn-4.3.1.cjs

bin/package-browser

@@ -4,15 +4,6 @@ ROOT=`dirname $0`
 
 cd "$ROOT/.."
 
-echo "Updating translations..."
-if ! [ -d packages/desktop-client/locale ]; then
-    git clone https://github.com/actualbudget/translations packages/desktop-client/locale
-fi
-pushd packages/desktop-client/locale > /dev/null
-git pull
-popd > /dev/null
-packages/desktop-client/bin/remove-untranslated-languages
-
 yarn workspace loot-core build:browser
 yarn workspace @actual-app/web build:browser
 

bin/package-electron

@@ -36,16 +36,6 @@ fi
 
 yarn workspace loot-core build:node
 
-# Get translations
-echo "Updating translations..."
-if ! [ -d packages/desktop-client/locale ]; then
-    git clone https://github.com/actualbudget/translations packages/desktop-client/locale
-fi
-pushd packages/desktop-client/locale > /dev/null
-git pull
-popd > /dev/null
-packages/desktop-client/bin/remove-untranslated-languages
-
 yarn workspace @actual-app/web build --mode=desktop # electron specific build
 
 yarn workspace desktop-electron update-client

eslint.config.mjs

@@ -1,835 +0,0 @@
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-import globals from 'globals';
-
-import pluginImport from 'eslint-plugin-import';
-import pluginJSXA11y from 'eslint-plugin-jsx-a11y';
-import pluginPrettier from 'eslint-plugin-prettier/recommended';
-import pluginReact from 'eslint-plugin-react';
-import pluginReactHooks from 'eslint-plugin-react-hooks';
-import pluginRulesDir from 'eslint-plugin-rulesdir';
-import pluginTypescript from 'typescript-eslint';
-
-import tsParser from '@typescript-eslint/parser';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-pluginRulesDir.RULES_DIR = path.join(
-  __dirname,
-  'packages',
-  'eslint-plugin-actual',
-  'lib',
-  'rules',
-);
-
-const confusingBrowserGlobals = [
-  // https://github.com/facebook/create-react-app/tree/main/packages/confusing-browser-globals
-  'addEventListener',
-  'blur',
-  'close',
-  'closed',
-  'confirm',
-  'defaultStatus',
-  'defaultstatus',
-  'event',
-  'external',
-  'find',
-  'focus',
-  'frameElement',
-  'frames',
-  'history',
-  'innerHeight',
-  'innerWidth',
-  'length',
-  'location',
-  'locationbar',
-  'menubar',
-  'moveBy',
-  'moveTo',
-  'name',
-  'onblur',
-  'onerror',
-  'onfocus',
-  'onload',
-  'onresize',
-  'onunload',
-  'open',
-  'opener',
-  'opera',
-  'outerHeight',
-  'outerWidth',
-  'pageXOffset',
-  'pageYOffset',
-  'parent',
-  'print',
-  'removeEventListener',
-  'resizeBy',
-  'resizeTo',
-  'screen',
-  'screenLeft',
-  'screenTop',
-  'screenX',
-  'screenY',
-  'scroll',
-  'scrollbars',
-  'scrollBy',
-  'scrollTo',
-  'scrollX',
-  'scrollY',
-  'status',
-  'statusbar',
-  'stop',
-  'toolbar',
-  'top',
-];
-
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  {
-    ignores: [
-      'packages/api/app/bundle.api.js',
-      'packages/api/dist',
-      'packages/api/@types',
-      'packages/api/migrations',
-      'packages/crdt/dist',
-      'packages/desktop-client/bundle.browser.js',
-      'packages/desktop-client/build/',
-      'packages/desktop-client/build-electron/',
-      'packages/desktop-client/build-stats/',
-      'packages/desktop-client/public/kcab/',
-      'packages/desktop-client/public/data/',
-      '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/build/',
-      'packages/desktop-electron/dist/',
-      'packages/import-ynab4/**/node_modules/*',
-      'packages/import-ynab5/**/node_modules/*',
-      'packages/loot-core/**/node_modules/*',
-      'packages/loot-core/**/lib-dist/*',
-      'packages/loot-core/**/proto/*',
-      'packages/sync-server',
-      '.yarn/*',
-      '.github/*',
-    ],
-  },
-  {
-    linterOptions: {
-      reportUnusedDisableDirectives: true,
-    },
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.commonjs,
-        ...globals.jest,
-        ...globals.node,
-        globalThis: false,
-        vi: true,
-      },
-    },
-    settings: {
-      react: {
-        version: 'detect',
-      },
-
-      'import/resolver': {
-        typescript: {
-          alwaysTryTypes: true,
-        },
-      },
-    },
-  },
-  pluginReact.configs.flat.recommended,
-  pluginReact.configs.flat['jsx-runtime'],
-  pluginPrettier,
-  ...pluginTypescript.configs.recommended,
-  pluginImport.flatConfigs.recommended,
-  {
-    plugins: {
-      'react-hooks': pluginReactHooks,
-      'jsx-a11y': pluginJSXA11y,
-      rulesdir: pluginRulesDir,
-    },
-  },
-  {
-    files: ['**/*.{js,ts,jsx,tsx}'],
-    rules: {
-      // http://eslint.org/docs/rules/
-      'array-callback-return': 'warn',
-
-      'default-case': [
-        'warn',
-        {
-          commentPattern: '^no default$',
-        },
-      ],
-
-      curly: ['warn', 'multi-line', 'consistent'],
-      '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',
-
-      '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',
-      'import/extensions': [
-        'warn',
-        'never',
-        {
-          json: 'always',
-        },
-      ],
-      'import/no-useless-path-segments': 'warn',
-      'import/no-duplicates': [
-        'warn',
-        {
-          'prefer-inline': true,
-        },
-      ],
-      'import/order': [
-        'warn',
-        {
-          alphabetize: {
-            caseInsensitive: true,
-            order: 'asc',
-          },
-
-          groups: ['builtin', 'external', 'parent', 'sibling', 'index'],
-          'newlines-between': 'always',
-
-          pathGroups: [
-            {
-              // Enforce that React (and react-related packages) is the first import
-              group: 'builtin',
-              pattern: 'react?(-*)',
-              position: 'before',
-            },
-            {
-              // Separate imports from Actual from "real" external imports
-              group: 'external',
-              pattern: 'loot-{core,design}/**/*',
-              position: 'after',
-            },
-          ],
-
-          pathGroupsExcludedImportTypes: ['react'],
-        },
-      ],
-
-      // 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',
-      'react/jsx-no-useless-fragment': 'warn',
-      'react/self-closing-comp': 'warn',
-      'react/jsx-filename-extension': [
-        'warn',
-        {
-          extensions: ['.jsx', '.tsx'],
-          allow: 'as-needed',
-        },
-      ],
-      'react/no-unstable-nested-components': [
-        'warn',
-        {
-          allowAsProps: true,
-          customValidators: ['formatter'],
-        },
-      ],
-      // Don't need this as we're using TypeScript
-      'react/prop-types': 'off',
-
-      // 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',
-      'react-hooks/exhaustive-deps': [
-        'warn',
-        {
-          additionalHooks: '(useQuery)',
-        },
-      ],
-
-      'rulesdir/typography': 'warn',
-      'rulesdir/prefer-if-statement': 'warn',
-
-      // Note: base rule explicitly disabled in favor of the TS one
-      'no-unused-vars': 'off',
-      '@typescript-eslint/no-unused-vars': [
-        'warn',
-        {
-          varsIgnorePattern: '^(_|React)',
-          ignoreRestSiblings: true,
-          caughtErrors: 'none',
-        },
-      ],
-
-      'no-restricted-globals': ['warn', ...confusingBrowserGlobals],
-
-      // https://github.com/eslint/eslint/issues/16954
-      // https://github.com/eslint/eslint/issues/16953
-      'no-loop-func': 'off',
-
-      // TODO: re-enable these rules
-      'react/react-in-jsx-scope': 'off',
-      'no-var': 'warn',
-      'react/jsx-curly-brace-presence': 'warn',
-      'object-shorthand': ['warn', 'properties'],
-
-      'no-restricted-syntax': [
-        'warn',
-        {
-          // forbid React.* as they are legacy https://twitter.com/dan_abramov/status/1308739731551858689
-          selector:
-            ":matches(MemberExpression[object.name='React'], TSQualifiedName[left.name='React'])",
-          message:
-            'Using default React import is discouraged, please use named exports directly instead.',
-        },
-        {
-          // forbid <a> in favor of <Link>
-          selector: 'JSXOpeningElement[name.name="a"]',
-          message: 'Using <a> is discouraged, please use <Link> instead.',
-        },
-      ],
-
-      'no-restricted-imports': [
-        'warn',
-        {
-          patterns: [
-            {
-              group: ['*.api', '*.web', '*.electron'],
-              message: "Don't directly reference imports from other platforms",
-            },
-            {
-              group: ['uuid'],
-              importNames: ['*'],
-              message: "Use `import { v4 as uuidv4 } from 'uuid'` instead",
-            },
-            {
-              group: ['**/style', '**/colors'],
-              importNames: ['colors'],
-              message: 'Please use themes instead of colors',
-            },
-          ],
-        },
-      ],
-
-      '@typescript-eslint/ban-ts-comment': [
-        'error',
-        {
-          'ts-ignore': 'allow-with-description',
-        },
-      ],
-
-      // Rules disabled during TS migration
-      '@typescript-eslint/no-var-requires': 'off',
-      'prefer-const': 'warn',
-      'prefer-spread': 'off',
-      '@typescript-eslint/no-empty-function': 'off',
-      '@typescript-eslint/no-require-imports': 'off',
-      'import/no-default-export': 'warn',
-    },
-  },
-  {
-    files: ['**/*.ts?(x)'],
-
-    languageOptions: {
-      parser: tsParser,
-      ecmaVersion: 2018,
-      sourceType: 'module',
-
-      parserOptions: {
-        project: [path.join(__dirname, './tsconfig.json')],
-        ecmaFeatures: {
-          jsx: true,
-        },
-
-        // typescript-eslint specific options
-        warnOnUnsupportedTypeScriptVersion: true,
-      },
-    },
-
-    // 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: [
-      'packages/desktop-client/**/*.{ts,tsx}',
-      'packages/loot-core/src/client/**/*.{ts,tsx}',
-    ],
-    rules: {
-      // enforce import type
-      '@typescript-eslint/consistent-type-imports': [
-        'warn',
-        {
-          prefer: 'type-imports',
-          fixStyle: 'inline-type-imports',
-        },
-      ],
-
-      '@typescript-eslint/no-restricted-types': [
-        'warn',
-        {
-          types: {
-            // forbid FC as superflous
-            FunctionComponent: {
-              message:
-                'Type the props argument and let TS infer or use ComponentType for a component prop',
-            },
-
-            FC: {
-              message:
-                'Type the props argument and let TS infer or use ComponentType for a component prop',
-            },
-          },
-        },
-      ],
-    },
-  },
-  {
-    files: ['packages/desktop-client/**/*'],
-    ignores: ['packages/desktop-client/src/hooks/useNavigate.{ts,tsx}'],
-
-    rules: {
-      'no-restricted-imports': [
-        'warn',
-        {
-          paths: [
-            {
-              name: 'react-router-dom',
-              importNames: ['useNavigate'],
-              message:
-                "Please import Actual's useNavigate() hook from `src/hooks` instead.",
-            },
-          ],
-        },
-      ],
-    },
-  },
-  {
-    files: ['packages/desktop-client/**/*', 'packages/loot-core/**/*'],
-    ignores: ['packages/desktop-client/src/redux/index.{ts,tsx}'],
-
-    rules: {
-      'no-restricted-imports': [
-        'warn',
-        {
-          paths: [
-            {
-              name: 'react-redux',
-              importNames: ['useDispatch'],
-              message:
-                "Please import Actual's useDispatch() hook from `src/redux` instead.",
-            },
-            {
-              name: 'react-redux',
-              importNames: ['useSelector'],
-              message:
-                "Please import Actual's useSelector() hook from `src/redux` instead.",
-            },
-            {
-              name: 'react-redux',
-              importNames: ['useStore'],
-              message:
-                "Please import Actual's useStore() hook from `src/redux` instead.",
-            },
-          ],
-        },
-      ],
-    },
-  },
-  {
-    files: ['packages/loot-core/src/**/*'],
-
-    rules: {
-      'no-restricted-imports': [
-        'warn',
-        {
-          patterns: [
-            {
-              group: ['*.api', '*.web', '*.electron'],
-              message: "Don't directly reference imports from other platforms",
-            },
-            {
-              group: ['uuid'],
-              importNames: ['*'],
-              message: "Use `import { v4 as uuidv4 } from 'uuid'` instead",
-            },
-            {
-              group: ['loot-core/**'],
-              message:
-                'Please use relative imports in loot-core instead of importing from `loot-core/*`',
-            },
-          ],
-        },
-      ],
-    },
-  },
-  {
-    files: [
-      'packages/loot-core/src/types/**/*',
-      'packages/loot-core/src/client/state-types/**/*',
-      '**/icons/**/*',
-      '**/{mocks,__mocks__}/**/*',
-      // can't correctly resolve usages
-      '**/*.{testing,electron,browser,web,api}.ts',
-    ],
-
-    rules: {
-      'import/no-unused-modules': 'off',
-    },
-  },
-  {
-    files: [
-      'packages/desktop-client/src/style/index.*',
-      'packages/desktop-client/src/style/palette.*',
-    ],
-
-    rules: {
-      'no-restricted-imports': [
-        'off',
-        {
-          patterns: [
-            {
-              group: ['**/style', '**/colors'],
-              importNames: ['colors'],
-              message: 'Please use themes instead of colors',
-            },
-          ],
-        },
-      ],
-    },
-  },
-  {
-    files: ['packages/api/migrations/*', 'packages/loot-core/migrations/*'],
-
-    rules: {
-      'import/no-default-export': 'off',
-    },
-  },
-  {
-    files: ['packages/api/index.ts'],
-    rules: {
-      'import/no-unresolved': 'off',
-    },
-  },
-  {},
-  {
-    // TODO: fix the issues in these files
-    files: [
-      'packages/desktop-client/src/components/accounts/Account.jsx',
-      'packages/desktop-client/src/components/accounts/MobileAccount.jsx',
-      'packages/desktop-client/src/components/accounts/MobileAccounts.jsx',
-      'packages/desktop-client/src/components/budget/BudgetCategories.jsx',
-      'packages/desktop-client/src/components/budget/BudgetSummaries.tsx',
-      '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/common/Menu.tsx',
-      'packages/desktop-client/src/components/FinancesApp.tsx',
-      'packages/desktop-client/src/components/GlobalKeys.ts',
-      'packages/desktop-client/src/components/LoggedInUser.tsx',
-      'packages/desktop-client/src/components/manager/ManagementApp.jsx',
-      'packages/desktop-client/src/components/manager/subscribe/common.tsx',
-      'packages/desktop-client/src/components/ManageRules.tsx',
-      'packages/desktop-client/src/components/mobile/MobileAmountInput.jsx',
-      'packages/desktop-client/src/components/mobile/MobileNavTabs.tsx',
-      'packages/desktop-client/src/components/Modals.tsx',
-      'packages/desktop-client/src/components/modals/EditRule.jsx',
-      'packages/desktop-client/src/components/modals/ImportTransactions.jsx',
-      'packages/desktop-client/src/components/modals/MergeUnusedPayees.jsx',
-      'packages/desktop-client/src/components/Notifications.tsx',
-      'packages/desktop-client/src/components/payees/ManagePayees.jsx',
-      'packages/desktop-client/src/components/payees/ManagePayeesWithData.jsx',
-      'packages/desktop-client/src/components/payees/PayeeTable.tsx',
-      'packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTable.tsx',
-      'packages/desktop-client/src/components/reports/graphs/tableGraph/ReportTableTotals.tsx',
-      'packages/desktop-client/src/components/reports/reports/CashFlowCard.jsx',
-      'packages/desktop-client/src/components/reports/reports/CustomReport.jsx',
-      'packages/desktop-client/src/components/reports/reports/NetWorthCard.jsx',
-      'packages/desktop-client/src/components/reports/SaveReportName.tsx',
-      'packages/desktop-client/src/components/reports/useReport.ts',
-      'packages/desktop-client/src/components/schedules/ScheduleDetails.jsx',
-      'packages/desktop-client/src/components/schedules/SchedulesTable.tsx',
-      'packages/desktop-client/src/components/select/DateSelect.tsx',
-      'packages/desktop-client/src/components/sidebar/Tools.tsx',
-      'packages/desktop-client/src/components/sort.tsx',
-      'packages/desktop-client/src/components/spreadsheet/useSheetValue.ts',
-      'packages/desktop-client/src/components/table.tsx',
-      'packages/desktop-client/src/components/Titlebar.tsx',
-      'packages/desktop-client/src/components/transactions/MobileTransaction.jsx',
-      'packages/desktop-client/src/components/transactions/SelectedTransactions.jsx',
-      'packages/desktop-client/src/components/transactions/SimpleTransactionsTable.jsx',
-      'packages/desktop-client/src/components/transactions/TransactionList.jsx',
-      'packages/desktop-client/src/components/transactions/TransactionsTable.jsx',
-      'packages/desktop-client/src/components/transactions/TransactionsTable.test.jsx',
-      'packages/desktop-client/src/hooks/useAccounts.ts',
-      'packages/desktop-client/src/hooks/useCategories.ts',
-      'packages/desktop-client/src/hooks/usePayees.ts',
-      'packages/desktop-client/src/hooks/useProperFocus.tsx',
-      'packages/desktop-client/src/hooks/useSelected.tsx',
-      'packages/loot-core/src/client/query-hooks.tsx',
-    ],
-
-    rules: {
-      'react-hooks/exhaustive-deps': 'off',
-    },
-  },
-  {
-    files: [
-      'eslint.config.mjs',
-      '**/*.test.js',
-      '**/*.test.ts',
-      '**/*.test.jsx',
-      '**/*.test.tsx',
-    ],
-
-    rules: {
-      'rulesdir/typography': 'off',
-    },
-  },
-  {
-    files: [
-      'packages/desktop-client/**/*.{ts,tsx}',
-      'packages/loot-core/src/client/**/*.{ts,tsx}',
-    ],
-    ignores: ['**/**/globals.d.ts'],
-    rules: {
-      // enforce type over interface
-      '@typescript-eslint/consistent-type-definitions': ['warn', 'type'],
-    },
-  },
-];

package.json

@@ -38,33 +38,33 @@
     "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",
+    "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"
   },
   "devDependencies": {
-    "@typescript-eslint/parser": "^8.18.1",
+    "@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": "^9.17.0",
+    "eslint": "^8.57.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-import-resolver-typescript": "^3.7.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-jsx-a11y": "^6.10.2",
+    "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.37.2",
-    "eslint-plugin-react-hooks": "^5.1.0",
+    "eslint-plugin-react": "7.35.0",
+    "eslint-plugin-react-hooks": "^4.6.2",
     "eslint-plugin-rulesdir": "^0.2.2",
-    "globals": "^15.13.0",
     "husky": "^9.0.11",
     "lint-staged": "^15.2.9",
     "node-jq": "^4.0.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^3.4.2",
+    "prettier": "3.3.3",
     "source-map-support": "^0.5.21",
     "typescript": "^5.5.4",
-    "typescript-eslint": "^8.18.1",
     "typescript-strict-plugin": "^2.4.4"
   },
   "resolutions": {

packages/api/methods.ts

@@ -85,22 +85,8 @@ export function addTransactions(
   });
 }
 
-export interface ImportTransactionsOpts {
-  defaultCleared?: boolean;
-}
-
-export function importTransactions(
-  accountId,
-  transactions,
-  opts: ImportTransactionsOpts = {
-    defaultCleared: true,
-  },
-) {
-  return send('api/transactions-import', {
-    accountId,
-    transactions,
-    opts,
-  });
+export function importTransactions(accountId, transactions) {
+  return send('api/transactions-import', { accountId, transactions });
 }
 
 export function getTransactions(accountId, startDate, endDate) {

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "25.2.1",
+  "version": "24.12.0",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {
@@ -23,7 +23,7 @@
   },
   "dependencies": {
     "@actual-app/crdt": "workspace:^",
-    "better-sqlite3": "^11.7.0",
+    "better-sqlite3": "^9.6.0",
     "compare-versions": "^6.1.0",
     "node-fetch": "^3.3.2",
     "uuid": "^9.0.1"

packages/api/tsconfig.dist.json

@@ -5,14 +5,13 @@
     // the latest Node 16.x release supports all of the features
     "target": "ES2021",
     "module": "CommonJS",
-    "moduleResolution": "node10",
     "noEmit": false,
     "declaration": true,
     "outDir": "dist",
     "declarationDir": "@types",
     "paths": {
       "loot-core/src/*": ["./loot-core/*"],
-      "loot-core/*": ["./@types/loot-core/*"]
+      "loot-core/*": ["./@types/loot-core/*"],
     }
   },
   "include": ["."],

packages/component-library/package.json

@@ -1,24 +0,0 @@
-{
-  "name": "@actual-app/components",
-  "version": "0.0.1",
-  "license": "MIT",
-  "peerDependencies": {
-    "react": ">=18.2"
-  },
-  "dependencies": {
-    "@emotion/css": "^11.13.4",
-    "react-aria-components": "^1.4.1"
-  },
-  "devDependencies": {
-    "@types/react": "^18.2.0",
-    "react": "18.2.0"
-  },
-  "exports": {
-    "./icons/*": "./src/icons/*.tsx",
-    "./button": "./src/Button.tsx",
-    "./styles": "./src/styles.ts",
-    "./theme": "./src/theme.ts",
-    "./tokens": "./src/tokens.ts",
-    "./view": "./src/View.tsx"
-  }
-}

packages/component-library/src/icons/AnimatedLoading.tsx

@@ -1,26 +0,0 @@
-import React, { type SVGProps } from 'react';
-
-import { css, keyframes } from '@emotion/css';
-
-import { SvgLoading } from './Loading';
-
-const rotation = keyframes({
-  '0%': { transform: 'rotate(-90deg)' },
-  '100%': { transform: 'rotate(666deg)' },
-});
-
-export function AnimatedLoading(props: SVGProps<SVGSVGElement>) {
-  return (
-    <span
-      className={css({
-        animationName: rotation,
-        animationDuration: '1.6s',
-        animationTimingFunction: 'cubic-bezier(0.17, 0.67, 0.83, 0.67)',
-        animationIterationCount: 'infinite',
-        lineHeight: 0,
-      })}
-    >
-      <SvgLoading {...props} />
-    </span>
-  );
-}

packages/component-library/src/icons/Loading.tsx

@@ -1,33 +0,0 @@
-import React, { type SVGProps, useState } from 'react';
-
-export const SvgLoading = (props: SVGProps<SVGSVGElement>) => {
-  const { color = 'currentColor' } = props;
-  const [gradientId] = useState('gradient-' + Math.random());
-
-  return (
-    <svg {...props} viewBox="0 0 38 38" style={{ ...props.style }}>
-      <defs>
-        <linearGradient
-          x1="8.042%"
-          y1="0%"
-          x2="65.682%"
-          y2="23.865%"
-          id={gradientId}
-        >
-          <stop stopColor={color} stopOpacity={0} offset="0%" />
-          <stop stopColor={color} stopOpacity={0.631} offset="63.146%" />
-          <stop stopColor={color} offset="100%" />
-        </linearGradient>
-      </defs>
-      <g transform="translate(1 2)" fill="none" fillRule="evenodd">
-        <path
-          d="M36 18c0-9.94-8.06-18-18-18"
-          stroke={'url(#' + gradientId + ')'}
-          strokeWidth={2}
-          fill="none"
-        />
-        <circle fill={color} cx={36} cy={18} r={1} />
-      </g>
-    </svg>
-  );
-};

packages/component-library/src/styles.ts

@@ -1,151 +0,0 @@
-import { keyframes } from '@emotion/css';
-
-import { theme } from './theme';
-import { tokens } from './tokens';
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type CSSProperties = Record<string, any>;
-
-const MOBILE_MIN_HEIGHT = 40;
-
-const shadowLarge = {
-  boxShadow: '0 15px 30px 0 rgba(0,0,0,0.11), 0 5px 15px 0 rgba(0,0,0,0.08)',
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const styles: Record<string, any> = {
-  incomeHeaderHeight: 70,
-  cardShadow: '0 1px 3px rgba(0,0,0,0.12), 0 1px 2px rgba(0,0,0,0.24)',
-  monthRightPadding: 5,
-  menuBorderRadius: 4,
-  mobileMinHeight: MOBILE_MIN_HEIGHT,
-  mobileMenuItem: {
-    fontSize: 17,
-    fontWeight: 400,
-    paddingTop: 8,
-    paddingBottom: 8,
-    height: MOBILE_MIN_HEIGHT,
-    minHeight: MOBILE_MIN_HEIGHT,
-  },
-  mobileEditingPadding: 12,
-  altMenuMaxHeight: 250,
-  altMenuText: {
-    fontSize: 13,
-  },
-  altMenuHeaderText: {
-    fontSize: 13,
-    fontWeight: 700,
-  },
-  veryLargeText: {
-    fontSize: 30,
-    fontWeight: 600,
-  },
-  largeText: {
-    fontSize: 20,
-    fontWeight: 700,
-    letterSpacing: 0.5,
-  },
-  mediumText: {
-    fontSize: 15,
-    fontWeight: 500,
-  },
-  smallText: {
-    fontSize: 13,
-  },
-  verySmallText: {
-    fontSize: 12,
-  },
-  tinyText: {
-    fontSize: 10,
-  },
-  page: {
-    flex: 1,
-    '@media (max-height: 550px)': {
-      minHeight: 700, // ensure we can scroll on small screens
-    },
-    paddingTop: 8, // height of the titlebar
-    [`@media (min-width: ${tokens.breakpoint_small})`]: {
-      paddingTop: 36,
-    },
-  },
-  pageContent: {
-    paddingLeft: 2,
-    paddingRight: 2,
-    [`@media (min-width: ${tokens.breakpoint_small})`]: {
-      paddingLeft: 20,
-      paddingRight: 20,
-    },
-  },
-  settingsPageContent: {
-    padding: 20,
-    [`@media (min-width: ${tokens.breakpoint_small})`]: {
-      padding: 'inherit',
-    },
-  },
-  staticText: {
-    cursor: 'default',
-    userSelect: 'none',
-  },
-  shadow: {
-    boxShadow: '0 2px 4px 0 rgba(0,0,0,0.1)',
-  },
-  shadowLarge,
-  tnum: {
-    // eslint-disable-next-line rulesdir/typography
-    fontFeatureSettings: '"tnum"',
-  },
-  notFixed: { fontFeatureSettings: '' },
-  text: {
-    fontSize: 16,
-    // lineHeight: 22.4 // TODO: This seems like trouble, but what's the right value?
-  },
-  delayedFadeIn: {
-    animationName: keyframes({
-      '0%': { opacity: 0 },
-      '100%': { opacity: 1 },
-    }),
-    animationDuration: '1s',
-    animationFillMode: 'both',
-    animationDelay: '0.5s',
-  },
-  underlinedText: {
-    borderBottom: `2px solid`,
-  },
-  noTapHighlight: {
-    WebkitTapHighlightColor: 'transparent',
-    ':focus': {
-      outline: 'none',
-    },
-  },
-  lineClamp: (lines: number) => {
-    return {
-      display: '-webkit-box',
-      WebkitLineClamp: lines,
-      WebkitBoxOrient: 'vertical',
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-      wordBreak: 'break-word',
-    };
-  },
-  tooltip: {
-    padding: 5,
-    ...shadowLarge,
-    borderWidth: 2,
-    borderRadius: 4,
-    borderStyle: 'solid',
-    borderColor: theme.tooltipBorder,
-    backgroundColor: theme.tooltipBackground,
-    color: theme.tooltipText,
-    overflow: 'auto',
-  },
-  popover: {
-    border: 'none',
-    backgroundColor: theme.menuBackground,
-    color: theme.menuItemText,
-  },
-  // Dynamically set
-  horizontalScrollbar: null as CSSProperties | null,
-  lightScrollbar: null as CSSProperties | null,
-  darkScrollbar: null as CSSProperties | null,
-  scrollbarWidth: null as number | null,
-};

packages/component-library/src/theme.ts

@@ -1,203 +0,0 @@
-export const theme = {
-  pageBackground: 'var(--color-pageBackground)',
-  pageBackgroundModalActive: 'var(--color-pageBackgroundModalActive)',
-  pageBackgroundTopLeft: 'var(--color-pageBackgroundTopLeft)',
-  pageBackgroundBottomRight: 'var(--color-pageBackgroundBottomRight)',
-  pageBackgroundLineTop: 'var(--color-pageBackgroundLineTop)',
-  pageBackgroundLineMid: 'var(--color-pageBackgroundLineMid)',
-  pageBackgroundLineBottom: 'var(--color-pageBackgroundLineBottom)',
-  pageText: 'var(--color-pageText)',
-  pageTextLight: 'var(--color-pageTextLight)',
-  pageTextSubdued: 'var(--color-pageTextSubdued)',
-  pageTextDark: 'var(--color-pageTextDark)',
-  pageTextPositive: 'var(--color-pageTextPositive)',
-  pageTextLink: 'var(--color-pageTextLink)',
-  pageTextLinkLight: 'var(--color-pageTextLinkLight)',
-  cardBackground: 'var(--color-cardBackground)',
-  cardBorder: 'var(--color-cardBorder)',
-  cardShadow: 'var(--color-cardShadow)',
-  tableBackground: 'var(--color-tableBackground)',
-  tableRowBackgroundHover: 'var(--color-tableRowBackgroundHover)',
-  tableText: 'var(--color-tableText)',
-  tableTextLight: 'var(--color-tableTextLight)',
-  tableTextSubdued: 'var(--color-tableTextSubdued)',
-  tableTextSelected: 'var(--color-tableTextSelected)',
-  tableTextHover: 'var(--color-tableTextHover)',
-  tableTextInactive: 'var(--color-tableTextInactive)',
-  tableHeaderText: 'var(--color-tableHeaderText)',
-  tableHeaderBackground: 'var(--color-tableHeaderBackground)',
-  tableBorder: 'var(--color-tableBorder)',
-  tableBorderSelected: 'var(--color-tableBorderSelected)',
-  tableBorderHover: 'var(--color-tableBorderHover)',
-  tableBorderSeparator: 'var(--color-tableBorderSeparator)',
-  tableRowBackgroundHighlight: 'var(--color-tableRowBackgroundHighlight)',
-  tableRowBackgroundHighlightText:
-    'var(--color-tableRowBackgroundHighlightText)',
-  tableRowHeaderBackground: 'var(--color-tableRowHeaderBackground)',
-  tableRowHeaderText: 'var(--color-tableRowHeaderText)',
-  sidebarBackground: 'var(--color-sidebarBackground)',
-  sidebarItemBackgroundPending: 'var(--color-sidebarItemBackgroundPending)',
-  sidebarItemBackgroundPositive: 'var(--color-sidebarItemBackgroundPositive)',
-  sidebarItemBackgroundFailed: 'var(--color-sidebarItemBackgroundFailed)',
-  sidebarItemAccentSelected: 'var(--color-sidebarItemAccentSelected)',
-  sidebarItemBackgroundHover: 'var(--color-sidebarItemBackgroundHover)',
-  sidebarItemText: 'var(--color-sidebarItemText)',
-  sidebarItemTextSelected: 'var(--color-sidebarItemTextSelected)',
-  menuBackground: 'var(--color-menuBackground)',
-  menuItemBackground: 'var(--color-menuItemBackground)',
-  menuItemBackgroundHover: 'var(--color-menuItemBackgroundHover)',
-  menuItemText: 'var(--color-menuItemText)',
-  menuItemTextHover: 'var(--color-menuItemTextHover)',
-  menuItemTextSelected: 'var(--color-menuItemTextSelected)',
-  menuItemTextHeader: 'var(--color-menuItemTextHeader)',
-  menuBorder: 'var(--color-menuBorder)',
-  menuBorderHover: 'var(--color-menuBorderHover)',
-  menuKeybindingText: 'var(--color-menuKeybindingText)',
-  menuAutoCompleteBackground: 'var(--color-menuAutoCompleteBackground)',
-  menuAutoCompleteBackgroundHover:
-    'var(--color-menuAutoCompleteBackgroundHover)',
-  menuAutoCompleteText: 'var(--color-menuAutoCompleteText)',
-  menuAutoCompleteTextHover: 'var(--color-menuAutoCompleteTextHover)',
-  menuAutoCompleteTextHeader: 'var(--color-menuAutoCompleteTextHeader)',
-  menuAutoCompleteItemTextHover: 'var(--color-menuAutoCompleteItemTextHover)',
-  menuAutoCompleteItemText: 'var(--color-menuAutoCompleteItemText)',
-  modalBackground: 'var(--color-modalBackground)',
-  modalBorder: 'var(--color-modalBorder)',
-  mobileHeaderBackground: 'var(--color-mobileHeaderBackground)',
-  mobileHeaderText: 'var(--color-mobileHeaderText)',
-  mobileHeaderTextSubdued: 'var(--color-mobileHeaderTextSubdued)',
-  mobileHeaderTextHover: 'var(--color-mobileHeaderTextHover)',
-  mobilePageBackground: 'var(--color-mobilePageBackground)',
-  mobileNavBackground: 'var(--color-mobileNavBackground)',
-  mobileNavItem: 'var(--color-mobileNavItem)',
-  mobileNavItemSelected: 'var(--color-mobileNavItemSelected)',
-  mobileAccountShadow: 'var(--color-mobileAccountShadow)',
-  mobileAccountText: 'var(--color-mobileAccountText)',
-  mobileTransactionSelected: 'var(--color-mobileTransactionSelected)',
-  mobileViewTheme: 'var(--color-mobileViewTheme)',
-  mobileConfigServerViewTheme: 'var(--color-mobileConfigServerViewTheme)',
-  markdownNormal: 'var(--color-markdownNormal)',
-  markdownDark: 'var(--color-markdownDark)',
-  markdownLight: 'var(--color-markdownLight)',
-  buttonMenuText: 'var(--color-buttonMenuText)',
-  buttonMenuTextHover: 'var(--color-buttonMenuTextHover)',
-  buttonMenuBackground: 'var(--color-buttonMenuBackground)',
-  buttonMenuBackgroundHover: 'var(--color-buttonMenuBackgroundHover)',
-  buttonMenuBorder: 'var(--color-buttonMenuBorder)',
-  buttonMenuSelectedText: 'var(--color-buttonMenuSelectedText)',
-  buttonMenuSelectedTextHover: 'var(--color-buttonMenuSelectedTextHover)',
-  buttonMenuSelectedBackground: 'var(--color-buttonMenuSelectedBackground)',
-  buttonMenuSelectedBackgroundHover:
-    'var(--color-buttonMenuSelectedBackgroundHover)',
-  buttonMenuSelectedBorder: 'var(--color-buttonMenuSelectedBorder)',
-  buttonPrimaryText: 'var(--color-buttonPrimaryText)',
-  buttonPrimaryTextHover: 'var(--color-buttonPrimaryTextHover)',
-  buttonPrimaryBackground: 'var(--color-buttonPrimaryBackground)',
-  buttonPrimaryBackgroundHover: 'var(--color-buttonPrimaryBackgroundHover)',
-  buttonPrimaryBorder: 'var(--color-buttonPrimaryBorder)',
-  buttonPrimaryShadow: 'var(--color-buttonPrimaryShadow)',
-  buttonPrimaryDisabledText: 'var(--color-buttonPrimaryDisabledText)',
-  buttonPrimaryDisabledBackground:
-    'var(--color-buttonPrimaryDisabledBackground)',
-  buttonPrimaryDisabledBorder: 'var(--color-buttonPrimaryDisabledBorder)',
-  buttonNormalText: 'var(--color-buttonNormalText)',
-  buttonNormalTextHover: 'var(--color-buttonNormalTextHover)',
-  buttonNormalBackground: 'var(--color-buttonNormalBackground)',
-  buttonNormalBackgroundHover: 'var(--color-buttonNormalBackgroundHover)',
-  buttonNormalBorder: 'var(--color-buttonNormalBorder)',
-  buttonNormalShadow: 'var(--color-buttonNormalShadow)',
-  buttonNormalSelectedText: 'var(--color-buttonNormalSelectedText)',
-  buttonNormalSelectedBackground: 'var(--color-buttonNormalSelectedBackground)',
-  buttonNormalDisabledText: 'var(--color-buttonNormalDisabledText)',
-  buttonNormalDisabledBackground: 'var(--color-buttonNormalDisabledBackground)',
-  buttonNormalDisabledBorder: 'var(--color-buttonNormalDisabledBorder)',
-  buttonBareText: 'var(--color-buttonBareText)',
-  buttonBareTextHover: 'var(--color-buttonBareTextHover)',
-  buttonBareBackground: 'var(--color-buttonBareBackground)',
-  buttonBareBackgroundHover: 'var(--color-buttonBareBackgroundHover)',
-  buttonBareBackgroundActive: 'var(--color-buttonBareBackgroundActive)',
-  buttonBareDisabledText: 'var(--color-buttonBareDisabledText)',
-  buttonBareDisabledBackground: 'var(--color-buttonBareDisabledBackground)',
-  calendarText: 'var(--color-calendarText)',
-  calendarBackground: 'var(--color-calendarBackground)',
-  calendarItemText: 'var(--color-calendarItemText)',
-  calendarItemBackground: 'var(--color-calendarItemBackground)',
-  calendarSelectedBackground: 'var(--color-calendarSelectedBackground)',
-  noticeBackground: 'var(--color-noticeBackground)',
-  noticeBackgroundLight: 'var(--color-noticeBackgroundLight)',
-  noticeBackgroundDark: 'var(--color-noticeBackgroundDark)',
-  noticeText: 'var(--color-noticeText)',
-  noticeTextLight: 'var(--color-noticeTextLight)',
-  noticeTextDark: 'var(--color-noticeTextDark)',
-  noticeTextMenu: 'var(--color-noticeTextMenu)',
-  noticeTextMenuHover: 'var(--color-noticeTextMenuHover)',
-  noticeBorder: 'var(--color-noticeBorder)',
-  warningBackground: 'var(--color-warningBackground)',
-  warningText: 'var(--color-warningText)',
-  warningTextLight: 'var(--color-warningTextLight)',
-  warningTextDark: 'var(--color-warningTextDark)',
-  warningBorder: 'var(--color-warningBorder)',
-  errorBackground: 'var(--color-errorBackground)',
-  errorText: 'var(--color-errorText)',
-  errorTextDark: 'var(--color-errorTextDark)',
-  errorTextDarker: 'var(--color-errorTextDarker)',
-  errorTextMenu: 'var(--color-errorTextMenu)',
-  errorBorder: 'var(--color-errorBorder)',
-  upcomingBackground: 'var(--color-upcomingBackground)',
-  upcomingText: 'var(--color-upcomingText)',
-  upcomingBorder: 'var(--color-upcomingBorder)',
-  formLabelText: 'var(--color-formLabelText)',
-  formLabelBackground: 'var(--color-formLabelBackground)',
-  formInputBackground: 'var(--color-formInputBackground)',
-  formInputBackgroundSelected: 'var(--color-formInputBackgroundSelected)',
-  formInputBackgroundSelection: 'var(--color-formInputBackgroundSelection)',
-  formInputBorder: 'var(--color-formInputBorder)',
-  formInputTextReadOnlySelection: 'var(--color-formInputTextReadOnlySelection)',
-  formInputBorderSelected: 'var(--color-formInputBorderSelected)',
-  formInputText: 'var(--color-formInputText)',
-  formInputTextSelected: 'var(--color-formInputTextSelected)',
-  formInputTextPlaceholder: 'var(--color-formInputTextPlaceholder)',
-  formInputTextPlaceholderSelected:
-    'var(--color-formInputTextPlaceholderSelected)',
-  formInputTextSelection: 'var(--color-formInputTextSelection)',
-  formInputShadowSelected: 'var(--color-formInputShadowSelected)',
-  formInputTextHighlight: 'var(--color-formInputTextHighlight)',
-  checkboxText: 'var(--color-checkboxText)',
-  checkboxBackgroundSelected: 'var(--color-checkboxBackgroundSelected)',
-  checkboxBorderSelected: 'var(--color-checkboxBorderSelected)',
-  checkboxShadowSelected: 'var(--color-checkboxShadowSelected)',
-  checkboxToggleBackground: 'var(--color-checkboxToggleBackground)',
-  checkboxToggleBackgroundSelected:
-    'var(--color-checkboxToggleBackgroundSelected)',
-  checkboxToggleDisabled: 'var(--color-checkboxToggleDisabled)',
-  pillBackground: 'var(--color-pillBackground)',
-  pillBackgroundLight: 'var(--color-pillBackgroundLight)',
-  pillText: 'var(--color-pillText)',
-  pillTextHighlighted: 'var(--color-pillTextHighlighted)',
-  pillBorder: 'var(--color-pillBorder)',
-  pillBorderDark: 'var(--color-pillBorderDark)',
-  pillBackgroundSelected: 'var(--color-pillBackgroundSelected)',
-  pillTextSelected: 'var(--color-pillTextSelected)',
-  pillBorderSelected: 'var(--color-pillBorderSelected)',
-  pillTextSubdued: 'var(--color-pillTextSubdued)',
-  reportsRed: 'var(--color-reportsRed)',
-  reportsBlue: 'var(--color-reportsBlue)',
-  reportsGreen: 'var(--color-reportsGreen)',
-  reportsGray: 'var(--color-reportsGray)',
-  reportsLabel: 'var(--color-reportsLabel)',
-  reportsInnerLabel: 'var(--color-reportsInnerLabel)',
-  noteTagBackground: 'var(--color-noteTagBackground)',
-  noteTagBackgroundHover: 'var(--color-noteTagBackgroundHover)',
-  noteTagText: 'var(--color-noteTagText)',
-  budgetOtherMonth: 'var(--color-budgetOtherMonth)',
-  budgetCurrentMonth: 'var(--color-budgetCurrentMonth)',
-  budgetHeaderOtherMonth: 'var(--color-budgetHeaderOtherMonth)',
-  budgetHeaderCurrentMonth: 'var(--color-budgetHeaderCurrentMonth)',
-  floatingActionBarBackground: 'var(--color-floatingActionBarBackground)',
-  floatingActionBarBorder: 'var(--color-floatingActionBarBorder)',
-  floatingActionBarText: 'var(--color-floatingActionBarText)',
-  tooltipText: 'var(--color-tooltipText)',
-  tooltipBackground: 'var(--color-tooltipBackground)',
-  tooltipBorder: 'var(--color-tooltipBorder)',
-  calendarCellBackground: 'var(--color-calendarCellBackground)',
-};

packages/component-library/src/tokens.ts

@@ -1,35 +0,0 @@
-enum BreakpointNames {
-  small = 'small',
-  medium = 'medium',
-  wide = 'wide',
-}
-
-type NumericBreakpoints = {
-  [key in BreakpointNames]: number;
-};
-
-export const breakpoints: NumericBreakpoints = {
-  small: 512,
-  medium: 730,
-  wide: 1100,
-};
-
-type BreakpointsPx = {
-  [B in keyof NumericBreakpoints as `breakpoint_${B}`]: string;
-};
-
-// Provide the same breakpoints in a form usable by CSS media queries
-// {
-//   breakpoint_small: '512px',
-//   breakpoint_medium: '740px',
-//   breakpoint_wide: '1100px',
-// }
-export const tokens: BreakpointsPx = Object.entries(
-  breakpoints,
-).reduce<BreakpointsPx>(
-  (acc, [key, val]) => ({
-    ...acc,
-    [`breakpoint_${key}`]: `${val}px`,
-  }),
-  {} as BreakpointsPx,
-);

packages/crdt/tsconfig.dist.json

@@ -5,7 +5,6 @@
     // the latest Node 16.x release supports all of the features
     "target": "ES2021",
     "module": "CommonJS",
-    "moduleResolution": "node10",
     "noEmit": false,
     "declaration": true,
     "strict": true,

packages/desktop-client/.gitignore

@@ -25,6 +25,3 @@ public/kcab
 public/data
 public/data-file-index.txt
 public/*.wasm
-
-# translations
-locale/

packages/desktop-client/bin/remove-untranslated-languages

@@ -1,53 +0,0 @@
-#!/usr/bin/env node
-const fs = require('fs');
-const path = require('path');
-
-// Local path to the cloned translations repository
-const localRepoPath = './packages/desktop-client/locale';
-
-// Compare JSON files and delete incomplete ones
-const processTranslations = () => {
-  try {
-    const files = fs.readdirSync(localRepoPath);
-    const enJsonPath = path.join(localRepoPath, 'en.json');
-
-    if (!fs.existsSync(enJsonPath)) {
-      throw new Error('en.json not found in the repository.');
-    }
-
-    const enJson = JSON.parse(fs.readFileSync(enJsonPath, 'utf8'));
-    const enKeysCount = Object.keys(enJson).length;
-
-    console.log(`en.json has ${enKeysCount} keys.`);
-
-    files.forEach((file) => {
-      if (file === 'en.json' || path.extname(file) !== '.json') return;
-
-      if (file.startsWith('en-')) {
-        console.log(`Keeping ${file} as it's an English language.`);
-        return;
-      }
-
-      const filePath = path.join(localRepoPath, file);
-      const jsonData = JSON.parse(fs.readFileSync(filePath, 'utf8'));
-      const fileKeysCount = Object.keys(jsonData).length;
-
-      // Calculate the percentage of keys present compared to en.json
-      const percentage = (fileKeysCount / enKeysCount) * 100;
-      console.log(`${file} has ${fileKeysCount} keys (${percentage.toFixed(2)}%).`);
-
-      if (percentage < 50) {
-        fs.unlinkSync(filePath);
-        console.log(`Deleted ${file} due to insufficient keys.`);
-      } else {
-        console.log(`Keeping ${file}.`);
-      }
-    });
-
-    console.log('Processing completed.');
-  } catch (error) {
-    console.error(`Error: ${error.message}`);
-  }
-};
-
-processTranslations();

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

@@ -1,13 +1,12 @@
-import { type Page } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 
-import { expect, test } from './fixtures';
 import { ConfigurationPage } from './page-models/configuration-page';
 import { MobileNavigation } from './page-models/mobile-navigation';
 
 test.describe('Mobile Accounts', () => {
-  let page: Page;
-  let navigation: MobileNavigation;
-  let configurationPage: ConfigurationPage;
+  let page;
+  let navigation;
+  let configurationPage;
 
   test.beforeEach(async ({ browser }) => {
     page = await browser.newPage();

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

@@ -1,17 +1,15 @@
 import { join } from 'path';
 
-import { type Page } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 
-import { expect, test } from './fixtures';
-import { type AccountPage } from './page-models/account-page';
 import { ConfigurationPage } from './page-models/configuration-page';
 import { Navigation } from './page-models/navigation';
 
 test.describe('Accounts', () => {
-  let page: Page;
-  let navigation: Navigation;
-  let configurationPage: ConfigurationPage;
-  let accountPage: AccountPage;
+  let page;
+  let navigation;
+  let configurationPage;
+  let accountPage;
 
   test.beforeEach(async ({ browser }) => {
     page = await browser.newPage();
@@ -56,17 +54,17 @@ test.describe('Accounts', () => {
     await expect(page).toMatchThemeScreenshots();
   });
 
-  test.describe('On Budget Accounts', () => {
+  test.describe('Budgeted Accounts', () => {
     // Reset filters
     test.afterEach(async () => {
       await accountPage.removeFilter(0);
     });
 
     test('creates a transfer from two existing transactions', async () => {
-      accountPage = await navigation.goToAccountPage('On budget');
+      accountPage = await navigation.goToAccountPage('For budget');
       await accountPage.waitFor();
 
-      await expect(accountPage.accountName).toHaveText('On Budget Accounts');
+      await expect(accountPage.accountName).toHaveText('Budgeted Accounts');
 
       await accountPage.filterByNote('Test Acc Transfer');
 

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

@@ -1,89 +1,18 @@
-import { type Page } from '@playwright/test';
+import { test, expect } from '@playwright/test';
 
-import { amountToCurrency, currencyToAmount } from 'loot-core/shared/util';
 import * as monthUtils from 'loot-core/src/shared/months';
 
-import { expect, test } from './fixtures';
 import { ConfigurationPage } from './page-models/configuration-page';
-import { type MobileBudgetPage } from './page-models/mobile-budget-page';
 import { MobileNavigation } from './page-models/mobile-navigation';
 
-const copyLastMonthBudget = async (
-  budgetPage: MobileBudgetPage,
-  categoryName: string,
-) => {
-  const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
-  await budgetMenuModal.copyLastMonthBudget();
-  await budgetMenuModal.close();
-};
-
-const setTo3MonthAverage = async (
-  budgetPage: MobileBudgetPage,
-  categoryName: string,
-) => {
-  const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
-  await budgetMenuModal.setTo3MonthAverage();
-  await budgetMenuModal.close();
-};
-
-const setTo6MonthAverage = async (
-  budgetPage: MobileBudgetPage,
-  categoryName: string,
-) => {
-  const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
-  await budgetMenuModal.setTo6MonthAverage();
-  await budgetMenuModal.close();
-};
-
-const setToYearlyAverage = async (
-  budgetPage: MobileBudgetPage,
-  categoryName: string,
-) => {
-  const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
-  await budgetMenuModal.setToYearlyAverage();
-  await budgetMenuModal.close();
-};
-
-async function setBudgetAverage(
-  budgetPage: MobileBudgetPage,
-  categoryName: string,
-  numberOfMonths: number,
-  setBudgetAverageFn: (
-    budgetPage: MobileBudgetPage,
-    categoryName: string,
-    numberOfMonths: number,
-  ) => Promise<void>,
-) {
-  let totalSpent = 0;
-
-  for (let i = 0; i < numberOfMonths; i++) {
-    await budgetPage.goToPreviousMonth();
-    const spentButton = await budgetPage.getButtonForSpent(categoryName);
-    const spent = await spentButton.textContent();
-    totalSpent += currencyToAmount(spent) ?? 0;
-  }
-
-  // Calculate average amount
-  const averageSpent = totalSpent / numberOfMonths;
-
-  // Go back to the current month
-  for (let i = 0; i < numberOfMonths; i++) {
-    await budgetPage.goToNextMonth();
-  }
-
-  await setBudgetAverageFn(budgetPage, categoryName, numberOfMonths);
-
-  return averageSpent;
-}
-
-const budgetTypes = ['Envelope', 'Tracking'] as const;
+const budgetTypes = ['Envelope', 'Tracking'];
 
 budgetTypes.forEach(budgetType => {
   test.describe(`Mobile Budget [${budgetType}]`, () => {
-    let page: Page;
-    let navigation: MobileNavigation;
-    let configurationPage: ConfigurationPage;
-    let previousGlobalIsTesting: boolean;
+    let page;
+    let navigation;
+    let configurationPage;
+    let previousGlobalIsTesting;
 
     test.beforeAll(() => {
       // TODO: Hack, properly mock the currentMonth function
@@ -108,8 +37,11 @@ budgetTypes.forEach(budgetType => {
       await page.goto('/');
       await configurationPage.createTestFile();
 
-      const settingsPage = await navigation.goToSettingsPage();
-      await settingsPage.useBudgetType(budgetType);
+      if (budgetType === 'Tracking') {
+        // Set budget type to tracking
+        const settingsPage = await navigation.goToSettingsPage();
+        await settingsPage.useBudgetType('tracking');
+      }
     });
 
     test.afterEach(async () => {
@@ -118,6 +50,7 @@ budgetTypes.forEach(budgetType => {
 
     test('loads the budget page with budgeted amounts', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       await expect(budgetPage.categoryNames).toHaveText([
         'Food',
@@ -144,6 +77,7 @@ budgetTypes.forEach(budgetType => {
 
     test('checks that clicking the Actual logo in the page header opens the budget page menu', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       await budgetPage.openBudgetPageMenu();
 
@@ -155,6 +89,7 @@ budgetTypes.forEach(budgetType => {
 
     test("checks that clicking the left arrow in the page header shows the previous month's budget", async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const selectedMonth = await budgetPage.getSelectedMonth();
       const displayMonth = monthUtils.format(
@@ -176,6 +111,7 @@ budgetTypes.forEach(budgetType => {
 
     test('checks that clicking the month in the page header opens the month menu modal', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const selectedMonth = await budgetPage.getSelectedMonth();
 
@@ -194,6 +130,7 @@ budgetTypes.forEach(budgetType => {
 
     test("checks that clicking the right arrow in the page header shows the next month's budget", async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const selectedMonth = await budgetPage.getSelectedMonth();
       const displayMonth = monthUtils.format(
@@ -217,6 +154,7 @@ budgetTypes.forEach(budgetType => {
 
     test('checks that clicking the category group name opens the category group menu modal', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const categoryGroupName = await budgetPage.getCategoryGroupNameForRow(0);
       await budgetPage.openCategoryGroupMenu(categoryGroupName);
@@ -231,11 +169,16 @@ budgetTypes.forEach(budgetType => {
 
     test('checks that clicking the category name opens the category menu modal', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const categoryName = await budgetPage.getCategoryNameForRow(0);
-      const categoryMenuModal = await budgetPage.openCategoryMenu(categoryName);
+      await budgetPage.openCategoryMenu(categoryName);
 
-      await expect(categoryMenuModal.heading).toHaveText(categoryName);
+      const categoryMenuModalHeading = page
+        .getByRole('dialog')
+        .getByRole('heading');
+
+      await expect(categoryMenuModalHeading).toHaveText(categoryName);
       await expect(page).toMatchThemeScreenshots();
     });
 
@@ -243,108 +186,32 @@ budgetTypes.forEach(budgetType => {
 
     test('checks that clicking the budgeted cell opens the budget menu modal', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const categoryName = await budgetPage.getCategoryNameForRow(0);
-      const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
+      await budgetPage.openBudgetMenu(categoryName);
 
-      await expect(budgetMenuModal.heading).toHaveText(categoryName);
+      const budgetMenuModalHeading = page
+        .getByRole('dialog')
+        .getByRole('heading');
+
+      await expect(budgetMenuModalHeading).toHaveText(categoryName);
       await expect(page).toMatchThemeScreenshots();
     });
 
     test('updates the budgeted amount', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const categoryName = await budgetPage.getCategoryNameForRow(0);
-      const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
 
-      const budgetAmount = 123;
-
-      // Set to 123.00
-      await budgetMenuModal.setBudgetAmount(`${budgetAmount}00`);
+      // Set to 100.00
+      await budgetPage.setBudget(categoryName, 10000);
 
       const budgetedButton =
         await budgetPage.getButtonForBudgeted(categoryName);
 
-      await expect(budgetedButton).toHaveText(amountToCurrency(budgetAmount));
-      await expect(page).toMatchThemeScreenshots();
-    });
-
-    test(`copies last month's budget`, async () => {
-      const budgetPage = await navigation.goToBudgetPage();
-
-      const categoryName = await budgetPage.getCategoryNameForRow(3);
-      const budgetedButton =
-        await budgetPage.getButtonForBudgeted(categoryName);
-
-      await budgetPage.goToPreviousMonth();
-
-      const lastMonthBudget = await budgetedButton.textContent();
-
-      await budgetPage.goToNextMonth();
-
-      await copyLastMonthBudget(budgetPage, categoryName);
-
-      await expect(budgetedButton).toHaveText(lastMonthBudget);
-      await expect(page).toMatchThemeScreenshots();
-    });
-
-    (
-      [
-        [3, setTo3MonthAverage],
-        [6, setTo6MonthAverage],
-        [12, setToYearlyAverage],
-      ] as const
-    ).forEach(([numberOfMonths, setBudgetAverageFn]) => {
-      test(`set budget to ${numberOfMonths} month average`, async () => {
-        const budgetPage = await navigation.goToBudgetPage();
-
-        const categoryName = await budgetPage.getCategoryNameForRow(3);
-
-        const averageSpent = await setBudgetAverage(
-          budgetPage,
-          categoryName,
-          numberOfMonths,
-          setBudgetAverageFn,
-        );
-
-        const budgetedButton =
-          await budgetPage.getButtonForBudgeted(categoryName);
-
-        await expect(budgetedButton).toHaveText(
-          amountToCurrency(Math.abs(averageSpent)),
-        );
-        await expect(page).toMatchThemeScreenshots();
-      });
-    });
-
-    test(`applies budget template`, async () => {
-      const settingsPage = await navigation.goToSettingsPage();
-      await settingsPage.enableExperimentalFeature('Goal templates');
-
-      const budgetPage = await navigation.goToBudgetPage();
-
-      const categoryName = await budgetPage.getCategoryNameForRow(1);
-
-      const amountToTemplate = 123;
-
-      const categoryMenuModal = await budgetPage.openCategoryMenu(categoryName);
-      const editNotesModal = await categoryMenuModal.editNotes();
-      const templateNotes = `#template ${amountToTemplate}`;
-      await editNotesModal.updateNotes(templateNotes);
-      await editNotesModal.close();
-
-      const budgetedButton =
-        await budgetPage.getButtonForBudgeted(categoryName);
-
-      const budgetMenuModal = await budgetPage.openBudgetMenu(categoryName);
-      await budgetMenuModal.applyBudgetTemplate();
-      await budgetMenuModal.close();
-
-      await expect(budgetedButton).toHaveText(
-        amountToCurrency(amountToTemplate),
-      );
-      const notification = page.getByRole('alert').first();
-      await expect(notification).toContainText(templateNotes);
+      await expect(budgetedButton).toHaveText('100.00');
       await expect(page).toMatchThemeScreenshots();
     });
 
@@ -352,6 +219,7 @@ budgetTypes.forEach(budgetType => {
 
     test('checks that clicking spent cell redirects to the category transactions page', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const categoryName = await budgetPage.getCategoryNameForRow(0);
       const accountPage = await budgetPage.openSpentPage(categoryName);
@@ -365,24 +233,31 @@ budgetTypes.forEach(budgetType => {
 
     test('checks that clicking the balance cell opens the balance menu modal', async () => {
       const budgetPage = await navigation.goToBudgetPage();
+      await budgetPage.waitForBudgetTable();
 
       const categoryName = await budgetPage.getCategoryNameForRow(0);
-      const balanceMenuModal = await budgetPage.openBalanceMenu(categoryName);
+      await budgetPage.openBalanceMenu(categoryName);
 
-      await expect(balanceMenuModal.heading).toHaveText(categoryName);
+      const balanceMenuModalHeading = page
+        .getByRole('dialog')
+        .getByRole('heading');
+
+      await expect(balanceMenuModalHeading).toHaveText(categoryName);
       await expect(page).toMatchThemeScreenshots();
     });
 
     if (budgetType === 'Envelope') {
       test('checks that clicking the To Budget/Overbudgeted amount opens the budget summary menu modal', async () => {
         const budgetPage = await navigation.goToBudgetPage();
+        await budgetPage.waitForBudgetTable();
 
-        const envelopeBudgetSummaryModal =
-          await budgetPage.openEnvelopeBudgetSummary();
+        await budgetPage.openEnvelopeBudgetSummaryMenu();
 
-        await expect(envelopeBudgetSummaryModal.heading).toHaveText(
-          'Budget Summary',
-        );
+        const summaryModalHeading = page
+          .getByRole('dialog')
+          .getByRole('heading');
+
+        await expect(summaryModalHeading).toHaveText('Budget Summary');
         await expect(page).toMatchThemeScreenshots();
       });
     }
@@ -390,13 +265,15 @@ budgetTypes.forEach(budgetType => {
     if (budgetType === 'Tracking') {
       test('checks that clicking the Saved/Projected Savings/Overspent amount opens the budget summary menu modal', async () => {
         const budgetPage = await navigation.goToBudgetPage();
+        await budgetPage.waitForBudgetTable();
 
-        const trackingBudgetSummaryModal =
-          await budgetPage.openTrackingBudgetSummary();
+        await budgetPage.openTrackingBudgetSummaryMenu();
 
-        await expect(trackingBudgetSummaryModal.heading).toHaveText(
-          'Budget Summary',
-        );
+        const summaryModalHeading = page
+          .getByRole('dialog')
+          .getByRole('heading');
+
+        await expect(summaryModalHeading).toHaveText('Budget Summary');
         await expect(page).toMatchThemeScreenshots();
       });
     }