[CP Staging] Fix independent tags not sorting by name by luacmartins · Pull Request #94509 · Expensify/App

luacmartins · 2026-06-24T21:29:01Z

Explanation of Change

Restrict WorkspaceTagsTable name sorting to use orderWeight only for dependent tags. Independent multi-level tags now sort alphabetically by name.

Fixed Issues

$ #94505

Tests

Open a workspace with independent multi-level tags
Go to Settings > Tags
Confirm tags are sorted by name; toggling the Name column re-sorts alphabetically
Confirm dependent tag policies still preserve hierarchical order

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Screen.Recording.2026-06-24.at.3.44.20.PM.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2026-06-24T21:45:01Z

@huult 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 · 2026-06-24T21:45:13Z

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

situchan · 2026-06-25T11:16:33Z

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

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

github-actions · 2026-06-25T11:55:06Z

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

OSBotify · 2026-06-25T11:58:13Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-06-25T12:00:50Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-d41e19c9042-f38ade5-8f72bb680c8b4eeae894b05d64febbaf104cc5ff/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-d41e19c-f38ade5-d1e6964544b1a9b8eeab991a223fcef669f29e7e/index.html

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

👀 View the workflow run that generated this build 👀

[CP Staging] Fix independent tags not sorting by name (cherry picked from commit d41e19c) (cherry-picked to staging by blimpich)

OSBotify · 2026-06-25T18:19:36Z

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.4.19-4 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-06-25T18:21:43Z

🤖 No help site changes required.

This PR is a one-line fix to the sort logic in src/components/Tables/WorkspaceTagsTable/index.tsx: independent multi-level tags now sort alphabetically by name instead of by orderWeight, while dependent tags keep their hierarchical order.

The only related help article — Create and manage expense tags — covers enabling, creating, importing, and managing tags (including dependent vs. independent multi-level tags). It does not document the display sort order of rows in the workspace Tags table, which is the only behavior this PR changes. There's no documented behavior to bring in line with this change, so no draft PR is needed.

@luacmartins, let me know if you'd still like a help site PR created — e.g. to add a note documenting the Tags table sort order — and I'll open one.

OSBotify · 2026-06-25T21:31:19Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.19-5 🚀

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

OSBotify · 2026-06-25T21:52:24Z

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.4.20-0 🚀

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

MelvinBot · 2026-06-25T21:55:43Z

🤖 I reviewed this PR against the help site articles under App/docs/articles and no help site changes are required.

Why: This PR is an internal bug fix — it restricts orderWeight-based sorting in the Settings > Tags table to dependent tags only, so independent multi-level tags now sort alphabetically by name (the expected default). The help articles that cover tags describe how dependent vs. independent multi-level tags behave functionally, but none of them document the sort/display order of tags within the Tags table, so there is nothing to update.

Articles checked

new-expensify/workspaces/Create-and-manage-expense-tags.md — covers enabling, importing, and the dependent vs. independent distinction, but does not describe table sort order.
new-expensify/workspaces/Require-tags-and-categories-for-expenses.md
expensify-classic/workspaces/Create-tags.md

A keyword search across these for sort, order, and alphabet returned no matches describing tag display order.

No draft docs PR was created since there is nothing to document.

OSBotify · 2026-06-26T19:24:18Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.4.20-1 🚀

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

Bundle Size Analysis (Sentry):

Android

fix sorting tags

464dd98

luacmartins self-assigned this Jun 24, 2026

luacmartins changed the title ~~fix sorting tags~~ Fix independent tags not sorting by name Jun 24, 2026

luacmartins changed the title ~~Fix independent tags not sorting by name~~ [CP Staging] Fix independent tags not sorting by name Jun 24, 2026

luacmartins marked this pull request as ready for review June 24, 2026 21:44

luacmartins requested review from a team as code owners June 24, 2026 21:44

melvin-bot Bot requested review from heyjennahay and huult and removed request for a team June 24, 2026 21:44

melvin-bot Bot removed the request for review from a team June 24, 2026 21:45

luacmartins requested review from a team, JS00001, Krishna2323 and situchan and removed request for heyjennahay and huult June 24, 2026 21:45

melvin-bot Bot requested review from rojiphil and trjExpensify and removed request for a team June 24, 2026 21:45

melvin-bot Bot removed the request for review from a team June 24, 2026 21:45

luacmartins removed the request for review from rojiphil June 24, 2026 21:47

situchan approved these changes Jun 25, 2026

View reviewed changes

JS00001 approved these changes Jun 25, 2026

View reviewed changes

JS00001 merged commit d41e19c into main Jun 25, 2026
47 checks passed

JS00001 deleted the cmartins-fixSorting branch June 25, 2026 11:53

OSBotify pushed a commit that referenced this pull request Jun 25, 2026

Merge pull request #94509 from Expensify/cmartins-fixSorting

740b110

[CP Staging] Fix independent tags not sorting by name (cherry picked from commit d41e19c) (cherry-picked to staging by blimpich)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Jun 25, 2026

OSBotify mentioned this pull request Jun 25, 2026

Deploy Checklist: New Expensify 2026-06-24 #94490

Closed

69 tasks done

melvin-bot Bot mentioned this pull request Jun 25, 2026

[Due for payment 2026-07-03] [Due for payment 2026-07-02] Tags - Independant tags are not sorted by name #94505

Closed

1 of 7 tasks

situchan mentioned this pull request Aug 18, 2026

[Due for payment 2026-08-24] [CFI] Update table styles on NewDot web to use a more compact, information-dense layout #86102

Closed

trjExpensify mentioned this pull request Oct 5, 2026

[Due for payment 2026-10-21] [$175] [CFI] Multi-level tags: keep spreadsheet order and disable sorting in NewDot #103082

Closed

Navigation Menu

Repository navigation

[CP Staging] Fix independent tags not sorting by name - #94509

[CP Staging] Fix independent tags not sorting by name#94509
JS00001 merged 1 commit into
mainfrom
cmartins-fixSorting

luacmartins commented Jun 24, 2026 •

edited

Loading

Uh oh!

melvin-bot Bot commented Jun 24, 2026

Uh oh!

melvin-bot Bot commented Jun 24, 2026

Uh oh!

situchan commented Jun 25, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

github-actions Bot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

MelvinBot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

MelvinBot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 26, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

luacmartins commented Jun 24, 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 Jun 24, 2026

Uh oh!

melvin-bot Bot commented Jun 24, 2026

Uh oh!

situchan commented Jun 25, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

github-actions Bot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

github-actions Bot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

MelvinBot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 25, 2026

Uh oh!

MelvinBot commented Jun 25, 2026

Uh oh!

OSBotify commented Jun 26, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

luacmartins commented Jun 24, 2026 •

edited

Loading