Skip to content

Unreported Expense - Category field#73101

Merged
cristipaval merged 18 commits into
Expensify:mainfrom
callstack-internal:feat/71784-category-field-reapply
Oct 22, 2025
Merged

Unreported Expense - Category field#73101
cristipaval merged 18 commits into
Expensify:mainfrom
callstack-internal:feat/71784-category-field-reapply

Conversation

@koko57

@koko57 koko57 commented Oct 21, 2025

Copy link
Copy Markdown
Contributor

Explanation of Change

Reapplies previously reverted PR that adds category field on unreported expenses

Fixed Issues

$ #71784
$ #72836
$ #72864
$ #72820
$ #72821
PROPOSAL:

Tests

Same as QA steps

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

Prerequisites: Account has selfDM

Scenario A:
Precondition: User with a default workspace or only one non-default workspace

  1. Create a new tracked expense
  2. Go to selfDM
  3. Go to the expense
  4. Verify that the Category field is shown
  5. Click on the Category field
  6. Verify that you see the list of categories that is available for the default/only workspace
  7. Select one of the Categories
  8. Verify that the RHP closes/you're navigated back to the transaction view and the category field is properly populated

Scenario B:
Precondition: User with a several (2 or more) non-default workspaces

Create a new tracked expense

  1. Go to selfDM
  2. Go to the expense
  3. Verify that the Category field is shown
  4. Click on the Category field
  5. Verify that the workspace selector is shown
  6. Select one of the workspaces
  7. Verify that you see the list of categories that is available for the workspace you selected
  8. Select one of the Categories
  9. Verify that the RHP closes/you're navigated back to the transaction view and the category field is properly populated
  10. Go to the Workspaces tab
  11. Verify that the workspace you selected has now Default badge

