Save the World - Navigation problem on teachers contact page after a reload #32065

ZhenjaHorbach · 2023-11-27T18:32:01Z

Details

Save the World - Navigation problem on teachers contact page after a reload

Fixed Issues

$ #31895
PROPOSAL: #31895 (comment)

Tests

Click on FAB
Click Save the World > I am a teacher
Click on the "Update email address" button at the bottom. (or the 'contact methods' link)
Click on New contact method
Refresh page.
Click on the back button twice
Check that you are on the I am a teacher screen

Verify that no errors appear in the JS console

Offline tests

Click on FAB
Click Save the World > I am a teacher
Click on the "Update email address" button at the bottom. (or the 'contact methods' link)
Click on New contact method
Refresh page.
Click on the back button twice
Check that you are on the I am a teacher screen

QA Steps

Click on FAB
Click Save the World > I am a teacher
Click on the "Update email address" button at the bottom. (or the 'contact methods' link)
Click on New contact method
Refresh page.
Click on the back button twice
Check that you are on the I am a teacher screen

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Not relevant

Android: mWeb Chrome

android.mov

iOS: Native

Not relevant

iOS: mWeb Safari

ios.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

…page after a reload

melvin-bot · 2023-11-27T18:32:06Z

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

ZhenjaHorbach · 2023-11-27T18:41:17Z

@shubham1206agra

Hello )
PR is ready )

Plus a little explanation

I added conditions here so as not to see back-to on the screens if we get there from the profile (That is, the behavior remains the same as in the main branch)

https://github.com/Expensify/App/pull/32065/files#diff-d9c1a4edf379b96aba8cc70a2dc157a4e3973014b544f1be1a405a513179dedcR115-R119

https://github.com/Expensify/App/pull/32065/files#diff-fe6782071280d20a06400ddd9435c11ea1961b6d8601c9acdc1e42257ad52348R95-R99

But I couldn’t decide how to do it right
Use back-to in the address bar everywhere
Or everywhere except screens if we get there from the profile? (My current implementation )

What do you think ?

shubham1206agra · 2023-11-28T05:38:14Z

src/pages/settings/Profile/Contacts/NewContactMethodPage.js

+    const onBackButtonPress = () => {
+        if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {
+            Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);
+
+            return;
+        }
+
+        Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(navigateBackTo));
+    };


Use useCallback here

shubham1206agra · 2023-11-28T05:39:29Z

src/pages/settings/Profile/Contacts/ContactMethodsPage.js

+    const onNewContactMethodButtonPress = () => {
+        if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {
+            Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.route);
+
+            return;
+        }
+
+        Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.getRoute(navigateBackTo));
+    };


Use useCallback here

shubham1206agra · 2023-11-28T05:41:06Z

@shubham1206agra

Hello ) PR is ready )

Plus a little explanation

I added conditions here so as not to see back-to on the screens if we get there from the profile (That is, the behavior remains the same as in the main branch)

https://github.com/Expensify/App/pull/32065/files#diff-d9c1a4edf379b96aba8cc70a2dc157a4e3973014b544f1be1a405a513179dedcR115-R119

https://github.com/Expensify/App/pull/32065/files#diff-fe6782071280d20a06400ddd9435c11ea1961b6d8601c9acdc1e42257ad52348R95-R99

But I couldn’t decide how to do it right Use back-to in the address bar everywhere Or everywhere except screens if we get there from the profile? (My current implementation )

What do you think ?

Current one seems right

shubham1206agra · 2023-11-28T07:31:52Z

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(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 reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

NA

Android: mWeb Chrome

iOS: Native

NA

iOS: mWeb Safari

Screen.Recording.2023-11-28.at.12.07.55.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2023-11-28.at.11.57.33.AM.mov

MacOS: Desktop

Screen.Recording.2023-11-28.at.12.33.46.PM.mov

shubham1206agra · 2023-11-28T11:57:58Z

src/pages/settings/Profile/Contacts/ContactMethodsPage.js

+    const onNewContactMethodButtonPress = useCallback(() => {
+        if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {
+            Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.route);
+
+            return;
+        }
+
+        Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.getRoute(navigateBackTo));
+    }, [navigateBackTo]);


Suggested change

const onNewContactMethodButtonPress = useCallback(() => {

if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {

Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.route);

return;

}

Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.getRoute(navigateBackTo));

}, [navigateBackTo]);

const onNewContactMethodButtonPress = useCallback(() => {

if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {

Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.route);

return;

}

Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.getRoute(navigateBackTo));

}, [navigateBackTo]);

shubham1206agra · 2023-11-28T11:58:36Z

src/pages/settings/Profile/Contacts/NewContactMethodPage.js

+    const onBackButtonPress = useCallback(() => {
+        if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {
+            Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);
+
+            return;
+        }
+
+        Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(navigateBackTo));
+    }, [navigateBackTo]);


Suggested change

const onBackButtonPress = useCallback(() => {

if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {

Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);

return;

}

Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(navigateBackTo));

}, [navigateBackTo]);

const onBackButtonPress = useCallback(() => {

if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {

Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.route);

return;

}

Navigation.goBack(ROUTES.SETTINGS_CONTACT_METHODS.getRoute(navigateBackTo));

}, [navigateBackTo]);

tylerkaraszewski

Conflicts need to be resolved.

…s-contact-page

ZhenjaHorbach · 2023-11-30T09:38:51Z

@tylerkaraszewski
Hello )
Done )

shubham1206agra · 2023-11-30T15:12:17Z

@tylerkaraszewski Can you merge this please?

OSBotify · 2023-11-30T15:49:56Z

✋ 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-01T12:57:10Z

🚀 Deployed to staging by https://github.com/tylerkaraszewski in version: 1.4.7-0 🚀

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

