Skip to content

Fix crash when accessing undefined avatar catalog entry #74634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlosmiceli merged 3 commits into from
Nov 8, 2025
Merged

Fix crash when accessing undefined avatar catalog entry #74634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac40046
handle null entry for avatar local
carlosmiceli Nov 8, 2025
35d25f0
ternary for drying
carlosmiceli Nov 8, 2025
9b86fbe
update tests
carlosmiceli Nov 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/libs/Avatars/PresetAvatarCatalog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,8 @@ function getLetterAvatar(name?: string): React.FC<SvgProps> | null {

const PRESET_AVATAR_CATALOG_ORDERED = buildOrderedAvatars();

const getAvatarLocal = (id: PresetAvatarID) => PRESET_AVATAR_CATALOG[id].local;
const getAvatarURL = (id: PresetAvatarID) => PRESET_AVATAR_CATALOG[id].url;
const getAvatarLocal = (id: PresetAvatarID) => PRESET_AVATAR_CATALOG[id]?.local;
const getAvatarURL = (id: PresetAvatarID) => PRESET_AVATAR_CATALOG[id]?.url;

/**
* Type guard to check if a value is a valid PresetAvatarID
Expand Down
4 changes: 3 additions & 1 deletion tests/unit/libs/Avatars/PresetAvatarCatalogTest.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ describe('PresetAvatarCatalog', () => {

it('throws or returns undefined for an unknown ID', () => {
// @ts-expect-error - This is a test for an unknown ID
expect(() => getAvatarLocal('not-a-real-id')).toThrow();
expect(getAvatarLocal('not-a-real-id')).toBeUndefined();
// @ts-expect-error - This is a test for an unknown ID
expect(getAvatarURL('not-a-real-id')).toBeUndefined();
});

it('ALL contains both default and seasonal IDs', () => {
Expand Down
Loading