diff --git a/app/controllers/intakes_controller.rb b/app/controllers/intakes_controller.rb index 0800cc5b1ea..9b93af1878b 100644 --- a/app/controllers/intakes_controller.rb +++ b/app/controllers/intakes_controller.rb @@ -143,7 +143,6 @@ def intake_ui_hash def feature_toggle_ui_hash { - useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, user: current_user), dateOfBirthField: FeatureToggle.enabled?(:date_of_birth_field, user: current_user), covidTimelinessExemption: FeatureToggle.enabled?(:covid_timeliness_exemption, user: current_user), filedByVaGovHlr: FeatureToggle.enabled?(:filed_by_va_gov_hlr, user: current_user), diff --git a/app/views/appeals/edit.html.erb b/app/views/appeals/edit.html.erb index f543d778340..71a6f753bbe 100644 --- a/app/views/appeals/edit.html.erb +++ b/app/views/appeals/edit.html.erb @@ -14,7 +14,6 @@ serverIntake: appeal.ui_hash, claimId: url_appeal_uuid, featureToggles: { - useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, user: current_user), correctClaimReviews: FeatureToggle.enabled?(:correct_claim_reviews, user: current_user), covidTimelinessExemption: FeatureToggle.enabled?(:covid_timeliness_exemption, user: current_user), split_appeal_workflow: FeatureToggle.enabled?(:split_appeal_workflow, user: current_user), diff --git a/app/views/higher_level_reviews/edit.html.erb b/app/views/higher_level_reviews/edit.html.erb index 6468416219d..c089f96084c 100644 --- a/app/views/higher_level_reviews/edit.html.erb +++ b/app/views/higher_level_reviews/edit.html.erb @@ -9,7 +9,6 @@ serverIntake: higher_level_review.ui_hash, claimId: url_claim_id, featureToggles: { - useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, user: current_user), correctClaimReviews: FeatureToggle.enabled?(:correct_claim_reviews, user: current_user), covidTimelinessExemption: FeatureToggle.enabled?(:covid_timeliness_exemption, user: current_user) } diff --git a/app/views/supplemental_claims/edit.html.erb b/app/views/supplemental_claims/edit.html.erb index b3c8d18054e..b6526b30667 100644 --- a/app/views/supplemental_claims/edit.html.erb +++ b/app/views/supplemental_claims/edit.html.erb @@ -9,7 +9,6 @@ serverIntake: supplemental_claim.ui_hash, claimId: url_claim_id, featureToggles: { - useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, user: current_user), correctClaimReviews: FeatureToggle.enabled?(:correct_claim_reviews, user: current_user), covidTimelinessExemption: FeatureToggle.enabled?(:covid_timeliness_exemption, user: current_user) } diff --git a/client/app/admin/reducers/featureToggle.js b/client/app/admin/reducers/featureToggle.js index 331e3653b7a..bb1acaeb27e 100644 --- a/client/app/admin/reducers/featureToggle.js +++ b/client/app/admin/reducers/featureToggle.js @@ -2,9 +2,6 @@ import { update } from '../../util/ReducerUtil'; const updateFromServerFeatures = (state, featureToggles) => { return update(state, { - useAmaActivationDate: { - $set: Boolean(featureToggles.useAmaActivationDate) - }, correctClaimReviews: { $set: Boolean(featureToggles.correctClaimReviews) }, diff --git a/client/app/intake/pages/addIssues.jsx b/client/app/intake/pages/addIssues.jsx index 68628723dfd..64d923a4527 100644 --- a/client/app/intake/pages/addIssues.jsx +++ b/client/app/intake/pages/addIssues.jsx @@ -212,7 +212,7 @@ class AddIssuesPage extends React.Component { } = this.props; const intakeData = intakeForms[formType]; const appealInfo = intakeForms.appeal; - const { useAmaActivationDate, hlrScUnrecognizedClaimants } = featureToggles; + const { hlrScUnrecognizedClaimants } = featureToggles; const hasClearedEp = intakeData && (intakeData.hasClearedRatingEp || intakeData.hasClearedNonratingEp); if (this.willRedirect(intakeData, hasClearedEp)) { @@ -238,7 +238,7 @@ class AddIssuesPage extends React.Component { (issue) => VBMS_BENEFIT_TYPES.includes(issue.benefitType) || issue.ratingIssueReferenceId ); - const issues = formatAddedIssues(intakeData.addedIssues, useAmaActivationDate); + const issues = formatAddedIssues(intakeData.addedIssues); const issuesPendingWithdrawal = issues.filter((issue) => issue.withdrawalPending); const issuesBySection = formatIssuesBySection(issues); diff --git a/client/app/intake/pages/formGenerator.stories.js b/client/app/intake/pages/formGenerator.stories.js index 03150bb812f..4262f1f1fde 100644 --- a/client/app/intake/pages/formGenerator.stories.js +++ b/client/app/intake/pages/formGenerator.stories.js @@ -69,7 +69,6 @@ const defaultArgs = { filedByVaGovHlr: true, updatedAppealForm: true, updatedIntakeForms: true, - useAmaActivationDate: true, vhaClaimReviewEstablishment: true, }, }; diff --git a/client/app/intake/pages/review.jsx b/client/app/intake/pages/review.jsx index cfc5bdca9d3..fba0f139dc0 100644 --- a/client/app/intake/pages/review.jsx +++ b/client/app/intake/pages/review.jsx @@ -79,7 +79,7 @@ const Review = (props) => { const formProps = useForm( { resolver: yupResolver(schemaMappings(props.featureToggles)[props.formType]), - context: { selectedForm: props.formType, useAmaActivationDate: props.featureToggles.useAmaActivationDate }, + context: { selectedForm: props.formType }, mode: 'onSubmit', reValidateMode: 'onSubmit' } diff --git a/client/app/intake/reducers/featureToggles.js b/client/app/intake/reducers/featureToggles.js index 53a5aa4dbda..b149436e36e 100644 --- a/client/app/intake/reducers/featureToggles.js +++ b/client/app/intake/reducers/featureToggles.js @@ -2,9 +2,6 @@ import { update } from '../../util/ReducerUtil'; const updateFromServerFeatures = (state, featureToggles) => { return update(state, { - useAmaActivationDate: { - $set: Boolean(featureToggles.useAmaActivationDate) - }, correctClaimReviews: { $set: Boolean(featureToggles.correctClaimReviews) }, @@ -35,7 +32,6 @@ const updateFromServerFeatures = (state, featureToggles) => { export const mapDataToFeatureToggle = (data = { featureToggles: {} }) => updateFromServerFeatures( { - useAmaActivationDate: false, correctClaimReviews: false, filedByVaGovHlr: false, updatedIntakeForms: false, diff --git a/client/app/intake/util/issues.js b/client/app/intake/util/issues.js index ed897f29062..db87a9722de 100644 --- a/client/app/intake/util/issues.js +++ b/client/app/intake/util/issues.js @@ -348,8 +348,8 @@ export const formatIssuesBySection = (issues) => { ); }; -export const formatAddedIssues = (issues = [], useAmaActivationDate = false) => { - const amaActivationDate = new Date(useAmaActivationDate ? DATES.AMA_ACTIVATION : DATES.AMA_ACTIVATION_TEST); +export const formatAddedIssues = (issues = []) => { + const amaActivationDate = new Date(DATES.AMA_ACTIVATION_TEST); return issues.map((issue, index) => { if (issue.isUnidentified || issue.verifiedUnidentifiedIssue) { diff --git a/client/test/app/intake/pages/review.test.js b/client/test/app/intake/pages/review.test.js index 6120c441518..1597f3bcbfe 100644 --- a/client/test/app/intake/pages/review.test.js +++ b/client/test/app/intake/pages/review.test.js @@ -2,7 +2,7 @@ import { reviewAppealSchema } from 'app/intake/pages/appeal/review'; import DATES from '../../../../constants/DATES'; import { subDays, addDays } from 'date-fns'; -const assertValidSchema = async (schema, testSchema, useAmaActivationDate, isValid) => { +const assertValidSchema = async (schema, testSchema, isValid) => { await schema .isValid(testSchema, { context: { useAmaActivationDate } }) @@ -35,13 +35,13 @@ describe('schema', () => { validSchema['original-hearing-request-type'] = null; await assertValidSchema(reviewAppealSchema, validSchema, true, true); }); - + it('hearing type is valid', async () => { const validSchema = validReviewAppealData; await assertValidSchema(reviewAppealSchema, validSchema, true, true); }); - + describe('homelessness-type', () => { it(' field is valid', async () => { await assertValidSchema(reviewAppealSchema, validReviewAppealData, true, true); @@ -49,34 +49,4 @@ describe('schema', () => { }); }); - describe('useAmaActivationDate', () => { - // eslint-disable-next-line jest/expect-expect - it('is valid after feb 19, 2019', async () => { - await assertValidSchema(reviewAppealSchema, validReviewAppealData, true, true); - }); - // eslint-disable-next-line jest/expect-expect - it('is invalid before feb 19, 2019', async () => { - const invalidSchema = validReviewAppealData; - - invalidSchema['receipt-date'] = BEFORE_AMA_DATE; - await assertValidSchema(reviewAppealSchema, invalidSchema, true, false); - }); - }); - - describe('!useAmaActivationDate', () => { - // eslint-disable-next-line jest/expect-expect - it('is valid after nov 1, 2017', async () => { - const validSchema = validReviewAppealData; - - validSchema['receipt-date'] = AFTER_AMA_TEST_DATE; - await assertValidSchema(reviewAppealSchema, validReviewAppealData, false, true); - }); - // eslint-disable-next-line jest/expect-expect - it('is invalid before nov 1, 2017', async () => { - const invalidSchema = validReviewAppealData; - - invalidSchema['receipt-date'] = BEFORE_AMA_TEST_DATE; - await assertValidSchema(reviewAppealSchema, invalidSchema, false, false); - }); - }); }); diff --git a/client/test/app/intake/testData.js b/client/test/app/intake/testData.js index 2982541058f..06066124bb2 100644 --- a/client/test/app/intake/testData.js +++ b/client/test/app/intake/testData.js @@ -872,7 +872,6 @@ export const sample1 = { }, claimId: '7dccd357-009c-4744-b986-4c46ad7c029e', featureToggles: { - useAmaActivationDate: true, correctClaimReviews: true, }, addIssuesModalVisible: false,