Merge pull request #60462 from Expensify/revert-60078-pac-guerreiro/feature/test-drive-admin-modal

Revert "[Test Drive][Phase 1][FE] Implement the Test Drive modal"

Author: marcaaron

assets/images/fast-track-cover.jpg

@@ -5160,7 +5160,6 @@ const CONST = {
             VIDEO_URL: `${CLOUDFRONT_URL}/videos/guided-setup-track-business-v2.mp4`,
             LEARN_MORE_LINK: `${USE_EXPENSIFY_URL}/track-expenses`,
         },
-        TEST_DRIVE_COVER_ASPECT_RATIO: 500 / 300,
     },
 
     /**

src/CONST.ts

@@ -11,7 +11,6 @@ export default {
     WELCOME_VIDEO_MODAL_NAVIGATOR: 'WelcomeVideoModalNavigator',
     EXPLANATION_MODAL_NAVIGATOR: 'ExplanationModalNavigator',
     MIGRATED_USER_MODAL_NAVIGATOR: 'MigratedUserModalNavigator',
-    TEST_DRIVE_MODAL_NAVIGATOR: 'TestDriveModalNavigator',
     REPORTS_SPLIT_NAVIGATOR: 'ReportsSplitNavigator',
     SETTINGS_SPLIT_NAVIGATOR: 'SettingsSplitNavigator',
     WORKSPACE_SPLIT_NAVIGATOR: 'WorkspaceSplitNavigator',

src/NAVIGATORS.ts

@@ -1893,7 +1893,6 @@ const ROUTES = {
     },
     WELCOME_VIDEO_ROOT: 'onboarding/welcome-video',
     EXPLANATION_MODAL_ROOT: 'onboarding/explanation',
-    TEST_DRIVE_MODAL_ROOT: 'onboarding/test-drive',
     WORKSPACE_CONFIRMATION: {
         route: 'workspace/confirmation',
         getRoute: (backTo?: string) => getUrlWithBackToParam(`workspace/confirmation`, backTo),

src/ROUTES.ts

@@ -658,10 +658,6 @@ const SCREENS = {
         ROOT: 'MigratedUserWelcomeModal_Root',
     },
 
-    TEST_DRIVE_MODAL: {
-        ROOT: 'TestDrive_Modal_Root',
-    },
-
     I_KNOW_A_TEACHER: 'I_Know_A_Teacher',
     INTRO_SCHOOL_PRINCIPAL: 'Intro_School_Principal',
     I_AM_A_TEACHER: 'I_Am_A_Teacher',

src/SCREENS.ts

@@ -1,8 +1,8 @@
 import type {VideoReadyForDisplayEvent} from 'expo-av';
 import type {ImageContentFit} from 'expo-image';
 import React, {useCallback, useEffect, useLayoutEffect, useState} from 'react';
-import {Image, InteractionManager, View} from 'react-native';
-import type {ImageResizeMode, ImageSourcePropType, StyleProp, ViewStyle} from 'react-native';
+import {InteractionManager, View} from 'react-native';
+import type {StyleProp, ViewStyle} from 'react-native';
 import {GestureHandlerRootView} from 'react-native-gesture-handler';
 import type {MergeExclusive} from 'type-fest';
 import useLocalize from '@hooks/useLocalize';
@@ -96,9 +96,6 @@ type BaseFeatureTrainingModalProps = {
 
     /** Whether to disable the modal */
     isModalDisabled?: boolean;
