Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prevent travel booking for SMS logins #48180

Merged
merged 10 commits into from
Sep 3, 2024
Merged

Prevent travel booking for SMS logins #48180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5ddc97a
Display error
Gonals Aug 28, 2024
a9a3875
correctly show error
Gonals Aug 28, 2024
d62d476
style
Gonals Aug 28, 2024
8fe9f7c
spnish
Gonals Aug 28, 2024
6f3c395
typescript
Gonals Aug 28, 2024
e387323
prettier
Gonals Aug 28, 2024
f8014c3
new message
Gonals Aug 28, 2024
b384936
Merge branch 'main' into alberto-travelSMS
Gonals Sep 2, 2024
1bbf430
Add margin
Gonals Sep 2, 2024
968e757
smaller margin
Gonals Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/components/FeatureList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ function FeatureList({
)}
{ctaErrorMessage && (
<DotIndicatorMessage
style={styles.mb1}
messages={{error: ctaErrorMessage}}
type="error"
/>
Expand Down
1 change: 1 addition & 0 deletions src/languages/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2112,6 +2112,7 @@ export default {
tripSummary: 'Trip summary',
departs: 'Departs',
errorMessage: 'Something went wrong. Please try again later.',
phoneError: 'To book travel, your default contact method must be a valid email',
},
workspace: {
common: {
Expand Down
1 change: 1 addition & 0 deletions src/languages/es.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2143,6 +2143,7 @@ export default {
tripSummary: 'Resumen del viaje',
departs: 'Sale',
errorMessage: 'Ha ocurrido un error. Por favor, inténtalo mas tarde.',
phoneError: 'Para reservar viajes, tu método de contacto predeterminado debe ser un correo electrónico válido',
Gonals marked this conversation as resolved.
Show resolved Hide resolved
},
workspace: {
common: {
Expand Down
6 changes: 6 additions & 0 deletions src/pages/Travel/ManageTrips.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import {Str} from 'expensify-common';
import React, {useState} from 'react';
import {Linking, View} from 'react-native';
import {useOnyx} from 'react-native-onyx';
Expand Down Expand Up @@ -35,6 +36,7 @@ function ManageTrips() {
const {translate} = useLocalize();
const [travelSettings] = useOnyx(ONYXKEYS.NVP_TRAVEL_SETTINGS);
const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
const policy = usePolicy(activePolicyID);

const [ctaErrorMessage, setCtaErrorMessage] = useState('');
Expand All @@ -60,6 +62,10 @@ function ManageTrips() {
ctaText={translate('travel.bookTravel')}
ctaAccessibilityLabel={translate('travel.bookTravel')}
onCtaPress={() => {
if (Str.isSMSLogin(account?.primaryLogin ?? '')) {
setCtaErrorMessage(translate('travel.phoneError'));
return;
}
if (!hasPolicyAddress) {
Navigation.navigate(ROUTES.WORKSPACE_PROFILE_ADDRESS.getRoute(activePolicyID ?? '-1'));
return;
Expand Down
Loading