Skip to content

Send bespoke welcome message optimistically from frontend - #83496

Merged
inimaga merged 7 commits into
mainfrom
marcochavezf/bespoke-welcome-message-frontend
Mar 4, 2026
Merged

inimaga merged 7 commits into
mainfrom
marcochavezf/bespoke-welcome-message-frontend

Conversation

@marcochavezf

@marcochavezf marcochavezf commented Feb 25, 2026 •

Copy link
Copy Markdown
Contributor

On hold for https://github.com/Expensify/Web-Expensify/pull/50949

cc @inimaga @Beamanator @mollfpr

Explanation of Change

When onboarding 1-10 company-size users with the suggestedFollowups beta, the frontend now generates the bespoke Concierge welcome message optimistically and sends it to the backend as API params (bespokeWelcomeMessage, optimisticConciergeReportActionID). The backend passes it to the agent as a PREGENERATED_RESPONSE so the LLM appends followups to the pre-displayed message instead of generating a new one.

Previously, the backend generated the message server-side and injected it into guidedSetupData for Auth to INSERT, which caused collision risk with the optimistic ID pattern. Now the frontend handles the optimistic display and the backend just routes the message content.

Changes:

  • CompleteGuidedSetupParams.ts — Added bespokeWelcomeMessage and optimisticConciergeReportActionID optional params
  • ReportUtils.ts — Added getBespokeWelcomeMessage() to generate the welcome message in markdown (markdown is required because getParsedComment escapes raw HTML). Added optimistic/success/failure Onyx data for the bespoke Concierge action in prepareOnboardingOnyxData()
  • ReportUtilsTest.ts — Updated existing prepareOnboardingOnyxData test to expect the bespoke action in optimistic data for MICRO + suggestedFollowups
  • Report/index.ts — completeOnboarding() passes the new params to the API

Fixed Issues

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

Tests

  1. Enable the suggestedFollowups beta
  2. Sign up as a new 1-10 company-size user with suggestedFollowups beta enabled
  3. Select an accounting integration (e.g. QuickBooks Online) during onboarding
  4. Verify the bespoke Concierge welcome message appears immediately in the #admins room (optimistically)
  5. Verify the message includes the accounting integration mention (e.g. "Since you use QuickBooks Online...")
  6. Verify Concierge followup suggestions appear after a few seconds
  7. Sign up as a new SMALL company-size user — verify the old task-based onboarding flow still works
  8. Sign up without suggestedFollowups beta — verify the old task-based flow still works

Offline tests

  1. Start onboarding while online, go offline before the API call completes — verify the bespoke message stays visible (optimistic)
  2. If the API call fails, verify the bespoke message shows an error indicator

QA Steps

Same as tests

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 shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 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)
  • 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 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.
  • 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 Screenshot 2026-02-25 at 5 55 52 p m

Instead of generating the bespoke welcome message server-side and injecting
it into guidedSetupData (which caused INSERT collision risk with optimistic
IDs), the frontend now generates the message, displays it optimistically via
Onyx, and sends it to the backend as API params. The backend passes it to
PAZR as a PREGENERATED_RESPONSE so the LLM appends followups. Old App
versions that don not send the new params fall back to the WELCOME_EVENT path.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@marcochavezf
marcochavezf requested review from a team as code owners February 25, 2026 21:49
@melvin-bot
melvin-bot Bot requested review from heyjennahay and youssef-lr and removed request for a team February 25, 2026 21:49
@melvin-bot

melvin-bot Bot commented Feb 25, 2026

Copy link
Copy Markdown

@youssef-lr 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 chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: a0e0cb7a91

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

Comment thread src/libs/ReportUtils.ts Resolved
Comment thread src/libs/ReportUtils.ts Resolved
@marcochavezf marcochavezf changed the title Send bespoke welcome message optimistically from frontend [WIP] Send bespoke welcome message optimistically from frontend Feb 25, 2026
marcochavezf and others added 4 commits February 25, 2026 16:00
…oke action

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
getParsedComment escapes HTML entities before parsing, so raw HTML tags
would render as literal text in the optimistic display. Markdown syntax
is converted correctly by the parser.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@codecov

codecov Bot commented Feb 25, 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/index.ts 65.40% <100.00%> (-0.18%) ⬇️
src/libs/ReportUtils.ts 75.58% <83.33%> (+0.02%) ⬆️
... and 13 files with indirect coverage changes

@marcochavezf marcochavezf changed the title [WIP] Send bespoke welcome message optimistically from frontend [HOLD] Send bespoke welcome message optimistically from frontend Feb 26, 2026

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

LGTM!

@marcochavezf marcochavezf changed the title [HOLD] Send bespoke welcome message optimistically from frontend Send bespoke welcome message optimistically from frontend Feb 28, 2026
@marcochavezf

Copy link
Copy Markdown
Contributor Author

Ready for review, the web-e PR was deployed to production, so that's enough to test the welcome message and also it's safe to deploy it since it's behind a beta

@situchan

Copy link
Copy Markdown
Contributor

If this requires C+ review, I can help

@marcochavezf
marcochavezf requested a review from situchan March 1, 2026 20:10
@marcochavezf

Copy link
Copy Markdown
Contributor Author

@situchan I will need to add you to the beta. What emails should I add? Alternatively, you can use any email with the domain @dmb.fun to test the welcome bespoke message

@situchan

