-
Notifications
You must be signed in to change notification settings - Fork 3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into fix-focus-when-editing-message
- Loading branch information
Showing
17 changed files
with
207 additions
and
238 deletions.
There are no files selected for viewing
Submodule Mobile-Expensify
updated
from 9e5fc5 to 9e6ead
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| import {Str} from 'expensify-common'; | ||
| import React, {useCallback, useContext, useState} from 'react'; | ||
| import {NativeModules} from 'react-native'; | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import usePolicy from '@hooks/usePolicy'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import {openTravelDotLink} from '@libs/actions/Link'; | ||
| import {cleanupTravelProvisioningSession} from '@libs/actions/Travel'; | ||
| import Log from '@libs/Log'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import {getAdminsPrivateEmailDomains} from '@libs/PolicyUtils'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import {isEmptyObject} from '@src/types/utils/EmptyObject'; | ||
| import Button from './Button'; | ||
| import CustomStatusBarAndBackgroundContext from './CustomStatusBarAndBackground/CustomStatusBarAndBackgroundContext'; | ||
| import DotIndicatorMessage from './DotIndicatorMessage'; | ||
|
|
||
| type BookTravelButtonProps = { | ||
| text: string; | ||
| }; | ||
|
|
||
| const navigateToAcceptTerms = (domain: string) => { | ||
| // Remove the previous provision session infromation if any is cached. | ||
| cleanupTravelProvisioningSession(); | ||
| Navigation.navigate(ROUTES.TRAVEL_TCS.getRoute(domain)); | ||
| }; | ||
|
|
||
| function BookTravelButton({text}: BookTravelButtonProps) { | ||
| const styles = useThemeStyles(); | ||
| const {translate} = useLocalize(); | ||
| const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID); | ||
| const policy = usePolicy(activePolicyID); | ||
| const [errorMessage, setErrorMessage] = useState(''); | ||
| const [travelSettings] = useOnyx(ONYXKEYS.NVP_TRAVEL_SETTINGS); | ||
| const [account] = useOnyx(ONYXKEYS.ACCOUNT); | ||
| const primaryLogin = account?.primaryLogin; | ||
| const {setRootStatusBarEnabled} = useContext(CustomStatusBarAndBackgroundContext); | ||
|
|
||
| // 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.IS_SINGLE_NEW_DOT_ENTRY); | ||
|
|
||
| const bookATrip = useCallback(() => { | ||
| setErrorMessage(''); | ||
|
|
||
| // The primary login of the user is where Spotnana sends the emails with booking confirmations, itinerary etc. It can't be a phone number. | ||
| if (!primaryLogin || Str.isSMSLogin(primaryLogin)) { | ||
| setErrorMessage(translate('travel.phoneError')); | ||
| return; | ||
| } | ||
|
|
||
| // Spotnana requires an address anytime an entity is created for a policy | ||
| if (isEmptyObject(policy?.address)) { | ||
| Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(policy?.id, Navigation.getActiveRoute())); | ||
| return; | ||
| } | ||
|
|
||
| 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 (!NativeModules.HybridAppModule || !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'); | ||
| NativeModules.HybridAppModule.closeReactNativeApp(false, false); | ||
| setRootStatusBarEnabled(false); | ||
| }) | ||
| ?.catch(() => { | ||
| setErrorMessage(translate('travel.errorMessage')); | ||
| }); | ||
| } else if (isPolicyProvisioned) { | ||
| navigateToAcceptTerms(CONST.TRAVEL.DEFAULT_DOMAIN); | ||
| } else { | ||
| // 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. | ||
| // - If admins have multiple private domains, the user must select one. | ||
| // - Public domains are not allowed; an error page is shown in that case. | ||
| const adminDomains = getAdminsPrivateEmailDomains(policy); | ||
| if (adminDomains.length === 0) { | ||
| Navigation.navigate(ROUTES.TRAVEL_PUBLIC_DOMAIN_ERROR); | ||
| } else if (adminDomains.length === 1) { | ||
| navigateToAcceptTerms(adminDomains.at(0) ?? CONST.TRAVEL.DEFAULT_DOMAIN); | ||
| } else { | ||
| Navigation.navigate(ROUTES.TRAVEL_DOMAIN_SELECTOR); | ||
| } | ||
| } | ||
| }, [policy, wasNewDotLaunchedJustForTravel, travelSettings, translate, primaryLogin, setRootStatusBarEnabled]); | ||
|
|
||
| return ( | ||
| <> | ||
| {!!errorMessage && ( | ||
| <DotIndicatorMessage | ||
| style={styles.mb1} | ||
| messages={{error: errorMessage}} | ||
| type="error" | ||
| /> | ||
| )} | ||
| <Button | ||
| text={text} | ||
| onPress={bookATrip} | ||
| accessibilityLabel={translate('travel.bookTravel')} | ||
| style={styles.w100} | ||
| success | ||
| large | ||
| /> | ||
| </> | ||
| ); | ||
| } | ||
|
|
||
| BookTravelButton.displayName = 'BookTravelButton'; | ||
|
|
||
| export default BookTravelButton; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.