Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Jun 15, 2023
Merged

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

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0538a3f
feat: show welcome menu only if the user is on central pane
allroundexperts Jun 13, 2023
af22572
feat: show welcome menu on home route as well
allroundexperts Jun 13, 2023
626ccde
feat: handle comments regarding floating action popover menu
allroundexperts Jun 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ import styles from '../../../../styles/styles';
import * as Expensicons from '../../../../components/Icon/Expensicons';
import Navigation from '../../../../libs/Navigation/Navigation';
import ROUTES from '../../../../ROUTES';
import NAVIGATORS from '../../../../NAVIGATORS';
import SCREENS from '../../../../SCREENS';
import Permissions from '../../../../libs/Permissions';
import * as Policy from '../../../../libs/actions/Policy';
import PopoverMenu from '../../../../components/PopoverMenu';
Expand Down Expand Up @@ -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];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)) {

return;
}
const routes = lodashGet(navigationState, 'routes', []);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

Welcome.show({routes, showCreateMenu: this.showCreateMenu});
}

Expand Down