Updated logic to Not allow future date as incorporation date

src/languages/en.js

@@ -431,6 +431,7 @@ export default {
             addressStreet: 'Please enter a valid street address that is not a PO Box',
             addressState: 'Please select a valid state',
             incorporationDate: 'Please enter a valid date',
+            incorporationDateFuture: 'Incorporation date cannot be in the future',
             incorporationState: 'Please enter a valid state',
             industryCode: 'Please enter a valid industry classification code. Must be 6 digits.',
             restrictedBusiness: 'Please confirm company is not on the list of restricted businesses',

src/languages/es.js

@@ -431,6 +431,7 @@ export default {
             addressStreet: 'Ingresa una calle de dirección válida que no sea un apartado postal',
             addressState: 'Por favor, selecciona un estado',
             incorporationDate: 'Ingresa una fecha válida',
+            incorporationDateFuture: 'La fecha de incorporación no puede ser futura',
             incorporationState: 'Ingresa un estado válido',
             industryCode: 'Ingresa un código de clasificación de industria válido',
             restrictedBusiness: 'Confirma que la empresa no está en la lista de negocios restringidos',

src/libs/ValidationUtils.js

@@ -56,6 +56,23 @@ function isValidDate(date) {
     return testDate.isValid() && testDate.isBetween(pastDate, futureDate);
 }
 
+/**
+ * Validate that date entered isn't a future date.
+ *
+ * @param {String|Date} date
+ * @returns {Boolean} true if valid
+ */
+function isValidPastDate(date) {
+    if (!date) {
+        return false;
+    }
+
+    const pastDate = moment().subtract(1000, 'years');
+    const currentDate = moment();
+    const testDate = moment(date).startOf('day');
+    return testDate.isValid() && testDate.isBetween(pastDate, currentDate);
+}
+
 /**
  * Used to validate a value that is "required".
  *
@@ -216,6 +233,7 @@ export {
     meetsAgeRequirements,
     isValidAddress,
     isValidDate,
+    isValidPastDate,
     isValidSecurityCode,
     isValidExpirationDate,
     isValidDebitCard,

src/pages/ReimbursementAccount/CompanyStep.js

@@ -24,7 +24,7 @@ import TextLink from '../../components/TextLink';
 import StatePicker from '../../components/StatePicker';
 import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize';
 import {
-    isValidDate, isRequiredFulfilled, isValidURL, isValidPhoneWithSpecialChars,
+    isValidDate, isValidPastDate, isRequiredFulfilled, isValidURL, isValidPhoneWithSpecialChars,
 } from '../../libs/ValidationUtils';
 import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
@@ -94,13 +94,15 @@ class CompanyStep extends React.Component {
             website: 'bankAccount.error.website',
             companyTaxID: 'bankAccount.error.taxID',
             incorporationDate: 'bankAccount.error.incorporationDate',
+            incorporationDateFuture: 'bankAccount.error.incorporationDateFuture',
             incorporationType: 'bankAccount.error.companyType',
             hasNoConnectionToCannabis: 'bankAccount.error.restrictedBusiness',
         };
 
         this.getErrorText = inputKey => ReimbursementAccountUtils.getErrorText(this.props, this.errorTranslationKeys, inputKey);
         this.clearError = inputKey => ReimbursementAccountUtils.clearError(this.props, inputKey);
         this.getErrors = () => ReimbursementAccountUtils.getErrors(this.props);
+        this.clearDateErrorsAndSetValue = this.clearDateErrorsAndSetValue.bind(this);
     }
 
     getFormattedAddressValue() {
@@ -139,6 +141,16 @@ class CompanyStep extends React.Component {
         this.clearError(inputKey);
     }
 
+    /**
+     * Clear errors associated with incorporation date.
+     *
+     * @param {String} value
+     */
+    clearDateErrorsAndSetValue(value) {
+        this.clearErrorAndSetValue('incorporationDate', value);
+        this.clearError('incorporationDateFuture');
+    }
+
     /**
      * @returns {Boolean}
      */
@@ -157,6 +169,10 @@ class CompanyStep extends React.Component {
             errors.incorporationDate = true;
         }
 
+        if (!isValidPastDate(this.state.incorporationDate)) {
+            errors.incorporationDateFuture = true;
+        }
+
         if (!isValidPhoneWithSpecialChars(this.state.companyPhone)) {
             errors.companyPhone = true;
         }
@@ -250,25 +266,23 @@ class CompanyStep extends React.Component {
                             hasError={this.getErrors().incorporationType}
                         />
                     </View>
-                    <View style={[styles.flexRow, styles.mt4]}>
-                        <View style={[styles.flex1, styles.mr2]}>
-                            <DatePicker
-                                label={this.props.translate('companyStep.incorporationDate')}
-                                onChange={value => this.clearErrorAndSetValue('incorporationDate', value)}
-                                value={this.state.incorporationDate}
-                                placeholder={this.props.translate('companyStep.incorporationDatePlaceholder')}
-                                errorText={this.getErrorText('incorporationDate')}
-                                translateX={-14}
-                            />
-                        </View>
-                        <View style={[styles.flex1]}>
-                            <StatePicker
-                                label={this.props.translate('companyStep.incorporationState')}
-                                onChange={value => this.clearErrorAndSetValue('incorporationState', value)}
-                                value={this.state.incorporationState}
-                                hasError={this.getErrors().incorporationState}
-                            />
-                        </View>
+                    <View style={styles.mt4}>
+                        <DatePicker
+                            label={this.props.translate('companyStep.incorporationDate')}
+                            onChange={this.clearDateErrorsAndSetValue}
+                            value={this.state.incorporationDate}
+                            placeholder={this.props.translate('companyStep.incorporationDatePlaceholder')}
+                            errorText={this.getErrorText('incorporationDate') || this.getErrorText('incorporationDateFuture')}
+                            translateX={-14}
+                        />
+                    </View>
+                    <View style={styles.mt4}>
+                        <StatePicker
+                            label={this.props.translate('companyStep.incorporationState')}
+                            onChange={value => this.clearErrorAndSetValue('incorporationState', value)}
+                            value={this.state.incorporationState}
+                            hasError={this.getErrors().incorporationState}
+                        />
                     </View>
                     <CheckboxWithLabel
                         isChecked={this.state.hasNoConnectionToCannabis}