Skip to content

[Payment due @bernhardoj] Send optimistic Concierge timestamp for pregenerated replies - #95002

Merged
deetergp merged 15 commits into
mainfrom
issa/Send-optimistic-Concierge-timestamp-for-pregenerated-replies
Jul 11, 2026
Merged

deetergp merged 15 commits into
mainfrom
issa/Send-optimistic-Concierge-timestamp-for-pregenerated-replies

Conversation

@inimaga

@inimaga inimaga commented Jun 30, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Held on https://github.com/Expensify/Web-Expensify/pull/54097

This PR adds optimisticConciergeCreated to AddComment params for pregenerated suggested-followup responses. The suggested-followup flow now builds the optimistic Concierge action before calling addComment and sends the exact timestamp used for the local optimistic message, so the backend can persist the final Concierge reply without changing its chat position.

Fixed Issues

$https://github.com/Expensify/Expensify/issues/651800
PROPOSAL: N/A

Tests

Manual Test:

Pre-requisite/Setup:
(Note: If testing using Staging or PROD backend, you can skip straight to Step 5)

  1. Ensure you have AZ/Concierge is setup in dev
  2. Checkout, compile, and run https://github.com/Expensify/Auth/pull/22590 in Auth
  3. Checkout and run https://github.com/Expensify/Web-Expensify/pull/54097 in Web-E
  4. Checkout and run [Payment due @bernhardoj] Send optimistic Concierge timestamp for pregenerated replies #95002 (current branch) in App and login with a test account
  5. Start a 1-on-1 chat with concierge and ask it a question so you have a response with suggested follow-up buttons

Actual Test:

  1. Click on a suggested follow-up button
  2. Wait until Concierge’s response is in progress and being generated for the question tapped, or followup suggested response buttons are still loading
  3. Send another user message during this window (before the previous response is completed and the buttons loaded)
  4. Now wait until everything loads and resolve.

Expected behaviour

The order of messages is maintained.

Fix.-.Isssue.-.651800.mp4

Current behaviour / On Main Branch & in Prod (Control)

The order of messages is not maintained. Concierge responses would jump to the latest point.

Issue.651800.-.Before.Main.mp4
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

PR Author Checklist

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

@inimaga inimaga changed the title Send optimistic Concierge timestamp for pregenerated replies [Hold Web-E#54097] Send optimistic Concierge timestamp for pregenerated replies Jun 30, 2026
@inimaga
inimaga marked this pull request as ready for review July 8, 2026 10:14
@inimaga
inimaga requested review from a team as code owners July 8, 2026 10:14
@melvin-bot
melvin-bot Bot requested review from bernhardoj and joekaufmanexpensify and removed request for a team July 8, 2026 10:14
@melvin-bot

melvin-bot Bot commented Jul 8, 2026

Copy link
Copy Markdown

@bernhardoj 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 July 8, 2026 10:14
@github-actions

github-actions Bot commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

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

@codecov

codecov Bot commented Jul 8, 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/libs/actions/Report/SuggestedFollowup.ts 85.71% <100.00%> (ø)
src/libs/actions/Report/index.ts 70.62% <100.00%> (-0.50%) ⬇️
... and 8 files with indirect coverage changes

@github-actions

This comment has been minimized.

@bernhardoj

Copy link
Copy Markdown
Contributor

Is this ready for review? If not, please let me know once it's ready for review

@inimaga inimaga changed the title [Hold Web-E#54097] Send optimistic Concierge timestamp for pregenerated replies Send optimistic Concierge timestamp for pregenerated replies Jul 8, 2026
@inimaga

inimaga commented Jul 8, 2026 •

Copy link
Copy Markdown
Contributor Author

@bernhardoj Yes it is ready for review

@bernhardoj

bernhardoj commented Jul 8, 2026 •

Copy link
Copy Markdown
Contributor

The recordings can't seem to load for me. Can you reupload them?

(I wanna see the question asked that triggers a follow-up response and how it compares between before and after fix)

EDIT: I found a question that triggers a follow-up response now and can understand the before and after

@inimaga

inimaga commented Jul 8, 2026

Copy link
Copy Markdown
Contributor Author

Videos now re-uploaded. So you can have an idea of what the before and after is.

Comment thread tests/actions/ReportTest.ts Resolved
@bernhardoj

bernhardoj commented Jul 8, 2026 •

Copy link
Copy Markdown
Contributor

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.mp4
Android: mWeb Chrome
android.mweb.mp4
iOS: HybridApp
ios.mp4
iOS: mWeb Safari
ios.mweb.mp4
MacOS: Chrome / Safari
web.mp4

@bernhardoj

Copy link
Copy Markdown
Contributor

Hmm, the lint errors are unrelated. Let's merge main and see if it's solved.

@joekaufmanexpensify joekaufmanexpensify 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.

Good for product

@inimaga
inimaga requested review from a team and removed request for deetergp July 10, 2026 07:15
@melvin-bot
melvin-bot Bot requested a review from mananjadhav July 10, 2026 07:15
@melvin-bot

melvin-bot Bot commented Jul 10, 2026

Copy link
Copy Markdown

@mananjadhav 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 July 10, 2026 07:15
@inimaga
inimaga requested a review from a team July 10, 2026 07:16
@melvin-bot
melvin-bot Bot requested a review from FitseTLT July 10, 2026 07:16
@melvin-bot

melvin-bot Bot commented Jul 10, 2026

Copy link
Copy Markdown

@FitseTLT 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 July 10, 2026 07:16
@inimaga
inimaga requested review from deetergp and removed request for FitseTLT and mananjadhav July 10, 2026 07:16
@deetergp
deetergp merged commit 4a7cc2d into main Jul 11, 2026
42 checks passed
@deetergp
deetergp deleted the issa/Send-optimistic-Concierge-timestamp-for-pregenerated-replies branch July 11, 2026 00:41
@github-actions

Copy link
Copy Markdown
Contributor

🚧 deetergp 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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/deetergp in version: 9.4.34-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

I reviewed the changes in this PR and no updates to App/docs/articles are needed, so I did not create a draft docs PR.

Why: This is an internal message-ordering fix. It threads an optimisticConciergeCreated timestamp through AddComment so the pregenerated Concierge suggested-followup reply is persisted at the correct chat position (strictly after the user's comment) rather than jumping to the latest point. The change is entirely in the optimistic-action / API-parameter plumbing (AddCommentOrAttachmentParams.ts, SuggestedFollowup.ts, Report/index.ts) plus test updates — there is no new or changed user-facing feature, setting, tab, label, or button, and the "expected behavior" is simply correct chronological ordering (a bug fix, not a documented capability).

The existing Concierge help articles (docs/articles/new-expensify/concierge-ai/) describe what Concierge can do at a product level and don't document internal message-ordering/timestamp behavior, so none of them are affected.

⚠️ Note: I could not verify this in a browser (web prep/browser control was unavailable in this run), so this conclusion is based on static analysis of the diff and the help-site content.

@inimaga, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

@jponikarchuk

Copy link
Copy Markdown

This PR failing because of the issue #96101
This issue is reproducible in: Web

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

@melvin-bot

melvin-bot Bot commented Jul 16, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #96237

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

Bundle Size Analysis (Sentry):

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.

8 participants