Navigate back to correct page from private note edit page #40951

nkdengineer · 2024-04-25T01:50:38Z

Details

Navigate back to correct page from private note edit page

Fixed Issues

$ #40502
PROPOSAL: #40502 (comment)

Tests

Open a 1:1 chat that we don't have private note
Click on Header > Private notes
Reload the page
Click on back button
Verify that we go back to profile page

Verify that no errors appear in the JS console

Offline tests

None

QA Steps

Open a 1:1 chat that we don't have private note
Click on Header > Private notes
Reload the page
Click on back button
Verify that we go back to profile page

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

Screenshots/Videos

Android: Native

Android: mWeb Chrome

Screen.Recording.2024-04-25.at.08.26.09.mov

iOS: Native

Screen.Recording.2024-04-25.at.08.38.39.mov

iOS: mWeb Safari

Screen.Recording.2024-04-25.at.08.24.23.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-25.at.08.21.45.mov

MacOS: Desktop

Screen.Recording.2024-04-25.at.08.42.44.mov

melvin-bot · 2024-04-25T01:50:54Z

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

shubham1206agra · 2024-04-26T07:35:51Z

src/libs/ReportUtils.ts

+    }
+    const currentUserPrivateNote = report.privateNotes?.[session.accountID]?.note ?? '';
+    if (isEmpty(currentUserPrivateNote)) {
+        goBackToDetailsPage(report);


As I said earlier, this will not work correctly.

@shubham1206agra I think this function is missing the selfDM case that appears in navigateToDetailsPage. So I think we can add this case in this function instead of modified a new version of navigateToDetailsPage. WDYT?

No the goback page is also wrong here.

What's wrong here. Can you detail? Thanks.

It goes to ROUTES.REPORT_SETTINGS instead of ROUTES.REPORT_WITH_ID_DETAILS

@shubham1206agra Got it. I updated.

shubham1206agra · 2024-04-26T13:30:39Z

src/libs/ReportUtils.ts

+        if (isSelfDM(report)) {
+            Navigation.goBack(ROUTES.PROFILE.getRoute(currentUserAccountID ?? 0));
+            return;
+        }


We don't need this.

@shubham1206agra I updated.

shubham1206agra · 2024-05-04T15:35:40Z

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

Android: mWeb Chrome

Screen.Recording.2024-05-04.at.8.59.20.PM.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2024-05-04.at.8.51.50.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-05-04.at.8.48.18.PM.mov

MacOS: Desktop

Screen.Recording.2024-05-04.at.9.02.31.PM.mov

nkdengineer · 2024-05-09T08:40:24Z

@mountiny Please help to review the PR when you have a chance. Thanks.

mountiny

Thanks, going to hold merging until green light

nkdengineer · 2024-05-14T07:25:07Z

@mountiny I think we can merge this PR now.

nkdengineer · 2024-05-20T09:01:36Z

@mountiny Is the PR ready for merge?

mountiny · 2024-05-20T17:59:51Z

We are still having a merge freeze

shubham1206agra · 2024-05-24T13:09:07Z

@mountiny Can we merge this now?

mountiny

Thanks!

nkdengineer · 2024-05-28T02:37:45Z

@mountiny Can we merge this PR now?

OSBotify · 2024-05-28T13:52:19Z

✋ 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-05-29T09:42:03Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.4.77-0 🚀

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

OSBotify · 2024-05-30T21:24:52Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.77-11 🚀

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

OSBotify · 2024-05-30T22:36:50Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.77-11 🚀

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

Navigate back to correct page from private note edit page

621f19c

nkdengineer marked this pull request as ready for review April 25, 2024 01:50

nkdengineer requested a review from a team as a code owner April 25, 2024 01:50

melvin-bot bot removed the request for review from a team April 25, 2024 01:50

melvin-bot bot requested a review from shubham1206agra April 25, 2024 01:50

nkdengineer mentioned this pull request Apr 25, 2024

[HOLD for payment 2024-06-06] [$250] RHP - User remains on the Private Notes page when clicked on back btn after reload #40502

Closed

6 tasks

nkdengineer added 3 commits April 25, 2024 08:54

fix ts check

dfcc2e7

fix lint

d150b37

revert podfile change

1f322c4

shubham1206agra reviewed Apr 26, 2024

View reviewed changes

nkdengineer added 2 commits April 26, 2024 17:47

Merge branch 'main' into fix/40502

c1c54f7

modify go back logic base on navigateToDetailsPage function

d2dceca

shubham1206agra reviewed Apr 26, 2024

View reviewed changes

nkdengineer added 2 commits May 2, 2024 12:00

merge main

5276fab

fix lint

432942c

shubham1206agra approved these changes May 4, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny May 4, 2024 15:36

Merge branch 'main' into fix/40502

6701a30

mountiny changed the title ~~Navigate back to correct page from private note edit page~~ [HOLD freeze] Navigate back to correct page from private note edit page May 9, 2024

mountiny assigned nkdengineer May 9, 2024

mountiny previously approved these changes May 9, 2024

View reviewed changes

Merge branch 'main' into fix/40502

2cf51d5

merge main

0cda48a

nkdengineer dismissed mountiny’s stale review via 0cda48a May 14, 2024 08:09

Merge branch 'main' into fix/40502

cd35ab6

mountiny changed the title ~~[HOLD freeze] Navigate back to correct page from private note edit page~~ Navigate back to correct page from private note edit page May 24, 2024

mountiny approved these changes May 24, 2024

View reviewed changes

mountiny merged commit 536e3a4 into Expensify:main May 28, 2024
16 checks passed

github-actions bot mentioned this pull request May 29, 2024

Deploy Checklist: New Expensify 2024-05-29 #42741

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Navigate back to correct page from private note edit page #40951

Navigate back to correct page from private note edit page #40951

nkdengineer commented Apr 25, 2024

melvin-bot bot commented Apr 25, 2024

shubham1206agra Apr 26, 2024

nkdengineer Apr 26, 2024

shubham1206agra Apr 26, 2024

nkdengineer Apr 26, 2024

shubham1206agra Apr 26, 2024

nkdengineer Apr 26, 2024

shubham1206agra Apr 26, 2024

nkdengineer May 2, 2024

shubham1206agra commented May 4, 2024

nkdengineer commented May 9, 2024

mountiny left a comment

nkdengineer commented May 14, 2024

nkdengineer commented May 20, 2024

mountiny commented May 20, 2024

shubham1206agra commented May 24, 2024

mountiny left a comment

nkdengineer commented May 28, 2024

OSBotify commented May 28, 2024

OSBotify commented May 29, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024

Navigate back to correct page from private note edit page #40951

Navigate back to correct page from private note edit page #40951

Conversation

nkdengineer commented Apr 25, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

shubham1206agra commented May 4, 2024

Reviewer Checklist

Screenshots/Videos

nkdengineer commented May 9, 2024

mountiny left a comment

Choose a reason for hiding this comment

nkdengineer commented May 14, 2024

nkdengineer commented May 20, 2024

mountiny commented May 20, 2024

shubham1206agra commented May 24, 2024

mountiny left a comment

Choose a reason for hiding this comment

nkdengineer commented May 28, 2024

OSBotify commented May 28, 2024

OSBotify commented May 29, 2024

OSBotify commented May 30, 2024

OSBotify commented May 30, 2024