Skip to content

[Better Expense Report View] Update the go to parent logic in Reports tab #61774

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

WojtekBoman
Copy link
Contributor

@WojtekBoman WojtekBoman commented May 9, 2025

Explanation of Change

This PR adds support for navigating to the parent report in the Reports tab. With this change, when clicking a link in the report header, users are redirected to the screen displayed in the current tab.

Note: This change only applies to expense reports.

Fixed Issues

$ #60441
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console
  1. Go to the Reports tab.
  2. Open the expense report.
  3. Click the parent report link.
  4. Verify that the displayed report page is opened in the Reports tab.

Offline tests

QA Steps

  • Verify that no errors appear in the JS console
  1. Go to the Reports tab.
  2. Open the expense report.
  3. Click the parent report link.
  4. Verify that you are redirected to the report page in the current tab.

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 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-05-13.at.16.22.18.mov
Android: mWeb Chrome
Screen.Recording.2025-05-13.at.16.24.44.mov
iOS: Native
Screen.Recording.2025-05-13.at.15.46.46.mov
iOS: mWeb Safari
Screen.Recording.2025-05-13.at.15.47.22.mov
MacOS: Chrome / Safari
Screen.Recording.2025-05-13.at.16.31.06.mov
MacOS: Desktop
Screen.Recording.2025-05-13.at.16.27.50.mov

Copy link
Member

@Kicu Kicu left a comment

Choose a reason for hiding this comment

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

hey left some comments 👍

@@ -352,6 +352,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
policy={policy}
parentReportAction={parentReportAction}
onBackButtonPress={onBackButtonPress}
openParentReportInCurrentTab
Copy link
Member

Choose a reason for hiding this comment

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

I'm kinda confused.

<MoneyRequestHeader> is used only 2 times in the app:

  • in ReportScreen
  • in MoneyRequestReportView - which is the child of SearchMoneyRequestReportPage

and this component is basically only ever used for the report that is actually the transaction thread view. So don't we always want to have this flag set to true?

@WojtekBoman
Copy link
Contributor Author

@Expensify/design @trjExpensify @mountiny

Feel free to run new builds and test if it works fine :)

Here's a video showing how it works now:

Screen.Recording.2025-05-09.at.15.53.49.mov

Copy link
Contributor

github-actions bot commented May 9, 2025

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

Copy link
Contributor

github-actions bot commented May 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/61774-hybrid/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/61774-hybrid/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/61774/NewExpensify.dmg https://61774.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@shawnborton
Copy link
Contributor

Okay, seems to work when you navigate from Expense to Expense Report.

However, many times the RHP is actually showing a report... like this case for instance, where we have a one-expense-report:
CleanShot 2025-05-09 at 11 04 50@2x

And at which point, clicking on the small blue text opens up the Inbox.

This is maybe a separate consideration for @Expensify/design (cc Tom & Jason) - maybe we should make it so that if you are actually opening a full report from Reports > Expenses, it should show in the main pane and not the RHP?

@dannymcclain
Copy link
Contributor

Yeah I think that makes sense to me. (And as a side note, I cannot wait for all reports to get the updated header treatment!)

@trjExpensify
Copy link
Contributor

maybe we should make it so that if you are actually opening a full report from Reports > Expenses, it should show in the main pane and not the RHP?

Mhm.. I'm in two minds about it, because I think it makes it a bit unpredictable. That list of expenses is a mixture of expenses on multi-expense reports, and one expense reports. So if some open main pane, others open in the RHP, but they look identical.. that's pretty confusing.

So I think I lean towards all rows in Expenses open in the RHP.

@shawnborton
Copy link
Contributor

Ok that's fair. What are your thoughts about opening up Expense/workspace chats right from Reports though? Basically this way we can try to keep most of the small blue links' navigation right within the Reports page.

@trjExpensify
Copy link
Contributor

For now, I'd go with:

  • If it's an expense report URL in the header, open it in the new main pane report view when clicked now.
  • If it's a chat report, still open it in Inbox for now.

I'm open to changing that latter to open the parent chat report in the main pane, but I think it probably needs more discussion... like maybe some consideration for having chat results in the Chat search follow suit to align. It might also have overlap with this whole resurgence of the the "3Panez" thing too.

@WojtekBoman WojtekBoman force-pushed the better-expense-report-view/go-to-parent branch from 84a6228 to f60de22 Compare May 12, 2025 07:56
@WojtekBoman
Copy link
Contributor Author

For now, I'd go with:

  • If it's an expense report URL in the header, open it in the new main pane report view when clicked now.
  • If it's a chat report, still open it in Inbox for now.

I'm open to changing that latter to open the parent chat report in the main pane, but I think it probably needs more discussion... like maybe some consideration for having chat results in the Chat search follow suit to align. It might also have overlap with this whole resurgence of the the "3Panez" thing too.

So I want to make sure, does the current version work fine?

@shawnborton
Copy link
Contributor

I believe this means the current version works fine, yes. Let's move this into final review then, thanks!

@WojtekBoman WojtekBoman marked this pull request as ready for review May 13, 2025 15:32
@WojtekBoman WojtekBoman requested a review from a team as a code owner May 13, 2025 15:32
@melvin-bot melvin-bot bot requested review from DylanDylann and removed request for a team May 13, 2025 15:32
Copy link

melvin-bot bot commented May 13, 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]

@WojtekBoman WojtekBoman force-pushed the better-expense-report-view/go-to-parent branch from f60de22 to 42fef5f Compare May 13, 2025 17:08
@WojtekBoman WojtekBoman force-pushed the better-expense-report-view/go-to-parent branch from 9ab79c7 to 485074d Compare May 14, 2025 07:36
@DylanDylann
Copy link
Contributor

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: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • 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 there are no new alerts related to the canBeMissing param for useOnyx
  • 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: HybridApp
Screen.Recording.2025-05-15.at.17.12.24.mov
Android: mWeb Chrome
Screen.Recording.2025-05-15.at.17.08.27.mov
iOS: HybridApp
Screen.Recording.2025-05-15.at.17.09.50.mov
iOS: mWeb Safari
Screen.Recording.2025-05-15.at.17.04.20.mov
MacOS: Chrome / Safari
Screen.Recording.2025-05-15.at.17.01.16.mov
MacOS: Desktop
Screen.Recording.2025-05-15.at.17.05.07.mov

Copy link
Contributor

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

Thanks, looking good

@@ -43,6 +61,31 @@ function ParentNavigationSubtitle({parentNavigationSubtitleData, parentReportAct
onPress={() => {
const parentAction = getReportAction(parentReportID, parentReportActionID);
const isVisibleAction = shouldReportActionBeVisible(parentAction, parentAction?.reportActionID ?? CONST.DEFAULT_NUMBER_ID, canUserPerformWriteAction);

if (openParentReportInCurrentTab && isReportInRHP) {
// If the report is displayed in RHP in Reports tab, we want to stay in the current tab after opening the parent report
Copy link
Contributor

Choose a reason for hiding this comment

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

Thank you for adding these comments, always better to add more with this logic

@mountiny mountiny merged commit d4347a6 into Expensify:main May 15, 2025
18 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.

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.

9 participants