[Payment due @jayeshmangwani] [No QA] Fix Concierge draft completion pacing by inimaga · Pull Request #94714 · Expensify/App

inimaga · 2026-06-26T16:09:03Z

Explanation of Change

This fixes Concierge draft pacing when the backend sends a terminal draft completion without final content and the persisted report action arrives separately through Onyx. The client now remembers terminal draft events so stale lower-sequence chunks cannot overwrite the visible draft, and it keeps the synthetic draft bubble active long enough to reveal the authoritative persisted report action content for the same reportActionID.
This lets in-app chat converge to the full final Concierge response instead of getting stuck on an early streamed prefix.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/651819
Part of $#94479

PROPOSAL: N/A

Tests

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

N/A

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

codecov · 2026-06-26T16:14:28Z

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/pages/inbox/conciergeDraftState.ts	`88.98% <ø> (ø)`
src/libs/SearchQueryUtils.ts	`87.44% <66.66%> (-0.07%)`	⬇️
src/pages/inbox/ConciergeDraftContext.tsx	`94.28% <50.00%> (-2.78%)`	⬇️
src/pages/inbox/report/ReportActionsList.tsx	`76.64% <63.63%> (-0.57%)`	⬇️
src/pages/inbox/usePusherDraftPacing.ts	`77.40% <84.37%> (+2.51%)`	⬆️
... and 10 files with indirect coverage changes

melvin-bot · 2026-06-30T13:12:38Z

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a514edfa42

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

jayeshmangwani · 2026-07-01T07:03:57Z

@inimaga I'm not sure whether this PR needs a C+ review, and there are no Tests to verify. Please let me know if it requires a C+ review.

inimaga · 2026-07-02T13:21:10Z

@jayeshmangwani Yes the C+ review is needed for the code. This covers an edge case for which there isn't a useful manual QA step, hence why no manual test steps and reliance on automated tests.

…aft-completion-pacing # Conflicts: # src/pages/inbox/ConciergeDraftContext.tsx

…github.com/Expensify/App into issa/fix-Concierge-draft-completion-pacing

jayeshmangwani · 2026-07-06T07:05:13Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 05d767ec4f

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

…aft-completion-pacing # Conflicts: # config/eslint/eslint.seatbelt.tsv # src/pages/inbox/usePusherDraftPacing.ts # tests/unit/pages/inbox/ConciergeDraftContext.test.tsx

jayeshmangwani · 2026-07-06T19:28:04Z

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 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)
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)
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.
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

jayeshmangwani

lgtm 🚀

melvin-bot · 2026-07-06T19:35:27Z

@marcochavezf 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-07-06T19:35:29Z

🎯 @jayeshmangwani, 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/651819.

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-07-07T06:04:25Z

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

OSBotify · 2026-07-07T06:10:43Z

✋ 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-07-07T06:11:27Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-f4ab24bf3ed-163e75a-09c9c5b4ef34a5e22121d06788e6c9a4035d3ec2/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-f4ab24b-163e75a-13b87723a63404f874decf6c092a99976786c786/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-07T18:17:38Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.4.29-0 🚀

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

MelvinBot · 2026-07-07T18:20:00Z

🤖 No help site changes required.

I reviewed the changes in this PR against Expensify's help site content under App/docs/articles and no documentation updates are needed, so I did not create a draft PR.

