From bf6655a640f5dce245d47df595b607cb96c90220 Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Mon, 18 Jan 2021 06:45:17 -0800
Subject: [PATCH] Clean up SandySettingsPanel

Summary: The fb and non-fb sandy settings are now identical (see diff 1 of this stack), so inlined the component and dropped the files

Reviewed By: priteshrnandgaonkar

Differential Revision: D25824522

fbshipit-source-id: 5a388b3f7259cb96f0e45ceb3363c40e4f198d7b
---
 desktop/app/src/chrome/SettingsSheet.tsx      | 14 +++++++---
 .../app/src/fb-stubs/SandySettingsPanel.tsx   | 26 -------------------
 2 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 desktop/app/src/fb-stubs/SandySettingsPanel.tsx

diff --git a/desktop/app/src/chrome/SettingsSheet.tsx b/desktop/app/src/chrome/SettingsSheet.tsx
index 94758dbf0..46146c8b1 100644
--- a/desktop/app/src/chrome/SettingsSheet.tsx
+++ b/desktop/app/src/chrome/SettingsSheet.tsx
@@ -25,7 +25,6 @@ import KeyboardShortcutInput from './settings/KeyboardShortcutInput';
 import {isEqual, isMatch, isEmpty} from 'lodash';
 import restartFlipper from '../utils/restartFlipper';
 import LauncherSettingsPanel from '../fb-stubs/LauncherSettingsPanel';
-import SandySettingsPanel from '../fb-stubs/SandySettingsPanel';
 import {reportUsage} from '../utils/metrics';
 import {Modal, message} from 'antd';
 import {Layout, withTrackingScope, _NuxManagerContext} from 'flipper-plugin';
@@ -261,7 +260,8 @@ class SettingsSheet extends Component<Props, State> {
             });
           }}
         />
-        <SandySettingsPanel
+        <ToggledSection
+          label="Disable Sandy UI"
           toggled={this.state.updatedSettings.disableSandy}
           onChange={(v) => {
             this.setState({
@@ -274,8 +274,14 @@ class SettingsSheet extends Component<Props, State> {
                 disableSandy: v,
               },
             });
-          }}
-        />
+          }}>
+          {' '}
+          <ConfigText
+            content={
+              'If disabled, Flipper will fall back to the classic design.'
+            }
+          />
+        </ToggledSection>
         {!disableSandy && (
           <ToggledSection
             label="Enable dark theme (experimental)"
diff --git a/desktop/app/src/fb-stubs/SandySettingsPanel.tsx b/desktop/app/src/fb-stubs/SandySettingsPanel.tsx
deleted file mode 100644
index fa6b37145..000000000
--- a/desktop/app/src/fb-stubs/SandySettingsPanel.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- */
-
-import React from 'react';
-import ToggledSection from '../chrome/settings/ToggledSection';
-import {ConfigText} from '../chrome/settings/configFields';
-
-export default function (props: {
-  toggled: boolean;
-  onChange: (value: boolean) => void;
-}) {
-  return (
-    <ToggledSection {...props} label="Disable Sandy UI">
-      {' '}
-      <ConfigText
-        content={'If disabled, Flipper will fall back to the classic design.'}
-      />
-    </ToggledSection>
-  );
-}