Add active-workspace-specific fields to Unreported Expenses - #71319
cristipaval merged 20 commits into
Conversation
|
@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] |
| // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing | ||
| const shouldShowCategory = (isPolicyExpenseChat && (categoryForDisplay || hasEnabledOptions(policyCategories ?? {}))) || isExpenseUnreported; | ||
| const areCategoriesEnabledAndHasCategory = categoryForDisplay || hasEnabledOptions(policyCategories ?? {}); | ||
| const shouldShowCategory = (isPolicyExpenseChat && areCategoriesEnabledAndHasCategory) || (isExpenseUnreported && (!activePolicy || areCategoriesEnabledAndHasCategory)); |
There was a problem hiding this comment.
Can we please simplify this condition?
There was a problem hiding this comment.
what do you propose, I think I simplified a bit?
|
Started... |
Codecov Report❌ Patch coverage is 📢 Thoughts on this report? Let us know! |
|
@parasharrajat I've added the test steps for the whole feature to the Test Steps section, the regressions are all in the QA Steps |
|
@parasharrajat added this one to the fix: #71274 |
|
@parasharrajat Ill be available for around two more hours, ping me if you find anything |
|
BUG: Create report option is missing from Move expenses on the search expense tab. 26.09.2025_17.38.26_REC.mp4 |
|
No blocker: For , I see that it shows 5% shortly instead of correct name and amount also reset to 0 before switching to actual value. I think it is out of scope of this project. We can work on it in follow-up. |
are you sure? It should be fixed - the only problem is that you first see the optimistic update (default tax rate)and then it goes back to the old value. The BE fix is on the way to the prod |
Ok, great. Thanks. I mean to say that we don't have to block this PR on this bug. |
|
BUG: On deleting the selected category, error is not show that category is not valid on on the tracked expense. |
@parasharrajat but do you see the whole name or just number%? |
|
@parasharrajat if it happens offline - imho not a blocker 😃 and if it also happens offline for the wrokspace expense - not even my fault xD |
|
OK, so I noticed that for some transactions we need to first open them to load. same for reports. Then it works. |
|
@parasharrajat ok, thanks for confirmation! I guess if we want to change it it must be first discussed and done in a separate PR |
|
Sure, I am fine with it. Let's keep this in mind for follow-up. Thanks. |
Screenshots🔲 iOS / native29.09.2025_23.07.43_REC.mp4🔲 iOS / Safari29.09.2025_23.29.04_REC.mp4🔲 MacOS / Desktop🔲 MacOS / Chrome29.09.2025_22.23.55_REC.mp4🔲 Android / Chrome🔲 Android / native29.09.2025_23.55.13_REC.mp4 |
parasharrajat
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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.
toggleReportand notonIconClick). - 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 Copylabel 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
- 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.
- 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 usingAvatarhave 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
|
Let's tackle the rest of things in follow-up. |
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.20-0 🚀
|
|
🚀 Deployed to production by https://github.com/Julesssss in version: 9.2.20-4 🚀
|


Explanation of Change
This PR adds the fields specific to the active workspace to the unreported expenses from selfDM.
If the user has no active workspace, we show
ReportandCategoryfields by default and redirect the user to Upgrade when they try editing them.Fixed Issues
$ #70660
PROPOSAL: -
Tests
Same as QA Steps
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
#68988
#68993
#68994
#68989
#68995
PREREQUISITES: having an active workspace
#69986
NOTE: NO violations should be shown until the report is moved to the workspace
#69988
#69989
#71259
Prerequisites: User is invited to workspace, the invited workspace has disabled Categories, User does not have other workspace.
#71265
Prerequisites: selfDM, at least 1 workspace with no expenses, delayed submissions and approvals enabled.
#71261
Prerequisites: Account has self DM and a workspace. Delete all workspace categories.
#71252
Prerequisites: Account has self DM and a default workspace.
NOTE: NO violations should be shown until the report is moved to the workspace
#71254
Prerequisites: Account has self DM and a workspace, Taxes are enabled on the workspace.
🚨KNOWN BE ISSUE (fix soon on the prod):
After changing the currency, the tax rate is correctly changed in the optimistic update to the default tax value and the title is displayed correctly, but after the response from the backend it is changed to the old value.
#71255
Prerequisites: Account has self DM and a workspace, Taxes are enabled on the workspace.
#71256
Prerequisites: Account has self DM and a default workspace
#71109
#71274
KNOWN ISSUES - will be handled in a follow-up
the distance rate in the selfDM expense will be different than the one that will be displayed when opening the edit rate page from rate field - in the edit rate page we display available rates on the active workspace, in the transaction thread we have a default rate for selfDM track expense
billable and reimbursable values for selfDM expense will be false even if the workspace settings default to true
Verify that no errors appear in the JS console
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop