Skip to content

Create report from reported expense#71808

Merged
cristipaval merged 25 commits intoExpensify:mainfrom
callstack-internal:feat/71776-create-report-from-reported-expense
Oct 8, 2025
Merged

Create report from reported expense#71808
cristipaval merged 25 commits intoExpensify:mainfrom
callstack-internal:feat/71776-create-report-from-reported-expense

Conversation

@koko57
Copy link
Copy Markdown
Contributor

@koko57 koko57 commented Oct 3, 2025

Explanation of Change

Fixed Issues

$ #71776
PROPOSAL:

Tests

Prerequisites: Have a user with 3 workspaces: A, B C. A is the default workspace

Default Workspace

  1. Have an open report with at least one expense in the workspace C or create one
  2. Go to this expense
  3. Click Report field
  4. Verify that you see the Create Report option.
  5. Verify that the Create Report has secondary text - the default workspace name (A)
  6. Click on it.
  7. Verify that the expense is moved to a newly created report in the active workspace A

Several workspaces, no default workspace

  1. Have another expense in the same open report from workspace C or create a new one
  2. Delete the active workspace A
  3. Go to workspace C expense
  4. Click on the Report field
  5. Verify that you see Create Report button with no secondary text
  6. Click Create Report
  7. Verify that you're redirected to the workspace selector
  8. Pick the workspace B
  9. Verify that the expense is moved to a newly created report in the workspace B

Only one workspace, not a default one

  1. Have another expense in the same open report from workspace C
  2. Delete the workspace B
  3. Go to the expense you have in the workspace C
  4. Click Report field
  5. Verify that you see the Create Report option.
  6. Verify that the Create Report has secondary text - the workspace name (C)
  7. Click on it.
  8. Verify that the expense is moved to a newly created report in the workspace C
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

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
    • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2025-10-03.at.12.12.18.mp4
Screen.Recording.2025-10-03.at.12.11.41.mp4
Screen.Recording.2025-10-03.at.12.08.01.mp4
MacOS: Desktop

@koko57 koko57 force-pushed the feat/71776-create-report-from-reported-expense branch from 3250006 to 6f5af51 Compare October 3, 2025 10:13
@koko57 koko57 marked this pull request as ready for review October 6, 2025 07:58
@koko57 koko57 requested a review from a team as a code owner October 6, 2025 07:58
@melvin-bot melvin-bot bot requested review from parasharrajat and removed request for a team October 6, 2025 07:58
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Oct 6, 2025

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

@parasharrajat
Copy link
Copy Markdown
Member

@koko57 Please merge main.

@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 6, 2025

@parasharrajat I merged main

