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

VBA Fields validation #5531

Merged
merged 10 commits into from
Oct 4, 2021
Merged

VBA Fields validation #5531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
08de2ed
Added validation for phone, ssn and taxt_id_number
akshayasalvi Sep 25, 2021
26d2e62
Added maxlength and keyboard type for zipcode and phone number
akshayasalvi Sep 25, 2021
f0f9680
Added maxlength to zipcode
akshayasalvi Sep 25, 2021
830b7f9
Added translations for phone number placeholder
akshayasalvi Sep 29, 2021
9fb2257
Updated regex validation for length and added length check in function
akshayasalvi Sep 29, 2021
d1a2119
Merge branch 'main' of github-personal:akshayasalvi/App into vba-flow…
akshayasalvi Sep 29, 2021
6ed6a77
Updated length to 12
akshayasalvi Sep 30, 2021
7b68fa9
Merge branch 'main' of github-personal:akshayasalvi/App into vba-flow…
akshayasalvi Sep 30, 2021
870c41c
Merge branch 'main' of github-personal:akshayasalvi/App into vba-flow…
akshayasalvi Oct 4, 2021
43f209a
Merge branch 'main' of github-personal:akshayasalvi/App into vba-flow…
akshayasalvi Oct 4, 2021
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
5 changes: 2 additions & 3 deletions src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ const CONST = {
TAX_ID_NUMBER: 9,
SSN: 4,
ZIP_CODE: 5,
PHONE_NUMBER: 15,
},
},
INCORPORATION_TYPES: {
Expand Down Expand Up @@ -420,12 +419,12 @@ const CONST = {
LARGE: 'large',
DEFAULT: 'default',
},

PHONE_MAX_LENGTH: 15,
REGEX: {
US_PHONE: /^\+1\d{10}$/,
DIGITS_AND_PLUS: /^\+?[0-9]*$/,
PHONE_E164_PLUS: /^\+?[1-9]\d{1,14}$/,
PHONE_WITH_SPECIAL_CHARS: /^[+]*[(]{0,1}[0-9]{1,3}[)]{0,1}[-\s\\./0-9]*$/,
PHONE_WITH_SPECIAL_CHARS: /^[+]*[(]{0,1}[0-9]{1,3}[)]{0,1}[-\s\\./0-9]{0,11}$/,
NON_ALPHA_NUMERIC: /[^A-Za-z0-9+]/g,
PO_BOX: /\b[P|p]?(OST|ost)?\.?\s*[O|o|0]?(ffice|FFICE)?\.?\s*[B|b][O|o|0]?[X|x]?\.?\s+[#]?(\d+)\b/,
ANY_VALUE: /^.+$/,
Expand Down
2 changes: 1 addition & 1 deletion src/libs/ValidationUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function isValidAge(date) {
* @returns {Boolean}
*/
function isValidPhoneWithSpecialChars(phoneNumber) {
return CONST.REGEX.PHONE_WITH_SPECIAL_CHARS.test(phoneNumber);
return CONST.REGEX.PHONE_WITH_SPECIAL_CHARS.test(phoneNumber) && phoneNumber.length <= CONST.PHONE_MAX_LENGTH;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/pages/ReimbursementAccount/CompanyStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class CompanyStep extends React.Component {
value={this.state.companyPhone}
placeholder={this.props.translate('companyStep.companyPhonePlaceholder')}
errorText={this.getErrorText('companyPhone')}
maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.PHONE_NUMBER}
maxLength={CONST.PHONE_MAX_LENGTH}

/>
<ExpensiTextInput
Expand Down