Skip to content

fix business phone validation and clipped text issue in country selection #3961

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

Merged
maxceem merged 1 commit into from
Apr 27, 2020
Merged

fix business phone validation and clipped text issue in country selection #3961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/Select/Select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
$reactselectheight : 40px;
$reactselectcontentheight: 20px;
@mixin reactselectstyles {
line-height: normal;

&.height-auto .react-select__control{
height: auto;
Expand Down
14 changes: 7 additions & 7 deletions src/routes/settings/routes/profile/components/ProfileSettingsForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class ProfileSettingsForm extends Component {
}
}

onBusinessPhoneCountryChange({ country, externalChange, isValid }) {
onBusinessPhoneCountryChange({ country, externalChange, isValid: isValidForApi }) {
const { countrySelected: previousSelectedCountry } = this.state

if (country && country.code) {
Expand All @@ -78,14 +78,14 @@ class ProfileSettingsForm extends Component {
countrySelected: country.name,
})
}
if (!this.state.businessPhoneValid && isValid) {
this.setState({
businessPhoneValid: true,
})
}
}

if (this.state.businessPhoneValid && !isValid) {
const isValid = isValidForApi && country && country.code
if (!this.state.businessPhoneValid && isValid) {
this.setState({
businessPhoneValid: true,
})
} else if (this.state.businessPhoneValid && !isValid) {
this.setState({
businessPhoneValid: false,
})
Expand Down