Skip to content

Show 'Concierge is thinking' indicator in #admins room#85327

Merged
carlosmiceli merged 2 commits intomainfrom
marco/610150-admins-room-thinking-indicator
Mar 17, 2026
Merged

Show 'Concierge is thinking' indicator in #admins room#85327
carlosmiceli merged 2 commits intomainfrom
marco/610150-admins-room-thinking-indicator

Conversation

@marcochavezf
Copy link
Contributor

@marcochavezf marcochavezf commented Mar 16, 2026

Explanation of Change

The AgentZero "Concierge is thinking..." status indicator was not appearing in the #admins room during onboarding because the frontend useAgentZeroStatusIndicator hook and the ReportActionCompose submit logic were gated on isConciergeChatReport(), which only returns true for the 1:1 Concierge DM chat. The backend already correctly sends the agentZeroProcessingRequestIndicator NVP for admin rooms, but the App was ignoring it.

This PR extends the check to also activate the indicator for isAdminRoom() reports. This enables:

  1. The optimistic "Thinking..." indicator when the user sends a message or clicks a suggested followup
  2. The server-pushed status labels (e.g., "Concierge is looking up categories...")
  3. The Pusher subscription for real-time reasoning event updates

Fixed Issues

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

Tests

  1. Enable the suggestedFollowups beta for your test account (alternatively, you can use an account with the domain @dmb.fun which is already included in the beta)
  2. Sign up as a new user and select "Manage my team's expenses" during onboarding
  3. Navigate to the #admins room
  4. Send a message or click a suggested followup
  5. Verify that "Concierge is thinking..." (or similar status label) appears above the text input while waiting for a response
  6. Verify the indicator disappears when Concierge's response arrives
  7. Open the Concierge 1:1 DM chat
  8. Send a message and verify the indicator still works there (regression check)
  • Verify that no errors appear in the JS console

Offline tests

  1. Send a message in the #admins room while online
  2. Verify the thinking indicator appears
  3. Go offline while the indicator is showing
  4. Verify the indicator clears (optimistic state clears on offline)

QA Steps

Same as tests

  • Verify that no errors appear in the JS console

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. and not )
    • 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 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 ) 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 , I verified the components using 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 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 is modified, I verified that is working as expected in all cases)

  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.

  • 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 does not already exist
    • The style cannot 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 is using the ScrollView component to make it scrollable when more elements are added to the page.

  • 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
PR

The AgentZero status indicator (typing/thinking) was only shown in
Concierge DM chats because the useAgentZeroStatusIndicator hook and
the submit form logic were gated on isConciergeChatReport(), which
returns false for policy #admins rooms. The backend already sends the
indicator NVP for admin rooms, but the App was ignoring it.

Extend the check to also activate the indicator for isAdminRoom()
reports, so users see "Concierge is thinking..." in the #admins room
during onboarding with the suggestedFollowups beta.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@marcochavezf marcochavezf requested review from a team as code owners March 16, 2026 05:17
@melvin-bot melvin-bot bot requested a review from ikevin127 March 16, 2026 05:17
@melvin-bot
Copy link

melvin-bot bot commented Mar 16, 2026

@ikevin127 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 requested review from joekaufmanexpensify and removed request for a team March 16, 2026 05:17
@codecov
Copy link

codecov bot commented Mar 16, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/hooks/useAgentZeroStatusIndicator.ts 100.00% <100.00%> (ø)
src/pages/inbox/ReportScreen.tsx 71.12% <ø> (+0.13%) ⬆️
...report/ReportActionCompose/ReportActionCompose.tsx 68.90% <100.00%> (+0.13%) ⬆️
... and 270 files with indirect coverage changes

Copy link
Contributor Author

@marcochavezf marcochavezf left a comment

Choose a reason for hiding this comment

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

Checklist boxes updated - triggering re-check

Copy link
Contributor

@joekaufmanexpensify joekaufmanexpensify left a comment

Choose a reason for hiding this comment

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

Makes sense to me!

@ikevin127
Copy link
Contributor

ikevin127 commented Mar 17, 2026

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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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.js 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 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.
  • 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

web.mov

Copy link
Contributor

@ikevin127 ikevin127 left a comment

Choose a reason for hiding this comment

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

(2) NAB comments during code-review. Moving forward with manual testing ♻️

Copy link
Contributor

@ikevin127 ikevin127 left a comment

Choose a reason for hiding this comment

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

Other than the ☝️ 2 NAB comments, LGTM 🟢

@melvin-bot melvin-bot bot requested a review from carlosmiceli March 17, 2026 01:53
@melvin-bot
Copy link

melvin-bot bot commented Mar 17, 2026

@carlosmiceli 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
Copy link

melvin-bot bot commented Mar 17, 2026

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

An E/App issue has been created to issue payment here: #85496.

carlosmiceli
carlosmiceli previously approved these changes Mar 17, 2026
Address review feedback:
- Rename isConciergeChat parameter to isAgentZeroChat in useAgentZeroStatusIndicator
  hook since it now supports both Concierge DMs and #admins rooms
- Remove useMemo wrapper for shouldShowConciergeIndicator in ReportActionCompose
  since it's a simple boolean expression that doesn't need memoization

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
@marcochavezf
Copy link
Contributor Author

Comments addressed, ready for re-review!

Copy link
Contributor

@ikevin127 ikevin127 left a comment

Choose a reason for hiding this comment

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

Thanks, LGTM 🟢

@melvin-bot melvin-bot bot requested a review from mjasikowski March 17, 2026 22:54
@melvin-bot
Copy link

melvin-bot bot commented Mar 17, 2026

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

@carlosmiceli carlosmiceli merged commit 88ee5ad into main Mar 17, 2026
38 checks passed
@carlosmiceli carlosmiceli deleted the marco/610150-admins-room-thinking-indicator branch March 17, 2026 23:02
@github-actions
Copy link
Contributor

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

@OSBotify
Copy link
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.

@kavimuru
Copy link

@marcochavezf is applause.expensifail.com domain account is beta enabled?

Enable the suggestedFollowups beta for your test account (alternatively, you can use an account with the domain @dmb.fun which is already included in the beta)

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.3.40-0 🚀

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

@marcochavezf
Copy link
Contributor Author

Hi @kavimuru, I think yes but let's use the dumb.fun domain to be sure

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.3.40-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-4 🚀

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.

6 participants