fix: prevent welcome message showing up on abradacabra page #20706

allroundexperts · 2023-06-13T19:17:59Z

Details

This PR edits the welcome menu logic such that it shows up only if the route is either Home or a CENTRAL_PANE_NAVIGATOR.

Fixed Issues

$ #20609
PROPOSAL: #20609 (comment)

Tests

Open the App and create a new account
Validate by using magic link on another tab
Verify that the welcome menu shows up in the original tab while the new tab shows the abracadebra page without welcome menu.

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Open the App and create a new account
Validate by using magic link on another tab
Verify that the welcome menu shows up in the original tab while the new tab shows the abracadebra page without welcome menu.

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 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 correct English and 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
- 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 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

Screen.Recording.2023-06-13.at.11.27.33.PM.mov

Mobile Web - Chrome

Screen.Recording.2023-06-13.at.11.58.45.PM.mov

Mobile Web - Safari

Screen.Recording.2023-06-13.at.11.57.47.PM.mov

Desktop

Screen.Recording.2023-06-13.at.11.31.50.PM.mov

iOS

ios1.mov

Android

android-1.mov

melvin-bot · 2023-06-13T19:18:05Z

@dangrous @mollfpr One of you needs to 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]

mollfpr

Some suggestion and minor prettier issue.

mollfpr · 2023-06-14T11:09:58Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

