Merge branch 'main' into feat/refresh-on-inactivity

Author: setchy

package.json

@@ -145,13 +145,13 @@
     "@biomejs/biome": "1.9.4",
     "@discordapp/twemoji": "15.1.0",
     "@electron/notarize": "2.5.0",
-    "@primer/octicons-react": "19.14.0",
+    "@primer/octicons-react": "19.15.0",
     "@primer/primitives": "10.3.4",
     "@primer/react": "36.27.0",
-    "@tailwindcss/postcss": "4.0.3",
+    "@tailwindcss/postcss": "4.0.4",
     "@testing-library/react": "16.2.0",
     "@types/jest": "29.5.14",
-    "@types/node": "22.13.0",
+    "@types/node": "22.13.1",
     "@types/react": "19.0.8",
     "@types/react-dom": "19.0.3",
     "@types/react-router-dom": "5.3.3",
@@ -163,7 +163,7 @@
     "css-loader": "7.1.2",
     "css-minimizer-webpack-plugin": "7.0.0",
     "date-fns": "4.1.0",
-    "electron": "34.0.2",
+    "electron": "34.1.1",
     "electron-builder": "25.1.8",
     "final-form": "4.20.10",
     "graphql-tag": "2.12.6",
@@ -176,10 +176,10 @@
     "postcss": "8.5.1",
     "postcss-loader": "8.1.1",
     "rimraf": "6.0.1",
-    "semver": "7.7.0",
-    "styled-components": "6.1.14",
+    "semver": "7.7.1",
+    "styled-components": "6.1.15",
     "tailwind-merge": "3.0.1",
-    "tailwindcss": "4.0.3",
+    "tailwindcss": "4.0.4",
     "terser-webpack-plugin": "5.3.11",
     "ts-jest": "29.2.5",
     "ts-loader": "9.5.2",

pnpm-lock.yaml

@@ -20,7 +20,7 @@ const browserWindowOpts = {
   minHeight: 400,
   resizable: false,
   skipTaskbar: true, // Hide the app from the Windows taskbar
-  // TODO ideally we would disable this as use a preload script with a context bridge
+  // TODO #700 refactor to use preload script with a context bridge
   webPreferences: {
     nodeIntegration: true,
     contextIsolation: false,

src/main/main.ts

@@ -106,7 +106,9 @@ const mockSystemSettings: SystemSettingsState = {
 };
 
 const mockFilters: FilterSettingsState = {
-  hideBots: false,
+  filterUserTypes: [],
+  filterIncludeHandles: [],
+  filterExcludeHandles: [],
   filterReasons: [],
 };
 

src/renderer/__mocks__/state-mocks.ts

@@ -14,9 +14,7 @@ describe('renderer/components/AllRead.tsx', () => {
     const tree = render(
       <AppContext.Provider
         value={{
-          settings: {
-            ...mockSettings,
-          },
+          settings: mockSettings,
         }}
       >
         <MemoryRouter>
@@ -35,7 +33,6 @@ describe('renderer/components/AllRead.tsx', () => {
           settings: {
             ...mockSettings,
             filterReasons: ['author'],
-            hideBots: true,
           },
         }}
       >

src/renderer/components/AllRead.test.tsx

@@ -2,7 +2,7 @@ import { type FC, useContext, useMemo } from 'react';
 
 import { AppContext } from '../context/App';
 import { Constants } from '../utils/constants';
-import { hasAnyFiltersSet } from '../utils/filters';
+import { hasAnyFiltersSet } from '../utils/notifications/filters/filter';
 import { EmojiSplash } from './layout/EmojiSplash';
 
 interface IAllRead {

src/renderer/components/AllRead.tsx

@@ -16,12 +16,12 @@ import { APPLICATION } from '../../shared/constants';
 import { AppContext } from '../context/App';
 import { quitApp } from '../utils/comms';
 import { Constants } from '../utils/constants';
-import { hasAnyFiltersSet } from '../utils/filters';
 import {
   openGitHubIssues,
   openGitHubNotifications,
   openGitHubPulls,
 } from '../utils/links';
+import { hasAnyFiltersSet } from '../utils/notifications/filters/filter';
 import { getNotificationCount } from '../utils/notifications/notifications';
 import { LogoIcon } from './icons/LogoIcon';