Skip to content

83861 migrate workspace tags part 3 v2#95203

Merged
mjasikowski merged 9 commits into
Expensify:mainfrom
huult:83861-migrate-workspace-tags-part-3-v2
Jul 7, 2026
Merged

83861 migrate workspace tags part 3 v2#95203
mjasikowski merged 9 commits into
Expensify:mainfrom
huult:83861-migrate-workspace-tags-part-3-v2

Conversation

@huult

@huult huult commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Fixed Issues

$ #83861
PROPOSAL:

Tests

Same QA step

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

WORKSPACE_TAGS_IMPORT

  1. Go to Workspace → Tags.
  2. Click Import and select either multiple-level or single-level tags.
  3. Verify that the import page opens and you can navigate back normally.

WORKSPACE_TAGS_IMPORTED

  1. Workspace → Tags → Import spreadsheet → single-level import
  2. Upload a CSV on the import screen
  3. Verify that the imported page opens and you can navigate back normally.

WORKSPACE_TAG_LIST_VIEW

Precondition:
Workspace has tags, including imported multi-level tags.

  1. Go to Workspace → Tags.
  2. Select any tag.
  3. Verify that the tag details page opens and you can navigate back normally.

SETTINGS_TAGS_SETTINGS

  1. Go to Workspace → Tags.
  2. Update the URL from the workspace route to the settings route. For example:
    https://dev.new.expensify.com:8082/workspaces/D56D50B841F69B0E/tags
    https://dev.new.expensify.com:8082/settings/D56D50B841F69B0E/tags
  3. Click More → Settings.
  4. Verify that the Tag Settings page opens and you can navigate back normally.
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-06-26.at.09.16.14.mov

@huult huult requested review from a team as code owners July 2, 2026 14:12
@melvin-bot melvin-bot Bot requested review from a team, suneox and trjExpensify and removed request for a team July 2, 2026 14:12
@melvin-bot

melvin-bot Bot commented Jul 2, 2026

Copy link
Copy Markdown

@suneox 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 melvin-bot Bot requested review from heyjennahay and removed request for a team July 2, 2026 14:12
@huult

huult commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

@suneox Could you reapprove this PR?

Comment thread src/pages/workspace/tags/ImportTagsOptionsPage.tsx
@suneox

suneox commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

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 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)
  • 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)
  • 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.
  • 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
DYNAMIC_ROUTES.WORKSPACE_TAG_LIST_VIEWmulti-level tag list view (workspace flow)
Case 1.1 — Entry: tap tag list row from Workspace Tags (multi-level) 1 1-1-before-tags-multilevel-list 1 1-2-entry-tag-list-view 1 1-3-after-back-tags-root
Case 1.2 — Back from Edit Tags (multi-level) reconstructs tag list view 1 2-1-before-tag-list-view 1 2-2-entry-edit-tags 1 2-3-after-back-tag-list-view
Case 1.3 — Guard: quick-settings flow still uses `SETTINGS_TAG_LIST_VIEW` (unchanged) 1 3-1-before-qs-tags-root 1 3-2-entry-qs-tag-list 1 3-3-after-back-qs-tags-root
Case 1.4 — Legacy redirect: `/workspaces/<W>/tag-list/<orderWeight>` 1 4-1-before-taglist-oldurl 1 4-2-entry-taglist-redirected
Case 1.5 — Refresh / deeplink restore on new URL 1 5-1-before-tags-root 1 5-2-entry-restored-view 1 5-3-after-back-tags-root

DYNAMIC_ROUTES.WORKSPACE_TAGS_IMPORTimport tags spreadsheet (workspace flow)
Case 2.1 — Entry: Tags → Import → single-level import 2 1-1-before-tags-multilevel-list 2 1-2-entry-switch-levels-confirm 2 1-3-after-back-import-options
Case 2.2 — Entry: Import options → multi-level path (confirm modal flow) 2 2-1-before-tags-multilevel-list 2 2-2-entry-override-confirm-modal 2 2-3-after-submit-import-page
Case 2.3 — Back from Multi-level import settings 2 3-1-before-import-upload-page 2 3-2-entry-ml-settings 2 3-3-after-back-import-page
Case 2.4 — Legacy redirect: `/workspaces/<W>/tags/import` 2 4-1-before-import-oldurl 2 4-2-entry-import-redirected

DYNAMIC_ROUTES.WORKSPACE_TAGS_IMPORTEDimported tags review (workspace flow)
Case 3.1 — Forward: Import CSV → Imported page (single-level) 3 1-2-entry-imported-ml 3 1-3-after-back-import-back
Case 3.2 — Legacy redirect: `/workspaces/<W>/tags/imported` 3 2-1-before-imported-oldurl 3 2-2-entry-imported-redirected 3 3-2-entry-imported-refresh

DYNAMIC_ROUTES.SETTINGS_TAGS_SETTINGStags settings (quick-settings flow)
Case 4.1 — Entry: quick-settings Tags → More → Settings 4 1-1-before-qs-tags-root 4 1-2-entry-settings-tags-settings 4 1-3-after-back-qs-tags-root
Case 4.2 — Nested: Edit tag list name from Tags Settings (`SETTINGS_TAGS_EDIT` collateral) 4 2-1-before-qs-tag-list-view 4 2-2-entry-settings-tags-edit 4 2-3-after-back-qs-tag-list-view
Case 4.3 — Guard: workspace flow Tags Settings still uses `WORKSPACE_TAGS_SETTINGS` 4 3-1-before-ws-tags-root 4 3-2-entry-ws-tags-settings 4 3-3-after-back-ws-tags-root
Case 4.4 — Legacy redirect: `/settings/<W>/tags/settings` 4 4-1-before-settings-tags-oldurl 4 4-2-entry-settings-tags-redirected

