Skip to content

fix: Scan icon and bottom navigation button shown briefly in concierge chat #75848

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

Merged
marcaaron merged 5 commits into from
Nov 25, 2025
Merged

fix: Scan icon and bottom navigation button shown briefly in concierge chat #75848

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
faefc85
fix: Scan icon and bottom navigation button shown briefly in concierg…
paulnjs Nov 24, 2025
6e46559
fix lint
paulnjs Nov 24, 2025
578406d
update code
paulnjs Nov 24, 2025
34f327e
update code
paulnjs Nov 24, 2025
82d82bd
Merge branch 'main' into paulnjs-fix/74778
paulnjs Nov 25, 2025
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
3 changes: 1 addition & 2 deletions src/components/Navigation/TopLevelNavigationTabBar/getIsScreenWithNavigationTabBarFocused.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {findFocusedRoute} from '@react-navigation/native';
import type {NavigationState} from '@react-navigation/native';
import {isSplitNavigatorName} from '@libs/Navigation/helpers/isNavigatorName';
import SCREENS_WITH_NAVIGATION_TAB_BAR from './SCREENS_WITH_NAVIGATION_TAB_BAR';

function getIsScreenWithNavigationTabBarFocused(state: NavigationState) {
Expand All @@ -9,7 +8,7 @@ function getIsScreenWithNavigationTabBarFocused(state: NavigationState) {
const routeName = focusedRoute?.params && 'screen' in focusedRoute.params ? (focusedRoute.params.screen as string) : focusedRoute?.name;
// We are checking if the focused route is a split navigator because there may be a brief moment where the navigator doesn't have state yet.
// That mens we don't have screen with bottom tab focused. This caused glitching.
return SCREENS_WITH_NAVIGATION_TAB_BAR.includes(routeName ?? '') || isSplitNavigatorName(routeName);
return SCREENS_WITH_NAVIGATION_TAB_BAR.includes(routeName ?? '');
}

export default getIsScreenWithNavigationTabBarFocused;
Loading