OSBotify · 2023-12-05T02:27:33Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.7-4 🚀

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

mkhutornyi · 2024-03-14T15:09:34Z

src/pages/settings/Profile/Contacts/ContactMethodsPage.js

+        if (navigateBackTo === ROUTES.SETTINGS_PROFILE) {
+            Navigation.navigate(ROUTES.SETTINGS_NEW_CONTACT_METHOD.route);
+            return;


@shubham1206agra can I have context why this change was necessary?
This code is being removed in #38308 to fix #38296.
So I'd like to confirm if this doesn't cause any side effect.

I'm not sure now, as this code is old. Just run the steps in this PR to verify no problem occurs.

Here is a little explanation of why this was done
#32065 (comment)

Thanks, @ZhenjaHorbach and @shubham1206agra for the reply.

@mkhutornyi @akinwale I reproduced the current PR test steps on the changes I made and the output is still the same:

Screen.Recording.2024-03-14.at.5.52.01.PM.mov

Fix bug with Save the World - Navigation problem on teachers contact …

a21abfa

…page after a reload

ZhenjaHorbach requested a review from a team as a code owner November 27, 2023 18:32

melvin-bot bot requested review from shubham1206agra and removed request for a team November 27, 2023 18:32

Fix lint error

7fd74ea

ZhenjaHorbach changed the title ~~Fix bug with Save the World - Navigation problem on teachers contact page after a reload~~ Save the World - Navigation problem on teachers contact page after a reload Nov 27, 2023

shubham1206agra reviewed Nov 28, 2023

View reviewed changes

Add some useCallbacks

7197f4f

shubham1206agra reviewed Nov 28, 2023

View reviewed changes

Fix extra spaces

1c596d3

shubham1206agra approved these changes Nov 28, 2023

View reviewed changes

melvin-bot bot requested a review from tylerkaraszewski November 28, 2023 12:33

tylerkaraszewski reviewed Nov 30, 2023

View reviewed changes

ZhenjaHorbach added 6 commits November 30, 2023 09:22

Resolve conflicts

da1baf9

Merge branch 'main' into save-the-world-navigation-problem-on-teacher…

f4192da

…s-contact-page

Create minor changes

1f449e7

Create minor changes x2

fb77d7a

Merge branch 'main' into save-the-world-navigation-problem-on-teacher…

f238de4

…s-contact-page

Refactor routes

3f8545a

tylerkaraszewski approved these changes Nov 30, 2023

View reviewed changes

tylerkaraszewski merged commit 71cf44f into Expensify:main Nov 30, 2023

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

Deploy Checklist: New Expensify 2023-12-01 #32342

Closed

53 tasks

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

[HOLD for payment 2023-12-12] [$500] Save the World - Navigation problem on teachers contact page after a reload #31895

Closed

6 tasks

mkhutornyi reviewed Mar 14, 2024

View reviewed changes

mkhutornyi mentioned this pull request Mar 14, 2024

[HOLD for payment 2024-03-22] [$250] Settings - Back button looped when navigated on Contact Methods page several #38296

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Save the World - Navigation problem on teachers contact page after a reload #32065

Save the World - Navigation problem on teachers contact page after a reload #32065

ZhenjaHorbach commented Nov 27, 2023 •

edited

Loading

melvin-bot bot commented Nov 27, 2023

ZhenjaHorbach commented Nov 27, 2023 •

edited

Loading

shubham1206agra Nov 28, 2023

shubham1206agra Nov 28, 2023

shubham1206agra commented Nov 28, 2023

shubham1206agra commented Nov 28, 2023

shubham1206agra Nov 28, 2023

shubham1206agra Nov 28, 2023

tylerkaraszewski left a comment

ZhenjaHorbach commented Nov 30, 2023

shubham1206agra commented Nov 30, 2023

OSBotify commented Nov 30, 2023

OSBotify commented Dec 1, 2023

OSBotify commented Dec 5, 2023

mkhutornyi Mar 14, 2024

shubham1206agra Mar 14, 2024

ZhenjaHorbach Mar 14, 2024

abzokhattab Mar 14, 2024 •

edited

Loading

Save the World - Navigation problem on teachers contact page after a reload #32065

Save the World - Navigation problem on teachers contact page after a reload #32065

Conversation

ZhenjaHorbach commented Nov 27, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 27, 2023

ZhenjaHorbach commented Nov 27, 2023 • edited Loading

shubham1206agra Nov 28, 2023

Choose a reason for hiding this comment

shubham1206agra Nov 28, 2023

Choose a reason for hiding this comment

shubham1206agra commented Nov 28, 2023

shubham1206agra commented Nov 28, 2023

Reviewer Checklist

Screenshots/Videos

shubham1206agra Nov 28, 2023

Choose a reason for hiding this comment

shubham1206agra Nov 28, 2023

Choose a reason for hiding this comment

tylerkaraszewski left a comment

Choose a reason for hiding this comment

ZhenjaHorbach commented Nov 30, 2023

shubham1206agra commented Nov 30, 2023

OSBotify commented Nov 30, 2023

OSBotify commented Dec 1, 2023

OSBotify commented Dec 5, 2023

mkhutornyi Mar 14, 2024

Choose a reason for hiding this comment

shubham1206agra Mar 14, 2024

Choose a reason for hiding this comment

ZhenjaHorbach Mar 14, 2024

Choose a reason for hiding this comment

abzokhattab Mar 14, 2024 • edited Loading

Choose a reason for hiding this comment

ZhenjaHorbach commented Nov 27, 2023 •

edited

Loading

ZhenjaHorbach commented Nov 27, 2023 •

edited

Loading

abzokhattab Mar 14, 2024 •

edited

Loading