situchan commented Mar 2, 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
    • MacOS: Desktop
  • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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-03.at.9.58.33.PM.mov

@situchan

situchan commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

@marcochavezf please merge main. The branch is behind 1.5k commits

@marcochavezf

Copy link
Copy Markdown
Contributor Author

@MelvinBot please merge main into this PR

@situchan

situchan commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

Step 1-5 tests well but

  1. Verify Concierge followup suggestions appear after a few seconds

This is not appearing. Signed up with test11@dmb.fun

Screenshot 2026-03-02 at 9 52 23 PM

@situchan

situchan commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

@situchan I will need to add you to the beta. What emails should I add? Alternatively, you can use any email with the domain @dmb.fun to test the welcome bespoke message

Please add situchandrashil7+83496@gmail.com, situchandrashil7+834961@gmail.com, situchandrashil7+834962@gmail.com

…welcome-message-frontend

Co-authored-by: Marco Chávez <marcochavezf@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor

Merged main into this branch — no conflicts. The merge commit has been pushed.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Hooray!

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

marcochavezf commented Mar 2, 2026 •

Copy link
Copy Markdown
Contributor Author

@marcochavezf

marcochavezf commented Mar 2, 2026 •

Copy link
Copy Markdown
Contributor Author

This is not appearing. Signed up with test11@dmb.fun

Hmm interesting, the follow-ups are not showing immediately since those are generated in the backend and sent via Onyx. I wonder if this is because the backend PR was only deployed to staging? But in that case, we should queue a job in staging too

@MelvinBot can you investigate the logs to find out what happened for this account?

@MelvinBot

Copy link
Copy Markdown
Contributor

I wasn't able to query production/staging logs directly (the VictoriaLogs tools aren't available in this environment), but I traced the full code flow to explain what's happening:

Why the bespoke welcome message appears but followup suggestions don't

The welcome message is frontend-optimistic — it's generated entirely by getBespokeWelcomeMessage() in ReportUtils.ts:11422-11440 and pushed to Onyx immediately via prepareOnboardingOnyxData() at ReportUtils.ts:11870-11888. This works regardless of backend state.

The followup suggestions are entirely backend-generated — the frontend only parses them from <followup-list> HTML in report actions (ReportActionFollowupUtils/index.ts:35-59). The expected flow is:

  1. Frontend sends bespokeWelcomeMessage + optimisticConciergeReportActionID as params in the CompleteGuidedSetup API call (Report/index.ts:4798-4814)
  2. Backend receives these, passes bespokeWelcomeMessage to the Concierge agent as a PREGENERATED_RESPONSE
  3. Agent appends <followup-list> HTML with suggestions to the pre-generated message
  4. Updated action flows back via Onyx, targeting optimisticConciergeReportActionID

If step 2-4 never happens (because the backend PR isn't deployed or the agent job isn't queued), the optimistic welcome message persists but no followups ever arrive — which matches the reported behavior.

What to check manually

Since I can't query logs, here's what to look for in the staging logs for test11@dmb.fun:

  1. Did CompleteGuidedSetup receive the params? — Look for the CompleteGuidedSetup command execution for this email and check if bespokeWelcomeMessage and optimisticConciergeReportActionID are present in the request params
  2. Was an agent job queued? — Check if a Concierge agent job was queued with PREGENERATED_RESPONSE for this account
  3. Did the agent job execute? — If queued, did it run? Any errors? Did it produce <followup-list> output?
  4. Environment gating — Is there a staging vs. production check in the Web-Expensify CompleteGuidedSetup handler that might prevent the followup job from being queued on staging?

Your hypothesis about the backend PR deployment seems likely correct — if the backend handler for these new params isn't active in the environment where testing occurred, the frontend would display the optimistic message but never receive followups.

@situchan

situchan commented Mar 3, 2026

Copy link
Copy Markdown
Contributor

@marcochavezf This is what I get:

Screenshot 2026-03-03 at 9 59 47 PM

Is it expected?

@marcochavezf

Copy link
Copy Markdown
Contributor Author

Hmm thanks @situchan, it should include a message like this one:

555067105-d87a7423-83a9-4d63-a369-98c38c22abc1

The backend PR has been deployed to production, could you try again?

@situchan

situchan commented Mar 4, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot pull main

…welcome-message-frontend

Co-authored-by: Situ Chandra Shil <situchan@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor

Merged main into this branch — no conflicts. The merge commit has been pushed.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Chef's kiss.

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

@situchan

situchan commented Mar 4, 2026

Copy link
Copy Markdown
Contributor

Works now 🎉

Screenshot 2026-03-04 at 1 23 31 PM

@melvin-bot
melvin-bot Bot requested a review from mjasikowski March 4, 2026 07:25
@melvin-bot

melvin-bot Bot commented Mar 4, 2026

Copy link
Copy Markdown

@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

melvin-bot Bot commented Mar 4, 2026

Copy link
Copy Markdown

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

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

@inimaga
inimaga merged commit e324578 into main Mar 4, 2026
35 checks passed
@inimaga
inimaga deleted the marcochavezf/bespoke-welcome-message-frontend branch March 4, 2026 11:49
@github-actions

github-actions Bot commented Mar 4, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Mar 4, 2026

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

OSBotify commented Mar 4, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/inimaga in version: 9.3.31-0 🚀

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

@OSBotify

OSBotify commented Mar 6, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.31-12 🚀

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.

7 participants