diff options
Diffstat (limited to 'src/view/shell')
-rw-r--r-- | src/view/shell/bottom-bar/BottomBar.tsx | 25 | ||||
-rw-r--r-- | src/view/shell/bottom-bar/BottomBarWeb.tsx | 11 | ||||
-rw-r--r-- | src/view/shell/desktop/LeftNav.tsx | 22 |
3 files changed, 23 insertions, 35 deletions
diff --git a/src/view/shell/bottom-bar/BottomBar.tsx b/src/view/shell/bottom-bar/BottomBar.tsx index 80886b320..b5ad92b4c 100644 --- a/src/view/shell/bottom-bar/BottomBar.tsx +++ b/src/view/shell/bottom-bar/BottomBar.tsx @@ -45,7 +45,6 @@ import { Message_Stroke2_Corner0_Rounded as Message, Message_Stroke2_Corner0_Rounded_Filled as MessageFilled, } from '#/components/icons/Message' -import {HomeTourExploreWrapper} from '#/tours/HomeTour' import {styles} from './BottomBarStyles' type TabOptions = @@ -163,19 +162,17 @@ export function BottomBar({navigation}: BottomTabBarProps) { <Btn testID="bottomBarSearchBtn" icon={ - <HomeTourExploreWrapper> - {isAtSearch ? ( - <MagnifyingGlassFilled - width={iconWidth + 2} - style={[styles.ctrlIcon, pal.text, styles.searchIcon]} - /> - ) : ( - <MagnifyingGlass - width={iconWidth + 2} - style={[styles.ctrlIcon, pal.text, styles.searchIcon]} - /> - )} - </HomeTourExploreWrapper> + isAtSearch ? ( + <MagnifyingGlassFilled + width={iconWidth + 2} + style={[styles.ctrlIcon, pal.text, styles.searchIcon]} + /> + ) : ( + <MagnifyingGlass + width={iconWidth + 2} + style={[styles.ctrlIcon, pal.text, styles.searchIcon]} + /> + ) } onPress={onPressSearch} accessibilityRole="search" diff --git a/src/view/shell/bottom-bar/BottomBarWeb.tsx b/src/view/shell/bottom-bar/BottomBarWeb.tsx index c89d2a63c..21c253ee0 100644 --- a/src/view/shell/bottom-bar/BottomBarWeb.tsx +++ b/src/view/shell/bottom-bar/BottomBarWeb.tsx @@ -41,7 +41,6 @@ import { UserCircle_Filled_Corner0_Rounded as UserCircleFilled, UserCircle_Stroke2_Corner0_Rounded as UserCircle, } from '#/components/icons/UserCircle' -import {HomeTourExploreWrapper} from '#/tours/HomeTour' import {styles} from './BottomBarStyles' export function BottomBarWeb() { @@ -95,12 +94,10 @@ export function BottomBarWeb() { {({isActive}) => { const Icon = isActive ? MagnifyingGlassFilled : MagnifyingGlass return ( - <HomeTourExploreWrapper> - <Icon - width={iconWidth + 2} - style={[styles.ctrlIcon, pal.text, styles.searchIcon]} - /> - </HomeTourExploreWrapper> + <Icon + width={iconWidth + 2} + style={[styles.ctrlIcon, pal.text, styles.searchIcon]} + /> ) }} </NavItem> diff --git a/src/view/shell/desktop/LeftNav.tsx b/src/view/shell/desktop/LeftNav.tsx index 49fb7fc99..ca8073f57 100644 --- a/src/view/shell/desktop/LeftNav.tsx +++ b/src/view/shell/desktop/LeftNav.tsx @@ -63,7 +63,6 @@ import { UserCircle_Filled_Corner0_Rounded as UserCircleFilled, UserCircle_Stroke2_Corner0_Rounded as UserCircle, } from '#/components/icons/UserCircle' -import {HomeTourExploreWrapper} from '#/tours/HomeTour' import {router} from '../../../routes' const NAV_ICON_WIDTH = 28 @@ -341,19 +340,14 @@ export function DesktopLeftNav() { iconFilled={<HomeFilled width={NAV_ICON_WIDTH} style={pal.text} />} label={_(msg`Home`)} /> - <HomeTourExploreWrapper> - <NavItem - href="/search" - icon={<MagnifyingGlass style={pal.text} width={NAV_ICON_WIDTH} />} - iconFilled={ - <MagnifyingGlassFilled - style={pal.text} - width={NAV_ICON_WIDTH} - /> - } - label={_(msg`Search`)} - /> - </HomeTourExploreWrapper> + <NavItem + href="/search" + icon={<MagnifyingGlass style={pal.text} width={NAV_ICON_WIDTH} />} + iconFilled={ + <MagnifyingGlassFilled style={pal.text} width={NAV_ICON_WIDTH} /> + } + label={_(msg`Search`)} + /> <NavItem href="/notifications" count={numUnreadNotifications} |