Add logic in get active route #33370

dukenv0307 · 2023-12-20T17:59:36Z

Details

App displays Hmm its not here page again on click of 'Go back to contacts page' after reload on any invalid email details page

Fixed Issues

$ #33001
PROPOSAL: #33001 (comment)

Tests

Open the app
Open invalid contact method details URL eg: https://staging.new.expensify.com/settings/profile/contact-methods/invalid@invalid.com/details
Reload on Hmm its not here page
Click on Go back to contacts page and verify that it opens contacts page

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open the app
Open invalid contact method details URL eg: https://staging.new.expensify.com/settings/profile/contact-methods/invalid@invalid.com/details
Reload on Hmm its not here page
Click on Go back to contacts page and verify that it opens contacts page

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

chrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

safari.mp4

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2023-12-22T09:04:33Z

@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-22T21:43:42Z

src/libs/Navigation/Navigation.ts

-    // We remove First forward slash from the URL before matching
-    return getActiveRoute().substring(1) === routePath;
+    // On web, we remove First forward slash from the URL before matching
+    return getActiveRoute().startsWith('/') ? getActiveRoute().substring(1) === routePath : getActiveRoute() === routePath;


Why is this change needed?

On native, currentRoute.path doesn't have a first forward slash

s77rt · 2023-12-22T21:44:00Z

src/libs/Navigation/Navigation.ts

+    if (currentRoute?.path) {
+        return currentRoute.path;
+    }
+


Should we remove the rest of the logic and only keep this one?

@dukenv0307 I just found that currentRoute.path is only available for the first navigated route. We may need to use the rootFromState as a fallback here

Screen.Recording.2023-12-25.at.7.53.50.PM.mov

Thanks for your comment, I just updated. Please check again

s77rt · 2023-12-26T15:54:56Z

src/libs/Navigation/Navigation.ts

-    if (!currentRoute?.name) {
-        return '';


Let's add this back

src/libs/Navigation/Navigation.ts

s77rt · 2023-12-26T17:20:57Z

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

android.mov

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

Co-authored-by: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>

dukenv0307 · 2023-12-27T03:23:58Z

@s77rt I just updated the code. I changed activeRoute.charAt(0) === '/' to activeRoute.startsWith('/') because it was causing a lint error.

OSBotify · 2024-01-02T21:09:34Z

✋ 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-02T23:51:43Z

🚀 Deployed to staging by https://github.com/dangrous in version: 1.4.21-0 🚀

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

OSBotify · 2024-01-04T18:54:19Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀

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

OSBotify · 2024-01-04T19:19:09Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀

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

OSBotify · 2024-01-04T20:16:36Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.21-4 🚀

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

dukenv0307 added 3 commits December 20, 2023 22:38

Add logic in get active route

61857e7

fix: slash in native

d649930

fix: lint

3f7fc64

dukenv0307 marked this pull request as ready for review December 22, 2023 09:04

dukenv0307 requested a review from a team as a code owner December 22, 2023 09:04

melvin-bot bot requested review from s77rt and removed request for a team December 22, 2023 09:04

dukenv0307 mentioned this pull request Dec 22, 2023

[HOLD for payment 2024-01-11] [$500] Settings - Invalid contact method revisits not here page #33001

Closed

6 tasks

s77rt suggested changes Dec 22, 2023

View reviewed changes

dukenv0307 added 3 commits December 25, 2023 11:34

Remove useless logic in get active route

c734dd8

Merge branch 'main' into fix/33001

de63760

fix: add fallback in get active route

99989a3

s77rt suggested changes Dec 26, 2023

View reviewed changes

dukenv0307 and others added 3 commits December 27, 2023 09:43

Update src/libs/Navigation/Navigation.ts

85430b2

Co-authored-by: Abdelhafidh Belalia <16493223+s77rt@users.noreply.github.com>

fix get active route

1eb6e35

fix lint

7163807

s77rt approved these changes Dec 27, 2023

View reviewed changes

melvin-bot bot requested a review from dangrous December 27, 2023 15:30

dangrous approved these changes Jan 2, 2024

View reviewed changes

dangrous merged commit 5b02cf0 into Expensify:main Jan 2, 2024
16 checks passed

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

Deploy Checklist: New Expensify 2024-01-02 #33855

Closed

58 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add logic in get active route #33370

Add logic in get active route #33370

dukenv0307 commented Dec 20, 2023 •

edited

Loading

melvin-bot bot commented Dec 22, 2023

s77rt Dec 22, 2023

dukenv0307 Dec 25, 2023

s77rt Dec 22, 2023

dukenv0307 Dec 25, 2023

s77rt Dec 25, 2023

dukenv0307 Dec 26, 2023

s77rt Dec 26, 2023

s77rt commented Dec 26, 2023 •

edited

Loading

dukenv0307 commented Dec 27, 2023

OSBotify commented Jan 2, 2024

OSBotify commented Jan 2, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

Add logic in get active route #33370

Add logic in get active route #33370

Conversation

dukenv0307 commented Dec 20, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Dec 22, 2023

s77rt Dec 22, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 25, 2023

Choose a reason for hiding this comment

s77rt Dec 22, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 25, 2023

Choose a reason for hiding this comment

s77rt Dec 25, 2023

Choose a reason for hiding this comment

dukenv0307 Dec 26, 2023

Choose a reason for hiding this comment

s77rt Dec 26, 2023

Choose a reason for hiding this comment

s77rt commented Dec 26, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

dukenv0307 commented Dec 27, 2023

OSBotify commented Jan 2, 2024

OSBotify commented Jan 2, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

OSBotify commented Jan 4, 2024

dukenv0307 commented Dec 20, 2023 •

edited

Loading

s77rt commented Dec 26, 2023 •

edited

Loading