Scenario C:
Precondition: User has no workspace

  1. Go to selfDM
  2. Go to the expense (create new if you don't have one)
  3. Verify that the Category field is shown
  4. Click on the Category field
  5. Verify that you're navigated to the Upgrade Page
  6. Click Upgrade
  7. On the Confirm Workspace page you can change the default name and the currency
  8. Click Confirm
  9. Verify that you're redirected to the Category selector
  10. Choose one of the category
  11. Verify that the selected category is shown in the transaction thread
  12. Go to the workspaces page
  13. Verify that the workspace you created is displayed

Scenario D: (#72836)
Preconditions:
Have at least 2 workspaces.
The account has no default workspace.

  1. Create an expense without a category in a workspace chat
  2. Go to the expense thread
  3. Click on the Category field
  4. Verify that the list of categories is shown

Scenario E (#72864):
Precondition: Account has self DM and a workspace.

  1. Go to self DM.
  2. Create a distance expense.
  3. Open the transaction thread.
  4. Click Category.
  5. Change the category.
  6. Rate field will not change to "Rate out of policy". after changing category.

Scenario F (#72822):
Precondition: Account only has a non-default workspace.

  1. Go to self DM.
  2. Create a manual expense.
  3. Go to Account > Troubleshoot > Clear cache and restart > Reset and refresh.
  4. Go back to self DM. Do not open workspace chat or workspace settings.
  5. Open the transaction thread.
  6. Click Category.
  7. Category will not load infinitely after reset app.

Scenario G (#72820):
Precondition: Account has self DM and a workspace.

  1. Go to self DM.
  2. Create a manual expense in self DM.
  3. Open the transaction thread.
  4. Click Category.
  5. Select a category.
  6. Go back to self DM.
  7. Click Submit it to someone.
  8. Select a workspace.
  9. On confirm page Category field will show the selected category.

Scenario H (#72821):
Preconditions:
User is invited to the workspace.
User does not have other workspace.
The invited workspace has disabled Categories.

  1. Go to self DM.
  2. Create an expense in self DM.
  3. Open transaction thread.
  4. Verify that Category field is not displayed for the invited member if workspace has no category.
  • 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
    • MacOS: Desktop
  • 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
Screen.Recording.2025-10-14.at.12.50.50.mp4
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2025-10-14.at.12.27.18.mp4
Screen.Recording.2025-10-14.at.12.26.47.mp4
MacOS: Desktop

@koko57 koko57 marked this pull request as ready for review October 21, 2025 13:18
@koko57 koko57 requested a review from a team as a code owner October 21, 2025 13:18
@melvin-bot melvin-bot Bot requested review from parasharrajat and removed request for a team October 21, 2025 13:19
@melvin-bot

melvin-bot Bot commented Oct 21, 2025

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]

@cristipaval cristipaval self-requested a review October 21, 2025 13:20
@parasharrajat

Copy link
Copy Markdown
Member

@koko57 Can you please add a list of issues that you have fixed other that the main one?

@koko57

koko57 commented Oct 21, 2025

Copy link
Copy Markdown
Contributor Author

@parasharrajat done!

@parasharrajat

Copy link
Copy Markdown
Member

Thanks. I will test now.

@parasharrajat

parasharrajat commented Oct 22, 2025

Copy link
Copy Markdown
Member

@koko57 #72820 is not yet fixed.

22.10.2025_18.20.30_REC.mp4

Comment on lines +92 to +95
const fetchData = useCallback(() => {
const policyIDToFetchCategories = report?.policyID === CONST.POLICY.ID_FAKE ? activePolicyID : report?.policyID;
getPolicyCategories(policyIDToFetchCategories ?? CONST.POLICY.ID_FAKE);
}, [activePolicyID, report?.policyID]);

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.

Now this API will be called each time regardless we have data or not.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Maybe it's intended and the only fix? cc @MrMuzyk

Why do you think it would cause problems?

@parasharrajat parasharrajat Oct 22, 2025

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.

It is an unnecessary api call to the backend when we have data. Can we skip the call when policy categories are present?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ok I will check this one

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@parasharrajat fixed - I restored the previous logic but changed report?.policyID to policyID, so now it should fetch the data properly

@parasharrajat

Copy link
Copy Markdown
Member

#72822
For this, now we hide the category field. is that expected? @cristipaval @koko57

image

@koko57

koko57 commented Oct 22, 2025

Copy link
Copy Markdown
Contributor Author

@koko57 #72820 is not yet fixed.

22.10.2025_18.20.30_REC.mp4

I fixed it,can you check it?

@cristipaval

cristipaval commented Oct 22, 2025

Copy link
Copy Markdown
Contributor

#72822
For this, now we hide the category field. is that expected? @cristipaval @koko57

image

this is because there's no data about the workspace categories in Onyx. I have a draft PR in the backend to address this issue.

Let's not block the PR on this, because this is a very rare case

@koko57

koko57 commented Oct 22, 2025

Copy link
Copy Markdown
Contributor Author

@cristipaval thanks! I was about to write about it but you were faster 😅

@codecov

codecov Bot commented Oct 22, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 11.32075% with 47 lines in your changes missing coverage. Please review.

Files with missing lines Patch % Lines
src/pages/SetDefaultWorkspacePage.tsx 0.00% 16 Missing ⚠️
src/components/Search/index.tsx 0.00% 11 Missing ⚠️
.../pages/iou/request/step/IOURequestStepCategory.tsx 0.00% 9 Missing ⚠️
...c/components/ReportActionItem/MoneyRequestView.tsx 0.00% 6 Missing ⚠️
...es/iou/request/step/IOURequestStepParticipants.tsx 0.00% 2 Missing ⚠️
src/ROUTES.ts 0.00% 1 Missing ⚠️
...gation/AppNavigator/ModalStackNavigators/index.tsx 50.00% 1 Missing ⚠️
...on/AppNavigator/Navigators/RightModalNavigator.tsx 0.00% 1 Missing ⚠️
Files with missing lines Coverage Δ
src/SCREENS.ts 100.00% <ø> (ø)
src/libs/Navigation/linkingConfig/config.ts 75.00% <ø> (ø)
src/libs/ReportUtils.ts 74.27% <100.00%> (-0.02%) ⬇️
src/libs/Violations/ViolationsUtils.ts 66.98% <100.00%> (ø)
src/libs/actions/IOU.ts 63.48% <ø> (ø)
src/pages/ReportDetailsPage.tsx 58.20% <ø> (-0.13%) ⬇️
src/pages/home/report/PureReportActionItem.tsx 53.48% <ø> (-0.08%) ⬇️
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx 0.00% <ø> (ø)
...rovals/WorkspaceWorkflowsApprovalsApproverPage.tsx 0.00% <ø> (ø)
src/ROUTES.ts 10.77% <0.00%> (-0.02%) ⬇️
... and 7 more

... and 7 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@parasharrajat

Copy link
Copy Markdown
Member

Testing...

@parasharrajat

Copy link
Copy Markdown
Member

@koko57 Can you please fix linting issues?

@koko57 koko57 requested a review from parasharrajat October 22, 2025 16:06
@koko57

koko57 commented Oct 22, 2025

Copy link
Copy Markdown
Contributor Author

@parasharrajat all checks passed

@parasharrajat

parasharrajat commented Oct 22, 2025

Copy link
Copy Markdown
Member

Screenshots

🔲 iOS / native

23.10.2025_02.01.48_REC.mp4
16.10.2025_20.32.59_REC.mp4

🔲 MacOS / Chrome

23.10.2025_01.38.43_REC.mp4
23.10.2025_01.40.07_REC.mp4
23.10.2025_01.45.46_REC.mp4
16.10.2025_19.05.30_REC.mp4

🔲 Android / Chrome

16.10.2025_20.41.23_REC.mp4
16.10.2025_20.43.15_REC.mp4

🔲 Android / native

16.10.2025_19.07.23_REC.mp4

@parasharrajat

parasharrajat commented Oct 22, 2025

Copy link
Copy Markdown
Member

BUG: Category page shows infinite loader when user has only once invited workspace.

Steps:

  1. INVITE A USER TO a worksapce.
  2. Login with that user.
  3. Track an expense.
  4. Click category.

you can try these steps after removing cache as well.

23.10.2025_01.41.50_REC.1.mp4

error from backend on GetPolicyCategories api.

image

@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 tests pass on all platforms & I tested again on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • 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.js 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.
  • 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.

🎀 👀 🎀 C+ reviewed

@melvin-bot melvin-bot Bot requested a review from MarioExpensify October 22, 2025 20:38
@parasharrajat

Copy link
Copy Markdown
Member

This bug #73101 (comment) will be solved in #72822 as it is backend issue.

@cristipaval cristipaval merged commit 9ccd25a into Expensify:main Oct 22, 2025
26 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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.37-1 🚀

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

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.2.37-8 🚀

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

@ShridharGoel

Copy link
Copy Markdown
Contributor

Coming from #84238, adding !isSelfDM check to the customUnitOutOfPolicy condition seems to have caused that issue. Analysis here.

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