diff --git a/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx b/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx index f1743710b..32aeb954d 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx @@ -9,7 +9,7 @@ import React, {cloneElement, useState, useCallback} from 'react'; import {Button, Divider, Badge, Tooltip, Menu, Modal} from 'antd'; -import {MobileFilled, SettingOutlined, BugOutlined} from '@ant-design/icons'; +import {SettingOutlined, BugOutlined} from '@ant-design/icons'; import {useStore} from '../utils/useStore'; import { theme, @@ -20,7 +20,6 @@ import { } from 'flipper-plugin'; import SettingsSheet from '../chrome/SettingsSheet'; import WelcomeScreen from './WelcomeScreen'; -import {ToplevelProps} from './SandyApp'; import config from '../fb-stubs/config'; import styled from '@emotion/styled'; import {setStaticView} from '../reducers/connections'; @@ -119,10 +118,7 @@ const LeftRailDivider = styled(Divider)({ }); LeftRailDivider.displayName = 'LeftRailDividier'; -export const LeftRail = withTrackingScope(function LeftRail({ - toplevelSelection, - setToplevelSelection, -}: ToplevelProps) { +export const LeftRail = withTrackingScope(function LeftRail() { return ( - - - } - title="App Inspect" - selected={toplevelSelection === 'appinspect'} - onClick={() => { - setToplevelSelection('appinspect'); - }} - /> - - - - - - - - - + + + + + + ); }); diff --git a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx index 3b31cecaa..af468f436 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx @@ -33,6 +33,7 @@ import { LayoutOutlined, LoginOutlined, MedicineBoxOutlined, + MobileOutlined, QuestionCircleOutlined, RocketOutlined, VideoCameraOutlined, @@ -70,6 +71,15 @@ export const Navbar = withTrackingScope(function Navbar({ }}> + { + setToplevelSelection('appinspect'); + }} + /> + diff --git a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx index 15d32dd9d..f370a2e97 100644 --- a/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx +++ b/desktop/flipper-ui-core/src/sandy-chrome/SandyApp.tsx @@ -175,10 +175,7 @@ export function SandyApp() { /> - + <_Sidebar width={250} minWidth={220} maxWidth={800} gutter> {leftMenuContent && (