Merge branch 'main' of https://github.com/Expensify/App into fix/64799/negative-sign-expense

Author: thelullabyy

src/CONST/index.ts

@@ -642,7 +642,6 @@ const CONST = {
         CUSTOM_RULES: 'customRules',
         GLOBAL_REIMBURSEMENTS_ON_ND: 'globalReimbursementsOnND',
         IS_TRAVEL_VERIFIED: 'isTravelVerified',
-        MULTI_LEVEL_TAGS: 'multiLevelTags',
         NEWDOT_MULTI_FILES_DRAG_AND_DROP: 'newDotMultiFilesDragAndDrop',
         NEWDOT_MULTI_SCAN: 'newDotMultiScan',
         PLAID_COMPANY_CARDS: 'plaidCompanyCards',

src/ROUTES.ts

@@ -1919,6 +1919,10 @@ const ROUTES = {
         getRoute: (backTo?: string) => getUrlWithBackToParam('change-workspace-educational', backTo),
     },
     TRAVEL_MY_TRIPS: 'travel',
+    TRAVEL_DOT_LINK_WEB_VIEW: {
+        route: 'travel-dot-link',
+        getRoute: (token: string, isTestAccount?: boolean) => `travel-dot-link?token=${token}&isTestAccount=${isTestAccount}` as const,
+    },
     TRAVEL_TCS: {
         route: 'travel/terms/:domain/accept',
         getRoute: (domain: string, backTo?: string) => getUrlWithBackToParam(`travel/terms/${domain}/accept`, backTo),
@@ -2581,7 +2585,10 @@ const ROUTES = {
         getRoute: (reportID: string) => `r/${reportID}/schedule-call/confirmation` as const,
     },
 
-    TEST_TOOLS_MODAL: 'test-tools',
+    TEST_TOOLS_MODAL: {
+        route: 'test-tools',
+        getRoute: (backTo?: string) => getUrlWithBackToParam('test-tools' as const, backTo),
+    },
 } as const;
 
 /**

src/SCREENS.ts

@@ -35,6 +35,7 @@ const SCREENS = {
         DOMAIN_PERMISSION_INFO: 'Travel_DomainPermissionInfo',
         PUBLIC_DOMAIN_ERROR: 'Travel_PublicDomainError',
         WORKSPACE_ADDRESS: 'Travel_WorkspaceAddress',
+        TRAVEL_DOT_LINK_WEB_VIEW: 'Travel_DotLinkWebView',
     },
     SEARCH: {
         ROOT: 'Search_Root',

src/components/BookTravelButton.tsx

@@ -8,14 +8,11 @@ import usePermissions from '@hooks/usePermissions';
 import usePolicy from '@hooks/usePolicy';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {openTravelDotLink} from '@libs/actions/Link';
 import {cleanupTravelProvisioningSession, requestTravelAccess} from '@libs/actions/Travel';
-import Log from '@libs/Log';
 import Navigation from '@libs/Navigation/Navigation';
+import {openTravelDotLink} from '@libs/openTravelDotLink';
 import {getActivePolicies, getAdminsPrivateEmailDomains, isPaidGroupPolicy} from '@libs/PolicyUtils';
 import colors from '@styles/theme/colors';
-import closeReactNativeApp from '@userActions/HybridApp';
-import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
@@ -68,9 +65,6 @@ function BookTravelButton({text, shouldRenderErrorMessageBelowButton = false, se
     const {login: currentUserLogin} = useCurrentUserPersonalDetails();
     const activePolicies = getActivePolicies(policies, currentUserLogin);
     const groupPaidPolicies = activePolicies.filter((activePolicy) => activePolicy.type !== CONST.POLICY.TYPE.PERSONAL && isPaidGroupPolicy(activePolicy));
-    // Flag indicating whether NewDot was launched exclusively for Travel,
-    // e.g., when the user selects "Trips" from the Expensify Classic menu in HybridApp.
-    const [wasNewDotLaunchedJustForTravel] = useOnyx(ONYXKEYS.HYBRID_APP, {selector: (hybridApp) => hybridApp?.isSingleNewDotEntry, canBeMissing: false});
 
     const hidePreventionModal = () => setPreventionModalVisibility(false);
     const hideVerificationModal = () => setVerificationModalVisibility(false);
@@ -125,21 +119,7 @@ function BookTravelButton({text, shouldRenderErrorMessageBelowButton = false, se
 
         const isPolicyProvisioned = policy?.travelSettings?.spotnanaCompanyID ?? policy?.travelSettings?.associatedTravelDomainAccountID;
         if (policy?.travelSettings?.hasAcceptedTerms ?? (travelSettings?.hasAcceptedTerms && isPolicyProvisioned)) {
-            openTravelDotLink(policy?.id)
-                ?.then(() => {
-                    // When a user selects "Trips" in the Expensify Classic menu, the HybridApp opens the ManageTrips page in NewDot.
-                    // The wasNewDotLaunchedJustForTravel flag indicates if NewDot was launched solely for this purpose.
-                    if (!CONFIG.IS_HYBRID_APP || !wasNewDotLaunchedJustForTravel) {
-                        return;
-                    }
-
-                    // Close NewDot if it was opened only for Travel, as its purpose is now fulfilled.
-                    Log.info('[HybridApp] Returning to OldDot after opening TravelDot');
-                    closeReactNativeApp({shouldSignOut: false, shouldSetNVP: false});
-                })
-                ?.catch(() => {
-                    setErrorMessage(translate('travel.errorMessage'));
-                });
+            openTravelDotLink(policy?.id);
         } else if (isPolicyProvisioned) {
             navigateToAcceptTerms(CONST.TRAVEL.DEFAULT_DOMAIN);
         } else if (!isBetaEnabled(CONST.BETAS.IS_TRAVEL_VERIFIED)) {
@@ -175,7 +155,6 @@ function BookTravelButton({text, shouldRenderErrorMessageBelowButton = false, se
         styles.link,
         StyleUtils,
         translate,
-        wasNewDotLaunchedJustForTravel,
         isUserValidated,
     ]);
 

src/components/TestToolsModalPage.tsx

@@ -1,60 +1,84 @@
+import {useRoute} from '@react-navigation/native';
 import React from 'react';
 import {View} from 'react-native';
 import useIsAuthenticated from '@hooks/useIsAuthenticated';
 import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import useWindowDimensions from '@hooks/useWindowDimensions';
+import navigateAfterInteraction from '@libs/Navigation/navigateAfterInteraction';
+import type {PlatformStackRouteProp} from '@libs/Navigation/PlatformStackNavigation/types';
 import Navigation from '@navigation/Navigation';
+import type {TestToolsModalModalNavigatorParamList} from '@navigation/types';
+import toggleTestToolsModal from '@userActions/TestTool';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
+import type SCREENS from '@src/SCREENS';
 import Button from './Button';
+import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback';
 import RecordTroubleshootDataToolMenu from './RecordTroubleshootDataToolMenu';
 import SafeAreaConsumer from './SafeAreaConsumer';
 import ScrollView from './ScrollView';
 import TestToolMenu from './TestToolMenu';
 import TestToolRow from './TestToolRow';
 import Text from './Text';
 
-function getRouteBasedOnAuthStatus(isAuthenticated: boolean, activeRoute: string) {
+function getRouteBasedOnAuthStatus(isAuthenticated: boolean, activeRoute?: string) {
     return isAuthenticated ? ROUTES.SETTINGS_CONSOLE.getRoute(activeRoute) : ROUTES.PUBLIC_CONSOLE_DEBUG.getRoute(activeRoute);
 }
 
 function TestToolsModalPage() {
     const {windowHeight} = useWindowDimensions();
     const styles = useThemeStyles();
     const {translate} = useLocalize();
-    const activeRoute = Navigation.getActiveRoute();
+    const route = useRoute<PlatformStackRouteProp<TestToolsModalModalNavigatorParamList, typeof SCREENS.TEST_TOOLS_MODAL.ROOT>>();
+    const backTo = route.params?.backTo;
     const [shouldStoreLogs = false] = useOnyx(ONYXKEYS.SHOULD_STORE_LOGS, {canBeMissing: true});
     const isAuthenticated = useIsAuthenticated();
-    const route = getRouteBasedOnAuthStatus(isAuthenticated, activeRoute);
+
+    // If no backTo param is provided (direct access to /test-tools),
+    // use home route as a default backTo param for console navigation
+    const effectiveBackTo = backTo ?? ROUTES.HOME;
+    const consoleRoute = getRouteBasedOnAuthStatus(isAuthenticated, effectiveBackTo);
 
     const maxHeight = windowHeight;
 
     return (
         <SafeAreaConsumer>
             {({safeAreaPaddingBottomStyle}) => (
                 <View style={[{maxHeight}, styles.h100, styles.defaultModalContainer, safeAreaPaddingBottomStyle]}>
-                    <ScrollView style={[styles.flex1, styles.flexGrow1, styles.ph5]}>
-                        <Text
-                            style={[styles.textLabelSupporting, styles.mt5, styles.mb3]}
-                            numberOfLines={1}
+                    <ScrollView
+                        style={[styles.flex1, styles.ph5]}
+                        contentContainerStyle={styles.flexGrow1}
+                    >
+                        <PressableWithoutFeedback
+                            accessible={false}
+                            style={[styles.cursorDefault]}
                         >
-                            {translate('initialSettingsPage.troubleshoot.releaseOptions')}
-                        </Text>
-                        <RecordTroubleshootDataToolMenu />
-                        {!!shouldStoreLogs && (
-                            <TestToolRow title={translate('initialSettingsPage.troubleshoot.debugConsole')}>
-                                <Button
-                                    small
-                                    text={translate('initialSettingsPage.debugConsole.viewConsole')}
-                                    onPress={() => {
-                                        Navigation.navigate(route);
-                                    }}
-                                />
-                            </TestToolRow>
-                        )}
-                        <TestToolMenu />
+                            <Text
+                                style={[styles.textLabelSupporting, styles.mt5, styles.mb3]}
+                                numberOfLines={1}
+                            >
+                                {translate('initialSettingsPage.troubleshoot.releaseOptions')}
+                            </Text>
+                            <RecordTroubleshootDataToolMenu />
+                            {!!shouldStoreLogs && (
+                                <TestToolRow title={translate('initialSettingsPage.troubleshoot.debugConsole')}>
+                                    <Button
+                                        small
+                                        text={translate('initialSettingsPage.debugConsole.viewConsole')}
+                                        onPress={() => {
+                                            // Close the test tools modal first, then navigate to console page
+                                            toggleTestToolsModal();
+                                            navigateAfterInteraction(() => {
+                                                Navigation.navigate(consoleRoute);
+                                            });
+                                        }}
+                                    />
+                                </TestToolRow>
+                            )}
+                            <TestToolMenu />
+                        </PressableWithoutFeedback>
                     </ScrollView>
                 </View>
             )}

src/libs/Navigation/AppNavigator/AuthScreens.tsx

@@ -760,6 +760,7 @@ function AuthScreens({session, lastOpenedPublicRoomID, initialLastUpdateIDApplie
                             cardStyle: {
                                 ...StyleUtils.getBackgroundColorWithOpacityStyle(theme.overlay, 0.72),
                             },
+                            animation: InternalPlatformAnimations.FADE,
                         },
                     }}
                     component={TestToolsModalNavigator}

src/libs/Navigation/AppNavigator/ModalStackNavigators/index.tsx

@@ -131,6 +131,7 @@ const MoneyRequestModalStackNavigator = createModalStackNavigator<MoneyRequestNa
 
 const TravelModalStackNavigator = createModalStackNavigator<TravelNavigatorParamList>({
     [SCREENS.TRAVEL.MY_TRIPS]: () => require<ReactComponentModule>('../../../../pages/Travel/MyTripsPage').default,
+    [SCREENS.TRAVEL.TRAVEL_DOT_LINK_WEB_VIEW]: () => require<ReactComponentModule>('../../../../pages/Travel/TravelDotLinkWebview').default,
     [SCREENS.TRAVEL.TCS]: () => require<ReactComponentModule>('../../../../pages/Travel/TravelTerms').default,
     [SCREENS.TRAVEL.UPGRADE]: () => require<ReactComponentModule>('../../../../pages/Travel/TravelUpgrade').default,
     [SCREENS.TRAVEL.TRIP_SUMMARY]: () => require<ReactComponentModule>('../../../../pages/Travel/TripSummaryPage').default,

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

@@ -9,6 +9,7 @@ import useIsAuthenticated from '@hooks/useIsAuthenticated';
 import useKeyboardShortcut from '@hooks/useKeyboardShortcut';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import useThemeStyles from '@hooks/useThemeStyles';
+import blurActiveElement from '@libs/Accessibility/blurActiveElement';
 import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator';
 import type {TestToolsModalModalNavigatorParamList} from '@libs/Navigation/types';
 import toggleTestToolsModal from '@userActions/TestTool';
@@ -25,6 +26,8 @@ function TestToolsModalNavigator() {
     const isAuthenticated = useIsAuthenticated();
 
     const handleOuterClick = useCallback(() => {
+        // Release focus from any focused element before closing the modal
+        blurActiveElement();
         requestAnimationFrame(() => {
             toggleTestToolsModal();
         });
@@ -34,17 +37,16 @@ function TestToolsModalNavigator() {
         e.stopPropagation();
     }, []);
 
-    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, () => toggleTestToolsModal(), {shouldBubble: true});
+    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.ESCAPE, () => toggleTestToolsModal(), {shouldBubble: false});
 
     return (
         <NoDropZone>
             <Overlay />
             <PressableWithoutFeedback
                 ref={outerViewRef}
                 onPress={handleOuterClick}
-                style={[styles.getTestToolsNavigatorOuterView(shouldUseNarrowLayout), styles.cursorDefault]}
-                accessibilityRole="button"
-                accessibilityLabel="button"
+                style={[styles.getTestToolsNavigatorOuterView(shouldUseNarrowLayout)]}
+                accessible={false}
             >
                 <FocusTrapForScreens>
                     <View

src/libs/Navigation/AppNavigator/PublicScreens.tsx

@@ -87,6 +87,7 @@ function PublicScreens() {
                         cardStyle: {
                             ...StyleUtils.getBackgroundColorWithOpacityStyle(theme.overlay, 0.72),
                         },
+                        animation: InternalPlatformAnimations.FADE,
                     },
                 }}
                 component={TestToolsModalNavigator}

src/libs/Navigation/linkingConfig/config.ts

@@ -1485,6 +1485,7 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
                 [SCREENS.RIGHT_MODAL.TRAVEL]: {
                     screens: {
                         [SCREENS.TRAVEL.MY_TRIPS]: ROUTES.TRAVEL_MY_TRIPS,
+                        [SCREENS.TRAVEL.TRAVEL_DOT_LINK_WEB_VIEW]: ROUTES.TRAVEL_DOT_LINK_WEB_VIEW.route,
                         [SCREENS.TRAVEL.UPGRADE]: ROUTES.TRAVEL_UPGRADE.route,
                         [SCREENS.TRAVEL.TCS]: ROUTES.TRAVEL_TCS.route,
                         [SCREENS.TRAVEL.TRIP_SUMMARY]: ROUTES.TRAVEL_TRIP_SUMMARY.route,
@@ -1803,7 +1804,7 @@ const config: LinkingOptions<RootNavigatorParamList>['config'] = {
         [NAVIGATORS.TEST_TOOLS_MODAL_NAVIGATOR]: {
             screens: {
                 [SCREENS.TEST_TOOLS_MODAL.ROOT]: {
-                    path: ROUTES.TEST_TOOLS_MODAL,
+                    path: ROUTES.TEST_TOOLS_MODAL.route,
                     exact: true,
                 },
             },