Expand PREGENERATED_RESPONSE to all company sizes and deprecate WELCOME_EVENT by marcochavezf · Pull Request #85326 · Expensify/App

marcochavezf · 2026-03-16T05:15:07Z

Explanation of Change

Removes the MICRO-only restriction on bespoke welcome messages so that all company sizes use the PREGENERATED_RESPONSE path when the suggestedFollowups beta is enabled. Previously, only MICRO (1-10 employees) company sizes would send a frontend-generated bespoke welcome message; larger companies fell through to the flaky WELCOME_EVENT backend LLM path.

Changes:

getBespokeWelcomeMessage() now accepts companySize and tailors the welcome phrasing:
- MEDIUM (101-1000) / LARGE (1001+): focuses on approval workflows, accounting software, and the Expensify Card
- SMALL (11-50) / MEDIUM_SMALL (51-100): focuses on expense categories, approval workflows, and team invitations
- MICRO (1-10) / default: original phrasing about receipts and quick setup
prepareOnboardingOnyxData(): the companySize === MICRO guard is removed — the bespoke message is generated for all company sizes when shouldUseFollowupsInsteadOfTasks is true.

Backward compatibility: The backend WELCOME_EVENT fallback in Web-Expensify (UserAPI::queueAdminsRoomWelcome) remains untouched — older App versions that don't send bespokeWelcomeMessage will still fall back to the WELCOME_EVENT path. A follow-up PR will deprecate WELCOME_EVENT from the Concierge prompt once this ships.

Fixed Issues

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

Tests

Log in with the suggestedFollowups beta enabled
Start onboarding with MANAGE_TEAM intent
Select company size SMALL (11-50 employees)
Complete onboarding and check the #admins room
Verify: Concierge welcome message says "For a growing team like yours" (not "For a small team like yours")
Verify: Followup suggestions appear below the welcome message
Repeat with company size LARGE (1001+)
Verify: Welcome message says "For an organization your size"
Repeat with company size MICRO (1-10)
Verify: Welcome message says "For a small team like yours" (original phrasing preserved)

Verify that no errors appear in the JS console

Offline tests

N/A — the bespoke welcome message is generated client-side during onboarding and sent to the server. Offline behavior is unchanged: the optimistic message appears immediately, and the server appends followups when connectivity is restored.

QA Steps

Ensure the suggestedFollowups beta is enabled for the test account
Create a new account and go through onboarding with MANAGE_TEAM intent
Select various company sizes (MICRO, SMALL, MEDIUM, LARGE)
For each size, verify the welcome message phrasing matches the company size
Verify followup suggestions appear for all company sizes

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

N/A — no UI component changes, only welcome message text varies by company size

Android: mWeb Chrome

N/A

iOS: Native

N/A

iOS: mWeb Safari

N/A

MacOS: Chrome / Safari

N/A

melvin-bot · 2026-03-16T05:15:13Z

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

src/libs/ReportUtils.ts

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: dd2a420ddf

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

src/libs/ReportUtils.ts

trjExpensify · 2026-03-16T10:33:53Z

PR doesn’t need product input as a code refactor PR. Unassigning and unsubscribing myself.

FitseTLT · 2026-03-16T14:39:46Z

Should I review this @marcochavezf ?

marcochavezf · 2026-03-16T19:20:27Z

Hi @FitseTLT, yes please this is ready for review

FitseTLT · 2026-03-16T19:35:44Z

Hi @FitseTLT, yes please this is ready for review

Okay

codecov · 2026-03-16T19:38:08Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/ReportUtils.ts	`78.35% <100.00%> (+0.21%)`	⬆️
... and 7 files with indirect coverage changes

tests/unit/ReportUtilsTest.ts

