Skip to content

Commit

Permalink
Move troubleshooting guide into a menu
Browse files Browse the repository at this point in the history
Reviewed By: lblasa

Differential Revision: D47591882

fbshipit-source-id: 84e3732100aa20d5f78b132a4c429b9b742678e9
  • Loading branch information
antonk52 authored and facebook-github-bot committed Jul 20, 2023
1 parent 57d4c99 commit 7195b35
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
2 changes: 2 additions & 0 deletions desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ import {
NavbarScreenshotButton,
} from '../chrome/ScreenCaptureButtons';
import {StatusMessage} from './appinspect/AppInspect';
import {TroubleshootingGuide} from './appinspect/fb-stubs/TroubleshootingGuide';

export const Navbar = withTrackingScope(function Navbar({
toplevelSelection,
Expand Down Expand Up @@ -509,6 +510,7 @@ function TroubleshootMenu({
Troubleshoot connectivity
</Menu.Item>
)}
<TroubleshootingGuide />
<Menu.Item
key="flipperlogs"
onClick={() => setToplevelSelection('flipperlogs')}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import {BaseDevice} from 'flipper-frontend-core';
import Client from '../../Client';
import {State} from '../../reducers';
import {brandColors, brandIcons, colors} from '../../ui/components/colors';
import {TroubleshootingGuide} from './fb-stubs/TroubleshootingGuide';
import {getSelectableDevices} from '../../selectors/connections';
import {getRenderHostInstance} from 'flipper-frontend-core';
import {NoDevices} from './NoDevices';
Expand Down Expand Up @@ -139,11 +138,7 @@ export function AppSelector() {
)}
{
/* Return the public component NoDevices if showGuide is false (This means that the user is not in the GK Allowlist) and no devices are detected */
!gkSelfSufficiency && entries.length == 0 ? (
<NoDevices />
) : !gkSelfSufficiency && entries.length > 0 ? null : (
<TroubleshootingGuide />
)
!gkSelfSufficiency && entries.length == 0 ? <NoDevices /> : null
}
</>
);
Expand Down

0 comments on commit 7195b35

Please sign in to comment.