[Payment due @ahmedGaber93] Bypass suggestedFollowups beta for MANAGE_TEAM + MICRO cohort by marcochavezf · Pull Request #87282 · Expensify/App

marcochavezf · 2026-04-07T19:56:13Z

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

Explanation of Change

Phase 1 of the suggested followups rollout targets the MANAGE_TEAM + MICRO company size cohort (1-10 employees). The backend bypass is already in place (Web-Expensify #51917), but the frontend also gates on the suggestedFollowups beta before generating the bespokeWelcomeMessage parameter.

This PR adds a cohort check alongside the existing beta check: if shouldPostTasksInAdminsRoom is true (which already implies MANAGE_TEAM) and the company size is MICRO, the beta gate is bypassed. The beta still works for non-cohort users.

Deploy coordination: This PR activates the Phase 1 beta bypass on the frontend. The backend bypass is in Web-Expensify #51917. Feature activates when both PRs are deployed. Safe to merge independently — the backend bypass is a no-op without the frontend sending bespokeWelcomeMessage.

Fixed Issues

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

Tests

Create a new account with MANAGE_TEAM and company size 1-4 or 5-10
Verify that the onboarding flow generates a welcome message with follow-ups in the #admins room and skips task creation (followups path)
Create a new account with MANAGE_TEAM and SMALL (11-50) company size
Verify that the onboarding flow generates onboarding tasks normally in the #admins room (current path)

Verify that no errors appear in the JS console

Offline tests

N/A — onboarding data is generated optimistically on the client side and queued for server sync. Offline behavior is unchanged by this PR.

QA Steps

Create a new account selecting MANAGE_TEAM and company size 1-4 or 5-10
Verify the admins chat shows the bespoke welcome message with followups (not task-based onboarding)
Create a new account selecting MANAGE_TEAM and company size 11-50 (without beta)
Verify the admins chat shows task-based onboarding

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

N/A — logic-only change, no UI modifications

Android: mWeb Chrome

N/A — logic-only change, no UI modifications

iOS: Native

N/A — logic-only change, no UI modifications

iOS: mWeb Safari

N/A — logic-only change, no UI modifications

MacOS: Chrome / Safari

Bespoke welcome message with follow-ups (manage my team's expenses + 1-10 company size)

Onboarding task (other variants)

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

The test for "without suggestedFollowups beta" was using MICRO company size, but our change makes MICRO + MANAGE_TEAM users bypass the beta gate. Changed to SMALL so the test still validates the beta gate for non-cohort users. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

codecov · 2026-04-07T22:31:11Z

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/ReportUtils.ts	`81.17% <100.00%> (-0.04%)`	⬇️
src/libs/actions/Policy/Policy.ts	`69.21% <100.00%> (+0.36%)`	⬆️
... and 13 files with indirect coverage changes

melvin-bot · 2026-04-08T20:10:32Z

@ahmedGaber93 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: 6a982fbeae

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

The createWorkspace path generates bespokeWelcomeMessage and optimisticConciergeReportActionID when shouldUseFollowupsInsteadOfTasks is true, but never sends them to the server. This causes the optimistic Concierge message to appear client-side but never persist. The completeOnboarding path already forwards these correctly. Add both fields to CreateWorkspaceParams and pass them from buildPolicyData so the server can persist the bespoke welcome message and generate suggested followups for the createWorkspace flow. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

quinthar · 2026-04-14T00:56:41Z

FYI, the web PR is merged, can we take this off hold?

flaviadefaria · 2026-04-15T16:16:24Z

No new product considerations - removing my assignment and unsubscribing.

marcochavezf · 2026-04-15T23:45:25Z

Hi @ahmedGaber93 the PR is ready for review

ahmedGaber93 · 2026-04-16T14:32:48Z

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-04-21.at.8.12.25.PM.mov

Screen.Recording.2026-04-21.at.8.14.46.PM.mov

Screen.Recording.2026-04-21.at.8.16.49.PM.mov

ahmedGaber93 · 2026-04-16T15:22:35Z

Bug already exist on production with beta enabled: the concierge icon and its tooltip are mismatched.

bug.mov

@marcochavezf Do you think this is a blocker since it can now be used outside of beta?

ahmedGaber93

Just a minor comment #87282 (comment)

melvin-bot · 2026-04-16T15:34:34Z

@MonilBhavsar 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-04-16T15:34:36Z

🎯 @ahmedGaber93, 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/621379.

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.

ahmedGaber93 · 2026-04-16T15:40:38Z

@MonilBhavsar Just a minor comment #87282 (comment)

MonilBhavsar · 2026-04-16T16:51:00Z

Yes, I think we should fix it 👍

github-actions · 2026-04-16T17:02:47Z

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

MonilBhavsar · 2026-04-17T09:16:22Z

Bug already exist on production with beta enabled: the concierge icon and its tooltip are mismatched.

@ahmedGaber93, looks like the bug was fixed in #87126. So it is not reproducible on production. Could you please try again?

ahmedGaber93 · 2026-04-17T12:03:00Z

@MonilBhavsar, I’ve tested it again, and it works well. However, we have new updates on the main branch that might need to be addressed here.

Micro company size is deprecated now, I think we need to replace it here with the new sizes MICRO_SMALL and MICRO_MEDIUM.

App/src/CONST/index.ts

Lines 151 to 155 in 64eac92

    
           MICRO_SMALL: '1-4', 
        
           MICRO_MEDIUM: '5-10', 
        
           // This range is deprecated in favor of the smaller ranges above, but the constant is kept to compare against saved data for backwards compatibility. 
        
           MICRO: '1-10',

MonilBhavsar · 2026-04-17T15:21:45Z

Yeah fair point.
We need to merge main and make the updates

…e1-bypass

MICRO is deprecated on main in favor of MICRO_SMALL (1-4) and MICRO_MEDIUM (5-10). Update the phase1 cohort check to match all micro company sizes, keeping the deprecated MICRO for backwards compatibility. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

marcochavezf · 2026-04-18T00:51:26Z

Updated to include the sizes, also I think we might require a new backend change

marcochavezf · 2026-04-18T00:58:57Z

PR created to include the other two sizes in the backend https://github.com/Expensify/Web-Expensify/pull/52206

marcochavezf · 2026-04-21T00:56:45Z

The last Web-E PR was deployed to staging cc @ahmedGaber93 @MonilBhavsar ready for a final review

MonilBhavsar · 2026-04-21T12:58:52Z

@ahmedGaber93 mind checking this bug #87282 (comment) now?

ahmedGaber93 · 2026-04-21T18:22:02Z

It works as expected

Screen.Recording.2026-04-21.at.8.12.25.PM.mov

Screen.Recording.2026-04-21.at.8.14.46.PM.mov

Screen.Recording.2026-04-21.at.8.16.49.PM.mov

ahmedGaber93

Tested and it works as expected.

We only need to update this QA step:

-1. Create a new account selecting MANAGE_TEAM and company size 1-10
+1. Create a new account selecting MANAGE_TEAM and company size 1-4 or 5-10

marcochavezf · 2026-04-21T23:21:44Z

Tested and it works as expected.

We only need to update this QA step:
-1. Create a new account selecting MANAGE_TEAM and company size 1-10
+1. Create a new account selecting MANAGE_TEAM and company size 1-4 or 5-10

QA steps updated

github-actions · 2026-04-22T05:01:03Z

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

OSBotify · 2026-04-22T05:14:09Z

✋ 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-22T05:16:04Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-215c0c8-d98911d-959025a88fc20238a1d7098c98da1ca318a7b651/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-215c0c8-d98911d-1b433a66f3115adf1accbee1924dbffeb9b72ed1/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-23T20:17:58Z

🚀 Deployed to staging by https://github.com/MonilBhavsar in version: 9.3.62-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

Phase 1: bypass suggestedFollowups beta for MANAGE_TEAM + MICRO cohort

0b034c4

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

melvin-bot Bot assigned marcochavezf Apr 7, 2026

Merge branch 'main' into marco/621379-app-phase1-bypass

6a982fb

marcochavezf changed the title ~~Phase 1: bypass suggestedFollowups beta for MANAGE_TEAM + MICRO cohort~~ [HOLD] Bypass suggestedFollowups beta for MANAGE_TEAM + MICRO cohort Apr 8, 2026

marcochavezf marked this pull request as ready for review April 8, 2026 20:10

marcochavezf requested review from a team as code owners April 8, 2026 20:10

melvin-bot Bot requested review from ahmedGaber93 and flaviadefaria and removed request for a team April 8, 2026 20:10

melvin-bot Bot removed the request for review from a team April 8, 2026 20:10

chatgpt-codex-connector Bot reviewed Apr 8, 2026

View reviewed changes

Comment thread src/libs/ReportUtils.ts

flaviadefaria removed their request for review April 15, 2026 16:16

marcochavezf changed the title ~~[HOLD] Bypass suggestedFollowups beta for MANAGE_TEAM + MICRO cohort~~ Bypass suggestedFollowups beta for MANAGE_TEAM + MICRO cohort Apr 15, 2026

ahmedGaber93 approved these changes Apr 16, 2026

View reviewed changes

melvin-bot Bot requested a review from MonilBhavsar April 16, 2026 15:34

melvin-bot Bot changed the title ~~Bypass suggestedFollowups beta for MANAGE_TEAM + MICRO cohort~~ [Payment due @ahmedGaber93] Bypass suggestedFollowups beta for MANAGE_TEAM + MICRO cohort Apr 16, 2026

MonilBhavsar added the Ready To Build label Apr 16, 2026

This comment has been minimized.

Sign in to view

ahmedGaber93 reviewed Apr 17, 2026

View reviewed changes

Comment thread src/libs/ReportUtils.ts Outdated

marcochavezf and others added 2 commits April 18, 2026 08:55

Merge remote-tracking branch 'origin/main' into marco/621379-app-phas…

88f09d1

…e1-bypass

ahmedGaber93 approved these changes Apr 21, 2026

View reviewed changes

MonilBhavsar approved these changes Apr 22, 2026

View reviewed changes

MonilBhavsar merged commit 215c0c8 into main Apr 22, 2026
39 checks passed

MonilBhavsar deleted the marco/621379-app-phase1-bypass branch April 22, 2026 04:59

OSBotify mentioned this pull request Apr 23, 2026

Deploy Checklist: New Expensify 2026-04-23 #88633

Open

Conversation

marcochavezf commented Apr 7, 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 Apr 7, 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 Apr 8, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

quinthar commented Apr 14, 2026

Uh oh!

flaviadefaria commented Apr 15, 2026

Uh oh!

marcochavezf commented Apr 15, 2026

Uh oh!

ahmedGaber93 commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ahmedGaber93 commented Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ahmedGaber93 left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Apr 16, 2026

Uh oh!

melvin-bot Bot commented Apr 16, 2026

Uh oh!

ahmedGaber93 commented Apr 16, 2026

Uh oh!

MonilBhavsar commented Apr 16, 2026

Uh oh!

github-actions Bot commented Apr 16, 2026

Uh oh!

This comment has been minimized.

MonilBhavsar commented Apr 17, 2026

Uh oh!

ahmedGaber93 commented Apr 17, 2026

Uh oh!

Uh oh!

MonilBhavsar commented Apr 17, 2026

Uh oh!

marcochavezf commented Apr 18, 2026

Uh oh!

marcochavezf commented Apr 18, 2026

Uh oh!

marcochavezf commented Apr 21, 2026

Uh oh!

MonilBhavsar commented Apr 21, 2026

Uh oh!

ahmedGaber93 commented Apr 21, 2026

Uh oh!

ahmedGaber93 left a comment

Choose a reason for hiding this comment

Uh oh!

marcochavezf commented Apr 21, 2026

Uh oh!

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

OSBotify commented Apr 22, 2026

Uh oh!

github-actions Bot commented Apr 22, 2026

Uh oh!

OSBotify commented Apr 23, 2026

marcochavezf commented Apr 7, 2026 •

edited

Loading

codecov Bot commented Apr 7, 2026 •

edited by github-actions Bot

Loading

ahmedGaber93 commented Apr 16, 2026 •

edited

Loading

ahmedGaber93 commented Apr 16, 2026 •

edited

Loading