Skip to content

Commit e637a16

Browse files
committed
Merge branch renovate/primer-react-37.x of github.com:gitify-app/gitify into renovate/primer-react-37.x
2 parents 87fce67 + ec98a56 commit e637a16

21 files changed

+169
-126
lines changed

package.json

+3-3
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": "37.11.2",
151-
"@tailwindcss/postcss": "4.0.4",
151+
"@tailwindcss/postcss": "4.0.6",
152152
"@testing-library/react": "16.2.0",
153153
"@types/jest": "29.5.14",
154154
"@types/node": "22.13.1",
@@ -163,7 +163,7 @@
163163
"css-loader": "7.1.2",
164164
"css-minimizer-webpack-plugin": "7.0.0",
165165
"date-fns": "4.1.0",
166-
"electron": "34.1.0",
166+
"electron": "34.1.1",
167167
"electron-builder": "25.1.8",
168168
"final-form": "4.20.10",
169169
"graphql-tag": "2.12.6",
@@ -179,7 +179,7 @@
179179
"semver": "7.7.1",
180180
"styled-components": "6.1.15",
181181
"tailwind-merge": "3.0.1",
182-
"tailwindcss": "4.0.4",
182+
"tailwindcss": "4.0.6",
183183
"terser-webpack-plugin": "5.3.11",
184184
"ts-jest": "29.2.5",
185185
"ts-loader": "9.5.2",

pnpm-lock.yaml

+76-76
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/main/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const browserWindowOpts = {
2020
minHeight: 400,
2121
resizable: false,
2222
skipTaskbar: true, // Hide the app from the Windows taskbar
23-
// TODO ideally we would disable this as use a preload script with a context bridge
23+
// TODO #700 refactor to use preload script with a context bridge
2424
webPreferences: {
2525
nodeIntegration: true,
2626
contextIsolation: false,

src/renderer/components/avatars/AvatarWithFallback.tsx

+4-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import type React from 'react';
22
import { useState } from 'react';
33

4-
import { FeedPersonIcon, MarkGithubIcon } from '@primer/octicons-react';
54
import { Avatar, Stack, Truncate } from '@primer/react';
65

76
import { type Link, Size } from '../../types';
87
import type { UserType } from '../../typesGitHub';
9-
import { isNonHumanUser } from '../../utils/helpers';
8+
import { getDefaultUserIcon } from '../../utils/icons';
9+
import { isNonHumanUser } from '../../utils/notifications/filters/userType';
1010

1111
export interface IAvatarWithFallback {
1212
src?: Link;
@@ -26,6 +26,7 @@ export const AvatarWithFallback: React.FC<IAvatarWithFallback> = ({
2626
const [isBroken, setIsBroken] = useState(false);
2727

2828
const isNonHuman = isNonHumanUser(userType);
29+
const DefaultUserIcon = getDefaultUserIcon(userType);
2930

3031
// TODO explore using AnchoredOverlay component (https://primer.style/components/anchored-overlay/react/alpha) to render Avatar Card on hover
3132
return (
@@ -36,11 +37,7 @@ export const AvatarWithFallback: React.FC<IAvatarWithFallback> = ({
3637
data-testid="avatar"
3738
>
3839
{!src || isBroken ? (
39-
isNonHuman ? (
40-
<MarkGithubIcon size={size} />
41-
) : (
42-
<FeedPersonIcon size={size} />
43-
)
40+
<DefaultUserIcon size={size} />
4441
) : (
4542
<Avatar
4643
src={src}

0 commit comments

Comments
 (0)