From 5647b9a4b8a03b9e647428e7399f7ee35d6769fe Mon Sep 17 00:00:00 2001
From: Anton Kastritskiy <antonk52@meta.com>
Date: Tue, 18 Jul 2023 03:52:34 -0700
Subject: [PATCH] start emulator button

Reviewed By: elboman

Differential Revision: D47400275

fbshipit-source-id: 38a0090283e8fc7207b643411246b15a3659616d
---
 .../src/sandy-chrome/LeftRail.tsx              | 18 ------------------
 .../src/sandy-chrome/Navbar.tsx                | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx b/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx
index a4af6da7f..b23042a22 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/LeftRail.tsx
@@ -15,7 +15,6 @@ import {
   FileExclamationOutlined,
   SettingOutlined,
   MedicineBoxOutlined,
-  RocketOutlined,
   BugOutlined,
   ApiOutlined,
 } from '@ant-design/icons';
@@ -37,7 +36,6 @@ import {ToplevelProps} from './SandyApp';
 import {useValue} from 'flipper-plugin';
 import config from '../fb-stubs/config';
 import styled from '@emotion/styled';
-import {showEmulatorLauncher} from './appinspect/LaunchEmulator';
 import {setStaticView} from '../reducers/connections';
 import {SandyRatingButton} from '../chrome/RatingButton';
 import {filterNotifications} from './notification/notificationUtils';
@@ -185,7 +183,6 @@ export const LeftRail = withTrackingScope(function LeftRail({
           )}
           <UpdateIndicator />
           <SandyRatingButton />
-          <LaunchEmulatorButton />
           <SetupDoctorButton />
           <RightSidebarToggleButton />
           <ExportEverythingEverywhereAllAtOnceButton />
@@ -532,21 +529,6 @@ function ExportEverythingEverywhereAllAtOnceButton() {
   );
 }
 
-function LaunchEmulatorButton() {
-  const store = useStore();
-
-  return (
-    <LeftRailButton
-      icon={<RocketOutlined />}
-      title="Start Emulator / Simulator"
-      onClick={() => {
-        showEmulatorLauncher(store);
-      }}
-      small
-    />
-  );
-}
-
 function SetupDoctorButton() {
   const [visible, setVisible] = useState(false);
   const result = useStore(
diff --git a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
index 0af2c1e22..258947b3d 100644
--- a/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
+++ b/desktop/flipper-ui-core/src/sandy-chrome/Navbar.tsx
@@ -24,11 +24,13 @@ import {
   LoginOutlined,
   MedicineBoxOutlined,
   QuestionCircleOutlined,
+  RocketOutlined,
   VideoCameraOutlined,
   WarningOutlined,
 } from '@ant-design/icons';
 import {toggleLeftSidebarVisible} from '../reducers/application';
 import PluginManager from '../chrome/plugin-manager/PluginManager';
+import {showEmulatorLauncher} from './appinspect/LaunchEmulator';
 
 export function Navbar() {
   return (
@@ -47,6 +49,7 @@ export function Navbar() {
         <button>device picker</button>
         <NavbarButton label="Screenshot" icon={CameraOutlined} />
         <NavbarButton label="Record" icon={VideoCameraOutlined} />
+        <LaunchEmulatorButton />
       </Layout.Horizontal>
       <Layout.Horizontal style={{gap: 4, alignItems: 'center'}}>
         <NavbarButton
@@ -85,6 +88,20 @@ function LeftSidebarToggleButton() {
   );
 }
 
+function LaunchEmulatorButton() {
+  const store = useStore();
+
+  return (
+    <NavbarButton
+      icon={RocketOutlined}
+      label="Start [E/Si]mulator"
+      onClick={() => {
+        showEmulatorLauncher(store);
+      }}
+    />
+  );
+}
+
 function NavbarButton({
   icon: Icon,
   label,