const reportNextStep = allReportNextSteps?.[`${ONYXKEYS.COLLECTION.NEXT_STEP}${optimisticReportID}`];
changeTransactionsReport(
selectedTransactionsKeys,
selectedTransactionsKeys.length ? selectedTransactionsKeys : selectedTransactionIDs,
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.

what are we doing here?

Copy link
Copy Markdown
Contributor Author

@koko57 koko57 Oct 6, 2025

Choose a reason for hiding this comment

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

we either use the keys or IDs. We either save the whole selectedTransactions objects or IDs only in the search context

@parasharrajat
Copy link
Copy Markdown
Member

parasharrajat commented Oct 6, 2025

@koko57 Where will we handle this bug #71778 (comment)? I am asking because you mentioned the second PR. Let's keep track of it too.

@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 6, 2025

@koko57 Where will we handle this bug #71778 (comment)? I am asking because you mentioned the second PR. Let's keep track of it too.

@parasharrajat it still doesn't work?

@parasharrajat
Copy link
Copy Markdown
Member

yes, it does not work.


const createReportOption = useMemo(() => {
if (!createReport || isUnreported === false) {
if (!createReport || isUnreported) {
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.

Suggested change
if (!createReport || isUnreported) {
if (!createReport || !isUnreported) {

Shouldn't this be like that?

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.

we're hoding it for now for unreported

@parasharrajat

This comment was marked as outdated.

@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 6, 2025

@parasharrajat the unreported expenses are handled in a separate PR - the one I mentioned on Slack

@parasharrajat
Copy link
Copy Markdown
Member

BUG: After create report and going back, I can still see ther report page.

06.10.2025_18.19.09_REC.mp4

@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 6, 2025

BUG: After create report and going back, I can still see ther report page.

06.10.2025_18.19.09_REC.mp4

what is expected? or you mean that the RHP shouldn't be there?

@parasharrajat
Copy link
Copy Markdown
Member

BUG: After create report and going back, I can still see ther report page.

06.10.2025_18.19.09_REC.mp4

what is expected? or you mean that the RHP shouldn't be there?

yes. RHP should not be shown. It should be the reports page, I think.But let's confirm on slack group.

@parasharrajat
Copy link
Copy Markdown
Member

BUG: After create report , user is taken to search view.

Steps:

  1. Open a expense report from lhn.
  2. edit report field.
  3. Click Create Report.

Expected: user should remain in LHN/report view.

@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 6, 2025

BUG: After create report , user is taken to search view.

Steps:

  1. Open a expense report from lhn.
  2. edit report field.
  3. Click Create Report.

Expected: user should remain in LHN/report view.

after creating the report, right? the workspace selector is not shown?

@parasharrajat
Copy link
Copy Markdown
Member

In both above mentioned cases @koko57

@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 8, 2025

@parasharrajat should be fixed now

@koko57 koko57 requested a review from parasharrajat October 8, 2025 07:39
@parasharrajat
Copy link
Copy Markdown
Member

Checking...

@parasharrajat
Copy link
Copy Markdown
Member

@koko57 Found one issue with move expenses.

  1. Create a report with one expense.
  2. Go to reports.
  3. Select that expense.
  4. No move expenses button is not shown.

Expected: Move expenses button should be shown for expense which are Only expense in the expense report.

@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 8, 2025

@parasharrajat can you repro this on staging? If not I don't think it's in the scope of this PR. As we discussed earlier, it happens sometimes - I haven't changed anything in the logic for showing the Move Expense button

@parasharrajat
Copy link
Copy Markdown
Member

OK, sure. I can reproduce this on staging.

@parasharrajat
Copy link
Copy Markdown
Member

Bug: After login in, create report does not take you workspace selection if user has multiple workspaces instead create report on a workspace.

const userPolicies = Object.values(allPolicies ?? {}).filter(
(policy) =>
checkForPendingDelete(login, policy) &&
(isUserPolicyAdmin(policy, login) || isPolicyUser(policy, login)) &&
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.

This is not correct. User can have more roles. what if check for any role

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.

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.

what other roles to check? We're not including the auditor role

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
Copy link
Copy Markdown
Member

parasharrajat commented Oct 8, 2025

Screenshots

🔲 iOS / native

08.10.2025_15.24.57_REC.mp4

🔲 iOS / Safari

08.10.2025_15.45.17_REC.mp4

🔲 MacOS / Desktop

08.10.2025_15.58.57_REC.mp4

🔲 MacOS / Chrome

08.10.2025_14.35.27_REC.mp4

🔲 Android / Chrome

08.10.2025_17.39.35_REC.mp4

🔲 Android / native

Copy link
Copy Markdown
Member

@parasharrajat parasharrajat left a comment

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 cristipaval October 8, 2025 12:19
@parasharrajat
Copy link
Copy Markdown
Member

Appreciate the patience here @koko57. It has been a long review.

@koko57 koko57 requested a review from parasharrajat October 8, 2025 12:34
@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 8, 2025

@parasharrajat the auditor role added

}

function isPolicyMemberByRole(login: string, policy: OnyxEntry<Policy>) {
return isPolicyAdmin(policy, login) || isPolicyUser(policy, login) || getPolicyRole(policy, login) === CONST.POLICY.ROLE.AUDITOR;
Copy link
Copy Markdown
Member

@parasharrajat parasharrajat Oct 8, 2025

Choose a reason for hiding this comment

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

We already have isPolicyAuditor in PolicyUtils

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.

We should also update isPolicyAuditor method to use getPolicyRole as is using similiar logic inside.

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 yeaah, but it uses employees list 😅 so another one I cannot use. I don't want to change the util either, because getPolicyRole returns policy?.role when it exists and I guess this util is used to check other members for being auditor

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.

Here is reads policy first

(policy?.role ?? (currentUserLogin && policy?.employeeList?.[currentUserLogin]?.role)) === CONST.POLICY.ROLE.AUDITOR;

but it is fine.

@koko57
Copy link
Copy Markdown
Contributor Author

koko57 commented Oct 8, 2025

Appreciate the patience here @koko57. It has been a long review.

Likewise! Thank you for your patience and a ton of work!

@cristipaval cristipaval merged commit d5fabcc into Expensify:main Oct 8, 2025
27 checks passed
@OSBotify
Copy link
Copy Markdown
Contributor

OSBotify commented Oct 8, 2025

✋ 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

OSBotify commented Oct 8, 2025

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.2.28-0 🚀

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

@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/lakchote in version: 9.2.28-5 🚀

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

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.

4 participants