@@ -81,7 +83,12 @@ class FloatingActionButtonAndPopover extends React.Component {
    }

    componentDidMount() {
-        const routes = lodashGet(this.props.navigation.getState(), 'routes', []);
+        const navigationState = this.props.navigation.getState();
+        const currentRoute = navigationState.routes[navigationState.index];


It's better we still use routes from the lodashGet to ensure the routes is not undefined and avoid error Cannot read properties of undefined.

mollfpr · 2023-06-14T11:10:21Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

-        const routes = lodashGet(this.props.navigation.getState(), 'routes', []);
+        const navigationState = this.props.navigation.getState();
+        const currentRoute = navigationState.routes[navigationState.index];
+        if(currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {


Missing space after if.

Suggested change

if(currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {

if (currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {

mollfpr · 2023-06-14T11:11:12Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

+        if(currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {
+            return;
+        }
+        const routes = lodashGet(navigationState, 'routes', []);


We can put this above so routes can be used to fill currentRoute.

mountiny · 2023-06-14T14:31:35Z

@allroundexperts @mollfpr lets wait for a confirmation from @WoLewicki would be great to have all these navigation changes under control for first couple of weeks. Changes look good to me fwiw, just good to double check

WoLewicki · 2023-06-14T14:51:57Z

Cannot we use Navigation.getActiveRoute() to check it?

allroundexperts · 2023-06-14T14:53:53Z

Cannot we use Navigation.getActiveRoute() to check it?

Checking.

allroundexperts · 2023-06-14T15:01:28Z

Cannot we use Navigation.getActiveRoute() to check it?

This returns the path @WoLewicki instead of the name.

WoLewicki

Hmm yeah, we use kind of a similar pattern e.g. here:

App/src/libs/Navigation/FreezeWrapper.js

Line 26 in e6201a6

    
           const index = lodashFindIndex(navigation.getState().routes, (route) => route.key === currentRoute.key);

, so it sounds fine. Thanks!

mollfpr · 2023-06-15T11:47:04Z

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 / Chrome
- iOS / native
- iOS / 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 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

Web

20706.Web.mov

Mobile Web - Chrome

20706.mWeb.Chrome.webm

Mobile Web - Safari

20706.mWeb.Safari.mp4

Desktop

20706.Desktop.mov

iOS

20706.iOS.mp4

Android

20706.Android.webm

mollfpr

LGTM and tests well 👍

All yours @dangrous

mountiny

Thanks everyone!

all yours @dangrous

mountiny · 2023-06-15T16:44:37Z

I see Daniel is ooo today so I will go ahead and merge this

OSBotify · 2023-06-15T16:49:10Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

dangrous · 2023-06-16T18:03:56Z

Thanks @mountiny !

OSBotify · 2023-06-16T18:51:10Z

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

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

OSBotify · 2023-06-21T02:18:40Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.3.29-11 🚀

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

allroundexperts added 2 commits June 13, 2023 23:48

feat: show welcome menu only if the user is on central pane

0538a3f

feat: show welcome menu on home route as well

af22572

allroundexperts requested a review from a team as a code owner June 13, 2023 19:18

melvin-bot bot requested review from dangrous and mollfpr and removed request for a team June 13, 2023 19:18

allroundexperts mentioned this pull request Jun 13, 2023

[HOLD for payment 2023-06-28] [$1000] FAB menu is displayed abracadabra page when creating a new account #20609

Closed

6 tasks

mollfpr suggested changes Jun 14, 2023

View reviewed changes

mountiny assigned allroundexperts Jun 14, 2023

feat: handle comments regarding floating action popover menu

626ccde

allroundexperts requested a review from mollfpr June 14, 2023 14:35

WoLewicki approved these changes Jun 14, 2023

View reviewed changes

mollfpr approved these changes Jun 15, 2023

View reviewed changes

mountiny approved these changes Jun 15, 2023

View reviewed changes

mountiny merged commit 826dbee into Expensify:main Jun 15, 2023

OSBotify mentioned this pull request Jun 16, 2023

Deploy Checklist: New Expensify 2023-06-16 #20928

Closed

lanitochka17 mentioned this pull request Jun 19, 2023

[$1000] Sign In - Logo is displayed instead Abracadabra page #20999

Closed

6 tasks

tsa321 mentioned this pull request Sep 28, 2023

[HOLD for payment 2023-10-23] [$1000] FAB menu not opening on new Registration #26076

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: prevent welcome message showing up on abradacabra page #20706

fix: prevent welcome message showing up on abradacabra page #20706

allroundexperts commented Jun 13, 2023

melvin-bot bot commented Jun 13, 2023

mollfpr left a comment

mollfpr Jun 14, 2023

allroundexperts Jun 14, 2023

mollfpr Jun 14, 2023

mollfpr Jun 14, 2023

allroundexperts Jun 14, 2023

mountiny commented Jun 14, 2023

WoLewicki commented Jun 14, 2023

allroundexperts commented Jun 14, 2023

allroundexperts commented Jun 14, 2023

WoLewicki left a comment

mollfpr commented Jun 15, 2023 •

edited

Loading

mollfpr left a comment

mountiny left a comment

mountiny commented Jun 15, 2023

OSBotify commented Jun 15, 2023

dangrous commented Jun 16, 2023

OSBotify commented Jun 16, 2023

OSBotify commented Jun 21, 2023

	if(currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {
	if (currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {

fix: prevent welcome message showing up on abradacabra page #20706

fix: prevent welcome message showing up on abradacabra page #20706

Conversation

allroundexperts commented Jun 13, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 13, 2023

mollfpr left a comment

Choose a reason for hiding this comment

mollfpr Jun 14, 2023

Choose a reason for hiding this comment

allroundexperts Jun 14, 2023

Choose a reason for hiding this comment

mollfpr Jun 14, 2023

Choose a reason for hiding this comment

mollfpr Jun 14, 2023

Choose a reason for hiding this comment

allroundexperts Jun 14, 2023

Choose a reason for hiding this comment

mountiny commented Jun 14, 2023

WoLewicki commented Jun 14, 2023

allroundexperts commented Jun 14, 2023

allroundexperts commented Jun 14, 2023

WoLewicki left a comment

Choose a reason for hiding this comment

mollfpr commented Jun 15, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

mollfpr left a comment

Choose a reason for hiding this comment

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented Jun 15, 2023

OSBotify commented Jun 15, 2023

dangrous commented Jun 16, 2023

OSBotify commented Jun 16, 2023

OSBotify commented Jun 21, 2023

mollfpr commented Jun 15, 2023 •

edited

Loading