Merge branch 'master' into matiss/preview-updates

actualbudget · Jan 17, 2025 · 01f1c32 · 01f1c32
2 parents a953023 + 278e4ad
commit 01f1c32
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -736,6 +736,12 @@ export default [
       'import/no-default-export': 'off',
     },
   },
+  {
+    files: ['packages/api/index.ts'],
+    rules: {
+      'import/no-unresolved': 'off',
+    },
+  },
   {},
   {
     // TODO: fix the issues in these files

diff --git a/packages/api/index.ts b/packages/api/index.ts
@@ -8,7 +8,7 @@ import type {
 import type { InitConfig } from 'loot-core/server/main';
 
 // @ts-ignore: bundle not available until we build it
-// eslint-disable-next-line import/extensions, import/no-unresolved
+// eslint-disable-next-line import/extensions
 import * as bundle from './app/bundle.api.js';
 import * as injected from './injected';
 import { validateNodeVersion } from './validateNodeVersion';

diff --git a/packages/desktop-client/src/components/App.tsx b/packages/desktop-client/src/components/App.tsx
@@ -146,7 +146,7 @@ function AppInner() {
         }),
       );
     }
-  }, [addNotification, signOut, t, userData?.tokenExpired]);
+  }, [dispatch, t, userData?.tokenExpired]);
 
   return budgetId ? <FinancesApp /> : <ManagementApp />;
 }

diff --git a/upcoming-release-notes/4184.md b/upcoming-release-notes/4184.md
@@ -0,0 +1,6 @@
+---
+category: Maintenance
+authors: [MatissJanis]
+---
+
+Patch lint issues in master branch.
-Original file line number
+Diff line change
@@ Expand Up / @@ -146,7 +146,7 @@ function AppInner() { @@
             }),
           );
         }
-      }, [addNotification, signOut, t, userData?.tokenExpired]);
+      }, [dispatch, t, userData?.tokenExpired]);
       return budgetId ? <FinancesApp /> : <ManagementApp />;
     }
@@ Expand Down @@