[Suggested Follow-ups][R2] Disable onboarding completion list when landing in #admins #80707

jmusial · 2026-01-28T01:58:03Z

Explanation of Change

This PR is a part of Suggested Follow-ups project.
It disables optimistic generation of onboarding messages and task list for the cases where the list was supposed to be posted in the #admins room (MANAGE_TEAM and TRACK_WORKSPACE onboarding actions, except for emails that have a '+'.)

This change is gated to NON PRODUCTION envs.

Fixed Issues

$ #80690
PROPOSAL:

Tests

This change is gated to NON PRODUCTION envs

Create a new account using a random email without + in it
Choose MANAGE_TEAM when prompted by onboarding modals
After dismissing the test drive make sure that checklist has not been posted in #admins or concierge chats.
Later: when the BE changes are deployed a welcome message with followups is expected it that place.

Offline tests

QA Steps

Same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

0089.android.native.mov

Android: mWeb Chrome

0089.android.chrome.mov

iOS: Native

0089.ios.native.mov

iOS: mWeb Safari

0089.ios.safari.mov

MacOS: Chrome / Safari

0089.chrome.desktop.mov

melvin-bot · 2026-01-29T16:58:43Z

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

jmusial · 2026-01-29T16:58:46Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ac4365ea2c

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

chatgpt-codex-connector · 2026-01-29T17:10:50Z

src/libs/ReportUtils.ts


    const optimisticData: Array<TupleToUnion<typeof tasksForOptimisticData> | OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [...tasksForOptimisticData];
-    const lastVisibleActionCreated = welcomeSignOffCommentAction.created;
+    const lastVisibleActionCreated = shouldPostTasksInAdminsRoom ? textCommentAction.created : welcomeSignOffCommentAction.created;


Avoid updating lastVisibleActionCreated without an action

For Manage Team/Track Workspace signups that post in #admins (no '+' email), you now skip adding textCommentAction but still set lastVisibleActionCreated to textCommentAction.created. That makes the #admins report look updated/unread and can reorder the sidebar even though no visible action exists (the last message text remains the old one) until the backend posts something. Consider leaving lastVisibleActionCreated untouched (or tying it to a real action) when shouldPostTasksInAdminsRoom is true.

Useful? React with 👍 / 👎.

I don't think that's confirmed by manual tests

codecov · 2026-01-29T18:49:58Z

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	`71.95% <0.00%> (-0.28%)`	⬇️
... and 67 files with indirect coverage changes

jmusial · 2026-01-29T20:18:12Z

@mananjadhav do you have time do check this one on a short notice?

mkhutornyi · 2026-01-29T20:21:57Z

I can help if urgent

jmusial · 2026-01-29T20:24:38Z

I can help if urgent

Lets give @mananjadhav 10 more minutes to react since it auto assigned to him, otherwise will appriciate your help @mkhutornyi 😃 Will have #80918 later on today as well if you want

Beamanator · 2026-01-29T20:34:33Z

Thanks @mkhutornyi ! Yes would highly appreciate the quick help here as the last few days 🙏

mkhutornyi · 2026-01-29T21:29:34Z

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

Before fix:

before.mov

After fix:

web.mov

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f7e128e3a8

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

chatgpt-codex-connector · 2026-01-29T21:46:30Z

src/libs/ReportUtils.ts

    const optimisticData: Array<TupleToUnion<typeof tasksForOptimisticData> | OnyxUpdate<typeof ONYXKEYS.COLLECTION.POLICY>> = [...tasksForOptimisticData];
