fix: Complete SETUP_CATEGORIES_AND_TAGS onboarding task when by mukhrr · Pull Request #80070 · Expensify/App

mukhrr · 2026-01-21T03:25:28Z

Explanation of Change

Fixed Issues

$ #78639
$ #78935
PROPOSAL: #78639 (comment)

Tests

Test for #78639

On Login page type new email and Join
Complete onboard flow with select option "Something else"
Create a workspace
At Concierge chat note that task "Setup tags" is incomplete yet
Go to Workspace "More features"
Enable tags and create a tag
Click on Inbox and go to Concierge chat

Verify "Add tags" is completed in admin channel

Test for #78935

Sign in to ND with a brand new gmail account with a "+"
Complete the onboarding with "Manage my team's expenses" purpose
In the Concierge chat click on "Set up categories and tags" task
Add both a category and tags
Get back to Concierge chat

Verify "Set up categories and tags" task is completed
Verify that no errors appear in the JS console

Offline tests

QA Steps

The same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_mWeb.mp4

iOS: Native

IOS_native.mp4

iOS: mWeb Safari

IOS_mWeb.mp4

MacOS: Chrome / Safari

web.mp4

…/disabling categories or creating tags - Add SETUP_CATEGORIES_AND_TAGS to IntroSelected type - Store combined task report ID in ReportUtils - Update createPolicyCategory to complete combined task when tags exist - Update createPolicyTag to complete combined task when categories exist - Refactor setWorkspaceCategoryEnabled to use options object pattern - Pass combined task data to setWorkspaceCategoryEnabled in CategorySettingsPage and WorkspaceCategoriesPage - Add comprehensive tests for task completion scenarios - Use OnyxUtils.get instead of deprecated Onyx.connect in tests

melvin-bot · 2026-01-21T03:25:35Z

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

src/pages/workspace/categories/CategorySettingsPage.tsx

src/pages/workspace/tags/WorkspaceCreateTagPage.tsx

src/libs/actions/Policy/Tag.ts

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4c890b21ff

ℹ️ 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/pages/workspace/tags/WorkspaceCreateTagPage.tsx

src/libs/ReportUtils.ts

codecov · 2026-01-21T03:42:19Z

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	`72.11% <75.00%> (+<0.01%)`	⬆️
src/libs/actions/Policy/Tag.ts	`70.22% <87.50%> (+0.40%)`	⬆️
.../pages/workspace/categories/CreateCategoryPage.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/Policy/Category.ts	`49.11% <70.00%> (+0.38%)`	⬆️
...s/workspace/categories/WorkspaceCategoriesPage.tsx	`60.07% <50.00%> (+0.46%)`	⬆️
...rc/pages/workspace/tags/WorkspaceCreateTagPage.tsx	`0.00% <0.00%> (ø)`
src/libs/PolicyUtils.ts	`54.55% <37.50%> (-0.19%)`	⬇️
...ages/workspace/categories/CategorySettingsPage.tsx	`0.00% <0.00%> (ø)`
... and 57 files with indirect coverage changes

mukhrr · 2026-01-21T05:08:11Z

@thesahindia Can you approve once more pls? cc @blimpich

joekaufmanexpensify

Second try PR

thesahindia · 2026-01-22T09:57:41Z

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

Screen.Recording.2026-01-13.at.3.38.26.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-01-13.at.3.43.45.PM.mov

iOS: HybridApp

Screen.Recording.2026-01-17.at.10.31.26.AM.mov

iOS: mWeb Safari

Screen.Recording.2026-01-17.at.10.38.54.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-01-13.at.10.20.11.AM.mov

OSBotify · 2026-01-22T18:25:53Z

✋ 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-22T22:54:17Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.3.7-0 🚀

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

OSBotify · 2026-01-23T22:05:37Z

🚀 Deployed to production by https://github.com/Beamanator in version: 9.3.7-3 🚀

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

mukhrr requested review from a team as code owners January 21, 2026 03:25

melvin-bot bot assigned mukhrr Jan 21, 2026

melvin-bot bot requested review from joekaufmanexpensify and thesahindia and removed request for a team January 21, 2026 03:25

melvin-bot bot removed the request for review from a team January 21, 2026 03:25

mukhrr mentioned this pull request Jan 21, 2026

fixed auto-checking onboarding tasks #80069

Closed

53 tasks

github-actions bot reviewed Jan 21, 2026

View reviewed changes

src/libs/ReportUtils.ts Show resolved Hide resolved

github-actions bot reviewed Jan 21, 2026

View reviewed changes

src/pages/workspace/categories/CategorySettingsPage.tsx Show resolved Hide resolved

github-actions bot reviewed Jan 21, 2026

View reviewed changes

src/pages/workspace/tags/WorkspaceCreateTagPage.tsx Outdated Show resolved Hide resolved

github-actions bot reviewed Jan 21, 2026

View reviewed changes

src/libs/actions/Policy/Tag.ts Outdated Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Jan 21, 2026

View reviewed changes

src/pages/workspace/tags/WorkspaceCreateTagPage.tsx Outdated Show resolved Hide resolved

src/libs/ReportUtils.ts Show resolved Hide resolved

mukhrr added 2 commits January 21, 2026 09:41

Add helper functions to check for tags and custom categories in policies

fa2b43f

prettier fix

cb2457e

joekaufmanexpensify approved these changes Jan 21, 2026

View reviewed changes

thesahindia approved these changes Jan 22, 2026

View reviewed changes

melvin-bot bot requested a review from blimpich January 22, 2026 09:59

mukhrr mentioned this pull request Jan 22, 2026

fix: Auto-complete setup tags task when creating first tag #78921

Merged

53 tasks

blimpich approved these changes Jan 22, 2026

View reviewed changes

blimpich merged commit 64be73c into Expensify:main Jan 22, 2026
30 of 31 checks passed

OSBotify mentioned this pull request Jan 22, 2026

Deploy Checklist: New Expensify 2026-01-22 #80277

Closed

63 tasks

vincdargento mentioned this pull request Jan 23, 2026

[$250] Task complete sound is heard after adding tag when there is no Set up tags task in #admins #80294

Open

7 tasks

mitarachim mentioned this pull request Jan 23, 2026

[$250] WS overview page opens after creating an account with "Manage my team's expenses" #80303

Closed

7 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Complete SETUP_CATEGORIES_AND_TAGS onboarding task when #80070

fix: Complete SETUP_CATEGORIES_AND_TAGS onboarding task when #80070
blimpich merged 3 commits intoExpensify:mainfrom
mukhrr:fix/78639-clean

mukhrr commented Jan 21, 2026

Uh oh!

melvin-bot bot commented Jan 21, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Jan 21, 2026 •

edited by github-actions bot

Loading

Uh oh!

mukhrr commented Jan 21, 2026

Uh oh!

joekaufmanexpensify left a comment

Uh oh!

thesahindia commented Jan 22, 2026

Uh oh!

Uh oh!

OSBotify commented Jan 22, 2026

Uh oh!

OSBotify commented Jan 22, 2026

Uh oh!

OSBotify commented Jan 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

mukhrr commented Jan 21, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 21, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

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

mukhrr commented Jan 21, 2026

Uh oh!

joekaufmanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

thesahindia commented Jan 22, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

OSBotify commented Jan 22, 2026

Uh oh!

OSBotify commented Jan 22, 2026

Uh oh!

OSBotify commented Jan 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Jan 21, 2026 •

edited by github-actions bot

Loading