diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 45bba456169f..aa533b41196d 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); @@ -93,7 +89,6 @@ function canUseNewDotSplits(betas: OnyxEntry): boolean { export default { canUseDefaultRooms, canUseLinkPreviews, - canUseSpotnanaTravel, isBlockedFromSpotnanaTravel, isTravelVerified, canUseNetSuiteUSATax, diff --git a/src/pages/Travel/MyTripsPage.tsx b/src/pages/Travel/MyTripsPage.tsx index 7a8a7007e418..ed68308633e2 100644 --- a/src/pages/Travel/MyTripsPage.tsx +++ b/src/pages/Travel/MyTripsPage.tsx @@ -1,15 +1,11 @@ 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() { const {translate} = useLocalize(); - const {canUseSpotnanaTravel} = usePermissions(); return ( - - - - + + ); } diff --git a/src/pages/Travel/TravelTerms.tsx b/src/pages/Travel/TravelTerms.tsx index c145f9148489..aee3dc1a7ce9 100644 --- a/src/pages/Travel/TravelTerms.tsx +++ b/src/pages/Travel/TravelTerms.tsx @@ -29,10 +29,10 @@ type TravelTermsPageProps = StackScreenProps - + Navigation.goBack()} diff --git a/src/pages/Travel/TripDetailsPage.tsx b/src/pages/Travel/TripDetailsPage.tsx index e83ff4507e8d..fe64c3cb020b 100644 --- a/src/pages/Travel/TripDetailsPage.tsx +++ b/src/pages/Travel/TripDetailsPage.tsx @@ -40,22 +40,22 @@ 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); 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 ( 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..5ce71936ae92 100644 --- a/src/pages/workspace/WorkspaceOverviewPage.tsx +++ b/src/pages/workspace/WorkspaceOverviewPage.tsx @@ -16,7 +16,6 @@ import useCardFeeds from '@hooks/useCardFeeds'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; import usePayAndDowngrade from '@hooks/usePayAndDowngrade'; -import usePermissions from '@hooks/usePermissions'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useThemeIllustrations from '@hooks/useThemeIllustrations'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -57,7 +56,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 +344,7 @@ function WorkspaceOverviewPage({policyDraft, policy: policyProp, route}: Workspa /> - {!!canUseSpotnanaTravel && shouldShowAddress && ( + {shouldShowAddress && (