-    const lastVisibleActionCreated = welcomeSignOffCommentAction.created;
+    const lastVisibleActionCreated = shouldUseFollowupsInsteadOfTasks ? textCommentAction.created : welcomeSignOffCommentAction.created;
    optimisticData.push(


Avoid updating lastVisibleActionCreated without an action

When shouldUseFollowupsInsteadOfTasks is true (admins room in non‑production), this path skips adding the text/sign‑off report actions, but still sets lastVisibleActionCreated to textCommentAction.created. That makes the admins report look like it has a new action even though no visible action exists, so the report can jump to the top/unread with an empty action list until backend followups arrive. Consider leaving lastVisibleActionCreated unchanged (or only updating it when you actually insert the corresponding report action) in the followups path.

Useful? React with 👍 / 👎.

This makes sense to me since we don't create textCommentAction optimistically.

mkhutornyi · 2026-01-29T22:31:18Z

tests/unit/ReportUtilsTest.ts

+        it('should not add anything to guidedSetupData when posting into the admin room', async () => {
+            const adminsChatReportID = '1';
+            // Not having `+` in the email allows for `isPostingTasksInAdminsRoom` flow
+            await Onyx.merge(ONYXKEYS.SESSION, {email: 'test@example.com'});


Can we also add test case of email having +?

mkhutornyi · 2026-01-29T22:37:26Z

tests/actions/PolicyTest.ts

-            const {onboardingMessages} = getOnboardingMessages();
-            const expectedManageTeamDefaultTasksCount = onboardingMessages[CONST.ONBOARDING_CHOICES.MANAGE_TEAM].tasks.length - 3;
+            // We do not pass tasks to `#admins` channel in favour of backed generated followup-list
+            const expectedManageTeamDefaultTasksCount = 0;


Can we also add test case of email having +?

actually this test result will not be affected by + in the email. We are only checking for #admins channel actions that are empty either way now. Would skip adding this one, it will duplicate a lot of code :(

melvin-bot · 2026-01-29T23:40:31Z

We did not find an internal engineer to review this PR, trying to assign a random engineer to #80690 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

marcochavezf

OSBotify · 2026-01-30T00:17:26Z

✋ 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-01-30T22:17:47Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.3.11-16 🚀

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

Disable follow up list when posting to admins room

e6557c9

melvin-bot bot assigned jmusial Jan 28, 2026

jmusial added 7 commits January 28, 2026 14:09

Merge branch 'main' into feat/concierge-followups-release-2

ada48c2

improve formatting

9054c67

remove all of the welcome messages poc

1512fac

update test to check for optimistic data as well

0780b4e

refactor to for minimal changes

0d26a8d

update tests for creating workspace

168c299

fix lint

ac4365e

jmusial marked this pull request as ready for review January 29, 2026 16:58

jmusial requested review from a team as code owners January 29, 2026 16:58

melvin-bot bot requested review from mananjadhav and trjExpensify and removed request for a team and trjExpensify January 29, 2026 16:58

melvin-bot bot removed the request for review from a team January 29, 2026 16:58

chatgpt-codex-connector bot reviewed Jan 29, 2026

View reviewed changes

Merge branch 'main' into feat/concierge-followups-release-2

89062a3

jmusial added 2 commits January 29, 2026 12:12

gate the change to non production environments

08a4d5d

update the flags

f7e128e

Beamanator requested review from mkhutornyi and removed request for mananjadhav January 29, 2026 20:33

chatgpt-codex-connector bot reviewed Jan 29, 2026

View reviewed changes

mkhutornyi reviewed Jan 29, 2026

View reviewed changes

add test

d6bcca5

jmusial requested a review from mkhutornyi January 29, 2026 23:39

mkhutornyi approved these changes Jan 29, 2026

View reviewed changes

melvin-bot bot requested a review from yuwenmemon January 29, 2026 23:40

marcochavezf approved these changes Jan 29, 2026

View reviewed changes

mollfpr approved these changes Jan 29, 2026

View reviewed changes

Beamanator approved these changes Jan 29, 2026

View reviewed changes

Beamanator removed the request for review from yuwenmemon January 29, 2026 23:53

Beamanator changed the title ~~[Suggested Follow-ups][R2] Disable obnoarding completion list when landing in #admins~~ [Suggested Follow-ups][R2] Disable onboarding completion list when landing in #admins Jan 29, 2026

Beamanator merged commit 09776ef into Expensify:main Jan 30, 2026
34 checks passed

OSBotify mentioned this pull request Jan 30, 2026

Deploy Checklist: New Expensify 2026-01-28 #80808

Open

mitarachim mentioned this pull request Jan 31, 2026

Onboarding - "This content is blocked" page opens when invited member opens test drive #81092

Open

7 tasks

[Suggested Follow-ups][R2] Disable onboarding completion list when landing in #admins #80707

[Suggested Follow-ups][R2] Disable onboarding completion list when landing in #admins #80707

Uh oh!

Conversation

jmusial commented Jan 28, 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 Jan 29, 2026

Uh oh!

jmusial commented Jan 29, 2026

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Jan 29, 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!

jmusial commented Jan 29, 2026

Uh oh!

mkhutornyi commented Jan 29, 2026

Uh oh!

jmusial commented Jan 29, 2026

Uh oh!

Beamanator commented Jan 29, 2026

Uh oh!

mkhutornyi commented Jan 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

chatgpt-codex-connector bot Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

jmusial Jan 29, 2026

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jan 29, 2026

Uh oh!

marcochavezf left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jan 30, 2026

Uh oh!

OSBotify commented Jan 30, 2026

Uh oh!

Reviewers

Assignees

Labels

jmusial commented Jan 28, 2026 •

edited

Loading

codecov bot commented Jan 29, 2026 •

edited by github-actions bot

Loading

mkhutornyi commented Jan 29, 2026 •

edited

Loading