Merge branch 'master' into matiss/fix-e2e-api

.github/workflows/electron-master.yml

@@ -51,8 +51,8 @@ jobs:
       - name: Build Electron
         run: ./bin/package-electron
         env:
-          CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
-          CSC_LINK: ${{ secrets.CSC_LINK }}
+          # CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
+          # CSC_LINK: ${{ secrets.CSC_LINK }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
       - name: Upload Build

bin/package-electron

@@ -38,7 +38,7 @@ yarn rebuild-electron
 
 yarn workspace loot-core build:node
 
-yarn workspace @actual-app/web build
+yarn workspace @actual-app/web build --mode=desktop
 
 yarn workspace desktop-electron update-client
 

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/api",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "license": "MIT",
   "description": "An API for Actual",
   "engines": {
@@ -27,8 +27,8 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@swc/core": "^1.3.105",
-    "@swc/jest": "^0.2.31",
+    "@swc/core": "^1.5.3",
+    "@swc/jest": "^0.2.36",
     "@types/jest": "^27.5.2",
     "@types/uuid": "^9.0.2",
     "jest": "^27.5.1",

packages/crdt/package.json

@@ -20,8 +20,8 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@swc/core": "^1.3.105",
-    "@swc/jest": "^0.2.31",
+    "@swc/core": "^1.5.3",
+    "@swc/jest": "^0.2.36",
     "@types/jest": "^27.5.2",
     "@types/uuid": "^9.0.2",
     "jest": "^27.5.1",

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

@@ -46,7 +46,7 @@ test.describe('Transactions', () => {
       await expect(datepicker).toMatchThemeScreenshots();
 
       // Select "is xxxxx"
-      await datepicker.getByRole('button', { name: '20' }).click();
+      await datepicker.getByText('20', { exact: true }).click();
       await filterTooltip.applyButton.click();
 
       // Assert that there are no transactions

packages/desktop-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actual-app/web",
-  "version": "24.4.0",
+  "version": "24.5.0",
   "license": "MIT",
   "files": [
     "build"
@@ -16,9 +16,9 @@
     "@react-stately/list": "^3.10.2",
     "@rollup/plugin-inject": "^5.0.5",
     "@svgr/cli": "^8.1.0",
-    "@swc/core": "^1.3.105",
-    "@swc/helpers": "^0.5.3",
-    "@swc/plugin-react-remove-properties": "^1.5.108",
+    "@swc/core": "^1.5.3",
+    "@swc/helpers": "^0.5.11",
+    "@swc/plugin-react-remove-properties": "^1.5.121",
     "@testing-library/react": "14.1.2",
     "@testing-library/user-event": "14.5.2",
     "@types/promise-retry": "^1.1.6",
@@ -30,7 +30,7 @@
     "@types/webpack-bundle-analyzer": "^4.6.3",
     "@use-gesture/react": "^10.3.0",
     "@vitejs/plugin-basic-ssl": "^1.1.0",
-    "@vitejs/plugin-react-swc": "^3.5.0",
+    "@vitejs/plugin-react-swc": "^3.6.0",
     "chokidar": "^3.5.3",
     "cross-env": "^7.0.3",
     "date-fns": "^2.30.0",
@@ -65,14 +65,14 @@
     "remark-gfm": "^3.0.1",
     "rollup-plugin-visualizer": "^5.12.0",
     "sass": "^1.70.0",
-    "swc-loader": "^0.2.3",
+    "swc-loader": "^0.2.6",
     "terser-webpack-plugin": "^5.3.10",
     "usehooks-ts": "^3.0.1",
     "uuid": "^9.0.1",
-    "vite": "^5.0.12",
-    "vite-plugin-pwa": "^0.19.0",
-    "vite-tsconfig-paths": "^4.3.1",
-    "vitest": "^1.2.1",
+    "vite": "^5.2.11",
+    "vite-plugin-pwa": "^0.20.0",
+    "vite-tsconfig-paths": "^4.3.2",
+    "vitest": "^1.6.0",
     "webpack-bundle-analyzer": "^4.10.1",
     "xml2js": "^0.6.2"
   },

packages/desktop-client/src/components/Modals.tsx

@@ -14,6 +14,7 @@ import { useSyncServerStatus } from '../hooks/useSyncServerStatus';
 import { ModalTitle } from './common/Modal';
 import { AccountAutocompleteModal } from './modals/AccountAutocompleteModal';
 import { AccountMenuModal } from './modals/AccountMenuModal';
+import { BudgetListModal } from './modals/BudgetListModal';
 import { BudgetPageMenuModal } from './modals/BudgetPageMenuModal';
 import { CategoryAutocompleteModal } from './modals/CategoryAutocompleteModal';
 import { CategoryGroupMenuModal } from './modals/CategoryGroupMenuModal';
@@ -609,6 +610,7 @@ export function Modals() {
               modalProps={modalProps}
               onAddCategoryGroup={options.onAddCategoryGroup}
               onToggleHiddenCategories={options.onToggleHiddenCategories}
+              onSwitchBudgetFile={options.onSwitchBudgetFile}
               onSwitchBudgetType={options.onSwitchBudgetType}
             />
           );
@@ -643,6 +645,9 @@ export function Modals() {
             </NamespaceContext.Provider>
           );
 
+        case 'budget-list':
+          return <BudgetListModal key={name} modalProps={modalProps} />;
+
         default:
           console.error('Unknown modal:', name);
           return null;

packages/desktop-client/src/components/NotesButton.tsx

@@ -66,7 +66,7 @@ export function NotesButton({
             setIsOpen(true);
           }}
         >
-          <SvgCustomNotesPaper style={{ width, height }} />
+          <SvgCustomNotesPaper style={{ width, height, flexShrink: 0 }} />
         </Button>
       </View>
 

packages/desktop-client/src/components/ThemeSelector.tsx

@@ -26,6 +26,7 @@ export function ThemeSelector({ style }: ThemeSelectorProps) {
     dark: SvgMoonStars,
     auto: SvgSystem,
     midnight: SvgMoonStars,
+    development: SvgMoonStars,
   } as const;
 
   function onMenuSelect(newTheme: Theme) {

packages/desktop-client/src/components/accounts/Account.jsx

@@ -448,7 +448,7 @@ class AccountInternal extends PureComponent {
         filters: [
           {
             name: 'Financial Files',
-            extensions: ['qif', 'ofx', 'qfx', 'csv', 'tsv'],
+            extensions: ['qif', 'ofx', 'qfx', 'csv', 'tsv', 'xml'],
           },
         ],
       });