[Payment due @ChavdaSachin] Fix suggested followup ordering and add HTML formatting tests by marcochavezf · Pull Request #86382 · Expensify/App

marcochavezf · 2026-03-25T23:27:49Z

Explanation of Change

When a user clicks a suggested followup button with a pregenerated response, the optimistic Concierge reply briefly renders above the user's question. This happens because the Concierge response's created timestamp uses createdOffset: 1 (1ms), which is not enough to guarantee correct sort order when both actions are queued to Onyx near-simultaneously.

Fix: Changed createdOffset from 1 to CONCIERGE_RESPONSE_DELAY_MS (4000ms). This ensures the Concierge response timestamp is well after the user's comment, matching the visual delay where Concierge "types" for 4 seconds before showing the response.

Also adds test coverage verifying:

The Concierge response created timestamp is strictly after the user comment's timestamp
HTML formatting in <followup-response> parsing is preserved (existing render() fix validated)

Note: This PR fixes the ordering of followup responses. Bullet-point formatting in Concierge responses is fixed separately in Auth#19993.

Fixed Issues

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

Tests

Pre-requisites: Use an account with the excluded beta suggestedFollowups. You can use an account with the domain @dmb.fun that has access to the beta.

Sign up with a new account
Select "Manage my team's expenses" during onboarding
Select company size "1-10 employees"
Complete the onboarding flow
Open the #admins room that contains the welcome message, and wait until the followup buttons appear (the concierge thinking indicator will appear meanwhile)
Click a followup button
Verify the user's question appears first, then after a brief typing indicator, the Concierge response appears below it (never above)
Continue clicking on the followup buttons and verify the Concierge response preserves any bullet-point formatting

Verify that no errors appear in the JS console

Test Evidence

should preserve HTML formatting in followup-response — PASS (verifies render() preserves <br>, <ul>, <li>, <strong> tags)
should create Concierge response with timestamp strictly after the user comment — PASS (verifies createdOffset: CONCIERGE_RESPONSE_DELAY_MS produces correct ordering)

Offline tests

N/A — followup buttons only appear in online Concierge conversations.

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

State	Screenshot
Followup buttons visible after welcome message
After click: user message ABOVE Concierge response (ordering fix), formatting preserved

Screen.Recording.2026-03-26.at.10.04.00.p.m.mov

The optimistic Concierge response was using createdOffset: 1 (1ms), which was not sufficient to guarantee correct sort order when both the user's comment and Concierge response are queued to Onyx near-simultaneously. Using CONCIERGE_RESPONSE_DELAY_MS (4s) ensures the Concierge response timestamp is well after the user's comment. Also adds tests verifying: - HTML formatting (bullets, breaks, strong tags) is preserved in followup-response parsing - Concierge response timestamp is strictly after user comment Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

melvin-bot · 2026-03-25T23:27:55Z

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

codecov · 2026-03-25T23:35:11Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/Report/SuggestedFollowup.ts	`96.00% <ø> (ø)`
... and 12 files with indirect coverage changes

marcochavezf · 2026-03-27T04:24:13Z

src/libs/actions/Report/SuggestedFollowup.ts

        text: selectedFollowup.response,
        actorAccountID: CONST.ACCOUNT_ID.CONCIERGE,
-        createdOffset: 1,
+        createdOffset: CONCIERGE_RESPONSE_DELAY_MS,


In reality, any value ≥1000ms would work, but using this one since it's the delay we use to post the optimistic Concierge response

marcochavezf · 2026-03-27T04:33:05Z

tests/unit/ReportActionsFollowupUtilsTest.ts

            ]);
        });

