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

Fix: remove maxLength property for taxId and expiration date fields #8764

Merged
merged 10 commits into from
Apr 27, 2022
Merged

Fix: remove maxLength property for taxId and expiration date fields #8764

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
03624d7
Remove maxLength from expiration date field
eVoloshchak Apr 25, 2022
e3509ae
Remove maxLength from taxID field
eVoloshchak Apr 25, 2022
a48ba65
Strip all non-numeric characters and test for length of 9 in error va…
eVoloshchak Apr 25, 2022
50caa13
Strip all non-numeric characters in companyTaxID on form submission
eVoloshchak Apr 25, 2022
ff0468f
Change taxID input placeholder
eVoloshchak Apr 25, 2022
8c31474
Fix linter errors
eVoloshchak Apr 25, 2022
70b90f3
Move tax ID validation to ValidationUtils.js
eVoloshchak Apr 26, 2022
d104d5d
Change isValidTaxID comment
eVoloshchak Apr 27, 2022
08076bf
Move non-numeric regex to CONST.js
eVoloshchak Apr 27, 2022
f967968
Move non-numeric regex to CONST.js
eVoloshchak Apr 27, 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
2 changes: 1 addition & 1 deletion src/CONST.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,6 @@ const CONST = {
PENDING: 'PENDING',
},
MAX_LENGTH: {
TAX_ID_NUMBER: 9,
SSN: 4,
ZIP_CODE: 5,
},
Expand Down Expand Up @@ -640,6 +639,7 @@ const CONST = {

// eslint-disable-next-line max-len, no-misleading-character-class
EMOJIS: /(?:\uD83D(?:\uDC41\u200D\uD83D\uDDE8|\uDC68\u200D\uD83D[\uDC68\uDC69]\u200D\uD83D(?:\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?)|\uDC69\u200D\uD83D\uDC69\u200D\uD83D(?:\uDC66(?:\u200D\uD83D\uDC66)?|\uDC67(?:\u200D\uD83D[\uDC66\uDC67])?))|[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|[\ud83c\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|[\ud83c\ude32-\ude3a]|[\ud83c\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/g,
TAX_ID: /^\d{9}$/,
},

PRONOUNS: {
Expand Down
2 changes: 1 addition & 1 deletion src/languages/en.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ export default {
legalBusinessName: 'Legal business name',
companyWebsite: 'Company website',
taxIDNumber: 'Tax ID number',
taxIDNumberPlaceholder: '9 digits, no hyphens',
taxIDNumberPlaceholder: '9 digits',
companyType: 'Company type',
incorporationDate: 'Incorporation date',
incorporationState: 'Incorporation state',
Expand Down
2 changes: 1 addition & 1 deletion src/languages/es.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ export default {
legalBusinessName: 'Nombre comercial legal',
companyWebsite: 'Página web de la empresa',
taxIDNumber: 'Número de identificación fiscal',
taxIDNumberPlaceholder: '9 dígitos, sin guiones',
taxIDNumberPlaceholder: '9 dígitos',
companyType: 'Tipo de empresa',
incorporationDate: 'Fecha de incorporación',
incorporationState: 'Estado de incorporación',
Expand Down
11 changes: 11 additions & 0 deletions src/libs/ValidationUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,16 @@ function isExistingRoomName(roomName, reports, policyID) {
);
}

/**
* Validate that this is a valid tax ID (consisting of 9 digits)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
* Validate that this is a valid tax ID (consisting of 9 digits)
* Checks if tax ID consists of 9 digits

*
* @param {String} taxID
* @returns {Boolean}
*/
function isValidTaxID(taxID) {
return CONST.REGEX.TAX_ID.test(taxID.replace(/\D/g, ''));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

here too

}

export {
meetsAgeRequirements,
isValidAddress,
Expand All @@ -381,4 +391,5 @@ export {
doesFailCharacterLimit,
isReservedRoomName,
isExistingRoomName,
isValidTaxID,
};
5 changes: 2 additions & 3 deletions src/pages/ReimbursementAccount/CompanyStep.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ class CompanyStep extends React.Component {
errors.website = true;
}

if (!/[0-9]{9}/.test(this.state.companyTaxID)) {
if (!ValidationUtils.isValidTaxID(this.state.companyTaxID)) {
errors.companyTaxID = true;
}

Expand Down Expand Up @@ -176,7 +176,7 @@ class CompanyStep extends React.Component {
}

const incorporationDate = moment(this.state.incorporationDate).format(CONST.DATE.MOMENT_FORMAT_STRING);
BankAccounts.setupWithdrawalAccount({...this.state, incorporationDate});
BankAccounts.setupWithdrawalAccount({...this.state, incorporationDate, companyTaxID: this.state.companyTaxID.replace(/\D/g, '')});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NAB: @eVoloshchak we could move this regex to const too

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

True, updated the PR

}

render() {
Expand Down Expand Up @@ -262,7 +262,6 @@ class CompanyStep extends React.Component {
disabled={shouldDisableCompanyTaxID}
placeholder={this.props.translate('companyStep.taxIDNumberPlaceholder')}
errorText={this.getErrorText('companyTaxID')}
maxLength={CONST.BANK_ACCOUNT.MAX_LENGTH.TAX_ID_NUMBER}
/>
<View style={styles.mt4}>
<Picker
Expand Down
1 change: 0 additions & 1 deletion src/pages/settings/Payments/AddDebitCardPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ class DebitCardPage extends Component {
label={this.props.translate('addDebitCardPage.expiration')}
placeholder={this.props.translate('addDebitCardPage.expirationDate')}
value={this.state.expirationDate}
maxLength={7}
errorText={this.getErrorText('expirationDate')}
keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
onChangeText={this.addOrRemoveSlashToExpiryDate}
Expand Down