Why: This is a purely internal frontend fix to how streamed Concierge responses render. It makes in-app chat converge to the full final Concierge response instead of getting stuck on an early streamed prefix, by remembering terminal draft events (so stale lower-sequence chunks can't overwrite the draft) and keeping the synthetic draft bubble active long enough to reveal the authoritative persisted report action. The changed files are all implementation-level — React components, hooks, context/state, a SearchQueryUtils type-safety tweak, and unit tests.

There is no user-facing feature, setting, tab, button, or workflow change here. The help site does not document Concierge message streaming/draft-pacing behavior (the only Concierge mentions in docs/articles are generic "contact Concierge" references), so there is nothing to add or correct.

If you believe a specific article should describe this behavior, let me know which one and I'll draft the update.

OSBotify · 2026-07-09T10:22:59Z

🚀 Deployed to staging by https://github.com/marcochavezf in version: 9.4.31-0 🚀

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

MelvinBot · 2026-07-09T10:24:47Z

🤖 Help site review — no changes required.

I reviewed the changes in this PR and confirmed that no updates to the help site files under docs/articles are needed. No draft PR was created.

Why: This PR is a purely internal, client-side bug fix for how streamed Concierge responses are rendered/paced in in-app chat. It makes the chat converge to the full final Concierge response instead of getting stuck on an early streamed prefix, by tracking terminal draft events and keeping the synthetic draft bubble active long enough to reveal the persisted report action content.

The changes are confined to streaming/pacing internals (usePusherDraftPacing.ts, ConciergeDraftContext.tsx, conciergeDraftState.ts, ReportActionsList.tsx) plus an unrelated type-safety tweak in SearchQueryUtils.ts. None of this introduces or alters a user-facing feature, setting, tab, button, or workflow.

Docs verification

The help site does not document Concierge response streaming/pacing behavior. The Concierge-in-Expensify.md article describes what Concierge is and how to use it, with no mention of stream, typing, pacing, draft, real-time, or response-rendering mechanics.
There is no article covering the internal rendering behavior this PR corrects, so there is nothing to update.

@inimaga, since no help site changes are required, there is no linked docs PR to review. If you believe a user-facing behavior change here should be documented, let me know and I'll draft the article.

OSBotify · 2026-07-09T10:43:01Z

🚀 Deployed to production by https://github.com/grgia in version: 9.4.31-0 🚀

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

Bundle Size Analysis (Sentry):

Android

melvin-bot · 2026-07-09T10:45:28Z

🤖 Payment issue created: #95680

inimaga added 2 commits June 26, 2026 10:55

Guard stale draft chunks

92953c0

Reveal persisted drafts

79b59c9

inimaga self-assigned this Jun 26, 2026

inimaga added 2 commits June 30, 2026 13:39

Merge origin/main into issa/fix-Concierge-draft-completion-pacing

fdcac88

fix spellcheck

a514edf

inimaga marked this pull request as ready for review June 30, 2026 13:12

inimaga requested review from a team as code owners June 30, 2026 13:12

melvin-bot Bot requested review from jayeshmangwani and trjExpensify and removed request for a team and trjExpensify June 30, 2026 13:12

melvin-bot Bot removed the request for review from a team June 30, 2026 13:12

inimaga changed the title ~~Fix Concierge draft completion pacing~~ [No QA] Fix Concierge draft completion pacing Jun 30, 2026

chatgpt-codex-connector Bot reviewed Jun 30, 2026

View reviewed changes

Comment thread src/pages/inbox/usePusherDraftPacing.ts

inimaga added 3 commits July 2, 2026 14:27

Merge remote-tracking branch 'origin/main' into issa/fix-Concierge-dr…

bb348df

…aft-completion-pacing # Conflicts: # src/pages/inbox/ConciergeDraftContext.tsx

Merge remote-tracking branch 'origin/main' into issa/fix-Concierge-dr…

d734fae

…aft-completion-pacing # Conflicts: # src/pages/inbox/ConciergeDraftContext.tsx

Merge branch 'issa/fix-Concierge-draft-completion-pacing' of https://…

05d767e

…github.com/Expensify/App into issa/fix-Concierge-draft-completion-pacing

chatgpt-codex-connector Bot reviewed Jul 6, 2026

View reviewed changes

Comment thread src/pages/inbox/usePusherDraftPacing.ts Outdated

inimaga added 2 commits July 6, 2026 19:13

Merge remote-tracking branch 'origin/main' into issa/fix-Concierge-dr…

cef497e

…aft-completion-pacing # Conflicts: # config/eslint/eslint.seatbelt.tsv # src/pages/inbox/usePusherDraftPacing.ts # tests/unit/pages/inbox/ConciergeDraftContext.test.tsx

Fix stale terminal draft stream handling

1f7b62b

jayeshmangwani approved these changes Jul 6, 2026

View reviewed changes

Comment thread src/pages/inbox/usePusherDraftPacing.ts Outdated

melvin-bot Bot requested a review from marcochavezf July 6, 2026 19:35

melvin-bot Bot changed the title ~~[No QA] Fix Concierge draft completion pacing~~ [Payment due @jayeshmangwani] [No QA] Fix Concierge draft completion pacing Jul 6, 2026

marcochavezf approved these changes Jul 7, 2026

View reviewed changes

marcochavezf merged commit f4ab24b into main Jul 7, 2026
47 of 48 checks passed

marcochavezf deleted the issa/fix-Concierge-draft-completion-pacing branch July 7, 2026 06:02

OSBotify mentioned this pull request Jul 7, 2026

Deploy Checklist: New Expensify 2026-07-07 #95520

Closed

77 tasks

This was referenced Jul 9, 2026

[Due for payment 2026-07-16] Response streaming: messages can get stuck on the first word, leaving an orphaned/incorrect message until streaming resolves #94479

Open

[Due for payment 2026-07-16] Payment issue for E/App PR#94714 #95680

Open

Uh oh!

Conversation

inimaga commented Jun 26, 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!

codecov Bot commented Jun 26, 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!

melvin-bot Bot commented Jun 30, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jayeshmangwani commented Jul 1, 2026

Uh oh!

inimaga commented Jul 2, 2026

Uh oh!

jayeshmangwani commented Jul 6, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

jayeshmangwani commented Jul 6, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

jayeshmangwani left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot Bot commented Jul 6, 2026

Uh oh!

melvin-bot Bot commented Jul 6, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jul 7, 2026

Uh oh!

OSBotify commented Jul 7, 2026

Uh oh!

github-actions Bot commented Jul 7, 2026

Uh oh!

OSBotify commented Jul 7, 2026

Uh oh!

MelvinBot commented Jul 7, 2026

Uh oh!

OSBotify commented Jul 9, 2026

Uh oh!

MelvinBot commented Jul 9, 2026

Uh oh!

OSBotify commented Jul 9, 2026

Uh oh!

melvin-bot Bot commented Jul 9, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

inimaga commented Jun 26, 2026 •

edited

Loading

codecov Bot commented Jun 26, 2026 •

edited by github-actions Bot

Loading