Merge pull request #33213 from JKobrynski/removeDemoSetupPage

[NoQA] Remove DemoSetupPage and related code

src/CONST.ts

@@ -2933,11 +2933,6 @@ const CONST = {
     PARENT_CHILD_SEPARATOR: ': ',
     CATEGORY_LIST_THRESHOLD: 8,
     TAG_LIST_THRESHOLD: 8,
-    DEMO_PAGES: {
-        SAASTR: 'SaaStrDemoSetup',
-        SBE: 'SbeDemoSetup',
-        MONEY2020: 'Money2020DemoSetup',
-    },
     COLON: ':',
     MAPBOX: {
         PADDING: 50,

src/Expensify.js

@@ -13,7 +13,6 @@ import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import SplashScreenHider from './components/SplashScreenHider';
 import UpdateAppModal from './components/UpdateAppModal';
 import withLocalize, {withLocalizePropTypes} from './components/withLocalize';
-import * as DemoActions from './libs/actions/DemoActions';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
 import * as Report from './libs/actions/Report';
 import * as User from './libs/actions/User';
@@ -183,13 +182,11 @@ function Expensify(props) {
 
         // If the app is opened from a deep link, get the reportID (if exists) from the deep link and navigate to the chat report
         Linking.getInitialURL().then((url) => {
-            DemoActions.runDemoByURL(url);
             Report.openReportFromDeepLink(url, isAuthenticated);
         });
 
         // Open chat report from a deep link (only mobile native)
         Linking.addEventListener('url', (state) => {
-            DemoActions.runDemoByURL(state.url);
             Report.openReportFromDeepLink(state.url, isAuthenticated);
         });
 

src/ONYXKEYS.ts

@@ -231,9 +231,6 @@ const ONYXKEYS = {
     // The access token to be used with the Mapbox library
     MAPBOX_ACCESS_TOKEN: 'mapboxAccessToken',
 
-    // Information on any active demos being run
-    DEMO_INFO: 'demoInfo',
-
     // Max area supported for HTML <canvas> element
     MAX_CANVAS_AREA: 'maxCanvasArea',
 
@@ -431,7 +428,6 @@ type OnyxValues = {
     [ONYXKEYS.MAPBOX_ACCESS_TOKEN]: OnyxTypes.MapboxAccessToken;
     [ONYXKEYS.ONYX_UPDATES_FROM_SERVER]: OnyxTypes.OnyxUpdatesFromServer;
     [ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT]: number;
-    [ONYXKEYS.DEMO_INFO]: OnyxTypes.DemoInfo;
     [ONYXKEYS.MAX_CANVAS_AREA]: number;
     [ONYXKEYS.MAX_CANVAS_HEIGHT]: number;
     [ONYXKEYS.MAX_CANVAS_WIDTH]: number;

src/ROUTES.ts

@@ -463,11 +463,6 @@ const ROUTES = {
         route: 'referral/:contentType',
         getRoute: (contentType: string) => `referral/${contentType}` as const,
     },
-
-    // These are some one-off routes that will be removed once they're no longer needed (see GH issues for details)
-    SAASTR: 'saastr',
-    SBE: 'sbe',
-    MONEY2020: 'money2020',
 } as const;
 
 export {getUrlWithBackToParam};

src/libs/Navigation/AppNavigator/AuthScreens.tsx

@@ -11,7 +11,6 @@ import * as Pusher from '@libs/Pusher/pusher';
 import PusherConnectionManager from '@libs/PusherConnectionManager';
 import * as SessionUtils from '@libs/SessionUtils';
 import type {AuthScreensParamList} from '@navigation/types';
-import DemoSetupPage from '@pages/DemoSetupPage';
 import NotFoundPage from '@pages/ErrorPage/NotFoundPage';
 import DesktopSignInRedirectPage from '@pages/signin/DesktopSignInRedirectPage';
 import SearchInputManager from '@pages/workspace/SearchInputManager';
@@ -50,9 +49,6 @@ type AuthScreensProps = {
 
     /** The last Onyx update ID was applied to the client */
     lastUpdateIDAppliedToClient: OnyxEntry<number>;
-
-    /** Information about any currently running demos */
-    demoInfo: OnyxEntry<OnyxTypes.DemoInfo>;
 };
 
 const loadReportAttachments = () => require('../../../pages/home/report/ReportAttachments').default as React.ComponentType;
@@ -130,7 +126,7 @@ const modalScreenListeners = {
     },
 };
 
-function AuthScreens({lastUpdateIDAppliedToClient, session, lastOpenedPublicRoomID, demoInfo, isUsingMemoryOnlyKeys = false}: AuthScreensProps) {
+function AuthScreens({lastUpdateIDAppliedToClient, session, lastOpenedPublicRoomID, isUsingMemoryOnlyKeys = false}: AuthScreensProps) {
     const styles = useThemeStyles();
     const {isSmallScreenWidth} = useWindowDimensions();
     const screenOptions = getRootNavigatorScreenOptions(isSmallScreenWidth, styles);
@@ -189,10 +185,6 @@ function AuthScreens({lastUpdateIDAppliedToClient, session, lastOpenedPublicRoom
 
         App.redirectThirdPartyDesktopSignIn();
 
-        // Check if we should be running any demos immediately after signing in.
-        if (demoInfo?.money2020?.isBeginningDemo) {
-            Navigation.navigate(ROUTES.MONEY2020, CONST.NAVIGATION.TYPE.FORCED_UP);
-        }
         if (lastOpenedPublicRoomID) {
             // Re-open the last opened public room if the user logged in from a public room link
             Report.openLastOpenedPublicRoom(lastOpenedPublicRoomID);
@@ -283,21 +275,6 @@ function AuthScreens({lastUpdateIDAppliedToClient, session, lastOpenedPublicRoom
                     options={defaultScreenOptions}
                     getComponent={loadConciergePage}
                 />
-                <RootStack.Screen
-                    name={CONST.DEMO_PAGES.SAASTR}
-                    options={defaultScreenOptions}
-                    component={DemoSetupPage}
-                />
-                <RootStack.Screen
-                    name={CONST.DEMO_PAGES.SBE}
-                    options={defaultScreenOptions}
-                    component={DemoSetupPage}
-                />
-                <RootStack.Screen
-                    name={CONST.DEMO_PAGES.MONEY2020}
-                    options={defaultScreenOptions}
-                    component={DemoSetupPage}
-                />
                 <RootStack.Screen
                     name={SCREENS.REPORT_ATTACHMENTS}
                     options={{
@@ -345,7 +322,4 @@ export default withOnyx<AuthScreensProps, AuthScreensProps>({
     lastUpdateIDAppliedToClient: {
         key: ONYXKEYS.ONYX_UPDATES_LAST_UPDATE_ID_APPLIED_TO_CLIENT,
     },
-    demoInfo: {
-        key: ONYXKEYS.DEMO_INFO,
-    },
 })(AuthScreensMemoized);

src/libs/Navigation/linkingConfig.ts

@@ -30,9 +30,6 @@ const linkingConfig: LinkingOptions<RootStackParamList> = {
             [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: ROUTES.DESKTOP_SIGN_IN_REDIRECT,
             [SCREENS.REPORT_ATTACHMENTS]: ROUTES.REPORT_ATTACHMENTS.route,
 
-            // Demo routes
-            [CONST.DEMO_PAGES.MONEY2020]: ROUTES.MONEY2020,
-
             // Sidebar
             [SCREENS.HOME]: {
                 path: ROUTES.HOME,

src/libs/Navigation/types.ts

@@ -400,16 +400,9 @@ type AuthScreensParamList = {
         reportID: string;
         source: string;
     };
-    [CONST.DEMO_PAGES.SAASTR]: {
-        name: string;
-    };
-    [CONST.DEMO_PAGES.SBE]: {
-        name: string;
-    };
     [SCREENS.NOT_FOUND]: undefined;
     [NAVIGATORS.RIGHT_MODAL_NAVIGATOR]: NavigatorScreenParams<RightModalNavigatorParamList>;
     [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: undefined;
-    [CONST.DEMO_PAGES.MONEY2020]: undefined;
 };
 
 type RootStackParamList = PublicScreensParamList & AuthScreensParamList;

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

@@ -59,21 +59,13 @@ const propTypes = {
 
     /** Forwarded ref to FloatingActionButtonAndPopover */
     innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
-
-    /** Information about any currently running demos */
-    demoInfo: PropTypes.shape({
-        money2020: PropTypes.shape({
-            isBeginningDemo: PropTypes.bool,
-        }),
-    }),
 };
 const defaultProps = {
     onHideCreateMenu: () => {},
     onShowCreateMenu: () => {},
     allPolicies: {},
     isLoading: false,
     innerRef: null,
-    demoInfo: {},
 };
 
 /**
@@ -157,9 +149,7 @@ function FloatingActionButtonAndPopover(props) {
         if (currentRoute && ![NAVIGATORS.CENTRAL_PANE_NAVIGATOR, SCREENS.HOME].includes(currentRoute.name)) {
             return;
         }
-        if (lodashGet(props.demoInfo, 'money2020.isBeginningDemo', false)) {
-            return;
-        }
+
         Welcome.show({routes, showCreateMenu});
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [props.isLoading]);
@@ -284,8 +274,5 @@ export default compose(
         isLoading: {
             key: ONYXKEYS.IS_LOADING_APP,
         },
-        demoInfo: {
-            key: ONYXKEYS.DEMO_INFO,
-        },
     }),
 )(FloatingActionButtonAndPopoverWithRef);

src/types/onyx/index.ts

@@ -7,7 +7,6 @@ import Card from './Card';
 import Credentials from './Credentials';
 import Currency from './Currency';
 import CustomStatusDraft from './CustomStatusDraft';
-import DemoInfo from './DemoInfo';
 import Download from './Download';
 import Form, {AddDebitCardForm, DateOfBirthForm} from './Form';
 import FrequentlyUsedEmoji from './FrequentlyUsedEmoji';
@@ -71,7 +70,6 @@ export type {
     Currency,
     CustomStatusDraft,
     DateOfBirthForm,
-    DemoInfo,
     Download,
     Form,
     FrequentlyUsedEmoji,