Fix: keep multi-level tags import navigation after upgrade and 'Switch Tag Levels'

[fedirjh]

Explanation of Change

On a Collect (Team) workspace, opening Tags → Import spreadsheet → Multi-level tags sends the user through the workspace upgrade flow. After confirming the upgrade and the Switch Tag Levels modal (shown because tags already exist), the user was left stuck on the Import Tags Options screen instead of landing on the spreadsheet import page (the "Choose file" screen). This regression was specific to Collect workspaces with existing tags — Control workspaces or workspaces with no tags worked fine.

Two underlying issues:

1. Modal-vs-navigation race. After confirming a modal, navigation to the import page could be scheduled while modal cleanup was still in flight, so the user sometimes remained on import-options.
2. Post-upgrade resume. The multi-level import flow did not reliably continue when returning from the workspace upgrade screen (Collect → upgrade → back to import options).

This PR:

• await showConfirmModal before navigating, so work runs after the modal close transition completes (see contributingGuides/INTERACTION_MANAGER.md).
• Navigation.setNavigationActionToMicrotaskQueue after cleanPolicyTags on the switch-tag-levels path so navigation is not raced by synchronous Onyx updates.
• useRef + useFocusEffect to resume the multi-level import flow when the screen regains focus after upgrade (instead of fragile useState + policy timing).
• Sets setImportedSpreadsheetIsImportingMultiLevelTags(true) before navigating to upgrade so import intent is preserved.
• Deduplicates switch-tag-levels confirmation via confirmSwitchTagLevels (multi-level menu + single-level menu).
• Uses normal Navigation.navigate (no forceReplace) so users can go back to re-pick single vs multi-level import if they chose the wrong option.
• Does not pass shouldHandleNavigationBack: false on confirm modals, so Android Chrome hardware back still closes the modal as expected.
• Adds unit tests in tests/ui/ImportTagsOptionsPageTest.tsx for Collect upgrade navigation and Control switch-tag-levels → import navigation.

Fixed Issues

$ #90463 (comment)
PROPOSAL:

Tests

Precondition: Have a Collect workspace with tags enabled and at least one tag added.

1. Open the workspace settings of the Collect workspace.
2. Click Tags.
3. Click the More dropdown button → Import spreadsheet.
4. Click Multi-level tags.
5. On the upgrade screen, click Upgrade → Got it, thanks.
6. On the Switch Tag Levels confirmation modal, click Switch Tag Levels.
7. Verify the Import spreadsheet page is displayed with a Choose file button (same as Control workspace behavior).

Precondition: Control workspace with existing single-level tags.

8. Tags → Import spreadsheet → Multi-level tags → confirm Switch Tag Levels → verify the import page opens.
9. From the import page, use the header back button and verify you can return to Import Tags Options

• Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as tests

• Verify that no errors appear in the JS console

PR Author Checklist

• I linked the correct issue in the ### Fixed Issues section above
• I wrote clear testing steps that cover the changes made in this PR
  • I added steps for local testing in the Tests section
  • I added steps for the expected offline behavior in the Offline steps section
  • I added steps for Staging and/or Production testing in the QA steps section
  • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
• I included screenshots or videos for tests on all platforms
• I ran the tests on all platforms & verified they passed on:
  • Android: Native
  • Android: mWeb Chrome
  • iOS: Native
  • iOS: mWeb Safari
  • MacOS: Chrome / Safari
• I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
• I followed proper code patterns (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 followed the guidelines as stated in the Review Guidelines
• I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
• 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
• I verified that if a function's arguments changed that all usages have also been updated correctly
• 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 new assets were added or existing ones were modified, I verified that:
  • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
  • The assets load correctly across all supported platforms.
• 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.
• I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

CleanShot.2026-05-22.at.19.05.07.mp4

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

[melvin-bot]

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

[dmkt9]

@fedirjh There are conflicts.

[fedirjh]

@dmkt9 Thanks for the review — I've pushed an update that addresses your feedback and refreshed the PR description to match the current approach.

Changes since last review:

• Removed shouldHandleNavigationBack: false (Android Chrome back should close the modal normally).
• Removed forceReplace: true (users can navigate back to re-pick import level).
• Resume after Collect upgrade via useRef + useFocusEffect instead of the earlier forceReplace / modal-history workaround.
• Deduplicated switch-tag-levels confirmation into confirmSwitchTagLevels.
• Merged latest main and resolved conflicts.

Please take another look when you have time. 🙏

[codecov]

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/workspace/tags/ImportTagsOptionsPage.tsx	85.88% <62.50%> (+85.88%)	⬆️
... and 10 files with indirect coverage changes

[dmkt9]

@fedirjh Thanks for the quick update. However, I noticed that we failed to fix the original issue:

2026-05-26.21-07-03.mp4

[joekaufmanexpensify]

Good for product