+        it('should preserve HTML formatting in followup-response (bullets, breaks, strong tags)', () => {


This one is not related to the main change, but it's a regression coverage for the HTML preservation

marcochavezf · 2026-03-27T04:34:09Z

Ok this is now ready for review @ChavdaSachin

JmillsExpensify

LGTM

marcochavezf · 2026-03-30T23:46:01Z

Friendly bump @ChavdaSachin

ChavdaSachin · 2026-03-31T05:25:26Z

@codex review

chatgpt-codex-connector · 2026-03-31T05:51:43Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

Failed to set up container

ℹ️ 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".

marcochavezf · 2026-03-31T16:03:49Z

@codex review

chatgpt-codex-connector · 2026-03-31T16:30:02Z

Codex Review: Something went wrong. Try again later by commenting “@codex review”.

Failed to set up container

ℹ️ 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".

ChavdaSachin · 2026-03-31T18:14:22Z

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

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-03-31.at.11.34.21.PM.mov

ChavdaSachin

LGTM! ✅

melvin-bot · 2026-03-31T18:20:12Z

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

melvin-bot · 2026-03-31T18:20:16Z

🎯 @ChavdaSachin, 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/616314.

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.

github-actions · 2026-04-01T14:00:43Z

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

OSBotify · 2026-04-01T14:03:53Z

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

github-actions · 2026-04-01T14:05:20Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-92cde27-b61a0f4-cc771e996458bf1a4f5f897b556a9613d24c6e6b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-92cde27-b61a0f4-e2c7da77fc79d4e0fff9758336504cbed87e65f9/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-02T20:20:05Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.3.52-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-02T20:21:54Z

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

No help site changes are required.

This PR is a purely internal bug fix — it changes the createdOffset value from 1 to CONCIERGE_RESPONSE_DELAY_MS (4000ms) in SuggestedFollowup.ts to fix a message ordering race condition, plus adds test coverage. It does not:

Introduce any new user-facing features or settings
Change any UI labels, button names, or navigation paths
Alter how Concierge behaves from the user's perspective
Change any terminology referenced in help docs

The existing Concierge help articles (Concierge-Basics.md, Concierge-Intelligence.md, Support-Agent.md, Expense-Assistant.md) don't mention suggested followups, and the fix is invisible to end users (messages simply appear in the correct chronological order now).

marcochavezf requested review from a team as code owners March 25, 2026 23:27

melvin-bot bot assigned marcochavezf Mar 25, 2026

melvin-bot bot requested review from ChavdaSachin and removed request for a team March 25, 2026 23:27

melvin-bot bot requested review from JmillsExpensify and removed request for a team March 25, 2026 23:27

marcochavezf changed the title ~~[HOLD] Fix suggested followup ordering and add HTML formatting tests~~ [WIP] Fix suggested followup ordering and add HTML formatting tests Mar 26, 2026

marcochavezf marked this pull request as draft March 26, 2026 19:52

marcochavezf commented Mar 27, 2026

View reviewed changes

marcochavezf changed the title ~~[WIP] Fix suggested followup ordering and add HTML formatting tests~~ Fix suggested followup ordering and add HTML formatting tests Mar 27, 2026

marcochavezf marked this pull request as ready for review March 27, 2026 04:33

JmillsExpensify reviewed Mar 29, 2026

View reviewed changes

ChavdaSachin approved these changes Mar 31, 2026

View reviewed changes

melvin-bot bot requested a review from mjasikowski March 31, 2026 18:20

melvin-bot bot changed the title ~~Fix suggested followup ordering and add HTML formatting tests~~ [Payment due @ChavdaSachin] Fix suggested followup ordering and add HTML formatting tests Mar 31, 2026

mjasikowski approved these changes Apr 1, 2026

View reviewed changes

mjasikowski merged commit 92cde27 into main Apr 1, 2026
63 of 67 checks passed

mjasikowski deleted the marco/fix-followup-ordering-and-bullet-stripping branch April 1, 2026 13:55

OSBotify mentioned this pull request Apr 2, 2026

Deploy Checklist: New Expensify 2026-04-02 #86989

Open

Conversation

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

Uh oh!

Explanation of Change

Fixed Issues

Tests

Test Evidence

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 25, 2026

Uh oh!

codecov bot commented Mar 25, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

marcochavezf Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

marcochavezf Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

marcochavezf commented Mar 27, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

marcochavezf commented Mar 30, 2026

Uh oh!

ChavdaSachin commented Mar 31, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 31, 2026

Uh oh!

marcochavezf commented Mar 31, 2026

Uh oh!

chatgpt-codex-connector bot commented Mar 31, 2026

Uh oh!

ChavdaSachin commented Mar 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ChavdaSachin left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 31, 2026

Uh oh!

melvin-bot bot commented Mar 31, 2026

Uh oh!

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

OSBotify commented Apr 1, 2026

Uh oh!

github-actions bot commented Apr 1, 2026

Uh oh!

OSBotify commented Apr 2, 2026

Uh oh!

MelvinBot commented Apr 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

marcochavezf commented Mar 25, 2026 •

edited

Loading

codecov bot commented Mar 25, 2026 •

edited by github-actions bot

Loading

ChavdaSachin commented Mar 31, 2026 •

edited

Loading