Fix: the user is navigated without showing the Not Found Page when deleting a money request or IOU report #33041

dukenv0307 · 2023-12-14T05:42:58Z

Details

When deleting a money request or IOU report, the user is navigated without showing the Not Found Page

Fixed Issues

$ #28969
PROPOSAL: #28969 (comment)

Tests

Open the app
Navigate to a chat without previous IOUs
Send 3 money requests
Open the money request detail screen
Tap three dots and delete a money request
Verify that the user is navigated to the money request preview
In the IOU report, when there is one money request left, delete it
Verify that the user is redirected to the chat report and should not see the not found page

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open the app
Navigate to a chat without previous IOUs
Send 3 money requests
Open the money request detail screen
Tap three dots and delete a money request
Verify that the user is navigated to the money request preview
In the IOU report, when there is one money request left, delete it
Verify that the user is redirected to the chat report and should not see the not found page

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android-resize.mov

Android: mWeb Chrome

chrome-resize.mov

iOS: Native

ios-resize.mov

iOS: mWeb Safari

safari-resize.mov

MacOS: Chrome / Safari

web-resize.mov

MacOS: Desktop

desktop-resize.mov

melvin-bot · 2023-12-14T10:13:39Z

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

s77rt · 2023-12-14T14:32:28Z

src/pages/home/ReportScreen.js

@@ -317,7 +326,8 @@ function ReportScreen({
                prevOnyxReportID === routeReportID &&
                !onyxReportID &&
                prevReport.statusNum === CONST.REPORT.STATUS.OPEN &&
-                (report.statusNum === CONST.REPORT.STATUS.CLOSED || (!report.statusNum && !prevReport.parentReportID && prevReport.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ROOM)))
+                (report.statusNum === CONST.REPORT.STATUS.CLOSED || (!report.statusNum && !prevReport.parentReportID && prevReport.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ROOM))) ||
+            ((ReportUtils.isMoneyRequest(prevReport) || ReportUtils.isMoneyRequestReport(prevReport)) && _.isEqual(report, defaultProps.report))


Instead of comparing to the default report props, let's just reuse the !report.statusNum condition

(!report.statusNum && ((!prevReport.parentReportID && prevReport.chatType === CONST.REPORT.CHAT_TYPE.POLICY_ROOM) || (the new condition)))

@s77rt I don't think this gonna work. since the code that you provided need prevReport.statusNum === CONST.REPORT.STATUS.OPEN
But I added a console.log the prevReport.statusNum is 1 which means 'SUBMITTED' not 'OPEN'

