From 7195b35b12e4a0375d50f4b3eb23a1ecedfd2e00 Mon Sep 17 00:00:00 2001
From: Anton Kastritskiy <antonk52@meta.com>
Date: Thu, 20 Jul 2023 03:54:19 -0700
Subject: [PATCH] Move troubleshooting guide into a menu

Reviewed By: lblasa

Differential Revision: D47591882

fbshipit-source-id: 84e3732100aa20d5f78b132a4c429b9b742678e9
---
 desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx        | 2 ++
 .../src/sandy-chrome/appinspect/AppSelector.tsx            | 7 +------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
index d33c0c732..1656c8170 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
@@ -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,
@@ -509,6 +510,7 @@ function TroubleshootMenu({
                 Troubleshoot connectivity
               </Menu.Item>
             )}
+            <TroubleshootingGuide />
             <Menu.Item
               key="flipperlogs"
               onClick={() => setToplevelSelection('flipperlogs')}>
diff --git a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/AppSelector.tsx b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/AppSelector.tsx
index 7c9ac6119..1fe010c9b 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/appinspect/AppSelector.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/appinspect/AppSelector.tsx
@@ -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';
@@ -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
       }
     </>
   );