Skip to content

[CP Staging] Revert "NavigationTabBar: Add dummy component" #63826

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
mountiny merged 1 commit into from
Jun 10, 2025
Merged

[CP Staging] Revert "NavigationTabBar: Add dummy component" #63826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
299 changes: 0 additions & 299 deletions src/components/Navigation/NavigationTabBar/NavigationTabBarDummy.tsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/Navigation/SearchSidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import SCREENS from '@src/SCREENS';
import type {SearchResults} from '@src/types/onyx';
import NavigationTabBar from './NavigationTabBar';
import NAVIGATION_TABS from './NavigationTabBar/NAVIGATION_TABS';
import NavigationTabBarDummy from './NavigationTabBar/NavigationTabBarDummy';
import TopBar from './TopBar';

type SearchSidebarProps = {
Expand Down Expand Up @@ -76,7 +76,7 @@ function SearchSidebar({state}: SearchSidebarProps) {
/>
<SearchTypeMenu queryJSON={queryJSON} />
</View>
<NavigationTabBarDummy selectedTab={NAVIGATION_TABS.SEARCH} />
<NavigationTabBar selectedTab={NAVIGATION_TABS.SEARCH} />
</View>
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/Search/SearchPageNarrow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import Animated, {clamp, runOnJS, useAnimatedScrollHandler, useAnimatedStyle, us
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types';
import HeaderWithBackButton from '@components/HeaderWithBackButton';
import NavigationTabBar from '@components/Navigation/NavigationTabBar';
import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
import NavigationTabBarDummy from '@components/Navigation/NavigationTabBar/NavigationTabBarDummy';
import TopBar from '@components/Navigation/TopBar';
import ScreenWrapper from '@components/ScreenWrapper';
import Search from '@components/Search';
Expand Down Expand Up @@ -141,7 +141,7 @@ function SearchPageNarrow({queryJSON, headerButtonsOptions, currentSearchResults
testID={SearchPageNarrow.displayName}
shouldEnableMaxHeight
offlineIndicatorStyle={styles.mtAuto}
bottomContent={<NavigationTabBarDummy selectedTab={NAVIGATION_TABS.SEARCH} />}
bottomContent={<NavigationTabBar selectedTab={NAVIGATION_TABS.SEARCH} />}
headerGapStyles={styles.searchHeaderGap}
shouldShowOfflineIndicator={!!searchResults}
>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/home/sidebar/BaseSidebarScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, {useEffect} from 'react';
import {View} from 'react-native';
import NavigationTabBar from '@components/Navigation/NavigationTabBar';
import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
import NavigationTabBarDummy from '@components/Navigation/NavigationTabBar/NavigationTabBarDummy';
import TopBar from '@components/Navigation/TopBar';
import ScreenWrapper from '@components/ScreenWrapper';
import useLocalize from '@hooks/useLocalize';
Expand All @@ -27,7 +27,7 @@ function BaseSidebarScreen() {
shouldEnableKeyboardAvoidingView={false}
style={[styles.sidebar, isMobile() ? styles.userSelectNone : {}]}
testID={BaseSidebarScreen.displayName}
bottomContent={!shouldDisplayLHB && <NavigationTabBarDummy selectedTab={NAVIGATION_TABS.HOME} />}
bottomContent={!shouldDisplayLHB && <NavigationTabBar selectedTab={NAVIGATION_TABS.HOME} />}
>
{({insets}) => (
<>
Expand All @@ -39,7 +39,7 @@ function BaseSidebarScreen() {
<View style={[styles.flex1]}>
<SidebarLinksData insets={insets} />
</View>
{shouldDisplayLHB && <NavigationTabBarDummy selectedTab={NAVIGATION_TABS.HOME} />}
{shouldDisplayLHB && <NavigationTabBar selectedTab={NAVIGATION_TABS.HOME} />}
</>
)}
</ScreenWrapper>
Expand Down
6 changes: 3 additions & 3 deletions src/pages/settings/InitialSettingsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import CustomStatusBarAndBackgroundContext from '@components/CustomStatusBarAndB
import Icon from '@components/Icon';
import * as Expensicons from '@components/Icon/Expensicons';
import MenuItem from '@components/MenuItem';
import NavigationTabBar from '@components/Navigation/NavigationTabBar';
import NAVIGATION_TABS from '@components/Navigation/NavigationTabBar/NAVIGATION_TABS';
import NavigationTabBarDummy from '@components/Navigation/NavigationTabBar/NavigationTabBarDummy';
import {PressableWithFeedback} from '@components/Pressable';
import ScreenWrapper from '@components/ScreenWrapper';
import {ScrollOffsetContext} from '@components/ScrollOffsetContextProvider';
Expand Down Expand Up @@ -422,7 +422,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
<ScreenWrapper
includeSafeAreaPaddingBottom
testID={InitialSettingsPage.displayName}
bottomContent={!shouldDisplayLHB && <NavigationTabBarDummy selectedTab={NAVIGATION_TABS.SETTINGS} />}
bottomContent={!shouldDisplayLHB && <NavigationTabBar selectedTab={NAVIGATION_TABS.SETTINGS} />}
shouldEnableKeyboardAvoidingView={false}
>
{headerContent}
Expand Down Expand Up @@ -455,7 +455,7 @@ function InitialSettingsPage({currentUserPersonalDetails}: InitialSettingsPagePr
}}
/>
</ScrollView>
{shouldDisplayLHB && <NavigationTabBarDummy selectedTab={NAVIGATION_TABS.SETTINGS} />}
{shouldDisplayLHB && <NavigationTabBar selectedTab={NAVIGATION_TABS.SETTINGS} />}
</ScreenWrapper>
);
}
Expand Down
Loading