From b9fafb0e61f8818d406e14f6d5a280ccc3fdfa3f Mon Sep 17 00:00:00 2001 From: Pritesh Nandgaonkar Date: Fri, 7 Feb 2020 03:43:17 -0800 Subject: [PATCH] Remove older support request form Summary: This diff removes the older support form as we no longer use it. Reviewed By: jknoxville Differential Revision: D19769541 fbshipit-source-id: ca2088e721f2895f2c8a1205889b0670477cc2d2 --- src/chrome/mainsidebar/MainSidebar2.tsx | 13 ------------ .../mainsidebar/MainSidebarUtilsSection.tsx | 5 +---- src/fb-stubs/SupportRequestFormManager.tsx | 20 ------------------- src/index.tsx | 1 - src/reducers/connections.tsx | 2 -- 5 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 src/fb-stubs/SupportRequestFormManager.tsx diff --git a/src/chrome/mainsidebar/MainSidebar2.tsx b/src/chrome/mainsidebar/MainSidebar2.tsx index c3f085f07..0b5660733 100644 --- a/src/chrome/mainsidebar/MainSidebar2.tsx +++ b/src/chrome/mainsidebar/MainSidebar2.tsx @@ -47,7 +47,6 @@ import { } from '../../reducers/connections'; import {setActiveSheet} from '../../reducers/application'; import {connect} from 'react-redux'; -import SupportRequestFormManager from '../../fb-stubs/SupportRequestFormManager'; import SupportRequestDetails from '../../fb-stubs/SupportRequestDetails'; import MainSidebarUtilsSection from './MainSidebarUtilsSection'; import { @@ -209,18 +208,6 @@ class MainSidebar2 extends PureComponent { showWatchDebugRoot: GK.get('watch_team_flipper_clientless_access'), showAllPlugins: false, }; - static getDerivedStateFromProps(props: Props, state: State) { - if ( - !state.showSupportForm && - props.staticView === SupportRequestFormManager - ) { - // Show SupportForm option even when GK is false and support form is shown. - // That means the user has used deeplink to open support form. - // Once the variable is true, it will be true for the whole session. - return {showSupportForm: true}; - } - return state; - } render() { const {devices} = this.props; diff --git a/src/chrome/mainsidebar/MainSidebarUtilsSection.tsx b/src/chrome/mainsidebar/MainSidebarUtilsSection.tsx index 33dadddc7..0348412c6 100644 --- a/src/chrome/mainsidebar/MainSidebarUtilsSection.tsx +++ b/src/chrome/mainsidebar/MainSidebarUtilsSection.tsx @@ -19,7 +19,6 @@ import NotificationScreen from '../NotificationScreen'; import {StaticView, setStaticView} from '../../reducers/connections'; import {setActiveSheet} from '../../reducers/application'; import UserAccount from '../UserAccount'; -import SupportRequestFormManager from '../../fb-stubs/SupportRequestFormManager'; import SupportRequestFormV2 from '../../fb-stubs/SupportRequestFormV2'; import WatchTools from '../../fb-stubs/WatchTools'; import { @@ -55,9 +54,7 @@ function MainSidebarUtilsSection({ const hasSeenSupportForm = useRef(false); const showSupportForm = - GK.get('support_requests_v2') || - isStaticViewActive(staticView, SupportRequestFormManager) || - hasSeenSupportForm.current; + GK.get('support_requests_v2') || hasSeenSupportForm.current; if (showSupportForm) { hasSeenSupportForm.current = true; } diff --git a/src/fb-stubs/SupportRequestFormManager.tsx b/src/fb-stubs/SupportRequestFormManager.tsx deleted file mode 100644 index a3cfcf270..000000000 --- a/src/fb-stubs/SupportRequestFormManager.tsx +++ /dev/null @@ -1,20 +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 Text from '../ui/components/FlexRow'; -import React, {PureComponent} from 'react'; - -export default class SupportRequestFormManager extends PureComponent< - void, - void -> { - render() { - return Implement your own Bug creator ; - } -} diff --git a/src/index.tsx b/src/index.tsx index 751bc4073..d82b59d91 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -29,7 +29,6 @@ export {PluginClient, Props} from './plugin'; export {default as Client} from './Client'; export {MetricType} from './utils/exportMetrics'; export {clipboard} from 'electron'; -export {default as SupportRequestFormManager} from './fb-stubs/SupportRequestFormManager'; export {default as SupportRequestFormV2} from './fb-stubs/SupportRequestFormV2'; export {default as constants} from './fb-stubs/constants'; export {connect} from 'react-redux'; diff --git a/src/reducers/connections.tsx b/src/reducers/connections.tsx index 717bf43cb..eb08efc3f 100644 --- a/src/reducers/connections.tsx +++ b/src/reducers/connections.tsx @@ -22,7 +22,6 @@ const WelcomeScreen = isHeadless() ? require('../chrome/WelcomeScreenHeadless').default : require('../chrome/WelcomeScreen').default; import NotificationScreen from '../chrome/NotificationScreen'; -import SupportRequestForm from '../fb-stubs/SupportRequestFormManager'; import SupportRequestFormV2 from '../fb-stubs/SupportRequestFormV2'; import SupportRequestDetails from '../fb-stubs/SupportRequestDetails'; import {getPluginKey} from '../utils/pluginUtils'; @@ -34,7 +33,6 @@ export type StaticView = | null | typeof WelcomeScreen | typeof NotificationScreen - | typeof SupportRequestForm | typeof SupportRequestFormV2 | typeof SupportRequestDetails;