-
-    /** Whether the modal image is a SVG */
-    shouldRenderSVG?: boolean;
 };
 
 type FeatureTrainingModalVideoProps = {
@@ -155,7 +152,6 @@ function FeatureTrainingModal({
     imageWidth,
     imageHeight,
     isModalDisabled = true,
-    shouldRenderSVG = true,
 }: FeatureTrainingModalProps) {
     const styles = useThemeStyles();
     const StyleUtils = useStyleUtils();
@@ -219,19 +215,13 @@ function FeatureTrainingModal({
                     (!!videoURL || !!image) && {aspectRatio},
                 ]}
             >
-                {!!image && shouldRenderSVG ? (
+                {!!image && (
                     <ImageSVG
                         src={image}
                         contentFit={contentFitImage}
                         width={imageWidth}
                         height={imageHeight}
                     />
-                ) : (
-                    <Image
-                        source={image as ImageSourcePropType}
-                        resizeMode={contentFitImage as ImageResizeMode}
-                        style={styles.featureTrainingModalImage}
-                    />
                 )}
                 {!!videoURL && videoStatus === 'video' && (
                     <GestureHandlerRootView>
@@ -260,25 +250,23 @@ function FeatureTrainingModal({
             </View>
         );
     }, [
+        image,
+        imageHeight,
+        imageWidth,
+        contentFitImage,
         illustrationAspectRatio,
         styles.w100,
-        styles.featureTrainingModalImage,
         styles.onboardingVideoPlayer,
         styles.flex1,
         styles.alignItemsCenter,
         styles.justifyContentCenter,
         styles.h100,
-        illustrationInnerContainerStyle,
-        videoURL,
-        image,
-        shouldRenderSVG,
-        contentFitImage,
-        imageWidth,
-        imageHeight,
         videoStatus,
+        videoURL,
         animationStyle,
         animation,
         shouldUseNarrowLayout,
+        illustrationInnerContainerStyle,
     ]);
 
     const toggleWillShowAgain = useCallback(() => setWillShowAgain((prevWillShowAgain) => !prevWillShowAgain), []);

src/components/FeatureTrainingModal.tsx

@@ -6221,14 +6221,6 @@ const translations = {
         talkToConcierge: 'Talk to Concierge',
         hangUp: 'Hang up',
     },
-    testDrive: {
-        modal: {
-            title: 'Take us for a test drive',
-            description: 'Take a quick product tour to get up to speed fast. No pit stops required!',
-            confirmText: 'Start test drive',
-            helpText: 'Skip',
-        },
-    },
 };
 
 export default translations satisfies TranslationDeepObject<typeof translations>;

src/components/TestDriveModal.tsx

@@ -6744,14 +6744,6 @@ const translations = {
         talkToConcierge: 'Habla con Concierge',
         hangUp: 'Colgar',
     },
-    testDrive: {
-        modal: {
-            title: 'Haz una prueba con nosotros',
-            description: 'Haz un recorrido rápido por el producto para ponerte al día rápidamente. ¡No se requieren paradas!',
-            confirmText: 'Iniciar prueba',
-            helpText: 'Omitir',
-        },
-    },
 };
 
 export default translations satisfies TranslationDeepObject<typeof en>;

src/languages/en.ts

@@ -69,7 +69,6 @@ import LeftModalNavigator from './Navigators/LeftModalNavigator';
 import MigratedUserWelcomeModalNavigator from './Navigators/MigratedUserWelcomeModalNavigator';
 import OnboardingModalNavigator from './Navigators/OnboardingModalNavigator';
 import RightModalNavigator from './Navigators/RightModalNavigator';
-import TestDriveModalNavigator from './Navigators/TestDriveModalNavigator';
 import WelcomeVideoModalNavigator from './Navigators/WelcomeVideoModalNavigator';
 import useRootNavigatorScreenOptions from './useRootNavigatorScreenOptions';
 
@@ -631,11 +630,6 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                     options={rootNavigatorScreenOptions.basicModalNavigator}
                     component={MigratedUserWelcomeModalNavigator}
                 />
-                <RootStack.Screen
-                    name={NAVIGATORS.TEST_DRIVE_MODAL_NAVIGATOR}
-                    options={rootNavigatorScreenOptions.basicModalNavigator}
-                    component={TestDriveModalNavigator}
-                />
                 <RootStack.Screen
                     name={NAVIGATORS.FEATURE_TRANING_MODAL_NAVIGATOR}
                     options={rootNavigatorScreenOptions.basicModalNavigator}

src/languages/es.ts

@@ -19,7 +19,6 @@ const MODAL_ROUTES_TO_DISMISS: string[] = [
     NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR,
     NAVIGATORS.FEATURE_TRANING_MODAL_NAVIGATOR,
     NAVIGATORS.SHARE_MODAL_NAVIGATOR,
-    NAVIGATORS.TEST_DRIVE_MODAL_NAVIGATOR,
     SCREENS.NOT_FOUND,
     SCREENS.ATTACHMENTS,
     SCREENS.TRANSACTION_RECEIPT,

src/libs/Navigation/AppNavigator/AuthScreens.tsx

@@ -83,15 +83,6 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
             },
         },
 
-        [NAVIGATORS.TEST_DRIVE_MODAL_NAVIGATOR]: {
-            screens: {
-                [SCREENS.TEST_DRIVE_MODAL.ROOT]: {
-                    path: ROUTES.TEST_DRIVE_MODAL_ROOT,
-                    exact: true,
-                },
-            },
-        },
-
         [NAVIGATORS.ONBOARDING_MODAL_NAVIGATOR]: {
             // Don't set the initialRouteName, because when the user continues from the last visited onboarding page,
             // the onboarding purpose page will be briefly visible.

src/libs/Navigation/AppNavigator/Navigators/TestDriveModalNavigator.tsx

@@ -1778,10 +1778,6 @@ type MigratedUserModalNavigatorParamList = {
     [SCREENS.MIGRATED_USER_WELCOME_MODAL.ROOT]: undefined;
 };
 
-type TestDriveModalNavigatorParamList = {
-    [SCREENS.TEST_DRIVE_MODAL.ROOT]: undefined;
-};
-
 type SharedScreensParamList = {
     [NAVIGATORS.REPORTS_SPLIT_NAVIGATOR]: NavigatorScreenParams<ReportsSplitNavigatorParamList>;
     [SCREENS.TRANSITION_BETWEEN_APPS]: {
@@ -1863,7 +1859,6 @@ type AuthScreensParamList = SharedScreensParamList & {
     [NAVIGATORS.WELCOME_VIDEO_MODAL_NAVIGATOR]: NavigatorScreenParams<WelcomeVideoModalNavigatorParamList>;
     [NAVIGATORS.EXPLANATION_MODAL_NAVIGATOR]: NavigatorScreenParams<ExplanationModalNavigatorParamList>;
     [NAVIGATORS.MIGRATED_USER_MODAL_NAVIGATOR]: NavigatorScreenParams<MigratedUserModalNavigatorParamList>;
-    [NAVIGATORS.TEST_DRIVE_MODAL_NAVIGATOR]: NavigatorScreenParams<TestDriveModalNavigatorParamList>;
     [NAVIGATORS.SEARCH_FULLSCREEN_NAVIGATOR]: NavigatorScreenParams<SearchFullscreenNavigatorParamList>;
     [SCREENS.DESKTOP_SIGN_IN_REDIRECT]: undefined;
     [SCREENS.TRANSACTION_RECEIPT]: {
@@ -2059,7 +2054,6 @@ export type {
     WorkspaceConfirmationNavigatorParamList,
     TwoFactorAuthNavigatorParamList,
     ConsoleNavigatorParamList,
-    TestDriveModalNavigatorParamList,
     WorkspaceScreenName,
     SettingsTabScreenName,
 };

src/libs/Navigation/AppNavigator/createRootStackNavigator/GetStateForActionHandlers.ts

@@ -5659,20 +5659,6 @@ const styles = (theme: ThemeColors) =>
             left: 0,
             right: 0,
         },
-
-        testDriveModalContainer: {
-            // On small/medium screens, we need to remove the top padding
-            paddingTop: 0,
-            // On medium screens, we need to prevent the modal from becoming too big
-            maxWidth: 500,
-        },
-
-        featureTrainingModalImage: {
-            width: '100%',
-            height: '100%',
-            borderTopLeftRadius: variables.componentBorderRadiusLarge,
-            borderTopRightRadius: variables.componentBorderRadiusLarge,
-        },
     } satisfies Styles);
 
 type ThemeStyles = ReturnType<typeof styles>;