Fix required tags state after switching tag levels by nabi-ebrahimi · Pull Request #89147 · Expensify/App

nabi-ebrahimi · 2026-04-29T04:01:41Z

Explanation of Change

When a workspace switches between single-level and multi-level tags, the backend clears the existing tags and disables Members must tag all expenses if keeping it enabled would leave the workspace in an invalid state.

The problem is that the frontend did not reflect that backend change immediately. This created a confusing experience where the switch flow completed successfully, but the UI still showed Members must tag all expenses as enabled until the user left and revisited the workspace settings. In other words, the workspace state was valid on the backend, but the frontend temporarily showed stale information.

This PR fixes that inconsistency by updating the frontend after the tag cleanup request succeeds, so users see the correct required-tags state right away and the UI stays aligned with the backend during the tag-level switching flow.

Fixed Issues

$ #87472
PROPOSAL: #87472 (comment)

Tests

Open the NewDot app.
Go to Workspace Settings for a Control Workspace → Tags.
Click Add tags, enter any name, and click Save.
Navigate to More → Settings, then enable Members must tag all expenses.
Go to More → Import Spreadsheet → Multi-level tags.
Verify the Switch Tag Levels warning modal appears, then click Switch Tag Levels.
Navigate back to More → Settings.
Verify Members must tag all expenses is automatically disabled after the switch succeeds.

Verify that no errors appear in the JS console

Offline tests

Not applicable

QA Steps

Same as Tests.

// TODO: These must be filled out, or the issue title must include "[No QA]."

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-05-15.at.4.40.58.PM.mov

Android: mWeb Chrome

Screen.Recording.2026-05-15.at.5.51.07.PM.mov

iOS: Native

Screen.Recording.2026-05-15.at.5.12.41.PM.mov

iOS: mWeb Safari

Screen.Recording.2026-05-15.at.5.17.25.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-15.at.4.37.25.PM.mov

codecov · 2026-04-29T04:11:44Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/libs/actions/Policy/Tag.ts	`71.48% <80.00%> (+0.69%)`	⬆️
src/pages/workspace/tags/ImportTagsOptionsPage.tsx	`0.00% <0.00%> (ø)`
... and 44 files with indirect coverage changes

melvin-bot · 2026-04-29T14:54:34Z

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

trjExpensify

I think the UX on what's being introduced here with the double modal preventing the user from switching to multiTags is pretty sub-par. Did we explore solving this in a different way? Like disabling the requiredTag toggle when you take this action, allowing the user to enable it on whatever new levels of tags they add?

CC: @Expensify/design

dubielzyk-expensify · 2026-04-30T03:04:26Z

The last dialog seems to trigger as a result of changing the tags and the first one is just a fair warning. Wouldn't it make more sense to just delete the last one. Cause that is the auto-dialog that triggers when you delete your last tag/category, no?

hoangzinh · 2026-04-30T08:22:34Z

If using double modals is not good, should we combine them into a new warning modal? For example:

Switching tag levels will erase all current tags. However, this action cannot be completed because your workspace requires tags.

dubielzyk-expensify · 2026-04-30T23:08:03Z

I like that idea. Curious what @trjExpensify and @Expensify/design thinks.

As long as the automatic modal still applies when you delete your last category or tag outside this flow.

trjExpensify · 2026-05-01T00:07:07Z

Overall, I think we're revealing a bit too much of a technical nuance here. I think the root cause of that is partly because of how multiTags are added/removed via a CSV, can't be independently managed, and ultimately how they are stored. We're going to look at solving that in the future, as it has many downstream consequences - including this one. The customer just wants to move from single to multi level tags.

Anyhow @hoangzinh I'm curious about your take on the feasibility of disabling requiredTags when you're wiping all of them in this flow to switch from single level tags to multi level tags?

hoangzinh · 2026-05-01T17:08:22Z

I'm curious about your take on the feasibility of disabling requiredTags when you're wiping all of them in this flow to switch from single level tags to multi level tags?

