From 0d0c9c6b8d7a0c801906930d64c4b38bc978a660 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 30 May 2025 16:34:34 -0400 Subject: [PATCH 01/11] Add new travelSignupRequest method and call it when pressing enable travel --- src/components/BookTravelButton.tsx | 3 ++- src/libs/API/types.ts | 1 + src/libs/Permissions.ts | 4 ---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/components/BookTravelButton.tsx b/src/components/BookTravelButton.tsx index 76b7555cfac1..10474d21fb44 100644 --- a/src/components/BookTravelButton.tsx +++ b/src/components/BookTravelButton.tsx @@ -10,7 +10,7 @@ import usePolicy from '@hooks/usePolicy'; import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import {openTravelDotLink} from '@libs/actions/Link'; -import {cleanupTravelProvisioningSession} from '@libs/actions/Travel'; +import {cleanupTravelProvisioningSession, travelSignupRequest} from '@libs/actions/Travel'; import Log from '@libs/Log'; import Navigation from '@libs/Navigation/Navigation'; import {getActivePolicies, getAdminsPrivateEmailDomains, isPaidGroupPolicy} from '@libs/PolicyUtils'; @@ -137,6 +137,7 @@ function BookTravelButton({text, shouldRenderErrorMessageBelowButton = false}: B navigateToAcceptTerms(CONST.TRAVEL.DEFAULT_DOMAIN); } else if (!isTravelVerified) { setVerificationModalVisibility(true); + travelSignupRequest(); } // Determine the domain to associate with the workspace during provisioning in Spotnana. // - If all admins share the same private domain, the workspace is tied to it automatically. diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index 56199380b62c..ba6f771b7aeb 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -484,6 +484,7 @@ const WRITE_COMMANDS = { FINISH_CORPAY_BANK_ACCOUNT_ONBOARDING: 'FinishCorpayBankAccountOnboarding', REOPEN_REPORT: 'ReopenReport', GET_GUIDE_CALL_AVAILABILITY_SCHEDULE: 'GetGuideCallAvailabilitySchedule', + TRAVEL_SIGNUP_REQUEST: 'TravelSignupRequest', } as const; type WriteCommand = ValueOf; diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 45bba456169f..27b6da778566 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -10,10 +10,6 @@ function canUseDefaultRooms(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.DEFAULT_ROOMS) || canUseAllBetas(betas); } -function canUseSpotnanaTravel(betas: OnyxEntry): boolean { - return !!betas?.includes(CONST.BETAS.SPOTNANA_TRAVEL) || canUseAllBetas(betas); -} - function isBlockedFromSpotnanaTravel(betas: OnyxEntry): boolean { // Don't check for all betas or nobody can use test travel on dev return !!betas?.includes(CONST.BETAS.PREVENT_SPOTNANA_TRAVEL); From 131fdc1766f4e64de4c9c66ed1d821265d313ad0 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 30 May 2025 16:35:29 -0400 Subject: [PATCH 02/11] remove canUseSpotnanaTravel beta --- src/libs/Permissions.ts | 1 - src/libs/actions/Travel.ts | 6 +++++- src/pages/Travel/MyTripsPage.tsx | 3 +-- src/pages/Travel/TravelTerms.tsx | 4 ++-- src/pages/Travel/TripDetailsPage.tsx | 4 ++-- src/pages/Travel/TripSummaryPage.tsx | 3 +-- .../FloatingActionButtonAndPopover.tsx | 20 +++++++++---------- src/pages/workspace/WorkspaceOverviewPage.tsx | 3 +-- 8 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 27b6da778566..aa533b41196d 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -89,7 +89,6 @@ function canUseNewDotSplits(betas: OnyxEntry): boolean { export default { canUseDefaultRooms, canUseLinkPreviews, - canUseSpotnanaTravel, isBlockedFromSpotnanaTravel, isTravelVerified, canUseNetSuiteUSATax, diff --git a/src/libs/actions/Travel.ts b/src/libs/actions/Travel.ts index b3a892c99ab6..8357816923d4 100644 --- a/src/libs/actions/Travel.ts +++ b/src/libs/actions/Travel.ts @@ -54,8 +54,12 @@ function acceptSpotnanaTerms(domain?: string) { API.write(WRITE_COMMANDS.ACCEPT_SPOTNANA_TERMS, params, {optimisticData, successData, failureData}); } +function travelSignupRequest() { + API.write(WRITE_COMMANDS.TRAVEL_SIGNUP_REQUEST, {}); +} + function cleanupTravelProvisioningSession() { Onyx.merge(ONYXKEYS.TRAVEL_PROVISIONING, null); } -export {acceptSpotnanaTerms, cleanupTravelProvisioningSession}; +export {acceptSpotnanaTerms, cleanupTravelProvisioningSession, travelSignupRequest}; diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx index 7a8a7007e418..67b25425fd12 100644 --- a/src/pages/Travel/MyTripsPage.tsx +++ b/src/pages/Travel/MyTripsPage.tsx @@ -9,7 +9,6 @@ import ManageTrips from './ManageTrips'; function MyTripsPage() { const {translate} = useLocalize(); - const {canUseSpotnanaTravel} = usePermissions(); return ( - + Navigation.goBack()} diff --git a/src/pages/Travel/TripDetailsPage.tsx b/src/pages/Travel/TripDetailsPage.tsx index e83ff4507e8d..2eea620fb852 100644 --- a/src/pages/Travel/TripDetailsPage.tsx +++ b/src/pages/Travel/TripDetailsPage.tsx @@ -40,7 +40,7 @@ function TripDetailsPage({route}: TripDetailsPageProps) { const styles = useThemeStyles(); const StyleUtils = useStyleUtils(); const {translate} = useLocalize(); - const {canUseSpotnanaTravel, isBlockedFromSpotnanaTravel} = usePermissions(); + const {isBlockedFromSpotnanaTravel} = usePermissions(); const {isOffline} = useNetwork(); const [isModifyTripLoading, setIsModifyTripLoading] = useState(false); @@ -67,7 +67,7 @@ function TripDetailsPage({route}: TripDetailsPageProps) { > canSendInvoicePolicyUtils(allPolicies as OnyxCollection, session?.email), [allPolicies, session?.email]); const isValidReport = !(isEmptyObject(quickActionReport) || isArchivedReport(reportNameValuePairs)); const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true}); @@ -471,16 +471,14 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, isT }, ] : []), - ...(canUseSpotnanaTravel - ? [ - { - icon: Expensicons.Suitcase, - text: translate('travel.bookTravel'), - rightIcon: isTravelEnabled ? Expensicons.NewWindow : undefined, - onSelected: () => interceptAnonymousUser(() => openTravel()), - }, - ] - : []), + [ + { + icon: Expensicons.Suitcase, + text: translate('travel.bookTravel'), + rightIcon: isTravelEnabled ? Expensicons.NewWindow : undefined, + onSelected: () => interceptAnonymousUser(() => openTravel()), + }, + ], ...(!hasSeenTour ? [ { diff --git a/src/pages/workspace/WorkspaceOverviewPage.tsx b/src/pages/workspace/WorkspaceOverviewPage.tsx index 6f175cb5491f..f29859d85b8e 100644 --- a/src/pages/workspace/WorkspaceOverviewPage.tsx +++ b/src/pages/workspace/WorkspaceOverviewPage.tsx @@ -57,7 +57,6 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa const {translate} = useLocalize(); const {shouldUseNarrowLayout} = useResponsiveLayout(); const illustrations = useThemeIllustrations(); - const {canUseSpotnanaTravel} = usePermissions(); const backTo = route.params.backTo; const [currencyList = {}] = useOnyx(ONYXKEYS.CURRENCY_LIST, {canBeMissing: true}); @@ -346,7 +345,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa /> - {!!canUseSpotnanaTravel && shouldShowAddress && ( + {shouldShowAddress && ( Date: Fri, 30 May 2025 16:43:53 -0400 Subject: [PATCH 03/11] Fix button display --- src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx index ff4413bde4a9..7b182972ea70 100644 --- a/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx +++ b/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx @@ -471,14 +471,14 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, isT }, ] : []), - [ + ...([ { icon: Expensicons.Suitcase, text: translate('travel.bookTravel'), rightIcon: isTravelEnabled ? Expensicons.NewWindow : undefined, onSelected: () => interceptAnonymousUser(() => openTravel()), }, - ], + ]), ...(!hasSeenTour ? [ { From ae2b21369a8857e6847a5cb2d0c458bdef865266 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 30 May 2025 17:29:19 -0400 Subject: [PATCH 04/11] remove useless notFoundView --- src/pages/Travel/MyTripsPage.tsx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx index 67b25425fd12..1afcf4dc574f 100644 --- a/src/pages/Travel/MyTripsPage.tsx +++ b/src/pages/Travel/MyTripsPage.tsx @@ -18,16 +18,7 @@ function MyTripsPage() { testID={MyTripsPage.displayName} shouldShowOfflineIndicatorInWideScreen > - - - - + ); } From 93eb9ae057edefc6b499dfdddfa261ba0d396035 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 30 May 2025 17:38:59 -0400 Subject: [PATCH 05/11] Update copy --- src/languages/en.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index ef7a7c83c42c..a1113c62e82b 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -2941,8 +2941,8 @@ const translations = { message: `Your admin has turned off Expensify Travel. Please follow your company's booking policy for travel arrangements.`, }, verifyCompany: { - title: 'Get started with travel today!', - message: `Please contact your Account manager or salesteam@expensify.com to get a demo of travel and have it enabled for your company.`, + title: 'We\'re reviewing your request...', + message: `We're doing a few checks on our end to verify your account is ready for Expensify Travel. We'll be in touch shortly!`, }, }, workspace: { From 9718df017a7b394923379aff75587264c1c31d92 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 30 May 2025 17:44:58 -0400 Subject: [PATCH 06/11] Slight copy change --- src/languages/en.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/languages/en.ts b/src/languages/en.ts index a1113c62e82b..2b9bd17f50e4 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -2942,7 +2942,7 @@ const translations = { }, verifyCompany: { title: 'We\'re reviewing your request...', - message: `We're doing a few checks on our end to verify your account is ready for Expensify Travel. We'll be in touch shortly!`, + message: `We're running a few checks on our end to verify your account is ready for Expensify Travel. We'll be in touch shortly!`, }, }, workspace: { From 3bb6c2a888208b6c2198d2e661345d4ce85ba0e4 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 30 May 2025 18:26:43 -0400 Subject: [PATCH 07/11] Lint cleanup --- src/pages/Travel/MyTripsPage.tsx | 4 ---- src/pages/Travel/TravelTerms.tsx | 2 +- src/pages/Travel/TripDetailsPage.tsx | 10 +++++----- src/pages/Travel/TripSummaryPage.tsx | 3 +-- src/pages/workspace/WorkspaceOverviewPage.tsx | 1 - 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx index 1afcf4dc574f..84281f89db23 100644 --- a/src/pages/Travel/MyTripsPage.tsx +++ b/src/pages/Travel/MyTripsPage.tsx @@ -1,10 +1,6 @@ import React from 'react'; -import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; -import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; import useLocalize from '@hooks/useLocalize'; -import usePermissions from '@hooks/usePermissions'; -import CONFIG from '@src/CONFIG'; import ManageTrips from './ManageTrips'; function MyTripsPage() { diff --git a/src/pages/Travel/TravelTerms.tsx b/src/pages/Travel/TravelTerms.tsx index 5959c1bc9e53..ead33264f41c 100644 --- a/src/pages/Travel/TravelTerms.tsx +++ b/src/pages/Travel/TravelTerms.tsx @@ -32,7 +32,7 @@ function TravelTerms({route}: TravelTermsPageProps) { const {isBlockedFromSpotnanaTravel} = usePermissions(); const [hasAcceptedTravelTerms, setHasAcceptedTravelTerms] = useState(false); const [errorMessage, setErrorMessage] = useState(''); - const [travelProvisioning] = useOnyx(ONYXKEYS.TRAVEL_PROVISIONING); + const [travelProvisioning] = useOnyx(ONYXKEYS.TRAVEL_PROVISIONING, {canBeMissing: true}); const isLoading = travelProvisioning?.isLoading; const domain = route.params.domain === CONST.TRAVEL.DEFAULT_DOMAIN ? undefined : route.params.domain; diff --git a/src/pages/Travel/TripDetailsPage.tsx b/src/pages/Travel/TripDetailsPage.tsx index 2eea620fb852..fe64c3cb020b 100644 --- a/src/pages/Travel/TripDetailsPage.tsx +++ b/src/pages/Travel/TripDetailsPage.tsx @@ -46,16 +46,16 @@ function TripDetailsPage({route}: TripDetailsPageProps) { const [isModifyTripLoading, setIsModifyTripLoading] = useState(false); const [isTripSupportLoading, setIsTripSupportLoading] = useState(false); - const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID); - const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${route.params.transactionID}`); - const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID ?? CONST.DEFAULT_NUMBER_ID}`); - const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID ?? CONST.DEFAULT_NUMBER_ID}`); + const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true}); + const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${route.params.transactionID}`, {canBeMissing: true}); + const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`, {canBeMissing: true}); + const [parentReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${report?.parentReportID}`, {canBeMissing: true}); const tripID = getTripIDFromTransactionParentReportID(parentReport?.reportID); const reservationType = transaction?.receipt?.reservationList?.at(route.params.reservationIndex ?? 0)?.type; const reservation = transaction?.receipt?.reservationList?.at(route.params.reservationIndex ?? 0); const reservationIcon = getTripReservationIcon(reservation?.type); - const [travelerPersonalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (personalDetails) => pickTravelerPersonalDetails(personalDetails, reservation)}); + const [travelerPersonalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST, {selector: (personalDetails) => pickTravelerPersonalDetails(personalDetails, reservation), canBeMissing: true}); return ( Date: Fri, 30 May 2025 18:34:44 -0400 Subject: [PATCH 08/11] Remove travel signup code --- src/components/BookTravelButton.tsx | 3 +-- src/languages/en.ts | 4 ++-- src/libs/API/types.ts | 1 - src/libs/actions/Travel.ts | 6 +----- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/components/BookTravelButton.tsx b/src/components/BookTravelButton.tsx index 10474d21fb44..76b7555cfac1 100644 --- a/src/components/BookTravelButton.tsx +++ b/src/components/BookTravelButton.tsx @@ -10,7 +10,7 @@ import usePolicy from '@hooks/usePolicy'; import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import {openTravelDotLink} from '@libs/actions/Link'; -import {cleanupTravelProvisioningSession, travelSignupRequest} from '@libs/actions/Travel'; +import {cleanupTravelProvisioningSession} from '@libs/actions/Travel'; import Log from '@libs/Log'; import Navigation from '@libs/Navigation/Navigation'; import {getActivePolicies, getAdminsPrivateEmailDomains, isPaidGroupPolicy} from '@libs/PolicyUtils'; @@ -137,7 +137,6 @@ function BookTravelButton({text, shouldRenderErrorMessageBelowButton = false}: B navigateToAcceptTerms(CONST.TRAVEL.DEFAULT_DOMAIN); } else if (!isTravelVerified) { setVerificationModalVisibility(true); - travelSignupRequest(); } // Determine the domain to associate with the workspace during provisioning in Spotnana. // - If all admins share the same private domain, the workspace is tied to it automatically. diff --git a/src/languages/en.ts b/src/languages/en.ts index 2b9bd17f50e4..ef7a7c83c42c 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -2941,8 +2941,8 @@ const translations = { message: `Your admin has turned off Expensify Travel. Please follow your company's booking policy for travel arrangements.`, }, verifyCompany: { - title: 'We\'re reviewing your request...', - message: `We're running a few checks on our end to verify your account is ready for Expensify Travel. We'll be in touch shortly!`, + title: 'Get started with travel today!', + message: `Please contact your Account manager or salesteam@expensify.com to get a demo of travel and have it enabled for your company.`, }, }, workspace: { diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index ba6f771b7aeb..56199380b62c 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -484,7 +484,6 @@ const WRITE_COMMANDS = { FINISH_CORPAY_BANK_ACCOUNT_ONBOARDING: 'FinishCorpayBankAccountOnboarding', REOPEN_REPORT: 'ReopenReport', GET_GUIDE_CALL_AVAILABILITY_SCHEDULE: 'GetGuideCallAvailabilitySchedule', - TRAVEL_SIGNUP_REQUEST: 'TravelSignupRequest', } as const; type WriteCommand = ValueOf; diff --git a/src/libs/actions/Travel.ts b/src/libs/actions/Travel.ts index 8357816923d4..b3a892c99ab6 100644 --- a/src/libs/actions/Travel.ts +++ b/src/libs/actions/Travel.ts @@ -54,12 +54,8 @@ function acceptSpotnanaTerms(domain?: string) { API.write(WRITE_COMMANDS.ACCEPT_SPOTNANA_TERMS, params, {optimisticData, successData, failureData}); } -function travelSignupRequest() { - API.write(WRITE_COMMANDS.TRAVEL_SIGNUP_REQUEST, {}); -} - function cleanupTravelProvisioningSession() { Onyx.merge(ONYXKEYS.TRAVEL_PROVISIONING, null); } -export {acceptSpotnanaTerms, cleanupTravelProvisioningSession, travelSignupRequest}; +export {acceptSpotnanaTerms, cleanupTravelProvisioningSession}; From ac8098ab823593f7dcf8422669808fc03286b9f2 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Fri, 30 May 2025 18:41:55 -0400 Subject: [PATCH 09/11] remove unused import --- src/pages/Travel/MyTripsPage.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx index 84281f89db23..c774b09c3343 100644 --- a/src/pages/Travel/MyTripsPage.tsx +++ b/src/pages/Travel/MyTripsPage.tsx @@ -4,8 +4,6 @@ import useLocalize from '@hooks/useLocalize'; import ManageTrips from './ManageTrips'; function MyTripsPage() { - const {translate} = useLocalize(); - return ( Date: Fri, 30 May 2025 18:42:50 -0400 Subject: [PATCH 10/11] Re-add header --- src/pages/Travel/MyTripsPage.tsx | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx index c774b09c3343..ec3939a9c383 100644 --- a/src/pages/Travel/MyTripsPage.tsx +++ b/src/pages/Travel/MyTripsPage.tsx @@ -2,8 +2,11 @@ import React from 'react'; import ScreenWrapper from '@components/ScreenWrapper'; import useLocalize from '@hooks/useLocalize'; import ManageTrips from './ManageTrips'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; function MyTripsPage() { + const {translate} = useLocalize(); + return ( + ); From 2cf78d797aa3f1293bca5c83bb4f22a161647810 Mon Sep 17 00:00:00 2001 From: Brandon Stites Date: Mon, 2 Jun 2025 14:25:21 -0400 Subject: [PATCH 11/11] Prettier and lint --- src/pages/Travel/MyTripsPage.tsx | 8 ++++---- src/pages/Travel/TravelTerms.tsx | 2 +- .../sidebar/FloatingActionButtonAndPopover.tsx | 16 ++++++++-------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx index ec3939a9c383..ed68308633e2 100644 --- a/src/pages/Travel/MyTripsPage.tsx +++ b/src/pages/Travel/MyTripsPage.tsx @@ -1,8 +1,8 @@ import React from 'react'; +import HeaderWithBackButton from '@components/HeaderWithBackButton'; import ScreenWrapper from '@components/ScreenWrapper'; import useLocalize from '@hooks/useLocalize'; import ManageTrips from './ManageTrips'; -import HeaderWithBackButton from '@components/HeaderWithBackButton'; function MyTripsPage() { const {translate} = useLocalize(); @@ -16,9 +16,9 @@ function MyTripsPage() { shouldShowOfflineIndicatorInWideScreen > + title={translate('travel.header')} + shouldShowBackButton + /> ); diff --git a/src/pages/Travel/TravelTerms.tsx b/src/pages/Travel/TravelTerms.tsx index ead33264f41c..aee3dc1a7ce9 100644 --- a/src/pages/Travel/TravelTerms.tsx +++ b/src/pages/Travel/TravelTerms.tsx @@ -81,7 +81,7 @@ function TravelTerms({route}: TravelTermsPageProps) { shouldEnableMaxHeight testID={TravelTerms.displayName} > - + Navigation.goBack()} diff --git a/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx b/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx index 7b182972ea70..21950c72d6ed 100644 --- a/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx +++ b/src/pages/home/sidebar/FloatingActionButtonAndPopover.tsx @@ -471,14 +471,14 @@ function FloatingActionButtonAndPopover({onHideCreateMenu, onShowCreateMenu, isT }, ] : []), - ...([ - { - icon: Expensicons.Suitcase, - text: translate('travel.bookTravel'), - rightIcon: isTravelEnabled ? Expensicons.NewWindow : undefined, - onSelected: () => interceptAnonymousUser(() => openTravel()), - }, - ]), + ...[ + { + icon: Expensicons.Suitcase, + text: translate('travel.bookTravel'), + rightIcon: isTravelEnabled ? Expensicons.NewWindow : undefined, + onSelected: () => interceptAnonymousUser(() => openTravel()), + }, + ], ...(!hasSeenTour ? [ {