Collateral — SETTINGS_TAGS_EDITsuffix rename + backward-compat redirects
Case 5.1 — Legacy redirect: `/settings/<W>/tags/<orderWeight>/edit` 5 1-1-before-edit-chain-oldurl 5 1-2-entry-edit-chain-redirected
Case 5.2 — ⚠️ Old URL `/settings/<W>/tags/edit/<orderWeight>` (P2 review)
CleanShot.2026-07-01.at.20.32.52.1.mp4

@suneox

suneox commented Jul 2, 2026

Copy link
Copy Markdown
Contributor

Updated the checklist from the previous PR

@huult

huult commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

thank you

@codecov

codecov Bot commented Jul 2, 2026

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/SCREENS.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/OldRoutes.ts 100.00% <ø> (ø)
...gation/linkingConfig/RELATIONS/WORKSPACE_TO_RHP.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 76.92% <ø> (ø)
src/ROUTES.ts 20.72% <0.00%> (+0.05%) ⬆️
...orkspace/tags/ImportMultiLevelTagsSettingsPage.tsx 0.00% <0.00%> (ø)
src/pages/workspace/tags/WorkspaceTagsPage.tsx 49.30% <0.00%> (ø)
src/pages/workspace/tags/ImportedTagsPage.tsx 0.00% <0.00%> (ø)
...gation/AppNavigator/ModalStackNavigators/index.tsx 6.55% <0.00%> (ø)
...es/workspace/tags/DynamicWorkspaceViewTagsPage.tsx 0.00% <0.00%> (ø)
... and 3 more
... and 9 files with indirect coverage changes

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0d269d8860

ℹ️ About Codex in GitHub

Your team has set up Codex to 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 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

Comment thread tests/navigation/getMatchingNewRouteTest.ts Outdated
@trjExpensify

Copy link
Copy Markdown
Contributor

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

@huult

huult commented Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

@suneox The failing checks are unrelated to our PR.

@suneox suneox left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All previous test cases still pass as expected

@melvin-bot melvin-bot Bot requested a review from mjasikowski July 6, 2026 12:08
@mjasikowski

Copy link
Copy Markdown
Contributor

@huult conflicts

@huult

huult commented Jul 7, 2026

Copy link
Copy Markdown
Contributor Author

@mjasikowski resolved

@mjasikowski mjasikowski merged commit 81ff15e into Expensify:main Jul 7, 2026
34 checks passed
@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

✋ 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

OSBotify commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.4.29-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes are required for this PR.

This is an internal navigation refactor — it migrates the workspace/settings Tags routes from static routes to dynamic routes and renames the associated SCREENS constants (e.g. TAG_LIST_VIEWDYNAMIC_TAG_LIST_VIEW, TAGS_IMPORTDYNAMIC_TAGS_IMPORT), then updates the linking config, param types, and modal navigators to match.

Why no docs update is needed
  • The change is limited to route/screen plumbing (src/ROUTES.ts, src/SCREENS.ts, src/libs/Navigation/*) and the page components that reference them.
  • OldRoutes.ts adds redirects so existing URLs continue to resolve, so no user-facing URL is broken.
  • There is no change to feature behavior, UI copy, tab/button labels, or user-facing workflows. The QA steps only confirm existing Tags flows (Import, Imported, tag list view, tag settings) still open and navigate back normally.
  • Help site articles under App/docs/articles describe how to use features (e.g. creating, importing, and managing tags), not internal route names or navigation architecture — none of that guidance is affected.

I reviewed against HELPSITE_NAMING_CONVENTIONS.md, HELP_AUTHORING_GUIDELINES.md, and TEMPLATE.md; since there is no behavior or copy change to document, no draft PR was created.

@huult, since no help site changes are required, I did not create a draft docs PR. If you believe a specific article should be updated as a result of this change, let me know which one and I'll take another look.

@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.4.31-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I reviewed this PR against Expensify's help site files under App/docs/articles and no help site changes are required.

Why: This PR is a purely internal navigation refactor for the workspace Tags flow (part of the tags route migration in #83861). Every change is plumbing that is invisible to end users:

  • Route/screen renames and migration to dynamic routes (src/ROUTES.ts, src/SCREENS.ts)
  • Navigation/linking config updates (ModalStackNavigators, OldRoutes.ts, WORKSPACE_TO_RHP.ts, config.ts, types.ts)
  • A page-component file rename (WorkspaceViewTagsPage.tsxDynamicWorkspaceViewTagsPage.tsx)
  • A navigation unit test (getMatchingNewRouteTest.ts)

There are no changes to src/languages/* copy, no new user-facing features, and no changed UI labels, tab names, buttons, or workflows. The PR's own QA steps confirm the goal is unchanged behavior ("verify you can navigate back normally"). Since the public help articles describe product features and workflows rather than internal route names, none of them are affected.

No draft docs PR was created.

@huult, please confirm you agree no help site updates are needed here. If you believe a user-facing behavior did change and docs should be updated, let me know and I'll create the draft PR.

@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.4.31-0 🚀

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

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants