prevent offline navigation on money request report deletion #34320

rojiphil · 2024-01-11T07:58:48Z

Details

We prevent the navigation to Money Request report in Report Screen when the Money Request report is marked for deletion.

Fixed Issues

$ #34263
PROPOSAL: #34263 (comment)

Tests

Steps
1 Go offline.
2 Go to 1:1 DM.
3 Create a money request.
4 Go to request details page.
5 Tap 3-dot menu > Delete request.
6 Delete the request.
7 Verify that the user navigates to main Chat Report

Verify that no errors appear in the JS console

Offline tests

Same as the Steps for Tests Section.

QA Steps

Same as the Steps for Tests Section.

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 / Chrome
- iOS / native
- iOS / 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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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 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 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.js 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
  - 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(themeColors.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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web - Safari

34263-web-safari-01.mp4

Mobile Web - Safari

34263-ios-safari-01.mp4

Desktop

34263-desktop-01.mp4

iOS

34263-ios-native-01.mp4

Android

34263-android-native-01.mp4

Mobile Web - Chrome

34263-android-chrome-01.mp4

melvin-bot · 2024-01-11T09:24:27Z

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

rojiphil · 2024-01-11T09:24:28Z

@fedirjh @blimpich
I tested the fix in 4 platforms and it seems to work well.
Let me know your thoughts on the changes here.
Once confirmed, I will complete the tests on all platforms.

Update: I have tested on the remaining platforms as well and have updated the PR author checklist too.

fedirjh · 2024-01-12T15:53:56Z

Thanks @rojiphil For raising a quick PR, I retested on all platforms, and it works fine. Let's wait for the green light from @blimpich.

blimpich

Looks good, thank you for the fix!

blimpich · 2024-01-12T20:18:01Z

@fedirjh can you complete the checklist as per #34320 (comment)? Then I'll merge.

fedirjh · 2024-01-13T10:32:22Z

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 the PR modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

CleanShot.2024-01-12.at.12.58.49.mp4

Android: mWeb Chrome

CleanShot.2024-01-12.at.14.11.30.mp4

iOS: Native

CleanShot.2024-01-12.at.16.45.37.mp4

iOS: mWeb Safari

CleanShot.2024-01-12.at.16.06.28.mp4

MacOS: Chrome / Safari

CleanShot.2024-01-12.at.15.44.54.mp4

MacOS: Desktop

CleanShot.2024-01-12.at.16.50.00.mp4

fedirjh

Looks good and tests well. left little feedbacks about code style.

fedirjh · 2024-01-13T10:41:42Z

src/libs/ReportUtils.ts

    if (isMoneyRequestReport(report)) {
        const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? '');
        if (parentReportAction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
-            return false;
+            return true;
        }
    }
+    return false;
+}


Let's improve code readability :

function isMoneyRequestReportPendingDeletion(report: OnyxEntry<Report>): boolean { if(!isMoneyRequestReport(report)){ return false; } const parentReportAction = ReportActionsUtils.getReportAction(report?.parentReportID ?? '', report?.parentReportActionID ?? ''); return parentReportAction?.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE; }

I will make the changes and test this again.

Wondering why I do not see Commit Suggestion for this code readability changes.

I couldn’t suggest the changes myself. It seems that option only works for the code that was changed.

I couldn’t suggest the changes myself. It seems that option only works for the code that was changed.

Ah! That makes sense. Thanks

src/pages/home/ReportScreen.js

Co-authored-by: Fedi Rajhi <[email protected]>

rojiphil · 2024-01-13T17:27:30Z

Looks good and tests well. left little feedbacks about code style.

@fedirjh
I have integrated feedback and tested the app again. It tests well.
Over to you for review again.

fedirjh

Looks good to me.

OSBotify · 2024-01-17T17:11:38Z

✋ 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 · 2024-01-18T03:25:57Z

🚀 Deployed to staging by https://github.com/blimpich in version: 1.4.27-0 🚀

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

OSBotify · 2024-01-19T09:45:43Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.27-1 🚀

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

rojiphil added 2 commits January 11, 2024 13:07

prevent offline navigation on money request report deletion

4e65a63

Merge branch 'Expensify:main' into 34263-redirection-to-mr-report

5eede8b

rojiphil marked this pull request as ready for review January 11, 2024 09:24

rojiphil requested a review from a team as a code owner January 11, 2024 09:24

melvin-bot bot requested review from fedirjh and removed request for a team January 11, 2024 09:24

fedirjh mentioned this pull request Jan 12, 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

blimpich previously approved these changes Jan 12, 2024

View reviewed changes

fedirjh reviewed Jan 13, 2024

View reviewed changes

Update src/pages/home/ReportScreen.js

61d3f42

Co-authored-by: Fedi Rajhi <[email protected]>

rojiphil dismissed blimpich’s stale review via 61d3f42 January 13, 2024 11:51

code readability improvement

c6017fc

rojiphil requested a review from fedirjh January 13, 2024 17:27

fedirjh approved these changes Jan 14, 2024

View reviewed changes

melvin-bot bot requested a review from blimpich January 14, 2024 14:57

blimpich approved these changes Jan 17, 2024

View reviewed changes

blimpich merged commit fe9e9e3 into Expensify:main Jan 17, 2024
16 of 20 checks passed

github-actions bot mentioned this pull request Jan 18, 2024

Deploy Checklist: New Expensify 2024-01-18 #34701

Closed

31 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

gijoe0295 mentioned this pull request Apr 21, 2024

Remove exported getReport() #40523

Closed

50 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

prevent offline navigation on money request report deletion #34320

prevent offline navigation on money request report deletion #34320

rojiphil commented Jan 11, 2024 •

edited

Loading

melvin-bot bot commented Jan 11, 2024

rojiphil commented Jan 11, 2024 •

edited

Loading

fedirjh commented Jan 12, 2024

blimpich left a comment

blimpich commented Jan 12, 2024

fedirjh commented Jan 13, 2024

fedirjh left a comment

fedirjh Jan 13, 2024

This comment was marked as outdated.

rojiphil Jan 13, 2024 •

edited

Loading

fedirjh Jan 13, 2024

rojiphil Jan 13, 2024

rojiphil commented Jan 13, 2024

fedirjh left a comment

OSBotify commented Jan 17, 2024

OSBotify commented Jan 18, 2024

OSBotify commented Jan 19, 2024

prevent offline navigation on money request report deletion #34320

prevent offline navigation on money request report deletion #34320

Conversation

rojiphil commented Jan 11, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jan 11, 2024

rojiphil commented Jan 11, 2024 • edited Loading

fedirjh commented Jan 12, 2024

blimpich left a comment

Choose a reason for hiding this comment

blimpich commented Jan 12, 2024

fedirjh commented Jan 13, 2024

Reviewer Checklist

Screenshots/Videos

fedirjh left a comment

Choose a reason for hiding this comment

fedirjh Jan 13, 2024

Choose a reason for hiding this comment

This comment was marked as outdated.

rojiphil Jan 13, 2024 • edited Loading

Choose a reason for hiding this comment

fedirjh Jan 13, 2024

Choose a reason for hiding this comment

rojiphil Jan 13, 2024

Choose a reason for hiding this comment

rojiphil commented Jan 13, 2024

fedirjh left a comment

Choose a reason for hiding this comment

OSBotify commented Jan 17, 2024

OSBotify commented Jan 18, 2024

OSBotify commented Jan 19, 2024

rojiphil commented Jan 11, 2024 •

edited

Loading

rojiphil commented Jan 11, 2024 •

edited

Loading

rojiphil Jan 13, 2024 •

edited

Loading