That makes sense. In that case just use _.isEmpty(report) instead of comparing with default prop (it's a little more readable)

Code updated. Please help review again.

s77rt · 2023-12-15T17:30:38Z

@dukenv0307 Conflicts please

dukenv0307 · 2023-12-18T05:53:43Z

@s77rt Updated.

s77rt · 2023-12-18T17:52:08Z

@dukenv0307 If we delete a IOU request the report will show skeleton view, can we prevent that as well?

ios.mov

dukenv0307 · 2023-12-19T11:18:51Z

@s77rt I think showing a loading screen after deleting makes sense since this is like normal navigation.
Especially in the scenario that the user is seeing that IOU report, then the sender deletes it, the user will see a loading screen and then be navigated to the chat report.

But if you insist, we can update the condition of showing ReportActionsSkeletonView

App/src/pages/home/ReportScreen.js

Line 467 in aa1d87c

    
           {(!isReportReadyForDisplay || isLoadingInitialReportActions || isLoading) && <ReportActionsSkeletonView />}

to

{((!isReportReadyForDisplay && !wasReportAccessibleRef.current) || isLoadingInitialReportActions || isLoading) && <ReportActionsSkeletonView />}

Please let me know your opinion on this

s77rt · 2023-12-19T12:01:05Z

I don't think that's a blocker.

s77rt · 2023-12-19T12:01:34Z

@dukenv0307 Can you please specify that the user should not see the not found page

s77rt · 2023-12-19T12:01:54Z

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

Can't test due to an ongoing issue https://expensify.slack.com/archives/C01GTK53T8Q/p1702883604941629

Android: mWeb Chrome

mweb-chrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

dukenv0307 · 2023-12-20T08:49:18Z

@s77rt

Can you please specify that the user should not see the not found page

Updated in test steps

I don't think that's a blocker.

I don't think I fully understand your point. Should we keep the current showing loading screen when navigating logic or update the code so that the loading screen does not appear

s77rt · 2023-12-20T14:14:09Z

Should we keep the current showing loading screen when navigating logic

Yes.

OSBotify · 2023-12-20T18:39:49Z

✋ 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 · 2023-12-21T05:31:05Z

🚀 Deployed to staging by https://github.com/francoisl in version: 1.4.15-0 🚀

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

OSBotify · 2023-12-22T05:19:48Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.4.15-5 🚀

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

dukenv0307 added 11 commits October 7, 2023 01:04

fix: 28969

afac89e

merge main

c36fefa

Merge branch 'main' into fix/28969

78d0ba6

fix infinite loading when deleting money report

8231d4f

Merge branch 'main' into fix/28969

cb41c47

Merge branch 'main' into fix/28969

51a8e5a

Merge branch 'main' into fix/28969

899e3ca

Merge branch 'main' into fix/28969

c69e2f2

Merge branch 'main' into fix/28969

837dd23

fix infinite loading in iou report

b9d80d1

fix issue

4a4317e

dukenv0307 changed the title ~~Fix/28969~~ Fix: the user is navigated without showing the Not Found Page when deleting a money request or IOU report Dec 14, 2023

dukenv0307 marked this pull request as ready for review December 14, 2023 10:13

dukenv0307 requested a review from a team as a code owner December 14, 2023 10:13

melvin-bot bot requested review from s77rt and removed request for a team December 14, 2023 10:13

s77rt suggested changes Dec 14, 2023

View reviewed changes

merge main

be45ff4

check if report empty

80196fc

s77rt approved these changes Dec 20, 2023

View reviewed changes

melvin-bot bot requested a review from francoisl December 20, 2023 14:14

francoisl approved these changes Dec 20, 2023

View reviewed changes

francoisl merged commit 463ca55 into Expensify:main Dec 20, 2023
17 of 18 checks passed

github-actions bot mentioned this pull request Dec 21, 2023

Deploy Checklist: New Expensify 2023-12-21 #33391

Closed

51 tasks

melvin-bot bot mentioned this pull request Dec 22, 2023

[HOLD for payment 2023-12-29] [$1000] IOU - Hmm, not there screen briefly displayed when deleting one IOU out of several #28969

Closed

6 tasks

rojiphil mentioned this pull request Jan 11, 2024

[$500] [HOLD for payment 2024-01-26] Request Money - User is redirected to chat then IOU report after deleting request offline #34263

Closed

6 tasks

rojiphil mentioned this pull request Jan 18, 2024

[C+ Checklist Needs Completion] [$500] Money Request - Deleted IOU in offline mode appears when User switch to online #26511

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: the user is navigated without showing the Not Found Page when deleting a money request or IOU report #33041

Fix: the user is navigated without showing the Not Found Page when deleting a money request or IOU report #33041

dukenv0307 commented Dec 14, 2023 •

edited

Loading

melvin-bot bot commented Dec 14, 2023

s77rt Dec 14, 2023

dukenv0307 Dec 15, 2023

s77rt Dec 15, 2023

dukenv0307 Dec 18, 2023

s77rt commented Dec 15, 2023

dukenv0307 commented Dec 18, 2023

s77rt commented Dec 18, 2023

dukenv0307 commented Dec 19, 2023

s77rt commented Dec 19, 2023

s77rt commented Dec 19, 2023

s77rt commented Dec 19, 2023 •

edited

Loading

dukenv0307 commented Dec 20, 2023

s77rt commented Dec 20, 2023

OSBotify commented Dec 20, 2023

OSBotify commented Dec 21, 2023

OSBotify commented Dec 22, 2023

Fix: the user is navigated without showing the Not Found Page when deleting a money request or IOU report #33041

Fix: the user is navigated without showing the Not Found Page when deleting a money request or IOU report #33041

Conversation

dukenv0307 commented Dec 14, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 14, 2023

s77rt Dec 14, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 15, 2023

Choose a reason for hiding this comment

s77rt Dec 15, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 18, 2023

Choose a reason for hiding this comment

s77rt commented Dec 15, 2023

dukenv0307 commented Dec 18, 2023

s77rt commented Dec 18, 2023

dukenv0307 commented Dec 19, 2023

s77rt commented Dec 19, 2023

s77rt commented Dec 19, 2023

s77rt commented Dec 19, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

dukenv0307 commented Dec 20, 2023

s77rt commented Dec 20, 2023

OSBotify commented Dec 20, 2023

OSBotify commented Dec 21, 2023

OSBotify commented Dec 22, 2023

dukenv0307 commented Dec 14, 2023 •

edited

Loading

s77rt commented Dec 19, 2023 •

edited

Loading