Skip to content

Make SearchMoneyRequestReportPage show single transaction view correctly #59735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Conversation

SzymczakJ
Copy link
Contributor

@SzymczakJ SzymczakJ commented Apr 7, 2025

Explanation of Change

This PR changes the way we show single expense reports on SearchMoneyRequestReportPage. When report has only one expense on it we show it like we did on chat page, instead of showing transaction list with only one item.

To accomplish that we use the ReportActionsView component which originally lives as a part of ReportScreen and we render it conditionally in case when there's only one IOU type reportAction in the report.

Fixed Issues

$ #59459 (One-expense report view)
$ #59295 (No option to add expense if report is created offline)
PROPOSAL:

Tests

Note: to test all of these fixes you have to have tableReportView permission

  1. Create new report with "Create report" FAB button.
  2. Add the expense to report by using "Add expense" button in the composer.
  3. Make sure that page looks like single transaction view from inbox
Screenshot 2025-04-08 at 10 24 54 4. Check, if this page has all functionalities of single transaction view from inbox. 5. Add another expense by using "Add expense" button. 6. Make sure that the view changed to list view with two expenses.

Additionally test if "No option to add expense if report is created offline" is not longer reproducible.

Offline tests

QA Steps

Same as tests.

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 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 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 https://github.com/user-attachments/assets/7ea6e8f5-2e29-448e-bdce-7d3d4d6f4fe3
Android: mWeb Chrome
androidWeb.mov
iOS: Native
ios.mov
iOS: mWeb Safari
iosweb.mov
MacOS: Chrome / Safari
web.mov
MacOS: Desktop
desktop.mov

@SzymczakJ
Copy link
Contributor Author

SzymczakJ commented Apr 8, 2025

The change to show single transaction view instead of a list with one expense is pretty smooth, but we got one problem left:

Recently we made some changes on BE, so that when we use openReport on SearchMoneyRequestReportPage it returns a paginated list of reportActions starting from the oldest action.
This becomes a problem, when we want to have the old way to show reports with single expense.
Screenshot 2025-04-08 at 09 54 10

This view is implemented with the assumption that openReport returns a paginated list of reportActions starting from the newest action which creates a conflict with a new way openReport works.

To solve this problem, we need BE to:

  • return paginated list of reportActions starting from the newestAction, when report has only one transaction,
  • return paginated list of reportActions starting from the newestAction, in all other cases
    Unfortunately, we cannot solve this just by passing a prop to openReport API call, because when we enter a report we don't know, if that report has only one transaction or more, or is a empty report.
    cc @mountiny @luacmartins

@mountiny
Copy link
Contributor

mountiny commented Apr 8, 2025

Yeah that makes sense, will look into updating the BE but i dont think e have to hold as its super rare for the report to have more than 50 report actions if there is a single expense on it.

It works fine in your testing right?

@SzymczakJ
Copy link
Contributor Author

its super rare for the report to have more than 50 report actions

Yeah I was about to say it doesn't need any hold, because of that. It tests well on my side.

}
return acc;
}, 0) === 1,
[reportActions],
Copy link
Contributor

Choose a reason for hiding this comment

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

const shouldUseSingleTransactionView = useMemo(() => { const iouActionsCount = reportActions.filter( action => action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU ).length; return iouActionsCount === 1; }, [reportActions]);

Don’t you think that filter would work the same way and be easier to understand? I generally like reduce, but I feel like it might be harder for some people to read.

@@ -118,6 +132,26 @@ function MoneyRequestReportView({report, policy, reportMetadata, shouldDisplayRe
return;
}

if (isLoadingApp) {
Copy link
Contributor

Choose a reason for hiding this comment

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

I think it's great that you used an early return here instead of a ternary — it really improves readability.

@luacmartins
Copy link
Contributor

Yeah that makes sense, will look into updating the BE but i dont think e have to hold as its super rare for the report to have more than 50 report actions if there is a single expense on it.

I agree. @mountiny are you taking this one?

@SzymczakJ SzymczakJ marked this pull request as ready for review April 9, 2025 07:39
@SzymczakJ SzymczakJ requested a review from a team as a code owner April 9, 2025 07:39
@melvin-bot melvin-bot bot requested review from DylanDylann and removed request for a team April 9, 2025 07:39
Copy link

melvin-bot bot commented Apr 9, 2025

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

Copy link
Contributor

github-actions bot commented Apr 9, 2025

🚧 @mountiny has triggered a test app build. You can view the workflow run here.

Copy link
Contributor

github-actions bot commented Apr 9, 2025

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖 iOS 🍎
Android 🤖🔄 iOS 🍎🔄
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/59735-hybrid/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/59735-hybrid/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/59735/NewExpensify.dmg https://59735.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@allgandalf
Copy link
Contributor

allgandalf commented Apr 9, 2025

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: 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 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 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 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.ts 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 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.
  • 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/Videos

Android: Native
Screen.Recording.2025-04-09.at.10.30.38.PM.mov
Android: mWeb Chrome
Screen.Recording.2025-04-09.at.10.26.39.PM.mov
iOS: Native
ScreenRecording_04-09-2025.22-35-39_1.MP4
iOS: mWeb Safari
Screen.Recording.2025-04-09.at.10.34.12.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2025-04-09.at.10.22.53.PM.mov
MacOS: Desktop
Screen.Recording.2025-04-09.at.10.34.45.PM.mov

Copy link
Contributor

@allgandalf allgandalf left a comment

Choose a reason for hiding this comment

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

works in offline mode as well

@melvin-bot melvin-bot bot requested a review from mountiny April 9, 2025 17:07
Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

Thank you, changes look good to me

@mountiny
Copy link
Contributor

I agree. @mountiny are you taking this one?

Yes

@mountiny
Copy link
Contributor

@martasudol is going to review this one too just a sec

@martasudol
Copy link
Contributor

Looks good to me also 🚀

@SzymczakJ
Copy link
Contributor Author

Let's get this merged then! It's blocking some of our other work.

@mountiny mountiny merged commit 9629c30 into Expensify:main Apr 10, 2025
18 of 19 checks passed
@OSBotify
Copy link
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.

Copy link
Contributor

🚀 Deployed to staging by https://github.com/mountiny in version: 9.1.27-0 🚀

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

report={report}
policy={policy}
reportActions={reportActions}
transactionThreadReportID={undefined}
Copy link
Contributor

Choose a reason for hiding this comment

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

@SzymczakJ @allgandalf Is there any reason why we pass undefined here? Or this is a mistake

Coming from: #60079

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it is a mistake. In fact, this is probably something that we forgot to add, because this transactionThreadReportID has been undefined, since the creation of this file.
Adding transactionThreadReportID might solve the issue.

Copy link
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.1.28-15 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 web 🕸 success ✅
🤖 android 🤖 failure ❌
🍎 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.

8 participants