Skip to content

[Payment due @parasharrajat] Add None option to clear default custom unit category#95396

Merged
flodnv merged 6 commits into
Expensify:mainfrom
ShridharGoel:add-none-default-distance-category
Jul 16, 2026
Merged

[Payment due @parasharrajat] Add None option to clear default custom unit category#95396
flodnv merged 6 commits into
Expensify:mainfrom
ShridharGoel:add-none-default-distance-category

Conversation

@ShridharGoel

@ShridharGoel ShridharGoel commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Adds a None option to the NewDot default custom unit category picker so a workspace admin can clear an already selected default category.

The category picker now supports an opt-in None row, the default category selector sends an empty category when that row is selected, and the settings row shows None when no default category is set.

Related OldDot PR: https://github.com/Expensify/Web-Expensify/pull/54116

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/653921
PROPOSAL:

Tests

  1. Open a workspace where categories and distance rates are enabled.
  2. Go to workspace settings and open the distance rates settings page.
  3. Set a default category and verify the settings row shows that category.
  4. Reopen the default category selector and choose None.
  5. Verify the settings row shows None.
  6. Start a new distance expense and verify no default category is applied.
  • Verify that no errors appear in the JS console

Offline tests

  1. Open the default category selector from the distance rates settings page.
  2. Go offline.
  3. Choose None.
  4. Verify the settings row shows None with the pending offline state.
  5. Go back online and verify the pending state clears and the row still shows None.

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

MacOS: Chrome / Safari
Screen.Recording.2026-07-06.at.10.00.13.PM.mov

@codecov

codecov Bot commented Jul 6, 2026

Copy link
Copy Markdown

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 Δ
.../components/Search/SearchSingleSelectionPicker.tsx 91.89% <100.00%> (-0.42%) ⬇️
src/libs/OptionsListUtils/index.ts 86.13% <80.00%> (-0.03%) ⬇️
...onents/CustomUnitDefaultCategorySelector/index.tsx 0.00% <0.00%> (ø)
.../categories/DynamicDefaultCategorySelectorPage.tsx 0.00% <0.00%> (ø)
src/components/CategoryPicker/index.tsx 2.94% <0.00%> (-0.51%) ⬇️
src/libs/actions/Policy/Category.ts 50.71% <0.00%> (-0.59%) ⬇️
... and 164 files with indirect coverage changes

@ShridharGoel
ShridharGoel marked this pull request as ready for review July 6, 2026 16:31
@ShridharGoel
ShridharGoel requested review from a team as code owners July 6, 2026 16:31
@melvin-bot
melvin-bot Bot requested review from JmillsExpensify and QichenZhu and removed request for a team July 6, 2026 16:31
@melvin-bot

melvin-bot Bot commented Jul 6, 2026

Copy link
Copy Markdown

@QichenZhu 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 removed the request for review from a team July 6, 2026 16:31
Comment thread src/components/CategoryPicker/index.tsx Outdated
JmillsExpensify
JmillsExpensify previously approved these changes Jul 7, 2026

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

LGTM

@ShridharGoel
ShridharGoel requested review from a team and removed request for QichenZhu July 7, 2026 09:52
@melvin-bot
melvin-bot Bot requested review from parasharrajat and removed request for a team July 7, 2026 09:52
@melvin-bot

melvin-bot Bot commented Jul 7, 2026

Copy link
Copy Markdown

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

@ShridharGoel

Copy link
Copy Markdown
Contributor Author

@JmillsExpensify Based on @flodnv's comment , how should we handle the possibility of "None" being an actual category created by users?

@mallenexpensify

Copy link
Copy Markdown
Contributor

@huult please take over as C+ for reviews, thanks.

@huult

huult commented Jul 8, 2026

Copy link
Copy Markdown
Contributor

@huult please take over as C+ for reviews, thanks.

Thank you! Reviewing now.

@huult

This comment was marked as resolved.

@huult

huult commented Jul 8, 2026

Copy link
Copy Markdown
Contributor
Screenshot 2026-07-08 at 09 39 19

