Database

* translate Allocation Methods

* fix translate Action

translate Split info

* translate date range

* translate monthly spending

* translate shorter filter

* translate date filter reports custom

* add relese note

---------

Co-authored-by: Alex <Alex>

.github/actions/ai-generated-release-notes/comment-on-pr.js

@@ -57,7 +57,8 @@ async function commentOnPR() {
       `**Summary:** ${summaryData.summary}`,
       `**File:** [upcoming-release-notes/${summaryData.prNumber}.md](${fileUrl})`,
       '',
-      'The release notes file has been committed to the repository. You can edit it if needed before merging.',
+      //      'The release notes file has been committed to the repository. You can edit it if needed before merging.',
+      "If you're happy with this release note, you can add it to your pull request. If not, you'll need to add your own before a maintainer can review your change.",
     ].join('\n');
 
     await octokit.rest.issues.createComment({

.github/actions/bump-package-versions

@@ -1,53 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-
-if [ "$#" -gt 0 ]; then
-    version="${1#v}"
-else
-    version=""
-fi
-
-files_to_bump=(
-    packages/api/package.json
-    packages/desktop-client/package.json
-    packages/desktop-electron/package.json
-    packages/sync-server/package.json
-)
-
-for file in "${files_to_bump[@]}"; do
-    if [ -z "$version" ]; then
-        # version format: YY.MM.patch
-        version="$(jq -r .version "$file" | perl -e '
-            ($y,$m,$p)=split(/\./,<>);
-            ($sec,$min,$hour,$day,$mon,$year)=localtime();
-            $year -= 100;  # Perl year starts at 1900
-            $mon++;  # Adjust 0-indexed month to 1-indexed
-            if ($y == $year && $m == $mon) {
-                if ($day <= 25) {
-                    # Patch release for the current month
-                    $p++;
-                } else {
-                    # Use next month for a new release period
-                    $p = 0;
-                    $m++;
-                    $m > 12 && ($m=1, $y++);
-                }
-            } else {
-                # Use the current date for a new release period
-                $y = $year;
-                $m = $mon;
-                $p = 0;
-            }
-            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/get-next-package-version.js

@@ -14,9 +14,14 @@ const options = {
     short: 'p',
   },
   type: {
-    type: 'string', // nightly, hotfix, monthly
+    type: 'string', // nightly, hotfix, monthly, auto
     short: 't',
   },
+  update: {
+    type: 'boolean',
+    short: 'u',
+    default: false,
+  },
 };
 
 const { values } = parseArgs({
@@ -57,37 +62,55 @@ try {
   const nextVersionYear = nextVersionMonthDate
     .getFullYear()
     .toString()
-    .slice(-2);
+    .slice(nextVersionMonthDate.getFullYear() < 2100 ? -2 : -3);
   const nextVersionMonth = nextVersionMonthDate.getMonth() + 1; // Convert back to 1-indexed
 
   // Get current date string
-  const currentDate = new Date()
+  const currentDate = new Date();
+  const currentDateString = currentDate
     .toISOString()
     .split('T')[0]
     .replaceAll('-', '');
 
+  if (values.type === 'auto') {
+    if (currentDate.getDate() <= 25) {
+      values.type = 'hotfix';
+    } else {
+      values.type = 'monthly';
+    }
+  }
+
+  let newVersion;
   switch (values.type) {
     case 'nightly': {
-      const newVersion = `${nextVersionYear}.${nextVersionMonth}.0-nightly.${currentDate}`;
-      process.stdout.write(newVersion); // return the new version to stdout
-      process.exit();
+      newVersion = `${nextVersionYear}.${nextVersionMonth}.0-nightly.${currentDateString}`;
+      break;
     }
     case 'hotfix': {
-      const bugfixVersion = `${versionYear}.${versionMonth}.${versionHotfix + 1}`;
-      process.stdout.write(bugfixVersion); // return the bugfix version to stdout
-      process.exit();
+      newVersion = `${versionYear}.${versionMonth}.${versionHotfix + 1}`;
+      break;
     }
     case 'monthly': {
-      const stableVersion = `${nextVersionYear}.${nextVersionMonth}.0`;
-      process.stdout.write(stableVersion); // return the stable version to stdout
-      process.exit();
+      newVersion = `${nextVersionYear}.${nextVersionMonth}.0`;
+      break;
     }
     default:
       console.error(
-        'Invalid type specified. Use "nightly", "hotfix", or "monthly".',
+        'Invalid type specified. Use "auto", "nightly", "hotfix", or "monthly".',
       );
       process.exit(1);
   }
+
+  process.stdout.write(newVersion); // return the new version to stdout
+
+  if (values.update) {
+    packageJson.version = newVersion;
+    fs.writeFileSync(
+      packageJsonPath,
+      JSON.stringify(packageJson, null, 2) + '\n',
+      'utf8',
+    );
+  }
 } catch (error) {
   console.error('Error:', error.message);
   process.exit(1);

.github/scripts/count-points.mjs

@@ -1,5 +1,8 @@
 import { Octokit } from '@octokit/rest';
 import { minimatch } from 'minimatch';
+import pLimit from 'p-limit';
+
+const limit = pLimit(30);
 
 /** Repository-specific configuration for points calculation */
 const REPOSITORY_CONFIG = new Map([
@@ -10,9 +13,10 @@ const REPOSITORY_CONFIG = new Map([
       POINTS_PER_ISSUE_CLOSING_ACTION: 1,
       POINTS_PER_RELEASE_PR: 0,
       PR_REVIEW_POINT_TIERS: [
-        { minChanges: 1000, points: 6 },
-        { minChanges: 100, points: 4 },
-        { minChanges: 0, points: 2 },
+        { minChanges: 500, points: 8 },
+        { minChanges: 100, points: 6 },
+        { minChanges: 10, points: 2 },
+        { minChanges: 0, points: 1 },
       ],
       EXCLUDED_FILES: [
         'yarn.lock',
@@ -29,8 +33,8 @@ const REPOSITORY_CONFIG = new Map([
       POINTS_PER_ISSUE_CLOSING_ACTION: 1,
       POINTS_PER_RELEASE_PR: 4,
       PR_REVIEW_POINT_TIERS: [
-        { minChanges: 1000, points: 6 },
-        { minChanges: 100, points: 4 },
+        { minChanges: 2000, points: 6 },
+        { minChanges: 200, points: 4 },
         { minChanges: 0, points: 2 },
       ],
       EXCLUDED_FILES: ['yarn.lock', '.yarn/**/*'],
@@ -45,24 +49,25 @@ const REPOSITORY_CONFIG = new Map([
 function getLastMonthDates() {
   // Get data relating to the last month
   const now = new Date();
+  // Always use UTC for calculations
   const firstDayOfLastMonth = new Date(
-    now.getFullYear(),
-    now.getMonth() - 1,
-    1,
+    Date.UTC(now.getUTCFullYear(), now.getUTCMonth() - 1, 1, 0, 0, 0, 0),
   );
   const since = process.env.START_DATE
-    ? new Date(process.env.START_DATE)
+    ? new Date(Date.parse(process.env.START_DATE))
     : firstDayOfLastMonth;
 
-  // Calculate the end of the month for the since date
+  // Calculate the end of the month for the since date in UTC
   const until = new Date(
-    since.getFullYear(),
-    since.getMonth() + 1,
-    0,
-    23,
-    59,
-    59,
-    999,
+    Date.UTC(
+      since.getUTCFullYear(),
+      since.getUTCMonth() + 1,
+      0,
+      23,
+      59,
+      59,
+      999,
+    ),
   );
 
   return { since, until };
@@ -75,7 +80,9 @@ function getLastMonthDates() {
  * @returns {number} The total points earned for the repository
  */
 async function countContributorPoints(repo) {
-  const octokit = new Octokit({ auth: process.env.GITHUB_TOKEN });
+  const octokit = new Octokit({
+    auth: process.env.GITHUB_TOKEN,
+  });
   const owner = 'actualbudget';
   const config = REPOSITORY_CONFIG.get(repo);
 
@@ -132,118 +139,124 @@ async function countContributorPoints(repo) {
   );
 
   // Get reviews and PR details for each PR
-  for (const pr of recentPRs) {
-    const { data: reviews } = await octokit.pulls.listReviews({
-      owner,
-      repo,
-      pull_number: pr.number,
-    });
-
-    // Get list of modified files
-    const { data: modifiedFiles } = await octokit.pulls.listFiles({
-      owner,
-      repo,
-      pull_number: pr.number,
-    });
-
-    // Calculate points based on PR size, excluding specified files
-    const totalChanges = modifiedFiles
-      .filter(
-        file =>
-          !config.EXCLUDED_FILES.some(pattern =>
-            minimatch(file.filename, pattern),
+  await Promise.all(
+    recentPRs.map(pr =>
+      limit(async () => {
+        const [reviews, modifiedFiles] = await Promise.all([
+          octokit.pulls.listReviews({ owner, repo, pull_number: pr.number }),
+          octokit.paginate(
+            octokit.pulls.listFiles,
+            {
+              owner,
+              repo,
+              pull_number: pr.number,
+              per_page: 100,
+            },
+            res => res.data,
           ),
-      )
-      .reduce((sum, file) => sum + file.additions + file.deletions, 0);
+        ]);
 
-    // Check if this is a release PR
-    const isReleasePR = pr.title.match(/^🔖 \(\d+\.\d+\.\d+\)/);
+        const totalChanges = modifiedFiles
+          .filter(
+            file =>
+              !config.EXCLUDED_FILES.some(pattern =>
+                minimatch(file.filename, pattern),
+              ),
+          )
+          .reduce((sum, file) => sum + file.additions + file.deletions, 0);
 
-    // Calculate points for reviewers based on PR size
-    const prPoints = config.PR_REVIEW_POINT_TIERS.find(
-      tier => totalChanges > tier.minChanges,
-    ).points;
+        const isReleasePR = pr.title.match(/🔖.*\d+\.\d+\.\d+/);
+        const prPoints =
+          config.PR_REVIEW_POINT_TIERS.find(t => totalChanges >= t.minChanges)
+            ?.points ?? 0;
 
-    // Add points to the reviewers
-    const uniqueReviewers = new Set();
-    reviews
-      .filter(
-        review =>
-          stats.has(review.user?.login) &&
-          review.state === 'APPROVED' &&
-          !uniqueReviewers.has(review.user?.login),
-      )
-      .forEach(({ user: { login: reviewer } }) => {
-        uniqueReviewers.add(reviewer);
-        const userStats = stats.get(reviewer);
-        userStats.reviews.push({ pr: pr.number.toString(), points: prPoints });
-        userStats.points += prPoints;
-      });
-
-    // Award points to the PR creator if it's a release PR
-    if (isReleasePR && stats.has(pr.user.login)) {
-      const creatorStats = stats.get(pr.user.login);
-      creatorStats.reviews.push({
-        pr: pr.number.toString(),
-        points: config.POINTS_PER_RELEASE_PR,
-        isReleaseCreator: true,
-      });
-      creatorStats.points += config.POINTS_PER_RELEASE_PR;
-    }
-  }
-
-  // Get all issues with label events in the last month
-  const issues = await octokit.paginate(
-    octokit.issues.listForRepo,
-    {
-      owner,
-      repo,
-      state: 'all',
-      sort: 'updated',
-      direction: 'desc',
-      per_page: 100,
-      since: since.toISOString(),
-    },
-    (response, done) =>
-      response.data.filter(issue => new Date(issue.updated_at) <= until),
+        if (isReleasePR) {
+          if (stats.has(pr.user.login)) {
+            const creatorStats = stats.get(pr.user.login);
+            creatorStats.reviews.push({
+              pr: pr.number.toString(),
+              points: config.POINTS_PER_RELEASE_PR,
+              isReleaseCreator: true,
+            });
+            creatorStats.points += config.POINTS_PER_RELEASE_PR;
+          }
+        } else {
+          const uniqueReviewers = new Set();
+          reviews.data
+            .filter(
+              review =>
+                stats.has(review.user?.login) &&
+                review.state === 'APPROVED' &&
+                !uniqueReviewers.has(review.user?.login),
+            )
+            .forEach(({ user: { login: reviewer } }) => {
+              uniqueReviewers.add(reviewer);
+              const userStats = stats.get(reviewer);
+              userStats.reviews.push({
+                pr: pr.number.toString(),
+                points: prPoints,
+              });
+              userStats.points += prPoints;
+            });
+        }
+      }),
+    ),
   );
 
+  // Get all issues with label events in the last month
+  const issues = await octokit.paginate(octokit.issues.listForRepo, {
+    owner,
+    repo,
+    state: 'all',
+    sort: 'updated',
+    direction: 'desc',
+    per_page: 100,
+    since: since.toISOString(),
+  });
+
   // Get label events for each issue
-  for (const issue of issues) {
-    const { data: events } = await octokit.issues.listEventsForTimeline({
-      owner,
-      repo,
-      issue_number: issue.number,
-    });
+  await Promise.all(
+    issues.map(issue =>
+      limit(async () => {
+        const { data: events } = await octokit.issues.listEventsForTimeline({
+          owner,
+          repo,
+          issue_number: issue.number,
+        });
 
-    // Process events
-    events
-      .filter(
-        event =>
-          new Date(event.created_at) > since &&
-          new Date(event.created_at) <= until &&
-          stats.has(event.actor?.login),
-      )
-      .forEach(event => {
-        if (
-          event.event === 'unlabeled' &&
-          event.label &&
-          event.label.name.toLowerCase() === 'needs triage'
-        ) {
-          const remover = event.actor.login;
-          const userStats = stats.get(remover);
-          userStats.labelRemovals.push(issue.number.toString());
-          userStats.points += config.POINTS_PER_ISSUE_TRIAGE_ACTION;
-        }
+        events
+          .filter(event => {
+            const createdAt = new Date(event.created_at);
+            return (
+              createdAt.getTime() > since.getTime() &&
+              createdAt.getTime() <= until.getTime() &&
+              stats.has(event.actor?.login)
+            );
+          })
+          .forEach(event => {
+            if (
+              event.event === 'unlabeled' &&
+              event.label?.name.toLowerCase() === 'needs triage'
+            ) {
+              const remover = event.actor.login;
+              const userStats = stats.get(remover);
+              userStats.labelRemovals.push(issue.number.toString());
+              userStats.points += config.POINTS_PER_ISSUE_TRIAGE_ACTION;
+            }
 
-        if (event.event === 'closed') {
-          const closer = event.actor.login;
-          const userStats = stats.get(closer);
-          userStats.issueClosings.push(issue.number.toString());
-          userStats.points += config.POINTS_PER_ISSUE_CLOSING_ACTION;
-        }
-      });
-  }
+            if (
+              event.event === 'closed' &&
+              event.state_reason === 'not_planned'
+            ) {
+              const closer = event.actor.login;
+              const userStats = stats.get(closer);
+              userStats.issueClosings.push(issue.number.toString());
+              userStats.points += config.POINTS_PER_ISSUE_CLOSING_ACTION;
+            }
+          });
+      }),
+    ),
+  );
 
   // Print all statistics
   printStats(

.github/workflows/docker-edge.yml

@@ -22,9 +22,9 @@ permissions:
 
 env:
   IMAGES: |
-    actualbudget/actual-server
-    ghcr.io/actualbudget/actual-server
-    ghcr.io/actualbudget/actual
+    ${{ !github.event.repository.fork && 'actualbudget/actual-server' || '' }}
+    ghcr.io/${{ github.repository_owner }}/actual-server
+    ghcr.io/${{ github.repository_owner }}/actual
 
   # Creates the following tags:
   # - actual-server:edge
@@ -34,7 +34,7 @@ env:
 
 jobs:
   build:
-    if: ${{ github.event.repository.fork == false }}
+    if: github.event_name == 'workflow_dispatch' || !github.event.repository.fork
     name: Build Docker image
     runs-on: ubuntu-latest
     strategy:
@@ -60,7 +60,7 @@ jobs:
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3
-        if: github.event_name != 'pull_request'
+        if: github.event_name != 'pull_request' && !github.event.repository.fork
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

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

@@ -24,8 +24,29 @@ jobs:
         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
+          declare -A packages=(
+            [web]="desktop-client"
+            [electron]="desktop-electron"
+            [sync]="sync-server"
+            [api]="api"
+          )
+
+          for key in "${!packages[@]}"; do
+            pkg="${packages[$key]}"
+
+            if [[ -n "${{ github.event.inputs.version }}" ]]; then
+              version="${{ github.event.inputs.version }}"
+            else
+              version=$(node ./.github/actions/get-next-package-version.js \
+                --package-json "./packages/$pkg/package.json" \
+                --type auto \
+                --update)
+            fi
+
+            eval "NEW_${key^^}_VERSION=\"$version\""
+          done
+
+          echo "version=$NEW_WEB_VERSION" >> "$GITHUB_OUTPUT"
       - name: Create PR
         uses: peter-evans/create-pull-request@v7
         with:

.gitignore

@@ -60,3 +60,6 @@ fly.toml
 
 # TypeScript cache
 build/
+
+# .d.ts files aren't type-checked with skipLibCheck set to true
+*.d.ts

bin/release-note-generator.ts

@@ -6,7 +6,7 @@ import prompts from 'prompts';
 
 async function run() {
   const username = await execAsync(
-    // eslint-disable-next-line rulesdir/typography
+    // eslint-disable-next-line actual/typography
     "gh api user --jq '.login'",
     'To avoid having to enter your username, consider installing the official GitHub CLI (https://github.com/cli/cli) and logging in with `gh auth login`.',
   );

eslint.config.mjs

@@ -1,29 +1,15 @@
-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 pluginReact from 'eslint-plugin-react';
 import pluginReactHooks from 'eslint-plugin-react-hooks';
-import pluginRulesDir from 'eslint-plugin-rulesdir';
 import pluginTypescript from 'typescript-eslint';
 import pluginTypescriptPaths from 'eslint-plugin-typescript-paths';
+import pluginActual from './packages/eslint-plugin-actual/lib/index.js';
 
 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',
@@ -167,11 +153,15 @@ export default pluginTypescript.config(
   pluginImport.flatConfigs.recommended,
   {
     plugins: {
+      actual: pluginActual,
       'react-hooks': pluginReactHooks,
       'jsx-a11y': pluginJSXA11y,
-      rulesdir: pluginRulesDir,
       'typescript-paths': pluginTypescriptPaths,
     },
+    rules: {
+      'actual/no-untranslated-strings': 'error',
+      'actual/prefer-trans-over-t': 'error',
+    },
   },
   {
     files: ['**/*.{js,ts,jsx,tsx}'],
@@ -458,8 +448,8 @@ export default pluginTypescript.config(
         },
       ],
 
-      'rulesdir/typography': 'warn',
-      'rulesdir/prefer-if-statement': 'warn',
+      'actual/typography': 'warn',
+      'actual/prefer-if-statement': 'warn',
 
       // Note: base rule explicitly disabled in favor of the TS one
       'no-unused-vars': 'off',
@@ -778,7 +768,8 @@ export default pluginTypescript.config(
     ],
 
     rules: {
-      'rulesdir/typography': 'off',
+      'actual/typography': 'off',
+      'actual/no-untranslated-strings': 'off',
     },
   },
   {
@@ -797,7 +788,7 @@ export default pluginTypescript.config(
     // TODO: fix the issues in these files
     rules: {
       'import/extensions': 'off',
-      'rulesdir/typography': 'off',
+      'actual/typography': 'off',
     },
   },
   {
@@ -805,8 +796,6 @@ export default pluginTypescript.config(
     rules: {
       'import/no-anonymous-default-export': 'off',
       'import/no-default-export': 'off',
-      // can be re-enabled after https://github.com/actualbudget/actual/pull/4253
-      '@typescript-eslint/no-unused-vars': 'off',
     },
   },
 );

package.json

@@ -54,7 +54,7 @@
   },
   "devDependencies": {
     "@octokit/rest": "^22.0.0",
-    "@types/node": "^22.15.18",
+    "@types/node": "^22.17.0",
     "@types/prompts": "^2.4.9",
     "@typescript-eslint/parser": "^8.32.1",
     "cross-env": "^7.0.3",
@@ -65,7 +65,6 @@
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-react": "^7.37.5",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-rulesdir": "^0.2.2",
     "eslint-plugin-typescript-paths": "^0.0.33",
     "globals": "^15.15.0",
     "html-to-image": "^1.11.13",
@@ -74,11 +73,12 @@
     "minimatch": "^10.0.3",
     "node-jq": "^6.0.1",
     "npm-run-all": "^4.1.5",
+    "p-limit": "^6.2.0",
     "prettier": "^3.5.3",
     "prompts": "^2.4.2",
     "source-map-support": "^0.5.21",
     "ts-node": "^10.9.2",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "typescript-eslint": "^8.32.1",
     "typescript-strict-plugin": "^2.4.4"
   },

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "25.7.1",
+  "version": "25.8.0",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {
@@ -24,14 +24,14 @@
   },
   "dependencies": {
     "@actual-app/crdt": "workspace:^",
-    "better-sqlite3": "^11.10.0",
+    "better-sqlite3": "^12.2.0",
     "compare-versions": "^6.1.1",
     "node-fetch": "^3.3.2",
     "uuid": "^11.1.0"
   },
   "devDependencies": {
     "tsc-alias": "^1.8.16",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "vitest": "^3.2.4"
   }
 }

packages/component-library/package.json

@@ -48,7 +48,8 @@
     "./tokens": "./src/tokens.ts",
     "./toggle": "./src/Toggle.tsx",
     "./tooltip": "./src/Tooltip.tsx",
-    "./view": "./src/View.tsx"
+    "./view": "./src/View.tsx",
+    "./color-picker": "./src/ColorPicker.tsx"
   },
   "scripts": {
     "generate:icons": "rm src/icons/*/*.tsx; cd src/icons && svgr --template template.ts --index-template index-template.ts --typescript --expand-props start -d . .",

packages/component-library/src/ColorPicker.tsx

@@ -0,0 +1,180 @@
+import { ChangeEvent, ReactNode } from 'react';
+import {
+  ColorPicker as AriaColorPicker,
+  ColorPickerProps as AriaColorPickerProps,
+  Dialog,
+  DialogTrigger,
+  ColorSwatch as AriaColorSwatch,
+  ColorSwatchProps,
+  ColorSwatchPicker as AriaColorSwatchPicker,
+  ColorSwatchPickerItem,
+  ColorField,
+  parseColor,
+} from 'react-aria-components';
+
+import { css } from '@emotion/css';
+
+import { Input } from './Input';
+import { Popover } from './Popover';
+
+function ColorSwatch(props: ColorSwatchProps) {
+  return (
+    <AriaColorSwatch
+      {...props}
+      style={({ color }) => ({
+        background: color.toString('hex'),
+        width: '32px',
+        height: '32px',
+        borderRadius: '4px',
+        boxShadow: 'inset 0 0 0 1px rgba(0, 0, 0, 0.1)',
+      })}
+    />
+  );
+}
+
+// colors from https://materialui.co/colors
+const DEFAULT_COLOR_SET = [
+  '#690CB0',
+  '#D32F2F',
+  '#C2185B',
+  '#7B1FA2',
+  '#512DA8',
+  '#303F9F',
+  '#1976D2',
+  '#0288D1',
+  '#0097A7',
+  '#00796B',
+  '#388E3C',
+  '#689F38',
+  '#AFB42B',
+  '#FBC02D',
+  '#FFA000',
+  '#F57C00',
+  '#E64A19',
+  '#5D4037',
+  '#616161',
+  '#455A64',
+];
+
+interface ColorSwatchPickerProps {
+  columns?: number;
+  colorset?: string[];
+}
+
+function ColorSwatchPicker({
+  columns = 5,
+  colorset = DEFAULT_COLOR_SET,
+}: ColorSwatchPickerProps) {
+  const pickers = [];
+
+  for (let l = 0; l < colorset.length / columns; l++) {
+    const pickerItems = [];
+
+    for (let c = 0; c < columns; c++) {
+      const color = colorset[columns * l + c];
+      if (!color) {
+        break;
+      }
+
+      pickerItems.push(
+        <ColorSwatchPickerItem
+          key={color}
+          color={color}
+          className={css({
+            position: 'relative',
+            outline: 'none',
+            borderRadius: '4px',
+            width: 'fit-content',
+            forcedColorAdjust: 'none',
+            cursor: 'pointer',
+
+            '&[data-selected]::after': {
+              // eslint-disable-next-line actual/typography
+              content: '""',
+              position: 'absolute',
+              inset: 0,
+              border: '2px solid black',
+              outline: '2px solid white',
+              outlineOffset: '-4px',
+              borderRadius: 'inherit',
+            },
+          })}
+        >
+          <ColorSwatch />
+        </ColorSwatchPickerItem>,
+      );
+    }
+
+    pickers.push(
+      <AriaColorSwatchPicker
+        key={`colorset-${l}`}
+        style={{
+          display: 'flex',
+          gap: '8px',
+          flexWrap: 'wrap',
+        }}
+      >
+        {pickerItems}
+      </AriaColorSwatchPicker>,
+    );
+  }
+
+  return pickers;
+}
+const isColor = (value: string) => /^#[0-9a-fA-F]{6}$/.test(value);
+
+interface ColorPickerProps extends AriaColorPickerProps {
+  children?: ReactNode;
+  columns?: number;
+  colorset?: string[];
+}
+
+export function ColorPicker({
+  children,
+  columns,
+  colorset,
+  ...props
+}: ColorPickerProps) {
+  const onInput = (value: string) => {
+    if (!isColor(value)) {
+      return;
+    }
+
+    const color = parseColor(value);
+    if (color) {
+      props.onChange?.(color);
+    }
+  };
+
+  return (
+    <AriaColorPicker defaultValue={props.defaultValue ?? '#690CB0'} {...props}>
+      <DialogTrigger>
+        {children}
+        <Popover>
+          <Dialog
+            style={{
+              outline: 'none',
+              padding: '15px',
+              display: 'flex',
+              flexDirection: 'column',
+              gap: '8px',
+              minWidth: '192px',
+              maxHeight: 'inherit',
+              boxSizing: 'border-box',
+              overflow: 'auto',
+            }}
+          >
+            <ColorSwatchPicker columns={columns} colorset={colorset} />
+            <ColorField
+              onInput={({ target: { value } }: ChangeEvent<HTMLInputElement>) =>
+                onInput(value)
+              }
+            >
+              <Input placeholder="#RRGGBB" style={{ width: '100px' }} />
+            </ColorField>
+          </Dialog>
+        </Popover>
+      </DialogTrigger>
+    </AriaColorPicker>
+  );
+}

packages/component-library/src/SpaceBetween.tsx

@@ -1,5 +1,6 @@
-import React, { type CSSProperties, type ReactNode } from 'react';
+import React, { type ReactNode } from 'react';
 
+import { type CSSProperties } from './styles';
 import { View } from './View';
 
 type SpaceBetweenProps = {

packages/component-library/src/Toggle.tsx

@@ -62,7 +62,7 @@ export const Toggle = ({
           data-on={isOn}
           className={css(
             {
-              // eslint-disable-next-line rulesdir/typography
+              // eslint-disable-next-line actual/typography
               content: '" "',
               position: 'absolute',
               top: '2px',

packages/component-library/src/Tooltip.tsx

@@ -27,8 +27,13 @@ export const Tooltip = ({
   const [isHovered, setIsHover] = useState(false);
 
   const hoverTimeoutRef = useRef<ReturnType<typeof setTimeout>>(null);
+  const closeTimeoutRef = useRef<ReturnType<typeof setTimeout>>(null);
 
   const handlePointerEnter = useCallback(() => {
+    if (closeTimeoutRef.current) {
+      clearTimeout(closeTimeoutRef.current);
+    }
+
     const timeout = setTimeout(() => {
       setIsHover(true);
     }, triggerProps.delay ?? 300);
@@ -41,8 +46,10 @@ export const Tooltip = ({
       clearTimeout(hoverTimeoutRef.current);
     }
 
-    setIsHover(false);
-  }, []);
+    closeTimeoutRef.current = setTimeout(() => {
+      setIsHover(false);
+    }, triggerProps.closeDelay ?? 0);
+  }, [triggerProps.closeDelay]);
 
   // Force closing the tooltip whenever the disablement state changes
   useEffect(() => {

packages/component-library/src/styles.ts

@@ -91,7 +91,7 @@ export const styles: Record<string, any> = {
   },
   shadowLarge,
   tnum: {
-    // eslint-disable-next-line rulesdir/typography
+    // eslint-disable-next-line actual/typography
     fontFeatureSettings: '"tnum"',
   },
   notFixed: { fontFeatureSettings: '' },

packages/component-library/src/theme.ts

@@ -188,6 +188,7 @@ export const theme = {
   reportsInnerLabel: 'var(--color-reportsInnerLabel)',
   noteTagBackground: 'var(--color-noteTagBackground)',
   noteTagBackgroundHover: 'var(--color-noteTagBackgroundHover)',
+  noteTagDefault: 'var(--color-noteTagDefault)',
   noteTagText: 'var(--color-noteTagText)',
   budgetOtherMonth: 'var(--color-budgetOtherMonth)',
   budgetCurrentMonth: 'var(--color-budgetCurrentMonth)',

packages/crdt/bin/generate-proto

@@ -18,4 +18,9 @@ protoc --plugin="protoc-gen-ts=../../node_modules/.bin/protoc-gen-ts" \
 
 ../../node_modules/.bin/prettier --write src/proto/*.d.ts
 
+for file in src/proto/*.d.ts; do
+  { echo "/* eslint-disable @typescript-eslint/no-namespace */"; sed 's/export class/export declare class/g' "$file"; } > "${file%.d.ts}.ts"
+  rm "$file"
+done
+
 echo 'One more step! Find the `var global = ...` declaration in src/proto/sync_pb.js and change it to `var global = globalThis;`'

packages/crdt/package.json

@@ -11,7 +11,7 @@
   "scripts": {
     "build:node": "tsc --p tsconfig.dist.json",
     "proto:generate": "./bin/generate-proto",
-    "build": "rm -rf dist && yarn run build:node && cp src/proto/sync_pb.d.ts dist/src/proto/",
+    "build": "rm -rf dist && yarn run build:node",
     "test": "vitest --globals"
   },
   "dependencies": {
@@ -20,8 +20,10 @@
     "uuid": "^11.1.0"
   },
   "devDependencies": {
+    "@types/google-protobuf": "^3.15.12",
+    "protoc-gen-js": "^3.21.4-4",
     "ts-protoc-gen": "^0.15.0",
-    "typescript": "^5.8.3",
+    "typescript": "^5.9.2",
     "vitest": "^3.2.4"
   }
 }

packages/crdt/src/proto/sync_pb.js

@@ -157,9 +157,9 @@ proto.EncryptedData.prototype.toObject = function(opt_includeInstance) {
  */
 proto.EncryptedData.toObject = function(includeInstance, msg) {
   var f, obj = {
-    iv: msg.getIv_asB64(),
-    authtag: msg.getAuthtag_asB64(),
-    data: msg.getData_asB64()
+iv: msg.getIv_asB64(),
+authtag: msg.getAuthtag_asB64(),
+data: msg.getData_asB64()
   };
 
   if (includeInstance) {
@@ -419,10 +419,10 @@ proto.Message.prototype.toObject = function(opt_includeInstance) {
  */
 proto.Message.toObject = function(includeInstance, msg) {
   var f, obj = {
-    dataset: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    row: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    column: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    value: jspb.Message.getFieldWithDefault(msg, 4, "")
+dataset: jspb.Message.getFieldWithDefault(msg, 1, ""),
+row: jspb.Message.getFieldWithDefault(msg, 2, ""),
+column: jspb.Message.getFieldWithDefault(msg, 3, ""),
+value: jspb.Message.getFieldWithDefault(msg, 4, "")
   };
 
   if (includeInstance) {
@@ -639,9 +639,9 @@ proto.MessageEnvelope.prototype.toObject = function(opt_includeInstance) {
  */
 proto.MessageEnvelope.toObject = function(includeInstance, msg) {
   var f, obj = {
-    timestamp: jspb.Message.getFieldWithDefault(msg, 1, ""),
-    isencrypted: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
-    content: msg.getContent_asB64()
+timestamp: jspb.Message.getFieldWithDefault(msg, 1, ""),
+isencrypted: jspb.Message.getBooleanFieldWithDefault(msg, 2, false),
+content: msg.getContent_asB64()
   };
 
   if (includeInstance) {
@@ -860,12 +860,12 @@ proto.SyncRequest.prototype.toObject = function(opt_includeInstance) {
  */
 proto.SyncRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
-    messagesList: jspb.Message.toObjectList(msg.getMessagesList(),
+messagesList: jspb.Message.toObjectList(msg.getMessagesList(),
     proto.MessageEnvelope.toObject, includeInstance),
-    fileid: jspb.Message.getFieldWithDefault(msg, 2, ""),
-    groupid: jspb.Message.getFieldWithDefault(msg, 3, ""),
-    keyid: jspb.Message.getFieldWithDefault(msg, 5, ""),
-    since: jspb.Message.getFieldWithDefault(msg, 6, "")
+fileid: jspb.Message.getFieldWithDefault(msg, 2, ""),
+groupid: jspb.Message.getFieldWithDefault(msg, 3, ""),
+keyid: jspb.Message.getFieldWithDefault(msg, 5, ""),
+since: jspb.Message.getFieldWithDefault(msg, 6, "")
   };
 
   if (includeInstance) {
@@ -1140,9 +1140,9 @@ proto.SyncResponse.prototype.toObject = function(opt_includeInstance) {
  */
 proto.SyncResponse.toObject = function(includeInstance, msg) {
   var f, obj = {
-    messagesList: jspb.Message.toObjectList(msg.getMessagesList(),
+messagesList: jspb.Message.toObjectList(msg.getMessagesList(),
     proto.MessageEnvelope.toObject, includeInstance),
-    merkle: jspb.Message.getFieldWithDefault(msg, 2, "")
+merkle: jspb.Message.getFieldWithDefault(msg, 2, "")
   };
 
   if (includeInstance) {

packages/crdt/src/proto/sync_pb.ts

@@ -1,9 +1,10 @@
+/* eslint-disable @typescript-eslint/no-namespace */
 // package:
 // file: sync.proto
 
 import * as jspb from 'google-protobuf';
 
-export class EncryptedData extends jspb.Message {
+export declare class EncryptedData extends jspb.Message {
   getIv(): Uint8Array | string;
   getIv_asU8(): Uint8Array;
   getIv_asB64(): string;
@@ -48,7 +49,7 @@ export namespace EncryptedData {
   };
 }
 
-export class Message extends jspb.Message {
+export declare class Message extends jspb.Message {
   getDataset(): string;
   setDataset(value: string): void;
 
@@ -88,7 +89,7 @@ export namespace Message {
   };
 }
 
-export class MessageEnvelope extends jspb.Message {
+export declare class MessageEnvelope extends jspb.Message {
   getTimestamp(): string;
   setTimestamp(value: string): void;
 
@@ -129,7 +130,7 @@ export namespace MessageEnvelope {
   };
 }
 
-export class SyncRequest extends jspb.Message {
+export declare class SyncRequest extends jspb.Message {
   clearMessagesList(): void;
   getMessagesList(): Array<MessageEnvelope>;
   setMessagesList(value: Array<MessageEnvelope>): void;
@@ -178,7 +179,7 @@ export namespace SyncRequest {
   };
 }
 
-export class SyncResponse extends jspb.Message {
+export declare class SyncResponse extends jspb.Message {
   clearMessagesList(): void;
   getMessagesList(): Array<MessageEnvelope>;
   setMessagesList(value: Array<MessageEnvelope>): void;