Skip to content

[Avatars] Split out Agent Avatars from User Avatars#92002

Merged
NicolasBonet merged 10 commits into
mainfrom
georgia-remove-bots
Jun 10, 2026
Merged

[Avatars] Split out Agent Avatars from User Avatars#92002
NicolasBonet merged 10 commits into
mainfrom
georgia-remove-bots

Conversation

@grgia

@grgia grgia commented May 28, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Agent (bot) avatars were mixed in with user preset avatars, so they wrongly showed up as options in the profile picture picker.

What changed:

  • Split user presets and agent avatars into separate catalogs, built from one small shared helper
  • Profile picker now pulls only from the user catalog — bots can't appear there
  • Agent creation/editing still uses the agent catalog; existing agent avatars render correctly everywhere
  • Same behavior for users, cleaner structure underneath, and an easy place to add more avatar categories (e.g. workspace avatars) later

Should Appear Here:

image

Not Here:

image

Fixed Issues

$ #91980
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

I tested by

  • Changing an avatar to all types of avatars
  • Creating agents and changing agent avatars

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

  • Verify that no errors appear in the JS console

  • Go to /settings/profile/avatar and click to edit avatar

  • Verify no Bot Avatars

  • Go to /settings/agents/new click to edit avatar

  • Verify bot avatars appear

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

@grgia grgia self-assigned this May 28, 2026
@github-actions

Copy link
Copy Markdown
Contributor

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

@grgia grgia marked this pull request as ready for review May 28, 2026 17:09
@grgia grgia requested review from a team as code owners May 28, 2026 17:09
@melvin-bot melvin-bot Bot requested review from JmillsExpensify and brunovjk and removed request for a team May 28, 2026 17:09
@melvin-bot

melvin-bot Bot commented May 28, 2026

Copy link
Copy Markdown

@brunovjk Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot Bot removed the request for review from a team May 28, 2026 17:09
@grgia grgia requested review from a team and NicolasBonet and removed request for JmillsExpensify and brunovjk May 28, 2026 17:09
@melvin-bot melvin-bot Bot requested review from cretadn22 and removed request for a team May 28, 2026 17:09
@melvin-bot

melvin-bot Bot commented May 28, 2026

Copy link
Copy Markdown

@cretadn22 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: c3ec1a9968

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/libs/Avatars/PresetAvatarCatalog.ts Outdated
@github-actions

This comment has been minimized.

@grgia grgia changed the title no bots in user presets [WIP] no bots in user presets May 28, 2026
@grgia grgia requested a review from a team as a code owner May 28, 2026 18:00
@codecov

codecov Bot commented May 28, 2026

Copy link
Copy Markdown

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines Coverage Δ
src/components/AvatarSelector.tsx 100.00% <100.00%> (ø)
src/hooks/useLetterAvatars.tsx 90.90% <ø> (ø)
src/libs/Avatars/AgentAvatarCatalog.ts 100.00% <100.00%> (ø)
src/libs/Avatars/AvatarLookup.ts 100.00% <100.00%> (ø)
src/libs/actions/Agent.ts 74.24% <100.00%> (ø)
src/styles/utils/index.ts 52.76% <ø> (ø)
src/components/Avatar.tsx 94.59% <66.66%> (ø)
src/stories/Avatar.stories.tsx 0.00% <0.00%> (ø)
src/libs/Avatars/AvatarCatalog.ts 88.23% <88.23%> (ø)
src/libs/UserAvatarUtils.ts 95.77% <83.33%> (-0.12%) ⬇️
... and 5 more
... and 22 files with indirect coverage changes

dannymcclain
dannymcclain previously approved these changes May 28, 2026

@dannymcclain dannymcclain left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me from a design perspective. No bots for users!

@github-actions

Copy link
Copy Markdown
Contributor

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

This comment has been minimized.

@shawnborton

Copy link
Copy Markdown
Contributor

Tests well to me 👍

@grgia grgia changed the title [WIP] no bots in user presets [Avatars] Split out Agent Avatars from User Avatars May 29, 2026
@brunovjk

Copy link
Copy Markdown
Contributor

@codex review

grgia added 2 commits June 1, 2026 11:01
createAvatarCatalog now takes an optional display-order hint and builds
the ordered list from entries itself, so each catalog is a pure data
table. Removes buildOrderedAvatars and the inline ordering map.
# Conflicts:
#	src/pages/settings/Agents/AddAgentPage.tsx
@NicolasBonet

Copy link
Copy Markdown
Contributor

@grgia tests are failing

@grgia grgia requested a review from NicolasBonet June 4, 2026 05:38

@NicolasBonet NicolasBonet left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests still failing

@brunovjk

brunovjk commented Jun 9, 2026

Copy link
Copy Markdown
Contributor

I believe the lastest warnings about ESLint and TypeScript are not related to this PR.

@grgia grgia requested a review from NicolasBonet June 10, 2026 09:33
@grgia

grgia commented Jun 10, 2026

Copy link
Copy Markdown
Contributor Author

@NicolasBonet back from OOO, should be okay to go

@NicolasBonet NicolasBonet merged commit 20f5657 into main Jun 10, 2026
36 checks passed
@NicolasBonet NicolasBonet deleted the georgia-remove-bots branch June 10, 2026 14:55
@melvin-bot melvin-bot Bot added the Emergency label Jun 10, 2026
@melvin-bot

melvin-bot Bot commented Jun 10, 2026

Copy link
Copy Markdown

@NicolasBonet looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@github-actions

Copy link
Copy Markdown
Contributor

🚧 @NicolasBonet has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@NicolasBonet

Copy link
Copy Markdown
Contributor

All tests passed:
image

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/NicolasBonet in version: 9.4.5-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: no documentation changes required.

I reviewed the changes in this PR against the help articles under docs/articles.

Why no docs update is needed:

  • This PR is a bug fix + internal refactor. It splits agent/bot avatars out of the user avatar catalog so that bot avatars no longer appear in the profile picture picker (/settings/profile/avatar). Agent creation/editing still uses its own catalog, with no user-facing behavior change there.
  • The closest help article is the Customized Avatar section in new-expensify/settings/Account-Settings.md. It documents the intended behavior — choosing a custom avatar or letter — and never listed bot/agent avatars as a selectable option.
  • Because the docs already describe the correct (post-fix) behavior, and this change only removes an unintended option, there is no documented behavior to update and no new feature, UI, tab, or label introduced.

No draft help site PR was created, since no article changes are warranted.


@grgia, this is a behavior-aligning bug fix with no user-facing docs impact — please confirm you agree no help site update is needed. If you'd like a clarifying note added anywhere (e.g., in the Agents documentation), let me know and I'll open a draft PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.5-6 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants