Skip to content

Commit 2e0bc5b

Browse files
authored
Merge branch 'main' into renovate/primer-react-37.x
2 parents b8eacf6 + c2bdc9c commit 2e0bc5b

File tree

61 files changed

+8662
-4296
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+8662
-4296
lines changed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
"@primer/octicons-react": "19.15.0",
149149
"@primer/primitives": "10.3.4",
150150
"@primer/react": "36.27.0",
151-
"@tailwindcss/postcss": "4.0.3",
151+
"@tailwindcss/postcss": "4.0.4",
152152
"@testing-library/react": "16.2.0",
153153
"@types/jest": "29.5.14",
154154
"@types/node": "22.13.1",
@@ -177,9 +177,9 @@
177177
"postcss-loader": "8.1.1",
178178
"rimraf": "6.0.1",
179179
"semver": "7.7.1",
180-
"styled-components": "6.1.14",
180+
"styled-components": "6.1.15",
181181
"tailwind-merge": "3.0.1",
182-
"tailwindcss": "4.0.3",
182+
"tailwindcss": "4.0.4",
183183
"terser-webpack-plugin": "5.3.11",
184184
"ts-jest": "29.2.5",
185185
"ts-loader": "9.5.2",

pnpm-lock.yaml

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/renderer/__mocks__/state-mocks.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,9 @@ const mockSystemSettings: SystemSettingsState = {
106106
};
107107

108108
const mockFilters: FilterSettingsState = {
109-
hideBots: false,
109+
filterUserTypes: [],
110+
filterIncludeHandles: [],
111+
filterExcludeHandles: [],
110112
filterReasons: [],
111113
};
112114

src/renderer/components/AllRead.test.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ describe('renderer/components/AllRead.tsx', () => {
1414
const tree = render(
1515
<AppContext.Provider
1616
value={{
17-
settings: {
18-
...mockSettings,
19-
},
17+
settings: mockSettings,
2018
}}
2119
>
2220
<MemoryRouter>
@@ -35,7 +33,6 @@ describe('renderer/components/AllRead.tsx', () => {
3533
settings: {
3634
...mockSettings,
3735
filterReasons: ['author'],
38-
hideBots: true,
3936
},
4037
}}
4138
>

src/renderer/components/AllRead.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { type FC, useContext, useMemo } from 'react';
22

33
import { AppContext } from '../context/App';
44
import { Constants } from '../utils/constants';
5-
import { hasAnyFiltersSet } from '../utils/filters';
5+
import { hasAnyFiltersSet } from '../utils/notifications/filters/filter';
66
import { EmojiSplash } from './layout/EmojiSplash';
77

88
interface IAllRead {

src/renderer/components/Sidebar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ import { APPLICATION } from '../../shared/constants';
1616
import { AppContext } from '../context/App';
1717
import { quitApp } from '../utils/comms';
1818
import { Constants } from '../utils/constants';
19-
import { hasAnyFiltersSet } from '../utils/filters';
2019
import {
2120
openGitHubIssues,
2221
openGitHubNotifications,
2322
openGitHubPulls,
2423
} from '../utils/links';
24+
import { hasAnyFiltersSet } from '../utils/notifications/filters/filter';
2525
import { getNotificationCount } from '../utils/notifications/notifications';
2626
import { LogoIcon } from './icons/LogoIcon';
2727

src/renderer/components/__snapshots__/AllRead.test.tsx.snap

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)