@mallenexpensify Please wait. It looks like @ShridharGoel removed @QichenZhu, so Melvin reassigned the PR to @parasharrajat. Should I still review it, or will @parasharrajat be the reviewer?

@parasharrajat

parasharrajat commented Jul 8, 2026

Copy link
Copy Markdown
Member

I will be reviewer here as I already started. @huult

@JmillsExpensify

Copy link
Copy Markdown
Contributor

@JmillsExpensify Based on @flodnv's comment , how should we handle the possibility of "None" being an actual category created by users?

If that happens, then the None option will have an internalID of whatever attached to it. So we'll always know what the "None" option is vs a "None" category name, right?

@ShridharGoel

Copy link
Copy Markdown
Contributor Author

@JmillsExpensify Based on @flodnv's comment , how should we handle the possibility of "None" being an actual category created by users?

If that happens, then the None option will have an internalID of whatever attached to it. So we'll always know what the "None" option is vs a "None" category name, right?

Yes, but users can be selecting different variations of "None" for different reports, because they will have the same text. Would that be fine?

Also, users would see "None" twice if they have created a "None" category.

@parasharrajat

Copy link
Copy Markdown
Member

May be we can add something like None(reset).

Copy link
Copy Markdown
Contributor

Do we know how many workspaces actually have this configuration? I've honestly never seen it. Equally I think that None (the option to remove the default category) should always be the top unselected option (or top if selected), so I don't think we need to worry about this case. We can address it if it comes up in the real world.

@parasharrajat

Copy link
Copy Markdown
Member

There is a patch failure. Can you merge main?

@parasharrajat

Copy link
Copy Markdown
Member

So after the expense is created, it has a category value probably assigned from the backend. We don't mean to change that in this PR? Correct? @ShridharGoel

@parasharrajat parasharrajat left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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

🔲 iOS / native

11.07.2026_18.34.55_REC.mp4

🔲 iOS / Safari

11.07.2026_18.42.46_REC.mp4

🔲 MacOS / Chrome

11.07.2026_18.29.28_REC.mp4

🔲 Android / native

11.07.2026_18.52.14_REC.mp4

🎀 👀 🎀 C+ reviewed

@melvin-bot melvin-bot Bot changed the title Add None option to clear default custom unit category [Payment due @parasharrajat] Add None option to clear default custom unit category Jul 11, 2026
@melvin-bot

melvin-bot Bot commented Jul 11, 2026

Copy link
Copy Markdown

🎯 @parasharrajat, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/653921.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@parasharrajat

Copy link
Copy Markdown
Member

Q: #95396 (comment)

@ShridharGoel

Copy link
Copy Markdown
Contributor Author

So after the expense is created, it has a category value probably assigned from the backend. We don't mean to change that in this PR? Correct?

Yeah, we are only providing an option to clear the category.

@ShridharGoel
ShridharGoel requested a review from flodnv July 15, 2026 15:42
@flodnv
flodnv merged commit c88326a into Expensify:main Jul 16, 2026
38 of 40 checks passed
@OSBotify

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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/flodnv in version: 9.4.36-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — docs update needed ✅

This PR adds a None option to the Distance rate Default category picker so a Workspace Admin can clear an already-selected default category. That behavior is user-facing but wasn't documented — the NewDot Set-distance-rates.md article covered enabling/adding/editing/removing rates but never mentioned the Default category setting at all.

I created a draft help site PR: #96358

It adds:

  • A How to set a Default category for Distance rates section covering how to set a default category and select None to clear it.
  • A matching FAQ entry: Can I remove the Default category for Distance rates?
Why this article

The Default category row appears on the Distance rates Settings page (PolicyDistanceRatesSettingsPage.tsx:148) and only when Categories are enabled. This PR's CustomUnitDefaultCategorySelector now renders None when nothing is set, and DynamicDefaultCategorySelectorPage sends an empty category when None is picked. Labels used in the docs (Default category, None, Settings) were verified against src/languages/en.ts.

⚠️ I could not verify this in a browser (live-UI verification was unavailable in this run), so the exact navigation path and label placement should be confirmed against the live app before merging.

@ShridharGoel, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

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.

8 participants