Merge pull request #2340 from rashmi73/issue_2094

Issue 2094 fix

Author: ThomasKranitsas

src/shared/components/Settings/Profile/BasicInfo/index.jsx

@@ -100,7 +100,9 @@ export default class BasicInfo extends ConsentComponent {
     let invalid = false;
     let errorMessage = '';
     let dateError = '';
+    let zipError = '';
     let birthDateInvalid = false;
+    let zipInvalid = false;
     const invalidFields = [];
 
     if (!_.trim(newBasicInfo.firstName).length) {
@@ -123,6 +125,13 @@ export default class BasicInfo extends ConsentComponent {
       errorMessage += ' cannot be empty';
     }
 
+    _.forEach(newBasicInfo.addresses, (address) => {
+      if (!(/^[0-9-]*$/.test(address.zip))) {
+        zipError = 'You must enter a valid zip code';
+        zipInvalid = true;
+      }
+    });
+
     if (_.trim(newBasicInfo.birthDate).length > 0) {
       if (!moment().isAfter(newBasicInfo.birthDate)) {
         dateError = 'You must enter a valid date for Birth Date';
@@ -137,6 +146,13 @@ export default class BasicInfo extends ConsentComponent {
       invalid = birthDateInvalid;
     }
 
+    if (errorMessage.length > 0) {
+      errorMessage = `${errorMessage}. ${zipError}`;
+    } else if (zipError.length > 0) {
+      errorMessage = zipError;
+      invalid = zipInvalid;
+    }
+
     this.setState({ errorMessage, formInvalid: invalid });
     return invalid;
   }