Skip to content

Commit

Permalink
Merge pull request #5629 from Expensify/marcaaron-fixIdentityValidate
Browse files Browse the repository at this point in the history
Fix identity validation in VBA flow
  • Loading branch information
Tim Szot authored Oct 4, 2021
2 parents 625665a + 60d37c0 commit c312069
Showing 2 changed files with 16 additions and 8 deletions.
22 changes: 14 additions & 8 deletions src/libs/ValidationUtils.js
Original file line number Diff line number Diff line change
@@ -46,6 +46,10 @@ function isValidAddress(value) {
* @returns {Boolean} true if valid
*/
function isValidDate(date) {
if (!date) {
return false;
}

const pastDate = moment().subtract(1000, 'years');
const futureDate = moment().add(1000, 'years');
const testDate = moment(date);
@@ -166,17 +170,19 @@ function isValidURL(url) {
* @returns {Object}
*/
function validateIdentity(identity) {
const requiredFields = ['firstName', 'lastName', 'street', 'city', 'zipCode', 'state', 'ssnLast4', 'dob'];
const errors = {};
if (!isValidAddress(identity.street)) {
errors.street = true;
}

if (!isRequiredFulfilled(identity.state)) {
errors.state = true;
}
// Check that all required fields are filled
_.each(requiredFields, (fieldName) => {
if (isRequiredFulfilled(identity[fieldName])) {
return;
}
errors[fieldName] = true;
});

if (!isRequiredFulfilled(identity.city)) {
errors.city = true;
if (!isValidAddress(identity.street)) {
errors.street = true;
}

if (!isValidZipCode(identity.zipCode)) {
2 changes: 2 additions & 0 deletions src/pages/ReimbursementAccount/RequestorStep.js
Original file line number Diff line number Diff line change
@@ -110,6 +110,8 @@ class RequestorStep extends React.Component {
*/
validate() {
const errors = validateIdentity({
firstName: this.state.firstName,
lastName: this.state.lastName,
street: this.state.requestorAddressStreet,
state: this.state.requestorAddressState,
city: this.state.requestorAddressCity,

0 comments on commit c312069

Please sign in to comment.