Moving Per Diem expense from self DM - #76159
Conversation
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.
|
|
@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] |
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(policy)), | ||
| [isEditable, parentReportAction, isChatReportArchived, outstandingReportsByPolicyID, isPerDiemRequest, policy], | ||
| (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(policy) || (isExpenseUnreported && !!perDiemOriginalPolicy)), | ||
| [isEditable, parentReportAction, isChatReportArchived, outstandingReportsByPolicyID, isPerDiemRequest, policy, isExpenseUnreported, perDiemOriginalPolicy], |
There was a problem hiding this comment.
❌ PERF-6 (docs)
The entire policy object is passed as a dependency to this useMemo, but only specific properties are used (policy?.isPolicyExpenseChatEnabled and policy?.customUnits via canSubmitPerDiemExpenseFromWorkspace). Passing entire objects causes the hook to re-execute whenever any property changes, even unrelated ones.
Suggested fix:
const canEditReport = useMemo(
() =>
isEditable &&
canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.REPORT, undefined, isChatReportArchived, outstandingReportsByPolicyID) &&
(!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(policy) || (isExpenseUnreported && !!perDiemOriginalPolicy)),
[isEditable, parentReportAction, isChatReportArchived, outstandingReportsByPolicyID, isPerDiemRequest, policy?.isPolicyExpenseChatEnabled, policy?.customUnits, isExpenseUnreported, perDiemOriginalPolicy],
);There was a problem hiding this comment.
haven't touched the policy object
|
test passes locally |
trjExpensify
left a comment
trjExpensify
left a comment
There was a problem hiding this comment.
PR is part of a whatsnext project, all good from product. 👍
|
@parasharrajat friendly bump (just making sure it's on your radar) |
|
Bump here @parasharrajat, what's your ETA on review? |
| mergeTransactionID?: string; | ||
| }; | ||
|
|
||
| const perDiemPoliciesSelector = (policies: OnyxCollection<OnyxTypes.Policy>) => Object.fromEntries(Object.entries(policies ?? {}).filter(([, policy]) => policy?.arePerDiemRatesEnabled)); |
There was a problem hiding this comment.
What if there are no per diems in the workspace, but the feature is enabled?
Should we allow moving and creating reports?
There was a problem hiding this comment.
no, we shouldn't, thanks for pointing this out
| const {options} = useOptionsList(); | ||
| const [outstandingReportsByPolicyID] = useOnyx(ONYXKEYS.DERIVED.OUTSTANDING_REPORTS_BY_POLICY_ID, {canBeMissing: true}); | ||
| const [allPolicies] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {canBeMissing: true}); | ||
| const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionIDs?.at(0))}`, {canBeMissing: true}); |
There was a problem hiding this comment.
| const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionIDs?.at(0))}`, {canBeMissing: true}); | |
| const [firstTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionIDs?.at(0))}`, {canBeMissing: true}); |
|
BUG: The move expenses page does not show reports for self DM expenses on the reports page. Sorry, I just noticed that this happens when a per diem expense(whole workspace is deleted) is selected with normal expense. 11.12.2025_18.09.29_REC.mp4 |
|
So I think we should exclude the reports page for test steps as this PR is not making any changes for reports page and the feature is still buggy for moving the per dieam expenses on reports page. cc: @cristipaval |
parasharrajat
left a comment
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
| @@ -275,8 +313,8 @@ function MoneyRequestView({ | |||
| () => | |||
| isEditable && | |||
| canEditFieldOfMoneyRequest(parentReportAction, CONST.EDIT_REQUEST_FIELD.REPORT, undefined, isChatReportArchived, outstandingReportsByPolicyID) && | |||
| (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(policy)), | |||
| [isEditable, parentReportAction, isChatReportArchived, outstandingReportsByPolicyID, isPerDiemRequest, policy], | |||
| (!isPerDiemRequest || canSubmitPerDiemExpenseFromWorkspace(policy) || (isExpenseUnreported && !!perDiemOriginalPolicy)), | |||
| [isEditable, parentReportAction, isChatReportArchived, outstandingReportsByPolicyID, isPerDiemRequest, policy, isExpenseUnreported, perDiemOriginalPolicy], | |||
There was a problem hiding this comment.
Let's remove useMemo from here to fix the compiler warnings check. @koko57
|
@parasharrajat but I can't just block moving the expenses on the reports page. Moving expenses feature is already on main. The only thing I changed is handling Create Report option - it's now pointing to the workspace with per diem enabled, not the default workspace as it does on the main. So I haven't add anything extra just fixed a bit current behavior (which turns out insuficient as it doesn't cover the deleted workspace and 2 different per diems case) |
can you also check it on main? |
|
Yes, let's ignore that bug. It is related to the reports page we can check in the next PR. Also, I am not asking to make changes to the code but to the test steps. We should clearly exclude reports page from testing steps. Otherwise, QA will rapid fire us with bugs. |
|
@parasharrajat I removed the note about the reports page, the test cases don't have the report page mentioned. The second test case is moving from the expense report |
|
@parasharrajat are we ok to proceed? Or something is still to be fixed? |
|
@koko57 this is ready. I already approved |
|
✋ 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.78-0 🚀
|
|
@Pujan92 not sure but I'll check it. What is the expected result - you should be able to see all the reports (even the ones from other workspaces)? Is there a GH issue for that? |
No, I was only expecting all the outstanding reports of the same workspace.
No @koko57 , I was reviewing the proposals for #76205 and found this issue which I believe seems to be from this PR(on logging, I found perDiemOriginalPolicy is undefined). |
|
@Pujan92 but wait - this issue was created 3 weeks ago. Not sure what my change has to do with it? Does my change preventing some of the proposals to be applied? |
|
the PR was merged a few days ago. |
|
Sorry if I am not clear but the below issue is occurring after your PR. Don't we need to list down the available reports of the same workspace here? Prod Screen.Recording.2025-12-15.at.15.29.27.movMain Screen.Recording.2025-12-15.at.15.31.37.mov |
|
🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.78-8 🚀
|
| const createReport = () => { | ||
| if (!policyForMovingExpensesID && !shouldSelectPolicy) { | ||
| if (hasPerDiemTransactions) { | ||
| handleCreateReport(); |
There was a problem hiding this comment.
Coming from #86579, we need to check whether we should restrict the current user from billable actions
9 participants
Explanation of Change
Fixed Issues
$ #72239
PROPOSAL:
Tests
Prerequisites: a few workspaces, some with per diem enabled, selfDM
NOTE: [known issue] Category field (and other expense fields) show categories from default workspace in per diem tracked expense
Moving from the expense report
Deleted workspace
Offline tests
QA Steps
// TODO: These must be filled out, or the issue title must include "[No QA]."
Same as tests
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