fix: share with my accountant from the header by nabi-ebrahimi · Pull Request #67020 · Expensify/App

nabi-ebrahimi · 2025-07-24T03:04:09Z

Explanation of Change

Fixed Issues

$ #63117
PROPOSAL: #63117 (comment)

Follow up #65998

Tests

Log in to an account that has self-DM
Create an expense in the self-DM
Click on just just-created expense
Click on the more button -> view details
Click on "Share it with my accountant."
Select a user > choose a workspace
Reload the page
The background page is still a self-DM page.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.1404-05-08.at.12.05.13.PM.mov

Android: mWeb Chrome

Screen.Recording.1404-05-07.at.9.01.38.PM.mov

iOS: Native

Screen.Recording.1404-05-08.at.12.08.12.PM.mov

iOS: mWeb Safari

Screen.Recording.1404-05-07.at.9.12.29.PM.mov

MacOS: Chrome / Safari

Screen.Recording.1404-05-07.at.8.58.05.PM.mov

MacOS: Desktop

Screen.Recording.1404-05-07.at.9.18.47.PM.mov

melvin-bot · 2025-07-24T03:04:14Z

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

nabi-ebrahimi · 2025-07-24T03:07:10Z

Screen.Recording.1404-05-02.at.7.33.32.AM.mp4

hoangzinh · 2025-07-24T09:03:43Z

@nabi-ebrahimi thank you for quickly making a PR. Can you explain bug and your solution to fix the bug?

nabi-ebrahimi · 2025-07-24T11:15:28Z

@nabi-ebrahimi thank you for quickly making a PR. Can you explain bug and your solution to fix the bug?

@hoangzinh We missed adding the backTo param when opening the RHP for these two places, so when the user selects the workspace and refreshes the page, the background page changes to the workspace page.

I added the active route as backTo when opening the details page to make sure the background page does not change to the workspace page after refresh.