It's feasible, @trjExpensify. I think we need to:

Update the BE API so that when it cleans all policy tags, it also disables requiredTags.
Update the FE so it can optimistically disable requiredTags.

However, if we choose this approach, can we consider doing nothing for this issue? Current behavior still allows customers to clean all tags and lets users switch to multi-level tags while keeping requiredTags as they are.

nabi-ebrahimi · 2026-05-07T08:36:59Z

@trjExpensify, could you please take a look at this comment, when you get a chance. Thanks.

dannymcclain · 2026-05-07T13:02:22Z

Overall, I think we're revealing a bit too much of a technical nuance here.

I think I agree. It's a bummer that the user gets all the way through the switch flow and then lands on a "You can't do that" modal. It might be better if we just warn them that switching tag levels with disable "Members must tag all expenses" and they'll have to re-enable it or something like that. Not totally sure what would be best, but I agree with Tom that this doesn't feel like it.

trjExpensify · 2026-05-07T19:57:24Z

However, if we choose this approach, can we consider doing nothing for this issue? Current behavior still allows customers to clean all tags and lets users switch to multi-level tags while keeping requiredTags as they are.

What do you mean by "do nothing for this issue"? If the toggle for required tags is enabled and the user has no tags at all, what are the downstream consequences of that?

hoangzinh · 2026-05-09T10:57:31Z

Anyhow @hoangzinh I'm curious about your take on the feasibility of disabling requiredTags when you're wiping all of them in this flow to switch from single level tags to multi level tags?

Hi @trjExpensify, I apologize for my previous comment regarding the current behavior here. Upon retesting, I found that the backend actually functions as you described. Specifically, the backend will automatically disable requiredTags when it removes all tags.

The only issue we currently face is in the FE. Users must revisit the workspace to see that requiredTags have been disabled. I believe we should optimistically disable the requiredTags in the FE in this case.

Screen.Recording.2026-05-09.at.17.48.10.mov

trjExpensify · 2026-05-11T22:18:07Z

Ah cool, then we don't need the "double modal" either. Nice! 👍

hoangzinh · 2026-05-12T09:47:33Z

Yes, @trjExpensify

@nabi-ebrahimi can you work on this FE part?

The only issue we currently face is in the FE. Users must revisit the workspace to see that requiredTags have been disabled. I believe we should optimistically disable the requiredTags in the FE in this case.

hoangzinh · 2026-05-14T09:42:57Z

    }, [isMultiLevelTags, policyTagLists]);

+    const handlePostConfirmTagSwitch = () => {
+        cleanPolicyTags(policyID, !!policy?.requiresTag);


I believe it will enable the policy.requiresTag when the user switches between a single tag and a multi-level tag. We should only optimistically mark policy.requiresTag as false when it is enabled.

@hoangzinh Thank you for pointing this out. I updated the logic so that we only pass this flag when \policy.requiresTagis explicitly enabled, which ensures we only markpolicy.requiresTagasfalse in the intended case.

hoangzinh · 2026-05-14T09:44:39Z

 }

