fix: navigate to parent report on delete track expense #55015

daledah · 2025-01-09T16:05:08Z

Explanation of Change

Fixed Issues

$ #54058
PROPOSAL: #54058 (comment)

Tests

Create a track expense
Open the expense details
Click "Delete expense" and confirm
Verify that: The screen navigates back to self DM page
Verify that: The whisper message is not shown when the report is loading

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Create a track expense
Open the expense details
Click "Delete expense" and confirm
Verify that: The screen navigates back to self DM page
Verify that: The whisper message is not shown when the report is loading

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 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: Nativehttps://github.com/user-attachments/assets/2022e45e-a88a-4d94-b597-0e0f7a6c5561

mmary>

Android: mWeb Chrome

Screen.Recording.2025-01-09.at.17.24.54.mov

iOS: Native

Screen.Recording.2025-01-09.at.17.25.31.mov

iOS: mWeb Safari

Screen.Recording.2025-01-09.at.17.26.15.mov

MacOS: Chrome / Safari

Screen.Recording.2025-01-09.at.17.20.19.mov

MacOS: Desktop

Uploading Screen Recording 2025-01-09 at 17.27.08.mov…

melvin-bot · 2025-01-10T07:49:58Z

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

dukenv0307 · 2025-01-13T08:25:06Z

@daledah After deleting the track expense, the self-dm appears 2 times in the stack. I'm not sure why it happens for now. Can you pls check?

dukenv0307 · 2025-01-15T07:39:55Z

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 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.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 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.
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-01-15.at.12.17.11.mov

Android: mWeb Chrome

Screen.Recording.2025-01-15.at.11.54.59.mov

iOS: Native

Screen.Recording.2025-01-15.at.11.57.46.mov

iOS: mWeb Safari

Screen.Recording.2025-01-15.at.11.54.27.mov

MacOS: Chrome / Safari

Screen.Recording.2025-01-15.at.11.49.44.mov

MacOS: Desktop

Screen.Recording.2025-01-15.at.14.44.38.mov

dukenv0307

LGTM

dukenv0307 · 2025-01-21T09:23:04Z

@puneetlath can you please take a look at this issue? Thanks

puneetlath · 2025-01-23T17:36:09Z

src/libs/Navigation/Navigation.ts

@@ -428,6 +428,13 @@ function getTopMostCentralPaneRouteFromRootState() {
    return getTopmostCentralPaneRoute(navigationRef.getRootState() as State<RootStackParamList>);
 }

+function getPreviousTrackReport(reportID?: string) {


I find this function name/behavior confusing. What is a "previous track report"? Would you mind explaining that to me in plan english?

What do you think if we rename this function getReportRouteByID?

puneetlath · 2025-01-23T17:37:06Z

src/libs/Navigation/Navigation.ts

@@ -442,6 +449,19 @@ function removeScreenFromNavigationState(screen: Screen) {
    });
 }

+function removeScreenByKey(key: string) {


What are we removing it from? Is it from the navigation state? If so I would suggest:

Suggested change

function removeScreenByKey(key: string) {

function removeScreenFromNavigationStateByKey(key: string) {

puneetlath · 2025-01-23T17:38:14Z

src/libs/ReportUtils.ts

@@ -4437,7 +4437,7 @@ function goBackToDetailsPage(report: OnyxEntry<Report>, backTo?: string) {
    }
 }

-function navigateBackOnDeleteTransaction(backRoute: Route | undefined, isFromRHP?: boolean) {
+function navigateBackOnDeleteTransaction(backRoute: Route | undefined, isFromRHP?: boolean, reportID?: string) {


What reportID is being passed here? Is it the reportID that the transaction itself is on?

puneetlath · 2025-01-23T17:44:21Z

src/libs/ReportUtils.ts

@@ -4447,7 +4447,13 @@ function navigateBackOnDeleteTransaction(backRoute: Route | undefined, isFromRHP
        return;
    }
    if (isFromRHP) {
-        Navigation.dismissModal();
+        if (reportID) {


How do we know that just because a reportID is passed that this is a tracked expense?

puneetlath · 2025-01-23T17:46:09Z

Sorry for the delay here. I have a handful of questions.

daledah · 2025-01-31T04:27:42Z

@puneetlath I updated

puneetlath · 2025-01-31T18:31:53Z

src/libs/Navigation/Navigation.ts

@@ -428,6 +428,13 @@ function getTopMostCentralPaneRouteFromRootState() {
    return getTopmostCentralPaneRoute(navigationRef.getRootState() as State<RootStackParamList>);
 }

+function getReportRouteByID(reportID?: string) {


Ok sorry, one more dumb question. Why isn't the report route just /r/<reportID> ?

fix: navigate to parent report on delete track expense

4978349

daledah marked this pull request as ready for review January 10, 2025 07:49

daledah requested a review from a team as a code owner January 10, 2025 07:49

melvin-bot bot requested a review from dukenv0307 January 10, 2025 07:49

melvin-bot bot removed the request for review from a team January 10, 2025 07:49

fix: update removeScreenByKey

b32cbee

dukenv0307 approved these changes Jan 15, 2025

View reviewed changes

melvin-bot bot requested a review from puneetlath January 15, 2025 07:45

daledah added 3 commits January 15, 2025 15:00

Merge branch 'main' into fix/54058

aba3714

fix: lint

3db3c2c

Merge branch 'main' into fix/54058

8cd6db4

puneetlath reviewed Jan 23, 2025

View reviewed changes

daledah mentioned this pull request Jan 31, 2025

fix: back button returns to expense report after submitting track expense #53065

Open

49 tasks

daledah added 2 commits January 31, 2025 11:23

refactor: change functions names

a482d4e

Merge branch 'main' into fix/54058

9a2fdda

puneetlath reviewed Jan 31, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: navigate to parent report on delete track expense #55015

fix: navigate to parent report on delete track expense #55015

daledah commented Jan 9, 2025

melvin-bot bot commented Jan 10, 2025

dukenv0307 commented Jan 13, 2025

dukenv0307 commented Jan 15, 2025 •

edited

Loading

dukenv0307 left a comment

dukenv0307 commented Jan 21, 2025

puneetlath Jan 23, 2025

daledah Jan 31, 2025

puneetlath Jan 23, 2025

puneetlath Jan 23, 2025

puneetlath Jan 23, 2025

puneetlath commented Jan 23, 2025

daledah commented Jan 31, 2025

puneetlath Jan 31, 2025

	function removeScreenByKey(key: string) {
	function removeScreenFromNavigationStateByKey(key: string) {

fix: navigate to parent report on delete track expense #55015

Are you sure you want to change the base?

fix: navigate to parent report on delete track expense #55015

Conversation

daledah commented Jan 9, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 10, 2025

dukenv0307 commented Jan 13, 2025

dukenv0307 commented Jan 15, 2025 • edited Loading

Reviewer Checklist

Screenshots/Videos

dukenv0307 left a comment

Choose a reason for hiding this comment

dukenv0307 commented Jan 21, 2025

puneetlath Jan 23, 2025

Choose a reason for hiding this comment

daledah Jan 31, 2025

Choose a reason for hiding this comment

puneetlath Jan 23, 2025

Choose a reason for hiding this comment

puneetlath Jan 23, 2025

Choose a reason for hiding this comment

puneetlath Jan 23, 2025

Choose a reason for hiding this comment

puneetlath commented Jan 23, 2025

daledah commented Jan 31, 2025

puneetlath Jan 31, 2025

Choose a reason for hiding this comment

dukenv0307 commented Jan 15, 2025 •

edited

Loading