hoangzinh · 2025-07-25T09:03:27Z


    const goToDetailsPage = useCallback(() => {
-        navigateToDetailsPage(report, Navigation.getReportRHPActiveRoute());
+        navigateToDetailsPage(report, Navigation.getActiveRoute());


I have a concern about whether it will cause any regression.

We missed adding the backTo param when opening the RHP for these two places

Your RCA is not really correct, we already have backTo param with Navigation.getReportRHPActiveRoute currently

@hoangzinh Thanks for the review.

The getReportRHPActiveRoute function currently passes backTo only for the SearchReport screen. However, since we open the RHP from multiple places within the Report screen, we would need to pass backTo from there as well. That said, we don’t require backTo for those cases. Therefore, I decided not to check for Report as well in the following function. We only need to handle backTo for those two specific cases.

App/src/libs/Navigation/helpers/isReportOpenInRHP.ts

Lines 5 to 15 in fe85b37

const isReportOpenInRHP = (state: NavigationState | undefined): boolean => {

const lastRoute = state?.routes?.at(-1);

if (!lastRoute) {

return false;

}

const params = lastRoute.params;

if (params && 'screen' in params && typeof params.screen === 'string' && params.screen === SCREENS.RIGHT_MODAL.SEARCH_REPORT) {

return true;

}

return !!(lastRoute.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute.state?.routes?.some((route) => route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT));

};

The getReportRHPActiveRoute function is used in multiple places, so any changes to it may introduce regressions.

App/src/libs/Navigation/Navigation.ts

Lines 135 to 143 in fe85b37

/**

* Returns the route of a report opened in RHP.

*/

function getReportRHPActiveRoute(): string {

if (isReportOpenInRHP(navigationRef.getRootState())) {

return getActiveRoute();

}

return '';

}

So I simply replaced it with getActiveRoute in the two places where it's needed.

hoangzinh · 2025-07-27T03:42:09Z

@nabi-ebrahimi Thanks for explanation. Can you:

Put them in the PR description "Explanation of Change" please
Also update test steps following steps here fix: reset background to workspace on page reload in Track Expense #65998 (comment)

hoangzinh · 2025-07-27T03:42:21Z

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-07-27.at.12.53.55.android.mov

Android: mWeb Chrome

Screen.Recording.2025-07-27.at.10.53.29.android.chrome.mov

iOS: HybridApp

Screen.Recording.2025-07-27.at.13.01.02.mov

iOS: mWeb Safari

Screen.Recording.2025-07-27.at.12.58.16.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2025-07-27.at.10.44.14.web.mov

MacOS: Desktop

Screen.Recording.2025-07-27.at.10.46.22.desktop.mov

hoangzinh · 2025-07-27T06:05:48Z

Please also upload new recordings with new changes in this PR, instead of the previous PR, against the new test steps.

nabi-ebrahimi · 2025-07-30T07:43:39Z

@hoangzinh Thanks, I updated the test steps and records.

hoangzinh

LGTM. Thanks @nabi-ebrahimi

Beamanator

Thanks, and thanks @hoangzinh for the great review!

github-actions · 2025-07-31T12:17:44Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 9.1.88-0 🚀

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

github-actions · 2025-08-04T19:24:38Z

🚀 Deployed to production by https://github.com/grgia in version: 9.1.88-3 🚀

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

fix: share with my accountant from the header

27ccb54

nabi-ebrahimi requested a review from a team as a code owner July 24, 2025 03:04

melvin-bot Bot requested review from hoangzinh and removed request for a team July 24, 2025 03:04

hoangzinh reviewed Jul 25, 2025

View reviewed changes

nabi-ebrahimi requested a review from hoangzinh July 30, 2025 07:42

hoangzinh approved these changes Jul 30, 2025

View reviewed changes

melvin-bot Bot requested a review from Beamanator July 30, 2025 09:57

Beamanator approved these changes Jul 30, 2025

View reviewed changes

Beamanator merged commit 344a393 into Expensify:main Jul 30, 2025

github-actions Bot mentioned this pull request Jul 30, 2025

Investigate workflow job failing on main: test / test (job 3) #67396

Closed

hoangzinh mentioned this pull request Jul 30, 2025

[Due for payment 2025-08-11] [Hold for deploy to prod] [Due for payment 2025-07-30] [$250] Track Expense - Reloading page changes the background to the workspace selected #63117

Closed

8 tasks

github-actions Bot mentioned this pull request Jul 31, 2025

Deploy Checklist: New Expensify 2025-07-31 #67499

Closed

90 tasks

	const isReportOpenInRHP = (state: NavigationState \| undefined): boolean => {
	const lastRoute = state?.routes?.at(-1);
	if (!lastRoute) {
	return false;
	}
	const params = lastRoute.params;
	if (params && 'screen' in params && typeof params.screen === 'string' && params.screen === SCREENS.RIGHT_MODAL.SEARCH_REPORT) {
	return true;
	}
	return !!(lastRoute.name === NAVIGATORS.RIGHT_MODAL_NAVIGATOR && lastRoute.state?.routes?.some((route) => route?.name === SCREENS.RIGHT_MODAL.SEARCH_REPORT));
	};

	/**
	* Returns the route of a report opened in RHP.
	*/
	function getReportRHPActiveRoute(): string {
	if (isReportOpenInRHP(navigationRef.getRootState())) {
	return getActiveRoute();
	}
	return '';
	}

Uh oh!

Conversation

nabi-ebrahimi commented Jul 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Jul 24, 2025

Uh oh!

nabi-ebrahimi commented Jul 24, 2025

Uh oh!

hoangzinh commented Jul 24, 2025

Uh oh!

nabi-ebrahimi commented Jul 24, 2025

Uh oh!

hoangzinh Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

nabi-ebrahimi Jul 25, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Jul 27, 2025

Uh oh!

hoangzinh commented Jul 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hoangzinh commented Jul 27, 2025

Uh oh!

nabi-ebrahimi commented Jul 30, 2025

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

Beamanator left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Jul 31, 2025

Uh oh!

github-actions Bot commented Aug 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

nabi-ebrahimi commented Jul 24, 2025 •

edited

Loading

hoangzinh commented Jul 27, 2025 •

edited

Loading