-function cleanPolicyTags(policyID: string) {
-    // We do not have any optimistic data or success data for this command as this action cannot be done offline


This action can not be done offline. Should we only mark it on successData?

@hoangzinh Thank you for the suggestion. I moved the \requiresTagupdate fromoptimisticDatatosuccessData only, since this action is not supported offline. This means the UI will now reflect the change only after the request succeeds. I also updated the related tests accordingly.

hoangzinh · 2026-05-14T13:37:54Z

Verify the app navigates to the import flow without showing the Cannot delete or disable all tags modal.

@nabi-ebrahimi Should we remove this test step? It seems redundant to me.

hoangzinh · 2026-05-14T13:38:13Z

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

Screen.Recording.2026-05-15.at.17.20.35.mov

Android: mWeb Chrome

Screen.Recording.2026-05-15.at.17.14.04.mov

iOS: HybridApp

Screen.Recording.2026-05-15.at.17.33.22.mov

iOS: mWeb Safari

Screen.Recording.2026-05-15.at.17.24.10.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-15.at.17.10.08.mov

nabi-ebrahimi · 2026-05-14T14:01:44Z

@nabi-ebrahimi Should we remove this test step? It seems redundant to me.

@hoangzinh Thank you for catching this. I agree that this test step is redundant, so I removed it from the test steps.

hoangzinh · 2026-05-15T10:37:07Z

@nabi-ebrahimi can you update the PR description + PR title so it matches what we are trying to fix?

nabi-ebrahimi · 2026-05-15T14:28:01Z

@nabi-ebrahimi can you update the PR description + PR title so it matches what we are trying to fix?

@hoangzinh Thank you for the clarification. I have updated the PR title and description to better reflect the issue we are addressing in this PR.

hoangzinh · 2026-05-15T14:33:58Z

@trjExpensify can you review this PR again? TY

trjExpensify

Much more graceful. Thank you!

hoangzinh

LGTM

nabi-ebrahimi · 2026-05-22T07:37:31Z

@robertjchen, could you please take a look at this pr, when you get a chance. thanks.

robertjchen

Looks good to me!

github-actions · 2026-05-22T07:55:12Z

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

github-actions · 2026-05-22T07:59:50Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-2703b90-d1139c3-f2062af7eed3f05362d1e13c74b25042887e33d9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-2703b90-d1139c3-6c49afbd1e8a9ed1fb01f1863829e2e328f4c726/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-05-22T08:03:15Z

✋ 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-05-22T22:43:34Z

🚀 Deployed to staging by https://github.com/robertjchen in version: 9.3.80-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-05-22T22:45:54Z

No help site changes are required for this PR.

This is a frontend bug fix for UI state synchronization — the "Members must tag all expenses" toggle now correctly reflects the backend state immediately after switching tag levels, instead of requiring the user to navigate away and back. The underlying behavior is unchanged, and the relevant help articles (Create and Manage Expense Tags, Require Tags and Categories for Expenses) don't document this internal state management detail, nor should they.

lanitochka17 · 2026-05-23T00:22:52Z

Deploy Blocker ##91483 was identified to be related to this PR.

…ete-tags-when-toggle-required-tags" This reverts commit 2703b90, reversing changes made to c6eb6c1.

hoangzinh · 2026-05-25T11:00:11Z

@nabi-ebrahimi our PR is reverted. Can you take a look at DB and bring our PR back again? TY

OSBotify · 2026-05-25T11:22:32Z

🚀 Deployed to staging by https://github.com/robertjchen in version: 9.3.81-0 🚀

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

MelvinBot · 2026-05-25T11:24:50Z

No help site changes are required.

This PR is a bug fix for frontend state synchronization — after switching between single-level and multi-level tags, the Members must tag all expenses toggle now immediately reflects the backend state instead of appearing stale. No user-facing workflows, UI labels, navigation paths, or features changed.

The relevant help articles (Require-tags-and-categories-for-expenses.md and Create-and-manage-expense-tags.md) don't reference this internal timing behavior and remain accurate as-is.

prevent deletion of all tags when enabling required tagging toggle

83403b0

melvin-bot Bot assigned nabi-ebrahimi Apr 29, 2026

nabi-ebrahimi marked this pull request as ready for review April 29, 2026 14:54

nabi-ebrahimi requested review from a team as code owners April 29, 2026 14:54

melvin-bot Bot requested review from hoangzinh and trjExpensify and removed request for a team April 29, 2026 14:54

melvin-bot Bot removed the request for review from a team April 29, 2026 14:54

github-actions Bot reviewed Apr 29, 2026

View reviewed changes

Comment thread src/pages/workspace/tags/ImportTagsOptionsPage.tsx Outdated

github-actions Bot reviewed Apr 29, 2026

View reviewed changes

Comment thread src/pages/workspace/tags/ImportTagsOptionsPage.tsx Outdated

github-actions Bot reviewed Apr 29, 2026

View reviewed changes

Comment thread src/pages/workspace/tags/ImportTagsOptionsPage.tsx Outdated

Nabi added 2 commits April 30, 2026 02:14

Prevent invalid tag level switches and address PR feedback

014bb2f

fixed prettier failer

df1c3fd

trjExpensify requested changes Apr 30, 2026

View reviewed changes

Nabi added 2 commits May 12, 2026 12:05

Merge branch 'main' into fix/delete-tags-when-toggle-required-tags

507f30c

Merge branch 'main' into fix/delete-tags-when-toggle-required-tags

84cce0e

hoangzinh reviewed May 14, 2026

View reviewed changes

Nabi added 2 commits May 14, 2026 11:57

Merge branch 'main' into fix/delete-tags-when-toggle-required-tags

ee8f74f

Move requiredTags cleanup update to successData only

14280f4

nabi-ebrahimi changed the title ~~Fix deletion of all tags when enabling "Members must tag all expenses"~~ Fix required tags state after switching tag levels May 15, 2026

trjExpensify approved these changes May 19, 2026

View reviewed changes

hoangzinh approved these changes May 19, 2026

View reviewed changes

melvin-bot Bot requested a review from robertjchen May 19, 2026 08:31

robertjchen approved these changes May 22, 2026

View reviewed changes

robertjchen merged commit 2703b90 into Expensify:main May 22, 2026
60 of 62 checks passed

OSBotify mentioned this pull request May 22, 2026

Deploy Checklist: New Expensify 2026-05-22 #91472

Closed

71 tasks

applause-bot Bot mentioned this pull request May 23, 2026

Workspace - Tags toggle remains disabled after “Members must tag all expenses” disabled #91483

Closed

7 tasks

lanitochka17 mentioned this pull request May 23, 2026

[$250] Tags - Can trigger delete all Tags after toggle on "Members must tag all expenses" #87472

Open

7 tasks

MelvinBot mentioned this pull request May 24, 2026

[CP Staging] Revert "Fix required tags state after switching tag levels" #91548

Merged

49 tasks

pull Bot pushed a commit to ykatyhoney/Expensify_App that referenced this pull request May 24, 2026

Revert "Merge pull request Expensify#89147 from nabi-ebrahimi/fix/del…

95e0944

…ete-tags-when-toggle-required-tags" This reverts commit 2703b90, reversing changes made to c6eb6c1.

Conversation

nabi-ebrahimi commented Apr 29, 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 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!

melvin-bot Bot commented Apr 29, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

dubielzyk-expensify commented Apr 30, 2026

Uh oh!

hoangzinh commented Apr 30, 2026

Uh oh!

dubielzyk-expensify commented Apr 30, 2026

Uh oh!

trjExpensify commented May 1, 2026

Uh oh!

hoangzinh commented May 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nabi-ebrahimi commented May 7, 2026

Uh oh!

dannymcclain commented May 7, 2026

Uh oh!

trjExpensify commented May 7, 2026

Uh oh!

hoangzinh commented May 9, 2026

Uh oh!

trjExpensify commented May 11, 2026

Uh oh!

hoangzinh commented May 12, 2026

Uh oh!

hoangzinh May 14, 2026

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi May 14, 2026

Choose a reason for hiding this comment

Uh oh!

hoangzinh May 14, 2026

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi May 14, 2026

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented May 14, 2026

Uh oh!

hoangzinh commented May 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

nabi-ebrahimi commented May 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hoangzinh commented May 15, 2026

Uh oh!

nabi-ebrahimi commented May 15, 2026

Uh oh!

hoangzinh commented May 15, 2026

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi commented Apr 29, 2026 •

edited

Loading

codecov Bot commented Apr 29, 2026 •

edited by github-actions Bot

Loading

hoangzinh commented May 1, 2026 •

edited

Loading

hoangzinh commented May 14, 2026 •

edited

Loading

nabi-ebrahimi commented May 14, 2026 •

edited

Loading