[Payment due @huult] [NoQA] fix: Concierge thinking message shows workspace icon instead of Concierge avatar in admin/announce rooms by marcochavezf · Pull Request #87126 · Expensify/App

marcochavezf · 2026-04-04T06:20:24Z

Explanation of Change

The ConciergeThinkingMessage component renders a ReportActionAvatars without passing the accountIDs prop. When the thinking message appears in admin or announce rooms, ReportActionAvatars derives the avatar from the report context — which resolves to the workspace icon instead of the Concierge avatar.

The fix passes accountIDs={[CONST.ACCOUNT_ID.CONCIERGE]} explicitly, which tells ReportActionAvatars to prioritize the provided account IDs over the report-derived avatars. This ensures the Concierge avatar is always shown regardless of room type.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/620352

Tests

Open an admin room (#admins) in a workspace
Trigger a Concierge thinking message (ask Concierge a question)
Verify the thinking message avatar shows the Concierge icon, not the workspace icon
Open a regular DM with Concierge and verify the avatar still displays correctly in the thinking indicator

Verify that no errors appear in the JS console

Offline tests

N/A — this is a purely visual/prop-passing fix with no network dependency.

QA Steps

Same as Tests above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

…on in admin rooms (#620352) Adds three tests to useReportActionAvatarsTest covering the bug where ConciergeThinkingMessage shows the workspace avatar instead of Concierge avatar in policy rooms. Test 1 documents the buggy behavior, Test 2 verifies the fix path (passing accountIDs), Test 3 is a regression check for normal Concierge DMs. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

The workspace-icon bug is not limited to admin rooms -- it affects all policy rooms. This test proves the systemic nature of the issue so the fix covers announce rooms, domain rooms, etc. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…nking message (#620352) Without the accountIDs prop, ReportActionAvatars derives the avatar from the report context. In admin and announce rooms this resolves to the workspace icon instead of the Concierge avatar. Passing accountIDs=[CONST.ACCOUNT_ID.CONCIERGE] ensures the Concierge avatar is always shown regardless of room type. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

melvin-bot · 2026-04-07T17:12:49Z

@thesahindia 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]

huult · 2026-04-09T03:05:12Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (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 verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
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
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
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 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Screen.Recording.2026-04-09.at.11.01.09.mp4

Android: mWeb Chrome

Screen.Recording.2026-04-09.at.11.03.04.mp4

iOS: HybridApp

Screen.Recording.2026-04-09.at.11.10.52.mp4

iOS: mWeb Safari

Screen.Recording.2026-04-09.at.11.13.49.mp4

MacOS: Chrome / Safari

Screen.Recording.2026-04-09.at.10.54.33.mp4

huult · 2026-04-09T03:24:23Z

@marcochavezf Could you sync the main branch?

huult

LGTM!

melvin-bot · 2026-04-09T04:19:33Z

@Valforte 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 · 2026-04-09T04:19:35Z

🎯 @huult, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/620352.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

Valforte

LGTM

github-actions · 2026-04-09T21:26:32Z

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

github-actions · 2026-04-09T21:31:17Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #87126.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-7b5e786-b0990c7-6d19a789025720ce9b279fd461cca7e90674add1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-7b5e786-b0990c7-7769e75afc832ceb494d147f4334bb187b08273c/index.html

Web 🕸️
https://87126.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-09T21:35:56Z

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

OSBotify · 2026-04-10T08:25:55Z

🚀 Deployed to staging by https://github.com/Valforte in version: 9.3.58-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-10T08:27:56Z

No help site changes are required for this PR.

This PR fixes a visual bug where the Concierge "thinking" message avatar incorrectly displayed the workspace icon instead of the Concierge avatar in admin/announce rooms. The change is a one-line prop fix plus unit tests — it doesn't alter any user-facing feature, workflow, setting name, or documented behavior that would need updates in docs/articles.

marcochavezf and others added 3 commits April 3, 2026 23:34

melvin-bot bot assigned marcochavezf Apr 4, 2026

marcochavezf marked this pull request as ready for review April 7, 2026 17:12

marcochavezf requested review from a team as code owners April 7, 2026 17:12

melvin-bot bot requested review from thesahindia and removed request for a team April 7, 2026 17:12

melvin-bot bot requested review from heyjennahay and removed request for a team April 7, 2026 17:12

marcochavezf requested review from huult and removed request for thesahindia April 8, 2026 21:34

huult approved these changes Apr 9, 2026

View reviewed changes

melvin-bot bot requested a review from Valforte April 9, 2026 04:19

melvin-bot bot changed the title ~~[NoQA] fix: Concierge thinking message shows workspace icon instead of Concierge avatar in admin/announce rooms~~ [Payment due @huult] [NoQA] fix: Concierge thinking message shows workspace icon instead of Concierge avatar in admin/announce rooms Apr 9, 2026

Merge branch 'main' into marco/620352-fix

d4d008a

Valforte approved these changes Apr 9, 2026

View reviewed changes

Valforte merged commit 7b5e786 into main Apr 9, 2026
35 checks passed

Valforte deleted the marco/620352-fix branch April 9, 2026 21:25

OSBotify mentioned this pull request Apr 10, 2026

Deploy Checklist: New Expensify 2026-04-10 #87562

Open

69 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Payment due @huult] [NoQA] fix: Concierge thinking message shows workspace icon instead of Concierge avatar in admin/announce rooms#87126

[Payment due @huult] [NoQA] fix: Concierge thinking message shows workspace icon instead of Concierge avatar in admin/announce rooms#87126
Valforte merged 4 commits intomainfrom
marco/620352-fix

marcochavezf commented Apr 4, 2026 •

edited

Loading

Uh oh!

melvin-bot bot commented Apr 7, 2026

Uh oh!

huult commented Apr 9, 2026 •

edited

Loading

Uh oh!

huult commented Apr 9, 2026

Uh oh!

huult left a comment

Uh oh!

melvin-bot bot commented Apr 9, 2026

Uh oh!

melvin-bot bot commented Apr 9, 2026

Uh oh!

Valforte left a comment

Uh oh!

Uh oh!

github-actions bot commented Apr 9, 2026

Uh oh!

github-actions bot commented Apr 9, 2026

Uh oh!

OSBotify commented Apr 9, 2026

Uh oh!

OSBotify commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

marcochavezf commented Apr 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 7, 2026

Uh oh!

huult commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

huult commented Apr 9, 2026

Uh oh!

huult left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Apr 9, 2026

Uh oh!

melvin-bot bot commented Apr 9, 2026

Uh oh!

Valforte left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Apr 9, 2026

Uh oh!

github-actions bot commented Apr 9, 2026

Uh oh!

OSBotify commented Apr 9, 2026

Uh oh!

OSBotify commented Apr 10, 2026

Uh oh!

MelvinBot commented Apr 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

marcochavezf commented Apr 4, 2026 •

edited

Loading

huult commented Apr 9, 2026 •

edited

Loading