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

Fix request call page errors #11864

Merged
merged 4 commits into from
Oct 21, 2022
Merged

Fix request call page errors #11864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3502891
change first and last name input to full width
Tushu17 Oct 14, 2022
ef4acee
change first and last name input error message
Tushu17 Oct 14, 2022
bfb49b7
Merge branch 'main' of https://github.com/Tushu17/App into fix-reques…
Tushu17 Oct 20, 2022
2e61bed
Remove punctuation from error messages
Tushu17 Oct 20, 2022
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
6 changes: 3 additions & 3 deletions src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default {
error: {
invalidAmount: 'Invalid amount',
acceptedTerms: 'You must accept the Terms of Service to continue',
phoneNumber: `Please enter a valid phone number, with the country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
phoneNumber: `Please enter a valid phone number, with the country code (e.g. ${CONST.EXAMPLE_PHONE_NUMBER})`,
},
please: 'Please',
contactUs: 'contact us',
Expand Down Expand Up @@ -955,8 +955,8 @@ export default {
},
error: {
phoneNumberExtension: 'Please enter a valid phone extension number',
firstName: 'Please provide your first name so our guides know how to address you!',
lastName: 'Please provide your last name so our guides know how to address you!',
firstName: 'Please provide your first name',
lastName: 'Please provide your last name',
firstNameLength: 'First name shouldn\'t be longer than 50 characters',
lastNameLength: 'Last name shouldn\'t be longer than 50 characters',
},
Expand Down
6 changes: 3 additions & 3 deletions src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default {
error: {
invalidAmount: 'Monto no válido',
acceptedTerms: 'Debes aceptar los Términos de servicio para continuar',
phoneNumber: `Ingresa un teléfono válido, incluyendo el código de país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER}).`,
phoneNumber: `Ingresa un teléfono válido, incluyendo el código de país (p. ej. ${CONST.EXAMPLE_PHONE_NUMBER})`,
},
please: 'Por favor',
contactUs: 'contáctenos',
Expand Down Expand Up @@ -957,8 +957,8 @@ export default {
},
error: {
phoneNumberExtension: 'Por favor, introduzca una extensión telefónica válida',
firstName: 'Por favor ingresa tu nombre!',
lastName: 'Por favor ingresa tu apellido!',
firstName: 'Por favor ingresa tu nombre',
lastName: 'Por favor ingresa tu apellido',
firstNameLength: 'El nombre no debe tener más de 50 caracteres',
lastNameLength: 'El apellido no debe tener más de 50 caracteres',
},
Expand Down
39 changes: 18 additions & 21 deletions src/pages/RequestCallPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,30 +270,26 @@ class RequestCallPage extends Component {
icon={Illustrations.ConciergeExclamation}
containerStyles={[styles.p0]}
>
<Text style={styles.mb4}>
<Text>
{this.props.translate('requestCallPage.description')}
</Text>
</Section>
<View style={[styles.flexRow, styles.mb4]}>
<View style={styles.flex1}>
<TextInput
inputID="firstName"
defaultValue={firstName}
label={this.props.translate('common.firstName')}
name="fname"
placeholder={this.props.translate('profilePage.john')}
/>
</View>
<View style={[styles.flex1, styles.ml2]}>
<TextInput
inputID="lastName"
defaultValue={lastName}
label={this.props.translate('common.lastName')}
name="lname"
placeholder={this.props.translate('profilePage.doe')}
/>
</View>
</View>
<TextInput
inputID="firstName"
defaultValue={firstName}
label={this.props.translate('common.firstName')}
name="fname"
placeholder={this.props.translate('profilePage.john')}
containerStyles={[styles.mt4]}
/>
<TextInput
inputID="lastName"
defaultValue={lastName}
label={this.props.translate('common.lastName')}
name="lname"
placeholder={this.props.translate('profilePage.doe')}
containerStyles={[styles.mt4]}
/>
<TextInput
inputID="phoneNumber"
defaultValue={this.getPhoneNumber(this.props.loginList)}
Expand All @@ -302,6 +298,7 @@ class RequestCallPage extends Component {
keyboardType={CONST.KEYBOARD_TYPE.PHONE_PAD}
autoCorrect={false}
placeholder="2109400803"
containerStyles={[styles.mt4]}
/>
<TextInput
inputID="phoneNumberExtension"
Expand Down