FitseTLT · 2026-03-17T21:57:51Z

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 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.
[ x 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

src/libs/ReportUtils.ts

FitseTLT

Approving, with one NAB suggestion

melvin-bot · 2026-03-18T13:20:53Z

@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 · 2026-03-18T13:20:56Z

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

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

Remove the MICRO-only restriction on bespoke welcome messages so that all company sizes use the PREGENERATED_RESPONSE path when the suggestedFollowups beta is enabled. This makes the WELCOME_EVENT backend fallback unnecessary for new App versions. getBespokeWelcomeMessage now accepts companySize and tailors the welcome phrasing: MEDIUM/LARGE companies hear about approval workflows and the Expensify Card, SMALL/MEDIUM_SMALL about categories and workflows, and MICRO (default) about receipts and quick setup. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

… company sizes The PR removed the MICRO-only guard from prepareOnboardingOnyxData, so now all company sizes get a bespoke welcome message when shouldUseFollowupsInsteadOfTasks is true. Update the expected signoff message count from 0 to 1. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…ration suffix paths Cover MEDIUM_SMALL, MEDIUM company sizes and the userReportedIntegration suffix path in prepareOnboardingOnyxData to satisfy Codecov requirements. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…ests - Extract duplicated welcome header string into `welcomeHeader` constant in getBespokeWelcomeMessage, concatenating only the varying tail per company size - Rename test from 'non-MICRO' to 'SMALL' to match the actual company size tested - Add content assertion for MICRO/default test case ('For a small team like yours') - Remove redundant toBeDefined() checks where toContain already validates Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…meHeader Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Address review feedback to simplify the switch by appending directly to message instead of using an intermediate variable. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

marcochavezf · 2026-03-20T13:10:38Z

Friendly bump @carlosmiceli

melvin-bot · 2026-03-20T13:43:33Z

@marcochavezf looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

marcochavezf · 2026-03-20T13:44:37Z

The remote build failing checks are unrelated to the changes

github-actions · 2026-03-20T13:46:23Z

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

github-actions · 2026-03-20T13:50:43Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-7015231-fe6e12a-3794e7177f866b89660ee875e22e1cc6b33126a0/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-7015231-fe6e12a-c2e4e52dd4c3b18d9aa456573fc568050ff894b6/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-20T13:56:23Z

✋ 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 · 2026-03-23T09:50:42Z

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

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

Bundle Size Analysis (Sentry):

Android
iOS

jponikarchuk · 2026-03-23T16:05:10Z

The issue #86110 is repro on all PRs. Could you please double check if it's not introduced by #85326

jponikarchuk · 2026-03-23T17:38:00Z

This PR failing because of the issue #86110
This issue is reproducible in: Web, Android app

marcochavezf requested review from a team as code owners March 16, 2026 05:15

melvin-bot bot assigned marcochavezf Mar 16, 2026

melvin-bot bot requested review from FitseTLT and trjExpensify and removed request for a team March 16, 2026 05:15

melvin-bot bot removed the request for review from a team March 16, 2026 05:15

github-actions bot reviewed Mar 16, 2026

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Mar 16, 2026

View reviewed changes

src/libs/ReportUtils.ts Show resolved Hide resolved

trjExpensify removed their request for review March 16, 2026 10:33

FitseTLT reviewed Mar 17, 2026

View reviewed changes

tests/unit/ReportUtilsTest.ts Outdated Show resolved Hide resolved

tests/unit/ReportUtilsTest.ts Outdated Show resolved Hide resolved

FitseTLT reviewed Mar 18, 2026

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

FitseTLT approved these changes Mar 18, 2026

View reviewed changes

melvin-bot bot requested a review from carlosmiceli March 18, 2026 13:20

melvin-bot bot mentioned this pull request Mar 18, 2026

[Due for Payment 2026-03-26] Payment issue for E/App PR#85326 #85651

Open

marcochavezf and others added 6 commits March 19, 2026 17:27

Fix ESLint no-useless-concat: merge adjacent string literals in welco…

5d195ac

…meHeader Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Remove messageTail variable, concatenate directly on message

966203b

Address review feedback to simplify the switch by appending directly to message instead of using an intermediate variable. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

marcochavezf force-pushed the marco/610942-expand-pregenerated-response branch from 1420b06 to 966203b Compare March 19, 2026 23:33

carlosmiceli approved these changes Mar 20, 2026

View reviewed changes

marcochavezf merged commit 7015231 into main Mar 20, 2026
39 of 47 checks passed

marcochavezf deleted the marco/610942-expand-pregenerated-response branch March 20, 2026 13:43

melvin-bot bot added the Emergency label Mar 20, 2026

marcochavezf removed the Emergency label Mar 20, 2026

github-actions bot mentioned this pull request Mar 20, 2026

Investigate workflow job failing on main: chooseDeployActions #85950

Closed

OSBotify mentioned this pull request Mar 23, 2026

Deploy Checklist: New Expensify 2026-03-23 #86080

Open

69 tasks

jponikarchuk mentioned this pull request Mar 23, 2026

Old WELCOME_EVENT is still actual for all company size #86110

Closed

7 tasks

Conversation

marcochavezf commented Mar 16, 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!

melvin-bot bot commented Mar 16, 2026

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

trjExpensify commented Mar 16, 2026

Uh oh!

FitseTLT commented Mar 16, 2026

Uh oh!

marcochavezf commented Mar 16, 2026

Uh oh!

FitseTLT commented Mar 16, 2026

Uh oh!

codecov bot commented Mar 16, 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!

Uh oh!

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

FitseTLT left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 18, 2026

Uh oh!

melvin-bot bot commented Mar 18, 2026

Uh oh!

marcochavezf commented Mar 20, 2026

Uh oh!

Uh oh!

melvin-bot bot commented Mar 20, 2026

Uh oh!

marcochavezf commented Mar 20, 2026

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

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

Uh oh!

Uh oh!

jponikarchuk commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

marcochavezf commented Mar 16, 2026 •

edited

Loading

codecov bot commented Mar 16, 2026 •

edited by github-actions bot

Loading

FitseTLT commented Mar 17, 2026 •

edited

Loading

jponikarchuk commented Mar 23, 2026 •

edited

Loading